From c8eeb699796b28a814daea342ed6b9409ea1560b Mon Sep 17 00:00:00 2001
From: Bohdan Zhemelinskyi <zhem0004@algonquinlive.com>
Date: Mon, 14 Feb 2022 21:05:10 +0000
Subject: [PATCH 01/50] fixedPhoneLock

---
 ...hangeLockSettingsInMeetingCmdMsgHdlr.scala | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
index 0517248f0d..d424532bdb 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
@@ -3,6 +3,7 @@ package org.bigbluebutton.core.apps.users
 import org.bigbluebutton.LockSettingsUtil
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.apps.{ PermissionCheck, RightsManagementTrait }
+import org.bigbluebutton.core.models._
 import org.bigbluebutton.core.running.OutMsgRouter
 import org.bigbluebutton.core.running.MeetingActor
 import org.bigbluebutton.core2.MeetingStatus2x
@@ -42,6 +43,25 @@ trait ChangeLockSettingsInMeetingCmdMsgHdlr extends RightsManagementTrait {
         if (!oldPermissions.disableMic && settings.disableMic) {
           // Apply lock settings when disableMic from false to true.
           LockSettingsUtil.enforceLockSettingsForAllVoiceUsers(liveMeeting, outGW)
+
+          // Dial-in
+          def buildLockMessage(meetingId: String, userId: String, lockedBy: String, locked: Boolean): BbbCommonEnvCoreMsg = {
+            val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, meetingId, userId)
+            val envelope = BbbCoreEnvelope(UserLockedInMeetingEvtMsg.NAME, routing)
+            val body = UserLockedInMeetingEvtMsgBody(userId, locked, lockedBy)
+            val header = BbbClientMsgHeader(UserLockedInMeetingEvtMsg.NAME, meetingId, userId)
+            val event = UserLockedInMeetingEvtMsg(header, body)
+
+            BbbCommonEnvCoreMsg(envelope, event)
+          }
+
+          VoiceUsers.findAll(liveMeeting.voiceUsers) foreach { vu =>
+            if (vu.intId.startsWith(IntIdPrefixType.DIAL_IN)) { // only Dial-in users need this
+              val eventExplicitLock = buildLockMessage(liveMeeting.props.meetingProp.intId, vu.intId, msg.body.setBy, settings.disableMic)
+              outGW.send(eventExplicitLock)
+            }
+          }
+
         }
 
         if (!oldPermissions.disableCam && settings.disableCam) {

From 0506928367c77c7ab1075c0fb420cac8668f960a Mon Sep 17 00:00:00 2001
From: Daniel Schreiber <daniel.schreiber@hrz.tu-chemnitz.de>
Date: Sun, 29 May 2022 19:24:53 +0200
Subject: [PATCH 02/50] Fix: only show breakout room in user list when user is
 in breakout room

The user list in the main room showed user being in breakout rooms who
already left a breakout room

closes #14982
---
 .../user-participants/user-list-item/component.jsx             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
index 518718f342..172ad51569 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
@@ -653,6 +653,7 @@ class UserListItem extends PureComponent {
       user,
       intl,
       isThisMeetingLocked,
+      userInBreakout,
       userLastBreakout,
       isMe,
       isRTL,
@@ -746,7 +747,7 @@ class UserListItem extends PureComponent {
       if (LABEL.guest) userNameSub.push(intl.formatMessage(messages.guest));
     }
 
-    if (userLastBreakout) {
+    if (userInBreakout && userLastBreakout) {
       userNameSub.push(
         <span key={_.uniqueId('breakout-')}>
           <Icon iconName="rooms" />

From e43c83b7ba501d74b31cdad8ce9b7c8917525189 Mon Sep 17 00:00:00 2001
From: Ramon Souza <contato@ramonsouza.com>
Date: Mon, 30 May 2022 16:40:14 -0300
Subject: [PATCH 03/50] fix restoreOnUpdate

---
 .../ui/components/presentation/component.jsx        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 3e9aa80322..e6c2208116 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -73,6 +73,7 @@ class Presentation extends PureComponent {
       zoom: 100,
       fitToWidth: false,
       isFullscreen: false,
+      hadPresentation: false,
     };
 
     this.currentPresentationToastId = null;
@@ -158,8 +159,7 @@ class Presentation extends PureComponent {
       intl,
     } = this.props;
 
-    const { presentationWidth, presentationHeight } = this.state;
-
+    const { presentationWidth, presentationHeight, hadPresentation } = this.state;
     const {
       numCameras: prevNumCameras,
       presentationBounds: prevPresentationBounds,
@@ -210,6 +210,11 @@ class Presentation extends PureComponent {
           render: this.renderCurrentPresentationToast(),
         });
       }
+
+      if (layoutSwapped && restoreOnUpdate && currentSlide && hadPresentation) {
+        toggleSwapLayout(layoutContextDispatch);
+        this.setState({ hadPresentation: false });
+      }
     }
 
     if (prevProps?.slidePosition && slidePosition) {
@@ -254,6 +259,10 @@ class Presentation extends PureComponent {
         value: currentSlide.num,
       });
     }
+
+    if (prevProps.currentSlide && !currentSlide) {
+      this.setState({ hadPresentation: true });
+    }
   }
 
   componentWillUnmount() {

From b467050bc7593a35c2de870ccb8fa7dcc127491f Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Fri, 3 Jun 2022 12:12:44 -0300
Subject: [PATCH 04/50] improvement: make the close button of the user details
 modal receive focus on open and improve its styling; close the user details
 modal when an element outside the modal receives focus

---
 .../src/components/UserDetails/component.jsx  | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/bbb-learning-dashboard/src/components/UserDetails/component.jsx b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
index 1a363d8cbb..10aae7975b 100644
--- a/bbb-learning-dashboard/src/components/UserDetails/component.jsx
+++ b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import {
   FormattedMessage, FormattedNumber, FormattedTime, injectIntl,
@@ -14,15 +14,35 @@ const UserDatailsComponent = (props) => {
 
   if (!isOpen) return null;
 
+  const modal = useRef();
+  const closeButton = useRef();
+
   useEffect(() => {
-    const handler = (e) => {
+    const keydownhandler = (e) => {
       if (e.code === 'Escape') dispatch({ type: 'closeModal' });
     };
 
-    window.addEventListener('keydown', handler);
-    return () => window.removeEventListener('keydown', handler);
+    const focusHandler = () => {
+      if (modal.current && document.activeElement) {
+        if (!modal.current.contains(document.activeElement)) {
+          dispatch({ type: 'closeModal' });
+        }
+      }
+    };
+
+    window.addEventListener('keydown', keydownhandler);
+    window.addEventListener('focus', focusHandler);
+
+    return () => {
+      window.removeEventListener('keydown', keydownhandler);
+      window.removeEventListener('focus', focusHandler);
+    };
   }, []);
 
+  useEffect(() => {
+    closeButton.current?.focus();
+  });
+
   const {
     createdOn, endedOn, polls, users,
   } = dataJson;
@@ -282,12 +302,14 @@ const UserDatailsComponent = (props) => {
         role="none"
         onClick={() => dispatch({ type: 'closeModal' })}
       />
-      <div className="overflow-auto w-full md:w-2/4 bg-gray-100 p-6">
+      <div ref={modal} className="overflow-auto w-full md:w-2/4 bg-gray-100 p-6">
         <div className="text-right rtl:text-left">
           <button
             onClick={() => dispatch({ type: 'closeModal' })}
             type="button"
             aria-label="Close user details modal"
+            ref={closeButton}
+            className="focus:rounded-md focus:outline-none focus:ring focus:ring-gray-500 focus:ring-opacity-50 hover:text-black/50 active:text-black/75"
           >
             <svg xmlns="http://www.w3.org/2000/svg" className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />

From 59c9d1da2eff21e1dee273cc4e8513b25208ab4a Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Fri, 3 Jun 2022 15:42:46 -0300
Subject: [PATCH 05/50] fix: close button focus on open

---
 .../src/components/UserDetails/component.jsx  |  4 +++-
 .../src/utils/hooks/index.js                  | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 bbb-learning-dashboard/src/utils/hooks/index.js

diff --git a/bbb-learning-dashboard/src/components/UserDetails/component.jsx b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
index 10aae7975b..5dc76897fd 100644
--- a/bbb-learning-dashboard/src/components/UserDetails/component.jsx
+++ b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
@@ -6,6 +6,7 @@ import {
 import { UserDetailsContext } from './context';
 import UserAvatar from '../UserAvatar';
 import { getSumOfTime, tsToHHmmss, getActivityScore } from '../../services/UserService';
+import { usePreviousValue } from '../../utils/hooks';
 
 const UserDatailsComponent = (props) => {
   const {
@@ -16,6 +17,7 @@ const UserDatailsComponent = (props) => {
 
   const modal = useRef();
   const closeButton = useRef();
+  const wasModalOpen = usePreviousValue(isOpen);
 
   useEffect(() => {
     const keydownhandler = (e) => {
@@ -40,7 +42,7 @@ const UserDatailsComponent = (props) => {
   }, []);
 
   useEffect(() => {
-    closeButton.current?.focus();
+    if (!wasModalOpen) closeButton.current?.focus();
   });
 
   const {
diff --git a/bbb-learning-dashboard/src/utils/hooks/index.js b/bbb-learning-dashboard/src/utils/hooks/index.js
new file mode 100644
index 0000000000..d82fdc9b49
--- /dev/null
+++ b/bbb-learning-dashboard/src/utils/hooks/index.js
@@ -0,0 +1,19 @@
+import { useEffect, useRef } from 'react';
+
+/**
+ * Custom hook to get previous values. It can be used, for example,
+ * to retrieve previous props or state.
+ * @param {*} value
+ * @returns The previous value.
+ */
+export const usePreviousValue = (value) => {
+  const ref = useRef(null);
+  useEffect(() => {
+    ref.current = value;
+  });
+  return ref.current;
+};
+
+export default {
+  usePreviousValue,
+};

From 72d2374b03240567a9ebdfeb2995cc806513f052 Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Fri, 3 Jun 2022 15:46:29 -0300
Subject: [PATCH 06/50] fix: focus handling when modal is open

---
 .../src/components/UserDetails/component.jsx                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bbb-learning-dashboard/src/components/UserDetails/component.jsx b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
index 5dc76897fd..072edec766 100644
--- a/bbb-learning-dashboard/src/components/UserDetails/component.jsx
+++ b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
@@ -27,17 +27,17 @@ const UserDatailsComponent = (props) => {
     const focusHandler = () => {
       if (modal.current && document.activeElement) {
         if (!modal.current.contains(document.activeElement)) {
-          dispatch({ type: 'closeModal' });
+          closeButton.current.focus();
         }
       }
     };
 
     window.addEventListener('keydown', keydownhandler);
-    window.addEventListener('focus', focusHandler);
+    window.addEventListener('focus', focusHandler, true);
 
     return () => {
       window.removeEventListener('keydown', keydownhandler);
-      window.removeEventListener('focus', focusHandler);
+      window.removeEventListener('focus', focusHandler, true);
     };
   }, []);
 

From 067b4e0c6b989a78220fcffb51a900101d66d673 Mon Sep 17 00:00:00 2001
From: Calvin Walton <calvin.walton@blindsidenetworks.com>
Date: Wed, 8 Jun 2022 11:15:28 -0400
Subject: [PATCH 07/50] Support deskshare videos that resize

Based on work done by Tiago Jacobs and Guilherme Pereira Leme to
investigate the behaviour of ffmpeg on videos with changing input size.

Rather than having the EDL code set fixed sizes for the scale and pad
filters, instead use ffmpeg's built in features to calculate the scale
and pad automatically, dynamically updating if the input video size
changes.

In the version of ffmpeg in Ubuntu 20.04, the 'movie' input filter is
buggy and doesn't correctly handle the video size changing. Instead of
using the movie filter, use separate inputs to the ffmpeg command (the
design used here is based on the code in audio.rb). The filter chain is
now stored into a file (using -filter_complex_script) to reduce problems
with the command line getting too long.

We are using a version of ffmpeg that's new enough to have the tpad
filter now too, so use it to extend the video if needed instead of an
extra concat.
---
 .../core/lib/recordandplayback/edl/video.rb   | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/record-and-playback/core/lib/recordandplayback/edl/video.rb b/record-and-playback/core/lib/recordandplayback/edl/video.rb
index fb86068f04..f9644dc744 100644
--- a/record-and-playback/core/lib/recordandplayback/edl/video.rb
+++ b/record-and-playback/core/lib/recordandplayback/edl/video.rb
@@ -380,18 +380,12 @@ module BigBlueButton
         [new_width, new_height]
       end
 
-      def self.pad_offset(video_width, video_height, area_width, area_height)
-        pad_x = (2 * ((area_width - video_width).to_f / 4).round).to_i
-        pad_y = (2 * ((area_height - video_height).to_f / 4).round).to_i
-        [pad_x, pad_y]
-      end
-
       def self.composite_cut(output, cut, layout, videoinfo)
         duration = cut[:next_timestamp] - cut[:timestamp]
         BigBlueButton.logger.info "  Cut start time #{cut[:timestamp]}, duration #{duration}"
 
+        ffmpeg_inputs = []
         ffmpeg_filter = "color=c=white:s=#{layout[:width]}x#{layout[:height]}:r=#{layout[:framerate]}"
-
         layout[:areas].each do |layout_area|
           area = cut[:areas][layout_area[:name]]
           video_count = area.length
@@ -448,9 +442,6 @@ module BigBlueButton
             scale_width, scale_height = aspect_scale(video_width, video_height, tile_width, tile_height)
             BigBlueButton.logger.debug "      scaled size: #{scale_width}x#{scale_height}"
 
-            offset_x, offset_y = pad_offset(scale_width, scale_height, tile_width, tile_height)
-            BigBlueButton.logger.debug "      offset: left: #{offset_x}, top: #{offset_y}"
-
             BigBlueButton.logger.debug("      start timestamp: #{video[:timestamp]}")
             seek_offset = this_videoinfo[:start_time]
             BigBlueButton.logger.debug("      seek offset: #{seek_offset}")
@@ -505,31 +496,30 @@ module BigBlueButton
             if seek > 0
               seek = seek + seek_offset
             end
-            ffmpeg_filter << "movie=#{video[:filename]}:sp=#{ms_to_s(seek)}"
+            input_index = ffmpeg_inputs.length
+            ffmpeg_inputs << {
+              filename: video[:filename],
+              seek: seek,
+            }
+            ffmpeg_filter << "[#{input_index}]"
             # Scale the video length for the deskshare timestamp workaround
             if !scale.nil?
-              ffmpeg_filter << ",setpts=PTS*#{scale}"
+              ffmpeg_filter << "setpts=PTS*#{scale},"
             end
             # Subtract away the offset from the timestamps, so the trimming
             # in the fps filter is accurate
-            ffmpeg_filter << ",setpts=PTS-#{ms_to_s(seek_offset)}/TB"
+            ffmpeg_filter << "setpts=PTS-#{ms_to_s(seek_offset)}/TB"
             # fps filter fills in frames up to the desired start point, and
             # cuts the video there
             ffmpeg_filter << ",fps=#{layout[:framerate]}:start_time=#{ms_to_s(video[:timestamp])}"
             # Reset the timestamps to start at 0 so that everything is synced
             # for the video tiling, and scale to the desired size.
-            ffmpeg_filter << ",setpts=PTS-STARTPTS,scale=#{scale_width}:#{scale_height},setsar=1"
+            ffmpeg_filter << ",setpts=PTS-STARTPTS,scale=w=#{tile_width}:h=#{tile_height}:force_original_aspect_ratio=decrease,setsar=1"
             # And finally, pad the video to the desired aspect ratio
-            ffmpeg_filter << ",pad=w=#{tile_width}:h=#{tile_height}:x=#{offset_x}:y=#{offset_y}:color=white"
-            ffmpeg_filter << "[#{pad_name}_movie];"
-
-            # In case the video was shorter than expected, we might have to pad
-            # it to length. do that by concatenating a video generated by the
-            # color filter. (It would be nice to repeat the last frame instead,
-            # but there's no easy way to do that.)
-            ffmpeg_filter << "color=c=white:s=#{tile_width}x#{tile_height}:r=#{layout[:framerate]}"
-            ffmpeg_filter << "[#{pad_name}_pad];"
-            ffmpeg_filter << "[#{pad_name}_movie][#{pad_name}_pad]concat=n=2:v=1:a=0[#{pad_name}];"
+            ffmpeg_filter << ",pad=w=#{tile_width}:h=#{tile_height}:x=-1:y=-1:color=white"
+            # Extend the video to the desired length
+            ffmpeg_filter << ",tpad=stop=-1:stop_mode=add:color=white"
+            ffmpeg_filter << "[#{pad_name}];"
           end
 
           # Create the video rows
@@ -562,7 +552,21 @@ module BigBlueButton
 
         ffmpeg_filter << ",trim=end=#{ms_to_s(duration)}"
 
-        ffmpeg_cmd = [*FFMPEG, '-filter_complex', ffmpeg_filter, '-an', *FFMPEG_WF_ARGS, '-r', layout[:framerate].to_s, output]
+        ffmpeg_cmd = [*FFMPEG]
+        ffmpeg_inputs.each do |input|
+          ffmpeg_cmd += ['-ss', ms_to_s(input[:seek]), '-i', input[:filename]]
+        end
+
+        BigBlueButton.logger.debug('  ffmpeg filter_complex_script:')
+        BigBlueButton.logger.debug(ffmpeg_filter)
+        filter_complex_script = "#{output}.filter"
+        File.open(filter_complex_script, 'w') do |io|
+          io.write(ffmpeg_filter)
+        end
+        ffmpeg_cmd += ['-filter_complex_script', filter_complex_script]
+
+        ffmpeg_cmd += ['-an', *FFMPEG_WF_ARGS, '-r', layout[:framerate].to_s, output]
+
         exitstatus = BigBlueButton.exec_ret(*ffmpeg_cmd)
         raise "ffmpeg failed, exit code #{exitstatus}" if exitstatus != 0
 

From b6a422d21482e1d4686ac23a7aa26ad0c25f151f Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Thu, 23 Jun 2022 18:06:26 +0000
Subject: [PATCH 08/50] "Change user status" test needs to wait for default
 presentation notification to clear

---
 bigbluebutton-tests/playwright/user/status.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-tests/playwright/user/status.js b/bigbluebutton-tests/playwright/user/status.js
index 4f95ec50a3..cbc972f058 100644
--- a/bigbluebutton-tests/playwright/user/status.js
+++ b/bigbluebutton-tests/playwright/user/status.js
@@ -1,6 +1,6 @@
 const Page = require('../core/page');
 const { setStatus } = require('./util');
-const { waitAndClearNotification } = require('../notifications/util');
+const { waitAndClearNotification, waitAndClearDefaultPresentationNotification } = require('../notifications/util');
 const e = require('../core/elements');
 
 class Status extends Page {
@@ -9,6 +9,7 @@ class Status extends Page {
   }
 
   async changeUserStatus() {
+    await waitAndClearDefaultPresentationNotification(this);
     await setStatus(this, e.applaud);
     await this.waitForSelector(e.smallToastMsg);
     await this.checkElement(e.applauseIcon);

From 7d6fe7b03ca6f38dbcf49ada532a6c50ab065f2c Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Fri, 20 May 2022 23:22:55 +0000
Subject: [PATCH 09/50] add helper functions to test for appearance and
 disappearance of n'th (i.e, second or third) browser elements

use these functions to fix a race condition in lockShareWebcam
where we tested for the disappearance of a second webcam without
necessarily waiting for it to disappear
---
 bigbluebutton-tests/playwright/core/page.js        | 10 ++++++++++
 bigbluebutton-tests/playwright/user/lockViewers.js |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-tests/playwright/core/page.js b/bigbluebutton-tests/playwright/core/page.js
index fd4b593fda..93b104d97d 100644
--- a/bigbluebutton-tests/playwright/core/page.js
+++ b/bigbluebutton-tests/playwright/core/page.js
@@ -154,11 +154,21 @@ class Page {
     await expect(locator).toBeHidden({ timeout });
   }
 
+  async wasNthElementRemoved(selector, count, timeout = ELEMENT_WAIT_TIME) {
+    const locator = this.getLocator(':nth-match(' + selector + ',' + count + ')');
+    await expect(locator).toBeHidden({ timeout });
+  }
+
   async hasElement(selector, timeout = ELEMENT_WAIT_TIME) {
     const locator = this.getLocator(selector);
     await expect(locator).toBeVisible({ timeout });
   }
 
+  async hasNElements(selector, count, timeout = ELEMENT_WAIT_TIME) {
+    const locator = this.getLocator(':nth-match(' + selector + ',' + count + ')');
+    await expect(locator).toBeVisible({ timeout });
+  }
+
   async hasElementDisabled(selector, timeout = ELEMENT_WAIT_TIME) {
     const locator = this.getLocator(selector);
     await expect(locator).toBeDisabled({ timeout });
diff --git a/bigbluebutton-tests/playwright/user/lockViewers.js b/bigbluebutton-tests/playwright/user/lockViewers.js
index 9932ef9dd5..2f8bc8da63 100644
--- a/bigbluebutton-tests/playwright/user/lockViewers.js
+++ b/bigbluebutton-tests/playwright/user/lockViewers.js
@@ -14,15 +14,20 @@ class LockViewers extends MultiUsers {
 
   async lockShareWebcam() {
     await this.modPage.shareWebcam();
+    await this.modPage.hasElement(e.webcamVideoItem);
     await this.userPage.hasElement(e.webcamVideoItem);
     await this.userPage2.hasElement(e.webcamVideoItem);
     await this.userPage.shareWebcam();
+    await this.modPage.hasNElements(e.webcamVideoItem, 2);
+    await this.userPage.hasNElements(e.webcamVideoItem, 2);
+    await this.userPage2.hasNElements(e.webcamVideoItem, 2);
     await openLockViewers(this.modPage);
     await this.modPage.waitAndClickElement(e.lockShareWebcam);
     await this.modPage.waitAndClick(e.applyLockSettings);
     await waitAndClearNotification(this.modPage);
-    const videoContainerLockedCount = await this.userPage2.getSelectorCount(e.webcamVideoItem);
-    expect(videoContainerLockedCount).toBe(1);
+    await this.modPage.wasNthElementRemoved(e.webcamVideoItem, 2);
+    await this.userPage.wasNthElementRemoved(e.webcamVideoItem, 2);
+    await this.userPage2.wasNthElementRemoved(e.webcamVideoItem, 2);
 
     await this.userPage2.waitForSelector(e.dropdownWebcamButton);
     await this.userPage2.hasText(e.dropdownWebcamButton, this.modPage.username);

From 776fd9f024ca05a4880c4def3db01f81becfd8b3 Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Mon, 23 May 2022 21:30:30 +0000
Subject: [PATCH 10/50] webcamContentCheck: check that webcam videos are
 changing by computing a hash of their entire contents, rather than checking a
 single pixel

---
 bigbluebutton-tests/playwright/webcam/util.js | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/bigbluebutton-tests/playwright/webcam/util.js b/bigbluebutton-tests/playwright/webcam/util.js
index 38690571ce..9f4e7272a9 100644
--- a/bigbluebutton-tests/playwright/webcam/util.js
+++ b/bigbluebutton-tests/playwright/webcam/util.js
@@ -2,6 +2,10 @@ const e = require('../core/elements');
 const { sleep } = require('../core/helpers');
 const { LOOP_INTERVAL, ELEMENT_WAIT_LONGER_TIME } = require('../core/constants');
 
+// loop 5 times, every LOOP_INTERVAL milliseconds, and check that all
+// videos displayed are changing by comparing a hash of their
+// displayed contents
+
 async function webcamContentCheck(test) {
   await test.waitForSelector(e.webcamVideoItem);
   await test.wasRemoved(e.webcamConnecting, ELEMENT_WAIT_LONGER_TIME);
@@ -11,23 +15,44 @@ async function webcamContentCheck(test) {
     console.log(`loop ${i}`);
     const checkCameras = () => {
       const videos = document.querySelectorAll('video');
-      const lastVideoColor = document.lastVideoColor || {};
-      document.lastVideoColor = lastVideoColor;
+      const lastVideoHash = document.lastVideoHash || {};
+      document.lastVideoHash = lastVideoHash;
+
+      // If this code was running in the playwright test harness, we
+      // could just require('sha1'), but it's running in the test
+      // browser via test.page.evaluate, and I'm not sure how to get a
+      // node module (like sha1) into the test browser.  So I just
+      // found a nice hash function on the Internet.  -bwb
+
+      // public domain code from https://stackoverflow.com/a/52171480/1493790
+      // and/or https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
+
+      const cyrb53 = function(array, seed = 0) {
+          let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+          for (let i = 0, ch; i < array.length; i++) {
+              ch = array[i];
+              h1 = Math.imul(h1 ^ ch, 2654435761);
+              h2 = Math.imul(h2 ^ ch, 1597334677);
+          }
+          h1 = Math.imul(h1 ^ (h1>>>16), 2246822507) ^ Math.imul(h2 ^ (h2>>>13), 3266489909);
+          h2 = Math.imul(h2 ^ (h2>>>16), 2246822507) ^ Math.imul(h1 ^ (h1>>>13), 3266489909);
+          return 4294967296 * (2097151 & h2) + (h1>>>0);
+      };
 
       for (let v = 0; v < videos.length; v++) {
         const video = videos[v];
         const canvas = document.createElement('canvas');
         const context = canvas.getContext('2d');
         context.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
-        const pixel = context.getImageData(0, 0, 1, 1).data;
-        const pixelString = new Array(pixel).join(' ').toString();
+        const pixel = context.getImageData(0, 0, video.videoWidth, video.videoHeight).data;
+        const pixelHash = cyrb53(pixel);
 
-        if (lastVideoColor[v]) {
-          if (lastVideoColor[v] == pixelString) {
+        if (lastVideoHash[v]) {
+          if (lastVideoHash[v] == pixelHash) {
             return false;
           }
         }
-        lastVideoColor[v] = pixelString;
+        lastVideoHash[v] = pixelHash;
       }
       return true;
     };

From 44e0c072d51af90fe83a301d2822d5e516c53fed Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Fri, 24 Jun 2022 11:42:22 -0300
Subject: [PATCH 11/50] fix: missing translations for some labels on L. A.
 Dashboard

---
 .../src/components/UserDetails/component.jsx       |  8 +++++++-
 bbb-learning-dashboard/src/utils/string.js         | 14 ++++++++++++++
 bigbluebutton-html5/public/locales/en.json         |  5 +++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 bbb-learning-dashboard/src/utils/string.js

diff --git a/bbb-learning-dashboard/src/components/UserDetails/component.jsx b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
index 1a363d8cbb..72cfcba17a 100644
--- a/bbb-learning-dashboard/src/components/UserDetails/component.jsx
+++ b/bbb-learning-dashboard/src/components/UserDetails/component.jsx
@@ -6,6 +6,7 @@ import {
 import { UserDetailsContext } from './context';
 import UserAvatar from '../UserAvatar';
 import { getSumOfTime, tsToHHmmss, getActivityScore } from '../../services/UserService';
+import { toCamelCase } from '../../utils/string';
 
 const UserDatailsComponent = (props) => {
   const {
@@ -235,7 +236,12 @@ const UserDatailsComponent = (props) => {
   ) {
     return (
       <div className="p-6 flex flex-row justify-between items-end">
-        <div className="min-w-[20%] text-ellipsis overflow-hidden">{category}</div>
+        <div className="min-w-[20%] text-ellipsis overflow-hidden">
+          <FormattedMessage
+            id={`app.learningDashboard.userDetails.${toCamelCase(category)}`}
+            defaultMessage={category}
+          />
+        </div>
         <div className="min-w-[60%] grow text-center text-sm">
           <div className="mb-2">
             { (function getAverage() {
diff --git a/bbb-learning-dashboard/src/utils/string.js b/bbb-learning-dashboard/src/utils/string.js
new file mode 100644
index 0000000000..13593c7788
--- /dev/null
+++ b/bbb-learning-dashboard/src/utils/string.js
@@ -0,0 +1,14 @@
+export function toCamelCase(text = '') {
+  let words = text.split(' ');
+  words = words.filter((word) => word !== '');
+  const firstWord = words.shift().toLowerCase();
+  words = words.map((word) => {
+    const firstLetter = word[0];
+    return firstLetter.toUpperCase() + word.substring(1);
+  });
+  return firstWord + words.join('');
+}
+
+export default {
+  toCamelCase,
+};
diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index 87f03d37f3..b6c4cac44e 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -1019,6 +1019,11 @@
     "app.learningDashboard.userDetails.response": "Response",
     "app.learningDashboard.userDetails.mostCommonAnswer": "Most Common Answer",
     "app.learningDashboard.userDetails.anonymousAnswer": "Anonymous Poll",
+    "app.learningDashboard.userDetails.talkTime": "Talk Time",
+    "app.learningDashboard.userDetails.messages": "Messages",
+    "app.learningDashboard.userDetails.emojis": "Emojis",
+    "app.learningDashboard.userDetails.raiseHands": "Raise Hands",
+    "app.learningDashboard.userDetails.pollVotes": "Poll Votes",
     "app.learningDashboard.usersTable.title": "Overview",
     "app.learningDashboard.usersTable.colOnline": "Online time",
     "app.learningDashboard.usersTable.colTalk": "Talk time",

From 3ea33ce3acdeec7132cf9ceb090bfcf134e00c19 Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Tue, 28 Jun 2022 13:33:54 -0300
Subject: [PATCH 12/50] fix: apply presentation 'isCurrent' changes to local
 state

---
 .../presentation-uploader/component.jsx       | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
index 28eb2f8318..a76a4a30f1 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
@@ -268,6 +268,31 @@ class PresentationUploader extends Component {
   componentDidUpdate(prevProps) {
     const { isOpen, presentations: propPresentations, intl } = this.props;
     const { presentations } = this.state;
+    const { presentations: prevPropPresentations } = prevProps;
+
+    let shouldUpdateState = isOpen && !prevProps.isOpen;
+    const presState = Object.values({
+      ...propPresentations,
+      ...presentations,
+    });
+    const presStateMapped = presState.map((presentation) => {
+      propPresentations.forEach((propPres) => {
+        if (propPres.id === presentation.id) {
+          const prevPropPres = prevPropPresentations.find((pres) => pres.id === propPres.id);
+          if (propPres.isCurrent !== prevPropPres?.isCurrent) {
+            presentation.isCurrent = propPres.isCurrent;
+            shouldUpdateState = true;
+          }
+        }
+      });
+      return presentation;
+    });
+
+    if (shouldUpdateState) {
+      this.setState({
+        presentations: presStateMapped,
+      });
+    }
 
     if (!isOpen && prevProps.isOpen) {
       unregisterTitleView();
@@ -300,24 +325,6 @@ class PresentationUploader extends Component {
           }
         }
       });
-
-      const presState = Object.values({
-        ...propPresentations,
-        ...presentations,
-      });
-      const presStateMapped = presState.map((presentation) => {
-        propPresentations.forEach((propPres) => {
-          if (propPres.id == presentation.id){
-            presentation.isCurrent = propPres.isCurrent;
-          }
-        })
-        return presentation;
-      })
-
-      this.setState({
-        presentations: presStateMapped,
-      })
-      
     }
 
     if (presentations.length > 0) {

From 52e27e80308619f733d2686668adf34a100ec0e6 Mon Sep 17 00:00:00 2001
From: Max Franke <max.franke@acad.pucrs.br>
Date: Thu, 7 Jul 2022 13:12:35 -0300
Subject: [PATCH 13/50] feat(emoji-picker): dynamic filter emojis

Configure filtered emojis via settings.yml
Emojis can be filtered by their unicodes
---
 .../ui/components/emoji-picker/component.jsx  | 39 ++-----------------
 .../private/config/settings.yml               |  2 +
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/emoji-picker/component.jsx b/bigbluebutton-html5/imports/ui/components/emoji-picker/component.jsx
index 06102b6fa9..5ca3538962 100644
--- a/bigbluebutton-html5/imports/ui/components/emoji-picker/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/emoji-picker/component.jsx
@@ -4,6 +4,8 @@ import { injectIntl } from 'react-intl';
 import { Picker } from 'emoji-mart';
 import 'emoji-mart/css/emoji-mart.css';
 
+const DISABLE_EMOJIS = Meteor.settings.public.chat.disableEmojis;
+
 const propTypes = {
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
@@ -21,42 +23,7 @@ const defaultProps = {
 };
 
 const emojisToExclude = [
-  // People & Body
-  '1F971', '1F90F', '1F9BE', '1F9BF', '1F9BB', '1F9D1-200D-1F9B0', '1F9D1-200D-1F9B1',
-  '1F9D1-200D-1F9B3', '1F9D1-200D-1F9B2', '1F9CF', '1F9CF-200D-2642-FE0F',
-  '1F9CF-200D-2640-FE0F', '1F9D1-200D-2695-FE0F', '1F9D1-200D-1F393', '1F9D1-200D-1F3EB',
-  '1F9D1-200D-2696-FE0F', '1F9D1-200D-1F33E', '1F9D1-200D-1F373', '1F9D1-200D-1F527',
-  '1F9D1-200D-1F3ED', '1F9D1-200D-1F4BC', '1F9D1-200D-1F52C', '1F9D1-200D-1F4BB',
-  '1F9D1-200D-1F3A4', '1F9D1-200D-1F3A8', '1F9D1-200D-2708-FE0F', '1F9D1-200D-1F680',
-  '1F9D1-200D-1F692', '1F9CD', '1F9CD-200D-2642-FE0F', '1F9CD-200D-2640-FE0F',
-  '1F9CE', '1F9CE-200D-2642-FE0F', '1F9CE-200D-2640-FE0F', '1F9D1-200D-1F91D-200D-1F9D1',
-  '1F90E', '1F90D', '1F469-200D-1F9B0', '1F468-200D-1F9B2', '1F469-200D-1F9B1',
-  '1F469-200D-1F9B2', '1F970', '263A-FE0F', '1F975', '1F976', '1F973', '1F97A', '1F9B5',
-  '1F9B6', '1F9B7', '1F9B4', '1F974', '1F468-200D-1F9B1', '1F468-200D-1F9B3',
-  '1F469-200D-1F9B0', '1F469-200D-1F9B3', '1F9B8', '1F9B8-200D-2642-FE0F',
-  '1F9B8-200D-2640-FE0F', '1F9B9', '1F9B9-200D-2642-FE0F', '1F9B9-200D-2640-FE0F',
-  '1F9D1-200D-1F9AF', '1F468-200D-1F9AF', '1F469-200D-1F9AF', '1F9D1-200D-1F9BC',
-  '1F468-200D-1F9BC', '1F469-200D-1F9BC', '1F9D1-200D-1F9BD', '1F468-200D-1F9BD',
-  '1F469-200D-1F9BD', '1F468-200D-1F9B0', '1F595', '1F92E',
-  // Animals & Nature
-  '1F9A7', '1F9AE', '1F9A5', '1F9A6', '1F9A8', '1F9A9', '1F415-200D-1F9BA', '1F99D',
-  '1F999', '1F99B', '1F998', '1F9A1', '1F9A2', '1F99A', '1F99C', '1F99F', '1F9A0',
-  // Food & Drink
-  '1F9C4', '1F9C5', '1F9C7', '1F9C6', '1F9C8', '1F9AA', '1F9C3', '1F9C9', '1F9CA', '1F96D',
-  '1F96C', '1F96F', '1F9C2', '1F96E', '1F99E', '1F9C1',
-  // Activity
-  '1F93F', '1FA80', '1FA81', '1F9E8', '1F9E7', '1F94E', '1F94F', '1F94D', '1F9FF', '1F9E9',
-  '1F9F8', '1F9F5', '1F9F6',
-  // Travel & Places
-  '1F6D5', '1F9BD', '1F9BC', '1F6FA', '1FA82', '1FA90', '1F9ED', '1F9F1', '1F6F9', '1F9F3',
-  // Objects
-  '1F9BA', '1F97B', '1FA71', '1FA72', '1FA73', '1FA70', '1FA95', '1FA94', '1FA93', '1F9AF',
-  '1FA78', '1FA79', '1FA7A', '1FA91', '1FA92', '1F97D', '1F97C', '1F97E', '1F97F', '1F9EE',
-  '1F9FE', '1F9F0', '1F9F2', '1F9EA', '1F9EB', '1F9EC', '1F9F4', '1F9F7', '1F9F9',
-  '1F9FA', '1F9FB', '1F9FC', '1F9FD', '1F9EF',
-  // Symbols
-  '1F7E0', '1F7E1', '1F7E2', '1F7E3', '1F7E4', '1F7E5', '1F7E7', '1F7E8', '1F7E9',
-  '1F7E6', '1F7EA', '1F7EB',
+  ...DISABLE_EMOJIS,
 ];
 
 const EmojiPicker = (props) => {
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index e6de790917..f1345e3752 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -473,6 +473,8 @@ public:
     moderatorChatEmphasized: true
     autoConvertEmoji: true
     enableEmojiPicker: false
+    # e.g.: disableEmojis: ['1F595','1F922']
+    disableEmojis: []
   notes:
     enabled: true
     id: notes

From 25000295bc56674e5d4356ad3f42da93e5e530e9 Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Tue, 12 Jul 2022 12:02:37 -0300
Subject: [PATCH 14/50] fix(Dashboard): wrap header on small screens

---
 bbb-learning-dashboard/src/App.css | 9 +++++++++
 bbb-learning-dashboard/src/App.js  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bbb-learning-dashboard/src/App.css b/bbb-learning-dashboard/src/App.css
index c240bf3d88..1904386088 100644
--- a/bbb-learning-dashboard/src/App.css
+++ b/bbb-learning-dashboard/src/App.css
@@ -11,3 +11,12 @@
 [dir="rtl"] .col-text-right {
   text-align: left;
 }
+
+@media (max-width: 640px) {
+  .col-text-right {
+    text-align: left;
+  }
+  [dir="rtl"] .col-text-right {
+    text-align: right;
+  }
+}
diff --git a/bbb-learning-dashboard/src/App.js b/bbb-learning-dashboard/src/App.js
index a28b71a091..d60ae091c4 100644
--- a/bbb-learning-dashboard/src/App.js
+++ b/bbb-learning-dashboard/src/App.js
@@ -313,7 +313,7 @@ class App extends React.Component {
 
     return (
       <div className="mx-10">
-        <div className="flex items-start justify-between pb-3">
+        <div className="flex flex-col sm:flex-row items-start justify-between pb-3">
           <h1 className="mt-3 text-2xl font-semibold whitespace-nowrap inline-block">
             <FormattedMessage id="app.learningDashboard.dashboardTitle" defaultMessage="Learning Dashboard" />
             {

From 5f98290413fe52e28cd7174fb6100bccdf32cd08 Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Tue, 12 Jul 2022 18:58:56 +0200
Subject: [PATCH 15/50] Add presentationWithAnnotationDownload,
 exportPresentationWithAnnotation to disabledFeatures

---
 .../PresentationWithAnnotationsMsgHdlr.scala         | 12 +++++++++---
 .../imports/ui/services/features/index.js            |  8 ++++++++
 .../grails-app/conf/bigbluebutton.properties         |  3 ++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
index 1df6ba0939..143cd25723 100644
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
@@ -74,8 +74,11 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
     val presentationPods: Vector[PresentationPod] = state.presentationPodManager.getAllPresentationPodsInMeeting()
     val currentPres: Option[PresentationInPod] = presentationPods.flatMap(_.getCurrentPresentation()).headOption
 
-    if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
-      val reason = "No permission to export presentation."
+    if (liveMeeting.props.meetingProp.disabledFeatures.contains("presentationWithAnnotationDownload")) {
+      val reason = "Annotated presentation download disabled for this meeting."
+      PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
+    } else if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
+      val reason = "No permission to download presentation."
       PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
     } else if (currentPres.isEmpty) {
       log.error(s"No presentation set in meeting ${meetingId}")
@@ -116,7 +119,10 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
     val presentationPods: Vector[PresentationPod] = state.presentationPodManager.getAllPresentationPodsInMeeting()
     val currentPres: Option[PresentationInPod] = presentationPods.flatMap(_.getCurrentPresentation()).headOption
 
-    if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
+    if (liveMeeting.props.meetingProp.disabledFeatures.contains("exportPresentationWithAnnotation")) {
+      val reason = "Annotated presentation export disabled for this meeting."
+      PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
+    } else if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
       val reason = "No permission to export presentation."
       PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
     } else if (currentPres.isEmpty) {
diff --git a/bigbluebutton-html5/imports/ui/services/features/index.js b/bigbluebutton-html5/imports/ui/services/features/index.js
index ec1b15a612..1ad2f9380f 100644
--- a/bigbluebutton-html5/imports/ui/services/features/index.js
+++ b/bigbluebutton-html5/imports/ui/services/features/index.js
@@ -51,3 +51,11 @@ export function isLayoutsEnabled() {
 export function isVirtualBackgroundsEnabled() {
   return getDisabledFeatures().indexOf('virtualBackgrounds') === -1;
 }
+
+export function isPresentationWithAnnotationDownloadEnabled() {
+  return getDisabledFeatures().indexOf('presentationWithAnnotationDownload') === -1;
+}
+
+export function isExportPresentationWithAnnotationEnabled() {
+  return getDisabledFeatures().indexOf('exportPresentationWithAnnotation') === -1;
+}
diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 9b65b3632f..b4535071f5 100755
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -417,7 +417,8 @@ endWhenNoModerator=false
 endWhenNoModeratorDelayInMinutes=1
 
 # List of features to disable (comma-separated)
-# Available options: breakoutRooms, captions, chat, externalVideos, layouts, learningDashboard, polls, screenshare, sharedNotes, virtualBackgrounds
+# Available options: breakoutRooms, captions, chat, externalVideos, layouts, learningDashboard, polls, screenshare,
+# sharedNotes, virtualBackgrounds, presentationWithAnnotationDownload, exportPresentationWithAnnotation
 #disabledFeatures=
 
 # Notify users that recording is on

From ca6b020f82b6659eeefebbe01123593660e9464e Mon Sep 17 00:00:00 2001
From: Mario Jr <mariogasparoni@gmail.com>
Date: Wed, 13 Jul 2022 22:19:04 -0300
Subject: [PATCH 16/50] fix(audio): prevent dial-in waiting / guest users to
 speak/listen to the room

Based on the strategy proposed by @schrd in #15163
Also thanks to @jacotec and @maximilianhoecker for the help on investigating

Closes #15163
---
 .../bigbluebutton/SystemConfiguration.scala   |  1 +
 .../voice/UserJoinedVoiceConfEvtMsgHdlr.scala |  7 ++
 .../core/apps/voice/VoiceApp.scala            | 62 ++++++++++++++++
 .../bigbluebutton/core2/AnalyticsActor.scala  |  4 ++
 .../core2/FromAkkaAppsMsgSenderActor.scala    |  8 +++
 .../guests/GuestsWaitingApprovedMsgHdlr.scala | 17 +++++
 .../core2/message/senders/MsgBuilder.scala    | 40 +++++++++++
 .../src/universal/conf/application.conf       |  4 ++
 .../voice/freeswitch/ConnectionManager.java   | 28 ++++++++
 .../freeswitch/FreeswitchApplication.java     | 36 ++++++++++
 .../freeswitch/actions/DeafUserCommand.java   | 40 +++++++++++
 .../freeswitch/actions/HoldUserCommand.java   | 40 +++++++++++
 .../freeswitch/actions/PlaySoundCommand.java  | 40 +++++++++++
 .../freeswitch/actions/StopSoundCommand.java  | 37 ++++++++++
 .../freeswitch/RxJsonMsgDeserializer.scala    | 72 +++++++++++++++++++
 .../freeswitch/RxJsonMsgHdlrActor.scala       |  8 +++
 .../common2/msgs/VoiceConfMsgs.scala          | 40 +++++++++++
 17 files changed, 484 insertions(+)
 create mode 100644 akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/DeafUserCommand.java
 create mode 100644 akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/HoldUserCommand.java
 create mode 100644 akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/PlaySoundCommand.java
 create mode 100644 akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/StopSoundCommand.java

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
index 6efb257d80..92af4b1cf3 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
@@ -40,6 +40,7 @@ trait SystemConfiguration {
   lazy val checkVoiceRecordingInterval = Try(config.getInt("voiceConf.checkRecordingInterval")).getOrElse(19)
   lazy val syncVoiceUsersStatusInterval = Try(config.getInt("voiceConf.syncUserStatusInterval")).getOrElse(43)
   lazy val ejectRogueVoiceUsers = Try(config.getBoolean("voiceConf.ejectRogueVoiceUsers")).getOrElse(true)
+  lazy val dialInApprovalAudioPath = Try(config.getString("voiceConf.dialInApprovalAudioPath")).getOrElse("ivr/ivr-please_hold_while_party_contacted.wav")
 
   lazy val recordingChapterBreakLengthInMinutes = Try(config.getInt("recording.chapterBreakLengthInMinutes")).getOrElse(0)
 
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
index 221db4e39a..5ea211ffec 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
@@ -63,6 +63,13 @@ trait UserJoinedVoiceConfEvtMsgHdlr extends SystemConfiguration {
         val guest = GuestWaiting(msg.body.intId, msg.body.callerIdName, Roles.VIEWER_ROLE, true, "", true, System.currentTimeMillis())
         GuestsWaiting.add(liveMeeting.guestsWaiting, guest)
         notifyModeratorsOfGuestWaiting(guest, liveMeeting.users2x, liveMeeting.props.meetingProp.intId)
+
+        VoiceApp.toggleUserAudioInVoiceConf(
+          liveMeeting,
+          outGW,
+          msg.body.voiceUserId,
+          false
+        )
       }
     }
 
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
index 54146a56e5..776731fe41 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
@@ -353,4 +353,66 @@ object VoiceApp extends SystemConfiguration {
       )
     }
   }
+
+/** Toggle audio for the given user in voice conference.
+ *
+ * We first stop the current audio being played, preventing the playback
+ * to also mix the "You are the first person ..." audio.
+ * After that we check if we are turning on/off based on enabled param. If
+ * enabled is false we:
+ *  - play a sound to let user know that an action is required
+ *       (eg. guest approval) from the server/room.
+ *  - put the user on hold, so DTMFs for mute / deaf mute are also disabled
+ *  - mute the user (other participants won't hear users's audio)
+ *  - deaf the user (user won't hear other participant's audio)
+ * If disabled, we remove user from hold, mute and deaf states, allowing the
+ * user to interact with the room.
+ */
+  def toggleUserAudioInVoiceConf(
+    liveMeeting: LiveMeeting,
+    outGW:       OutMsgRouter,
+    voiceUserId: String,
+    enabled: Boolean
+  ): Unit = {
+    val stopEvent = MsgBuilder.buildStopSoundInVoiceConfSysMsg(
+      liveMeeting.props.meetingProp.intId,
+      liveMeeting.props.voiceProp.voiceConf,
+      ""
+    )
+    outGW.send(stopEvent)
+
+    if (!enabled) {
+      val playEvent = MsgBuilder.buildPlaySoundInVoiceConfSysMsg(
+        liveMeeting.props.meetingProp.intId,
+        liveMeeting.props.voiceProp.voiceConf,
+        voiceUserId,
+        dialInApprovalAudioPath
+      )
+      outGW.send(playEvent)
+    }
+
+    val holdEvent = MsgBuilder.buildHoldUserInVoiceConfSysMsg(
+      liveMeeting.props.meetingProp.intId,
+      liveMeeting.props.voiceProp.voiceConf,
+      voiceUserId,
+      !enabled
+    )
+    outGW.send(holdEvent)
+
+    val muteEvent = MsgBuilder.buildMuteUserInVoiceConfSysMsg(
+      liveMeeting.props.meetingProp.intId,
+      liveMeeting.props.voiceProp.voiceConf,
+      voiceUserId,
+      !enabled
+    )
+    outGW.send(muteEvent)
+
+    val deafEvent = MsgBuilder.buildDeafUserInVoiceConfSysMsg(
+      liveMeeting.props.meetingProp.intId,
+      liveMeeting.props.voiceProp.voiceConf,
+      voiceUserId,
+      !enabled
+    )
+    outGW.send(deafEvent)
+  }
 }
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
index 0fd193f4a9..cc64bf51ea 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
@@ -65,6 +65,10 @@ class AnalyticsActor(val includeChat: Boolean) extends Actor with ActorLogging {
       case m: RecordingStartedVoiceConfEvtMsg                => logMessage(msg)
       case m: MuteUserCmdMsg                                 => logMessage(msg)
       case m: MuteUserInVoiceConfSysMsg                      => logMessage(msg)
+      case m: DeafUserInVoiceConfSysMsg                      => logMessage(msg)
+      case m: HoldUserInVoiceConfSysMsg                      => logMessage(msg)
+      case m: PlaySoundInVoiceConfSysMsg                     => logMessage(msg)
+      case m: StopSoundInVoiceConfSysMsg                     => logMessage(msg)
       case m: MuteAllExceptPresentersCmdMsg                  => logMessage(msg)
       case m: EjectUserFromVoiceCmdMsg                       => logMessage(msg)
       case m: MuteMeetingCmdMsg                              => logMessage(msg)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
index b24c12dc85..49ea4f30a1 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
@@ -49,6 +49,14 @@ class FromAkkaAppsMsgSenderActor(msgSender: MessageSender)
         msgSender.send(toVoiceConfRedisChannel, json)
       case MuteUserInVoiceConfSysMsg.NAME =>
         msgSender.send(toVoiceConfRedisChannel, json)
+      case DeafUserInVoiceConfSysMsg.NAME =>
+        msgSender.send(toVoiceConfRedisChannel, json)
+      case HoldUserInVoiceConfSysMsg.NAME =>
+        msgSender.send(toVoiceConfRedisChannel, json)
+      case PlaySoundInVoiceConfSysMsg.NAME =>
+        msgSender.send(toVoiceConfRedisChannel, json)
+      case StopSoundInVoiceConfSysMsg.NAME =>
+        msgSender.send(toVoiceConfRedisChannel, json)
       case StartRecordingVoiceConfSysMsg.NAME =>
         msgSender.send(toVoiceConfRedisChannel, json)
       case StopRecordingVoiceConfSysMsg.NAME =>
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala
index ceb53eb1de..afebbae7ce 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala
@@ -45,6 +45,23 @@ trait GuestsWaitingApprovedMsgHdlr extends HandlerHelpers with RightsManagementT
                     false,
                     "freeswitch"
                   )
+                  VoiceUsers.findWithIntId(
+                    liveMeeting.voiceUsers,
+                    dialInUser.intId
+                  ) match {
+                      case Some(vu) =>
+                        VoiceApp.toggleUserAudioInVoiceConf(
+                          liveMeeting,
+                          outGW,
+                          vu.voiceUserId,
+                          true
+                        )
+                      case None =>
+                        println(s"Skipping transferring dial-in user to the "
+                          + "voiceconf: dial-in user already left. meetingId= "
+                          + "${liveMeeting.props.meetingProp.intId}, userId="
+                          + "${dialInUser.intId}")
+                    }
                 } else {
                   VoiceApp.removeUserFromVoiceConf(liveMeeting, outGW, dialInUser.extId)
                   val event = MsgBuilder.buildEjectUserFromVoiceConfSysMsg(liveMeeting.props.meetingProp.intId, liveMeeting.props.voiceProp.voiceConf, g.guest)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala
index a68c8bd6ad..5afb08b36b 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala
@@ -336,6 +336,46 @@ object MsgBuilder {
     BbbCommonEnvCoreMsg(envelope, event)
   }
 
+  def buildDeafUserInVoiceConfSysMsg(meetingId: String, voiceConf: String, voiceUserId: String, deaf: Boolean): BbbCommonEnvCoreMsg = {
+    val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
+    val envelope = BbbCoreEnvelope(DeafUserInVoiceConfSysMsg.NAME, routing)
+    val body = DeafUserInVoiceConfSysMsgBody(voiceConf, voiceUserId, deaf)
+    val header = BbbCoreHeaderWithMeetingId(DeafUserInVoiceConfSysMsg.NAME, meetingId)
+    val event = DeafUserInVoiceConfSysMsg(header, body)
+
+    BbbCommonEnvCoreMsg(envelope, event)
+  }
+
+  def buildHoldUserInVoiceConfSysMsg(meetingId: String, voiceConf: String, voiceUserId: String, hold: Boolean): BbbCommonEnvCoreMsg = {
+    val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
+    val envelope = BbbCoreEnvelope(HoldUserInVoiceConfSysMsg.NAME, routing)
+    val body = HoldUserInVoiceConfSysMsgBody(voiceConf, voiceUserId, hold)
+    val header = BbbCoreHeaderWithMeetingId(HoldUserInVoiceConfSysMsg.NAME, meetingId)
+    val event = HoldUserInVoiceConfSysMsg(header, body)
+
+    BbbCommonEnvCoreMsg(envelope, event)
+  }
+
+  def buildPlaySoundInVoiceConfSysMsg(meetingId: String, voiceConf: String, voiceUserId: String, soundPath: String): BbbCommonEnvCoreMsg = {
+    val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
+    val envelope = BbbCoreEnvelope(PlaySoundInVoiceConfSysMsg.NAME, routing)
+    val body = PlaySoundInVoiceConfSysMsgBody(voiceConf, voiceUserId, soundPath)
+    val header = BbbCoreHeaderWithMeetingId(PlaySoundInVoiceConfSysMsg.NAME, meetingId)
+    val event = PlaySoundInVoiceConfSysMsg(header, body)
+
+    BbbCommonEnvCoreMsg(envelope, event)
+  }
+
+  def buildStopSoundInVoiceConfSysMsg(meetingId: String, voiceConf: String, voiceUserId: String): BbbCommonEnvCoreMsg = {
+    val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
+    val envelope = BbbCoreEnvelope(StopSoundInVoiceConfSysMsg.NAME, routing)
+    val body = StopSoundInVoiceConfSysMsgBody(voiceConf, voiceUserId)
+    val header = BbbCoreHeaderWithMeetingId(StopSoundInVoiceConfSysMsg.NAME, meetingId)
+    val event = StopSoundInVoiceConfSysMsg(header, body)
+
+    BbbCommonEnvCoreMsg(envelope, event)
+  }
+
   def buildBreakoutRoomEndedEvtMsg(meetingId: String, userId: String, breakoutRoomId: String): BbbCommonEnvCoreMsg = {
     val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, meetingId, userId)
     val envelope = BbbCoreEnvelope(BreakoutRoomEndedEvtMsg.NAME, routing)
diff --git a/akka-bbb-apps/src/universal/conf/application.conf b/akka-bbb-apps/src/universal/conf/application.conf
index f44cfd6062..60ee61d713 100755
--- a/akka-bbb-apps/src/universal/conf/application.conf
+++ b/akka-bbb-apps/src/universal/conf/application.conf
@@ -88,6 +88,10 @@ voiceConf {
   syncUserStatusInterval = 41
   # Voice users with no matching user record
   ejectRogueVoiceUsers = true
+
+  # Path to the audio file being played when dial-in user is waiting for
+  # approval. This can be relative to FreeSWITCH sounds folder
+  dialInApprovalAudioPath = "ivr/ivr-please_hold_while_party_contacted.wav"
 }
 
 recording {
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
index d87f80422e..f66a2e3a69 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
@@ -204,6 +204,34 @@ public class ConnectionManager {
 		}
 	}
 
+	public void deaf(DeafUserCommand duc) {
+		Client c = manager.getESLClient();
+		if (c.canSend()) {
+			c.sendAsyncApiCommand(duc.getCommand(), duc.getCommandArgs());
+		}
+	}
+
+	public void hold(HoldUserCommand huc) {
+		Client c = manager.getESLClient();
+		if (c.canSend()) {
+			c.sendAsyncApiCommand(huc.getCommand(), huc.getCommandArgs());
+		}
+	}
+
+	public void playSound(PlaySoundCommand psc) {
+		Client c = manager.getESLClient();
+		if (c.canSend()) {
+			c.sendAsyncApiCommand(psc.getCommand(), psc.getCommandArgs());
+		}
+	}
+
+	public void stopSound(StopSoundCommand ssc) {
+		Client c = manager.getESLClient();
+		if (c.canSend()) {
+			c.sendAsyncApiCommand(ssc.getCommand(), ssc.getCommandArgs());
+		}
+	}
+
 	public void tranfer(TransferUserToMeetingCommand tutmc) {
 		Client c = manager.getESLClient();
 		if (c.canSend()) {
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
index 90fbcd590c..9acdcc5672 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
@@ -28,6 +28,10 @@ import org.bigbluebutton.freeswitch.voice.freeswitch.actions.EjectUserCommand;
 import org.bigbluebutton.freeswitch.voice.freeswitch.actions.FreeswitchCommand;
 import org.bigbluebutton.freeswitch.voice.freeswitch.actions.GetAllUsersCommand;
 import org.bigbluebutton.freeswitch.voice.freeswitch.actions.MuteUserCommand;
+import org.bigbluebutton.freeswitch.voice.freeswitch.actions.DeafUserCommand;
+import org.bigbluebutton.freeswitch.voice.freeswitch.actions.HoldUserCommand;
+import org.bigbluebutton.freeswitch.voice.freeswitch.actions.PlaySoundCommand;
+import org.bigbluebutton.freeswitch.voice.freeswitch.actions.StopSoundCommand;
 import org.bigbluebutton.freeswitch.voice.freeswitch.actions.RecordConferenceCommand;
 import org.bigbluebutton.freeswitch.voice.freeswitch.actions.TransferUserToMeetingCommand;
 import org.bigbluebutton.freeswitch.voice.freeswitch.actions.*;
@@ -123,6 +127,26 @@ public class FreeswitchApplication implements  IDelayedCommandListener{
     queueMessage(mpc);
   }
 
+  public void deafUser(String voiceConfId, String voiceUserId, Boolean deaf) {
+    DeafUserCommand duc = new DeafUserCommand(voiceConfId, voiceUserId, deaf, USER);
+    queueMessage(duc);
+  }
+
+  public void holdUser(String voiceConfId, String voiceUserId, Boolean hold) {
+    HoldUserCommand huc = new HoldUserCommand(voiceConfId, voiceUserId, hold, USER);
+    queueMessage(huc);
+  }
+
+  public void playSound(String voiceConfId, String voiceUserId, String soundPath) {
+    PlaySoundCommand psc = new PlaySoundCommand(voiceConfId, voiceUserId, soundPath, USER);
+    queueMessage(psc);
+  }
+
+  public void stopSound(String voiceConfId, String voiceUserId) {
+    StopSoundCommand ssc = new StopSoundCommand(voiceConfId, voiceUserId, USER);
+    queueMessage(ssc);
+  }
+
   public void eject(String voiceConfId, String voiceUserId) {
     EjectUserCommand mpc = new EjectUserCommand(voiceConfId, voiceUserId, USER);
     queueMessage(mpc);
@@ -158,6 +182,18 @@ public class FreeswitchApplication implements  IDelayedCommandListener{
           } else if (command instanceof MuteUserCommand) {
             MuteUserCommand cmd = (MuteUserCommand) command;
             manager.mute(cmd);
+          } else if (command instanceof DeafUserCommand) {
+            DeafUserCommand cmd = (DeafUserCommand) command;
+            manager.deaf(cmd);
+          } else if (command instanceof HoldUserCommand) {
+            HoldUserCommand cmd = (HoldUserCommand) command;
+            manager.hold(cmd);
+          } else if (command instanceof PlaySoundCommand) {
+            PlaySoundCommand cmd = (PlaySoundCommand) command;
+            manager.playSound(cmd);
+          } else if (command instanceof StopSoundCommand) {
+            StopSoundCommand cmd = (StopSoundCommand) command;
+            manager.stopSound(cmd);
           } else if (command instanceof EjectUserCommand) {
             EjectUserCommand cmd = (EjectUserCommand) command;
             manager.eject(cmd);
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/DeafUserCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/DeafUserCommand.java
new file mode 100644
index 0000000000..12c67136bc
--- /dev/null
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/DeafUserCommand.java
@@ -0,0 +1,40 @@
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2022 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+package org.bigbluebutton.freeswitch.voice.freeswitch.actions;
+
+public class DeafUserCommand extends FreeswitchCommand {
+
+    private final String participant;
+    private final Boolean deaf;
+
+    public DeafUserCommand(String room, String participant, Boolean deaf, String requesterId) {
+            super(room, requesterId);
+            this.participant = participant;
+            this.deaf = deaf;
+    }
+
+    @Override
+    public String getCommandArgs() {
+            String action = "undeaf";
+            if (deaf) action = "deaf";
+
+            return room + SPACE + action + SPACE + participant;
+    }
+
+}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/HoldUserCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/HoldUserCommand.java
new file mode 100644
index 0000000000..43ec940327
--- /dev/null
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/HoldUserCommand.java
@@ -0,0 +1,40 @@
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2022 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+package org.bigbluebutton.freeswitch.voice.freeswitch.actions;
+
+public class HoldUserCommand extends FreeswitchCommand {
+
+    private final String participant;
+    private final Boolean hold;
+
+    public HoldUserCommand(String room, String participant, Boolean hold, String requesterId) {
+            super(room, requesterId);
+            this.participant = participant;
+            this.hold = hold;
+    }
+
+    @Override
+    public String getCommandArgs() {
+            String action = "unhold";
+            if (hold) action = "hold";
+
+            return room + SPACE + action + SPACE + participant;
+    }
+
+}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/PlaySoundCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/PlaySoundCommand.java
new file mode 100644
index 0000000000..b4aeba0e36
--- /dev/null
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/PlaySoundCommand.java
@@ -0,0 +1,40 @@
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2022 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+package org.bigbluebutton.freeswitch.voice.freeswitch.actions;
+
+public class PlaySoundCommand extends FreeswitchCommand {
+
+    private final String participant;
+    private final String soundPath;
+
+    public PlaySoundCommand(String room, String participant, String soundPath, String requesterId) {
+            super(room, requesterId);
+            this.participant = participant;
+            this.soundPath = soundPath;
+    }
+
+    @Override
+    public String getCommandArgs() {
+            String action = "play";
+
+            return room + SPACE + action + SPACE
+                + this.soundPath + SPACE + participant;
+    }
+
+}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/StopSoundCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/StopSoundCommand.java
new file mode 100644
index 0000000000..0c96fd310c
--- /dev/null
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/StopSoundCommand.java
@@ -0,0 +1,37 @@
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2022 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+package org.bigbluebutton.freeswitch.voice.freeswitch.actions;
+
+public class StopSoundCommand extends FreeswitchCommand {
+
+    private final String participant;
+
+    public StopSoundCommand(String room, String participant, String requesterId) {
+            super(room, requesterId);
+            this.participant = participant;
+    }
+
+    @Override
+    public String getCommandArgs() {
+            String action = "stop all";
+
+            return room + SPACE + action + SPACE + participant;
+    }
+
+}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala
index 5df337fb31..c6557a5317 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala
@@ -117,6 +117,78 @@ trait RxJsonMsgDeserializer {
     }
   }
 
+  def routeDeafUserInVoiceConfMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Unit = {
+    def deserialize(jsonNode: JsonNode): Option[DeafUserInVoiceConfSysMsg] = {
+      val (result, error) = JsonDeserializer.toBbbCommonMsg[DeafUserInVoiceConfSysMsg](jsonNode)
+      result match {
+        case Some(msg) => Some(msg.asInstanceOf[DeafUserInVoiceConfSysMsg])
+        case None =>
+          log.error("Failed to deserialize message: error: {} \n msg: {}", error, jsonNode)
+          None
+      }
+    }
+
+    for {
+      m <- deserialize(jsonNode)
+    } yield {
+      fsApp.deafUser(m.body.voiceConf, m.body.voiceUserId, m.body.deaf)
+    }
+  }
+
+  def routeHoldUserInVoiceConfMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Unit = {
+    def deserialize(jsonNode: JsonNode): Option[HoldUserInVoiceConfSysMsg] = {
+      val (result, error) = JsonDeserializer.toBbbCommonMsg[HoldUserInVoiceConfSysMsg](jsonNode)
+      result match {
+        case Some(msg) => Some(msg.asInstanceOf[HoldUserInVoiceConfSysMsg])
+        case None =>
+          log.error("Failed to deserialize message: error: {} \n msg: {}", error, jsonNode)
+          None
+      }
+    }
+
+    for {
+      m <- deserialize(jsonNode)
+    } yield {
+      fsApp.holdUser(m.body.voiceConf, m.body.voiceUserId, m.body.hold)
+    }
+  }
+
+  def routePlaySoundInVoiceConfMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Unit = {
+    def deserialize(jsonNode: JsonNode): Option[PlaySoundInVoiceConfSysMsg] = {
+      val (result, error) = JsonDeserializer.toBbbCommonMsg[PlaySoundInVoiceConfSysMsg](jsonNode)
+      result match {
+        case Some(msg) => Some(msg.asInstanceOf[PlaySoundInVoiceConfSysMsg])
+        case None =>
+          log.error("Failed to deserialize message: error: {} \n msg: {}", error, jsonNode)
+          None
+      }
+    }
+
+    for {
+      m <- deserialize(jsonNode)
+    } yield {
+      fsApp.playSound(m.body.voiceConf, m.body.voiceUserId, m.body.soundPath)
+    }
+  }
+
+  def routeStopSoundInVoiceConfMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Unit = {
+    def deserialize(jsonNode: JsonNode): Option[StopSoundInVoiceConfSysMsg] = {
+      val (result, error) = JsonDeserializer.toBbbCommonMsg[StopSoundInVoiceConfSysMsg](jsonNode)
+      result match {
+        case Some(msg) => Some(msg.asInstanceOf[StopSoundInVoiceConfSysMsg])
+        case None =>
+          log.error("Failed to deserialize message: error: {} \n msg: {}", error, jsonNode)
+          None
+      }
+    }
+
+    for {
+      m <- deserialize(jsonNode)
+    } yield {
+      fsApp.stopSound(m.body.voiceConf, m.body.voiceUserId)
+    }
+  }
+
   def routeTransferUserToVoiceConfMsg(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Unit = {
     def deserialize(jsonNode: JsonNode): Option[TransferUserToVoiceConfSysMsg] = {
       val (result, error) = JsonDeserializer.toBbbCommonMsg[TransferUserToVoiceConfSysMsg](jsonNode)
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
index 0d82974ffd..51a812eca0 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
@@ -42,6 +42,14 @@ class RxJsonMsgHdlrActor(val fsApp: FreeswitchApplication) extends Actor with Ac
         routeEjectUserFromVoiceConfMsg(envelope, jsonNode)
       case MuteUserInVoiceConfSysMsg.NAME =>
         routeMuteUserInVoiceConfMsg(envelope, jsonNode)
+      case DeafUserInVoiceConfSysMsg.NAME =>
+        routeDeafUserInVoiceConfMsg(envelope, jsonNode)
+      case HoldUserInVoiceConfSysMsg.NAME =>
+        routeHoldUserInVoiceConfMsg(envelope, jsonNode)
+      case PlaySoundInVoiceConfSysMsg.NAME =>
+        routePlaySoundInVoiceConfMsg(envelope, jsonNode)
+      case StopSoundInVoiceConfSysMsg.NAME =>
+        routeStopSoundInVoiceConfMsg(envelope, jsonNode)
       case TransferUserToVoiceConfSysMsg.NAME =>
         routeTransferUserToVoiceConfMsg(envelope, jsonNode)
       case StartRecordingVoiceConfSysMsg.NAME =>
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala
index 746594e62f..a0dc0b10e2 100755
--- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/VoiceConfMsgs.scala
@@ -258,6 +258,46 @@ case class MeetingMutedEvtMsg(
 ) extends BbbCoreMsg
 case class MeetingMutedEvtMsgBody(muted: Boolean, mutedBy: String)
 
+/**
+ * Send to FS to deaf user in the voice conference.
+ */
+object DeafUserInVoiceConfSysMsg { val NAME = "DeafUserInVoiceConfSysMsg" }
+case class DeafUserInVoiceConfSysMsg(
+    header: BbbCoreHeaderWithMeetingId,
+    body:   DeafUserInVoiceConfSysMsgBody
+) extends BbbCoreMsg
+case class DeafUserInVoiceConfSysMsgBody(voiceConf: String, voiceUserId: String, deaf: Boolean)
+
+/**
+ * Send to FS to hold user in the voice conference.
+ */
+object HoldUserInVoiceConfSysMsg { val NAME = "HoldUserInVoiceConfSysMsg" }
+case class HoldUserInVoiceConfSysMsg(
+    header: BbbCoreHeaderWithMeetingId,
+    body:   HoldUserInVoiceConfSysMsgBody
+) extends BbbCoreMsg
+case class HoldUserInVoiceConfSysMsgBody(voiceConf: String, voiceUserId: String, hold: Boolean)
+
+/**
+ * Send to FS to play sound in the voice conference, or specific user
+ */
+object PlaySoundInVoiceConfSysMsg { val NAME = "PlaySoundInVoiceConfSysMsg" }
+case class PlaySoundInVoiceConfSysMsg(
+    header: BbbCoreHeaderWithMeetingId,
+    body:   PlaySoundInVoiceConfSysMsgBody
+) extends BbbCoreMsg
+case class PlaySoundInVoiceConfSysMsgBody(voiceConf: String, voiceUserId: String, soundPath: String)
+
+/**
+ * Send to FS to stop current sound in the voice conference, or specific user
+ */
+object StopSoundInVoiceConfSysMsg { val NAME = "StopSoundInVoiceConfSysMsg" }
+case class StopSoundInVoiceConfSysMsg(
+    header: BbbCoreHeaderWithMeetingId,
+    body:   StopSoundInVoiceConfSysMsgBody
+) extends BbbCoreMsg
+case class StopSoundInVoiceConfSysMsgBody(voiceConf: String, voiceUserId: String)
+
 /**
  * Received from FS that voice is being recorded.
  */

From 3d77b2a52cac09e7c4866f58f40453392992feb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Souza?= <contato@ramonsouza.com>
Date: Mon, 18 Jul 2022 13:15:28 -0300
Subject: [PATCH 17/50] chore: Bump version to 2.5.4

---
 bigbluebutton-config/bigbluebutton-release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-config/bigbluebutton-release b/bigbluebutton-config/bigbluebutton-release
index 51efcf430c..c6f703c03c 100644
--- a/bigbluebutton-config/bigbluebutton-release
+++ b/bigbluebutton-config/bigbluebutton-release
@@ -1 +1 @@
-BIGBLUEBUTTON_RELEASE=2.5.3
+BIGBLUEBUTTON_RELEASE=2.5.4

From 35ca527d943009d102dcbdcbbe208bbaee3cb9e7 Mon Sep 17 00:00:00 2001
From: Localization Server <bigbluebuttonlocalizeserver@googlegroups.com>
Date: Mon, 18 Jul 2022 15:38:01 -0300
Subject: [PATCH 18/50] chore: Pulled the latest 2.5 HTML5 locales from
 Transifex

---
 bigbluebutton-html5/public/locales/af.json    |   2 -
 bigbluebutton-html5/public/locales/ar.json    |   5 +-
 bigbluebutton-html5/public/locales/az.json    |   2 -
 bigbluebutton-html5/public/locales/bg_BG.json | 423 +++++++++++++++++-
 bigbluebutton-html5/public/locales/bn.json    |   2 -
 bigbluebutton-html5/public/locales/ca.json    |   2 -
 bigbluebutton-html5/public/locales/cs_CZ.json |   2 -
 bigbluebutton-html5/public/locales/da.json    |   2 -
 bigbluebutton-html5/public/locales/de.json    |   3 +-
 bigbluebutton-html5/public/locales/dv.json    |   2 -
 bigbluebutton-html5/public/locales/el_GR.json |   2 -
 bigbluebutton-html5/public/locales/eo.json    |   2 -
 bigbluebutton-html5/public/locales/es.json    |   2 -
 bigbluebutton-html5/public/locales/es_ES.json | 288 +++++++++++-
 bigbluebutton-html5/public/locales/es_MX.json |   1 -
 bigbluebutton-html5/public/locales/et.json    |   2 -
 bigbluebutton-html5/public/locales/eu.json    |   2 -
 bigbluebutton-html5/public/locales/fa_IR.json |  85 ++--
 bigbluebutton-html5/public/locales/fi.json    |   2 -
 bigbluebutton-html5/public/locales/fr.json    |   2 -
 bigbluebutton-html5/public/locales/gl.json    |   3 +-
 bigbluebutton-html5/public/locales/he.json    |   2 -
 bigbluebutton-html5/public/locales/hi_IN.json |   1 -
 bigbluebutton-html5/public/locales/hr.json    |   2 -
 bigbluebutton-html5/public/locales/hu_HU.json |   3 +-
 bigbluebutton-html5/public/locales/hy.json    |   2 -
 bigbluebutton-html5/public/locales/id.json    |   2 -
 bigbluebutton-html5/public/locales/it_IT.json |   2 -
 bigbluebutton-html5/public/locales/ja.json    |  17 +-
 bigbluebutton-html5/public/locales/ka.json    |   2 -
 bigbluebutton-html5/public/locales/km.json    |   2 -
 bigbluebutton-html5/public/locales/kn.json    |   2 -
 bigbluebutton-html5/public/locales/ko_KR.json |  17 +-
 bigbluebutton-html5/public/locales/lt_LT.json |   2 -
 bigbluebutton-html5/public/locales/lv.json    |   2 -
 bigbluebutton-html5/public/locales/ml.json    |   2 -
 bigbluebutton-html5/public/locales/nb_NO.json |   2 -
 bigbluebutton-html5/public/locales/nl.json    |   2 -
 bigbluebutton-html5/public/locales/oc.json    |   2 -
 bigbluebutton-html5/public/locales/pl_PL.json |   2 -
 bigbluebutton-html5/public/locales/pt.json    |   2 -
 bigbluebutton-html5/public/locales/pt_BR.json |   2 -
 bigbluebutton-html5/public/locales/ro_RO.json |   2 -
 bigbluebutton-html5/public/locales/ru.json    |   2 -
 bigbluebutton-html5/public/locales/sk_SK.json |   2 -
 bigbluebutton-html5/public/locales/sl.json    |   2 -
 bigbluebutton-html5/public/locales/sr.json    |   2 -
 bigbluebutton-html5/public/locales/sv_SE.json |   2 -
 bigbluebutton-html5/public/locales/ta.json    |   2 -
 bigbluebutton-html5/public/locales/te.json    |   2 -
 bigbluebutton-html5/public/locales/th.json    |   2 -
 bigbluebutton-html5/public/locales/tr.json    |   2 -
 bigbluebutton-html5/public/locales/tr_TR.json |   2 -
 bigbluebutton-html5/public/locales/uk_UA.json |   2 -
 bigbluebutton-html5/public/locales/vi_VN.json |   2 -
 bigbluebutton-html5/public/locales/zh_CN.json |   2 -
 bigbluebutton-html5/public/locales/zh_TW.json |   2 -
 57 files changed, 773 insertions(+), 165 deletions(-)

diff --git a/bigbluebutton-html5/public/locales/af.json b/bigbluebutton-html5/public/locales/af.json
index e4333c2dd9..e800e3e25e 100644
--- a/bigbluebutton-html5/public/locales/af.json
+++ b/bigbluebutton-html5/public/locales/af.json
@@ -346,7 +346,6 @@
     "app.settings.main.save.label.description": "Stoor die veranderinge en sluit die instellingsmenu",
     "app.settings.dataSavingTab.label": "Databesparing",
     "app.settings.dataSavingTab.webcam": "Aktiveer webkameras",
-    "app.settings.dataSavingTab.screenShare": "Aktiveer werkskermdeling",
     "app.settings.dataSavingTab.description": "Om jou bandwydte te bespaar, moet jy dit wat tans vertoon word, aanpas.",
     "app.settings.save-notification.label": "Instellings is gestoor",
     "app.statusNotifier.lowerHands": "Laat sak hande",
@@ -363,7 +362,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Bestuur aanbieding",
     "app.actionsBar.actionsDropdown.initPollLabel": "Begin 'n peiling",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Deel jou skerm",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Skermdeling gesluit",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Staak skermdeling",
     "app.actionsBar.actionsDropdown.presentationDesc": "Laai jou aanbieding op",
     "app.actionsBar.actionsDropdown.initPollDesc": "Begin 'n peiling",
diff --git a/bigbluebutton-html5/public/locales/ar.json b/bigbluebutton-html5/public/locales/ar.json
index 494a8eb4cc..82e4e4c50a 100644
--- a/bigbluebutton-html5/public/locales/ar.json
+++ b/bigbluebutton-html5/public/locales/ar.json
@@ -420,7 +420,7 @@
     "app.settings.main.save.label.description": "حفظ التغييرات وغلق قائمة الإعدادات",
     "app.settings.dataSavingTab.label": "توفير البيانات",
     "app.settings.dataSavingTab.webcam": "تشغيل الكاميرا",
-    "app.settings.dataSavingTab.screenShare": "تشغيل مشاركة سطح المكتب",
+    "app.settings.dataSavingTab.screenShare": "تفعيل مشاركة سطح المكتب للمشاركين الآخرين",
     "app.settings.dataSavingTab.description": "لحفظ النطاق الترددي الخاص بك ، اضبط ما يتم عرضه حاليًا.",
     "app.settings.save-notification.label": "تم حفظ الإعدادات",
     "app.statusNotifier.lowerHands": "خفض الأيدي",
@@ -440,7 +440,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "إدارة العروض",
     "app.actionsBar.actionsDropdown.initPollLabel": "إنشاء تصويت جديد",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "مشاركة الشاشة",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "مشاركة الشاشة مقفلة",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "إيقاف مشاركة الشاشة",
     "app.actionsBar.actionsDropdown.presentationDesc": "إرفع عرضك",
     "app.actionsBar.actionsDropdown.initPollDesc": "إنشاء تصويت جديد",
@@ -1008,7 +1007,7 @@
     "app.learningDashboard.indicators.polls": "تصويتات",
     "app.learningDashboard.indicators.timeline": "الجدول الزمني",
     "app.learningDashboard.indicators.activityScore": "نتيجة النشاط",
-    "app.learningDashboard.indicators.duration": "مدة",
+    "app.learningDashboard.indicators.duration": "المدة",
     "app.learningDashboard.userDetails.startTime": "وقت البدء",
     "app.learningDashboard.userDetails.endTime": "وقت النهاية",
     "app.learningDashboard.userDetails.joined": "انضم",
diff --git a/bigbluebutton-html5/public/locales/az.json b/bigbluebutton-html5/public/locales/az.json
index 97ecfc56e5..554416c4c7 100644
--- a/bigbluebutton-html5/public/locales/az.json
+++ b/bigbluebutton-html5/public/locales/az.json
@@ -314,7 +314,6 @@
     "app.settings.main.save.label.description": "Dəyişiklikləri yadda saxlayır və tənzimləmələr menyusunu seçir",
     "app.settings.dataSavingTab.label": "Data savings",
     "app.settings.dataSavingTab.webcam": "Veb kameranı aktivləşdir",
-    "app.settings.dataSavingTab.screenShare": "Desktop paylaşımı aktiv et",
     "app.settings.dataSavingTab.description": "Internet sərfiyyatına qənaet etmək üçün nəyin hal-hazırda göstərildiyini müəyyən et.",
     "app.settings.save-notification.label": "Tənzimləmələr yadda saxlanıldır",
     "app.statusNotifier.lowerHands": "Əlləri aşağı sal",
@@ -332,7 +331,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Əməliyyatlar",
     "app.actionsBar.actionsDropdown.initPollLabel": "Sorğu başlat",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Ekranı paylaş",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekranı paylaşımı kilidlənib",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ekran paylaşımını dayandır",
     "app.actionsBar.actionsDropdown.presentationDesc": "Təqdimatı yüklə",
     "app.actionsBar.actionsDropdown.initPollDesc": "Sorğu başlat",
diff --git a/bigbluebutton-html5/public/locales/bg_BG.json b/bigbluebutton-html5/public/locales/bg_BG.json
index 6c31ff1680..10bfaa5e98 100644
--- a/bigbluebutton-html5/public/locales/bg_BG.json
+++ b/bigbluebutton-html5/public/locales/bg_BG.json
@@ -1,10 +1,12 @@
 {
     "app.home.greeting": "Вашата презентация ще започне всеки момент",
     "app.chat.submitLabel": "Изпрати",
+    "app.chat.loading": "Заредени чат съобщения: {0}%",
     "app.chat.errorMaxMessageLength": "Съобщението е с {0} знак(а) по-дълго ",
     "app.chat.disconnected": "Вие не сте свързан, съобщението не може да бъде изпратено",
     "app.chat.locked": "Разговора е заключен, съобщението не може да бъде изпратено",
     "app.chat.inputLabel": "Message input for chat {0}",
+    "app.chat.inputPlaceholder": "Изпрати съобщение до {0}",
     "app.chat.titlePublic": "Общ чат",
     "app.chat.titlePrivate": "Личен чат с  {0}",
     "app.chat.partnerDisconnected": "{0} напуснаха срещата",
@@ -18,11 +20,14 @@
     "app.chat.label": "Чат",
     "app.chat.offline": "Offline",
     "app.chat.pollResult": "Резултати от проучването",
+    "app.chat.breakoutDurationUpdated": "Времето на екипната стая вече е {0} минути",
     "app.chat.emptyLogLabel": "Историята на чата е празна",
     "app.chat.clearPublicChatMessage": "Историята на разговора беше изчистена от модератора",
     "app.chat.multi.typing": "Пишат няколко потребителя",
     "app.chat.one.typing": "{0} пише",
     "app.chat.two.typing": "{0} и {1} пишат",
+    "app.chat.copySuccess": "Копиране на чата",
+    "app.chat.copyErr": "Проблем с копирането на чата",
     "app.captions.label": "Субтитри",
     "app.captions.menu.close": "Затвори",
     "app.captions.menu.start": "Старт",
@@ -38,6 +43,22 @@
     "app.captions.menu.backgroundColor": "Цвят на фона",
     "app.captions.menu.previewLabel": "Преглед",
     "app.captions.menu.cancelLabel": "Отказ",
+    "app.captions.hide": "Скрий субтитрите",
+    "app.captions.ownershipTooltip": "Ще бъдете записан като собственик на {0} субтитри",
+    "app.captions.dictationStart": "Започнете диктовка",
+    "app.captions.dictationStop": "Спрете диктовката",
+    "app.captions.dictationOnDesc": "Включете разпознаването на реч",
+    "app.captions.dictationOffDesc": "Изключете разпознаването на реч",
+    "app.captions.speech.start": "Времето на екипната стая вече е {0} минути",
+    "app.captions.speech.stop": "Разпознаването на реч е прекратено",
+    "app.captions.speech.error": "Разпознаването на реч е спряно поради несъвместимост с браузара или период без говор",
+    "app.textInput.sendLabel": "Изпращане",
+    "app.title.defaultViewLabel": "Стандартен изглед на презентацията",
+    "app.notes.title": "Споделени бележки",
+    "app.notes.label": "Бележки",
+    "app.notes.hide": "Скрий бележките",
+    "app.notes.locked": "Заключен",
+    "app.pads.hint": "Натиснете Esc, за да фокусирате лентата с инструменти на панела",
     "app.user.activityCheck": "Проверка на потребителската активност",
     "app.user.activityCheck.label": "Проверка дали потребителя е още в срещата ({0})",
     "app.user.activityCheck.check": "Провери",
@@ -53,8 +74,13 @@
     "app.userList.byModerator": "от (Модератор)",
     "app.userList.label": "Списък на потребителите",
     "app.userList.toggleCompactView.label": "Превключи към режим на компактен преглед",
+    "app.userList.moderator": "Модератор",
+    "app.userList.mobile": "Мобилен",
     "app.userList.guest": "Гост",
+    "app.userList.sharingWebcam": "Web камера",
     "app.userList.menuTitleContext": "Опции",
+    "app.userList.chatListItem.unreadSingular": "Едно ново съобщение",
+    "app.userList.chatListItem.unreadPlural": "{0} нови съобщения",
     "app.userList.menu.chat.label": "Започни личен чат",
     "app.userList.menu.clearStatus.label": "Изчисти статуса",
     "app.userList.menu.removeUser.label": "Изключи потребителя",
@@ -62,6 +88,11 @@
     "app.userlist.menu.removeConfirmation.desc": "Предотврати повторно влизане на потребителя",
     "app.userList.menu.muteUserAudio.label": "Заглуши",
     "app.userList.menu.unmuteUserAudio.label": "включи микрофона",
+    "app.userList.menu.webcamPin.label": "Закачи потребителските камери",
+    "app.userList.menu.webcamUnpin.label": "Откачи потребителските камери",
+    "app.userList.menu.giveWhiteboardAccess.label" : "Предоставя достъп до дъската",
+    "app.userList.menu.removeWhiteboardAccess.label": "Премахва достъп до дъската",
+    "app.userList.menu.ejectUserCameras.label": "Затвори камерите",
     "app.userList.userAriaLabel": "{0} {1} {2} Статус {3}",
     "app.userList.menu.promoteUser.label": "Повиши до модератор",
     "app.userList.menu.demoteUser.label": "Понижи до участник",
@@ -80,10 +111,13 @@
     "app.userList.userOptions.unmuteAllDesc": "Премахва заглушаването на срещата",
     "app.userList.userOptions.lockViewersLabel": "Задай ограничение",
     "app.userList.userOptions.lockViewersDesc": "Заключете определени функционалности за участниците в срещата",
+    "app.userList.userOptions.guestPolicyLabel": "Политика за гости",
+    "app.userList.userOptions.guestPolicyDesc": "Променете настройката на правилата за гости на срещата",
     "app.userList.userOptions.disableCam": "Web камерите на участниците са изключени",
     "app.userList.userOptions.disableMic": "Микрофоните на участниците са изключени",
     "app.userList.userOptions.disablePrivChat": "Личния чат е изключен",
     "app.userList.userOptions.disablePubChat": "Публичния чат е изключен",
+    "app.userList.userOptions.disableNotes": "Споделените бележки вече са заключени",
     "app.userList.userOptions.hideUserList": "Списъка с потребителите е скрит за участниците",
     "app.userList.userOptions.webcamsOnlyForModerator": "Само модераторите могат да виждат web камерите на участниците (поради настройка на заключване)",
     "app.userList.content.participants.options.clearedStatus": "Статуса на всички участници е изчистен",
@@ -91,28 +125,57 @@
     "app.userList.userOptions.enableMic": "Разрешено е ползването на микрофони от участниците",
     "app.userList.userOptions.enablePrivChat": "Личния чат е разрешен",
     "app.userList.userOptions.enablePubChat": "Общия чат е разрешен",
+    "app.userList.userOptions.enableNotes": "Споделените бележки вече са включени",
     "app.userList.userOptions.showUserList": "Участниците виждат списъка с потребителите",
     "app.userList.userOptions.enableOnlyModeratorWebcam": "Вече можете да включите камерата си, всички ще ви виждат",
+    "app.userList.userOptions.savedNames.title": "Списък на потребителите в срещата {0} от {1}",
+    "app.userList.userOptions.sortedFirstName.heading": "Сортирани по собствено име:",
+    "app.userList.userOptions.sortedLastName.heading": "Сортирани по фамилия:",
+    "app.userList.userOptions.hideViewersCursor": "Курсура на потребителя беше заключен",
+    "app.userList.userOptions.showViewersCursor": "Курсора на потрабителя беше отключен",
     "app.media.label": "Медия",
     "app.media.autoplayAlertDesc": "Разреши достъпа",
     "app.media.screenshare.start": "Споделянето на екрана започна",
     "app.media.screenshare.end": "Споделянето на екрана приключи",
+    "app.media.screenshare.endDueToDataSaving": "Споделянето на екран е спряно за икономия на трафик",
     "app.media.screenshare.unavailable": "Споделянето на екран не е възможно",
     "app.media.screenshare.notSupported": " Споделянето на екран не е възможно с този браузър.",
     "app.media.screenshare.autoplayBlockedDesc": "Нуждаем се от Вашето разрешение за да Ви покажем екрана на презентатора",
     "app.media.screenshare.autoplayAllowLabel": "Виж споделения екран",
+    "app.screenshare.presenterLoadingLabel": "Вашият споделен екран се зарежда",
+    "app.screenshare.viewerLoadingLabel": "Екрана на презентатора се зарежда",
+    "app.screenshare.presenterSharingLabel": "В момента споделяте екрана си",
+    "app.screenshare.screenshareFinalError": "Код {0}. Невъзможно е споделянето на екрана",
+    "app.screenshare.screenshareRetryError": "Код {0}. Повторен опит за споделяне на екран",
+    "app.screenshare.screenshareRetryOtherEnvError": "Код {0}. Невъзможно е споделянето на екрана. Опитайте да използвате друг браузър или устройство",
+    "app.screenshare.screenshareUnsupportedEnv": "Код {0}. Браузърът не се поддържа. Опитайте да използвате друг браузър или устройство.",
+    "app.screenshare.screensharePermissionError": "Код {0}. Необходимо е разрешение за заснемане на екрана.",
     "app.meeting.ended": "Тази сесия приключи",
     "app.meeting.meetingTimeRemaining": "Оставащо време до края на срещата: {0}",
     "app.meeting.meetingTimeHasEnded": "Времето изтече: Скоро срещата ще приключи",
+    "app.meeting.endedByUserMessage": "Сесията е прекратена от {0}",
+    "app.meeting.endedByNoModeratorMessageSingular": "Срещата е прекратена поради липса на модератор за повече от една минута.",
+    "app.meeting.endedByNoModeratorMessagePlural": "Срещата е прекратена поради липса на модератор за повече от {0} минути.",
     "app.meeting.endedMessage": "Ще бъдете пренасочени към началния екран",
     "app.meeting.alertMeetingEndsUnderMinutesSingular": "Срещата ще приключи до една минута",
     "app.meeting.alertMeetingEndsUnderMinutesPlural": "Срещата ще приключи до {0} минути",
+    "app.meeting.alertBreakoutEndsUnderMinutesPlural": "Екипната стая ще се затвори след {0} минути.",
+    "app.meeting.alertBreakoutEndsUnderMinutesSingular": "Екипната стая ще се затвори след една минута.",
     "app.presentation.hide": "Скрий презентацията",
     "app.presentation.notificationLabel": "Текуща презентация",
+    "app.presentation.downloadLabel": "Download",
     "app.presentation.slideContent": "Съдържание на слайда",
     "app.presentation.startSlideContent": "Начало на слайда",
     "app.presentation.endSlideContent": "Край на слайда",
+    "app.presentation.changedSlideContent": "Презентацията премина към слайд: {0}",
     "app.presentation.emptySlideContent": "Няма съдържание в текущия слайд",
+    "app.presentation.options.fullscreen": "Цял екран",
+    "app.presentation.options.exitFullscreen": "Изход от цял екран",
+    "app.presentation.options.minimize": "Минимизиране",
+    "app.presentation.options.snapshot": "Снимка на текущия слайд",
+    "app.presentation.options.downloading": "Сваляне...",
+    "app.presentation.options.downloaded": "Текущата презентация беше изтеглена",
+    "app.presentation.options.downloadFailed": "Текущата презентация не може да бъде изтеглена",
     "app.presentation.presentationToolbar.noNextSlideDesc": "Край на презентацията",
     "app.presentation.presentationToolbar.noPrevSlideDesc": "Начало на презентацията",
     "app.presentation.presentationToolbar.selectLabel": "Избери слайд",
@@ -137,8 +200,10 @@
     "app.presentation.presentationToolbar.fitToWidth": "Разшири максимално",
     "app.presentation.presentationToolbar.fitToPage": "Запълни страницата",
     "app.presentation.presentationToolbar.goToSlide": "Слайд {0}",
+    "app.presentation.placeholder": "Изчакване да бъде качена презентация",
     "app.presentationUploder.title": "презентацията",
     "app.presentationUploder.message": "Като презентатор имате възможност да качите Office документ или PDF файл. Препоръчваме PDF файл. Моля уверете се, че презентацията е избрана използвайки кръглия чек бокс от дясно.",
+    "app.presentationUploder.extraHint": "ВАЖНО: единичен файл не може да превишава {0} МВ и {1} страници. ",
     "app.presentationUploder.uploadLabel": "Качване",
     "app.presentationUploder.confirmLabel": "Потвърждаване",
     "app.presentationUploder.confirmDesc": "Запазете Вашите промени и стартирайте презентацията",
@@ -151,7 +216,10 @@
     "app.presentationUploder.fileToUpload": "да бъде качено...",
     "app.presentationUploder.currentBadge": "Текущо",
     "app.presentationUploder.rejectedError": "Избрания/те файл(ове) бяха отхвърлени. Моля проверете типа на файла(овете)",
+    "app.presentationUploder.connectionClosedError": "Прекъсване поради лоша връзка. Моля опитайте отново.",
     "app.presentationUploder.upload.progress": "Качване ({0}%)",
+    "app.presentationUploder.upload.413": "Файла е прекалено голям, надвишава максумума от {0} МВ",
+    "app.presentationUploder.genericError": "Оопс, нещо се обърка...",
     "app.presentationUploder.upload.408": "Времето на заявката за upload токен изтече",
     "app.presentationUploder.upload.404": "404: Невалиден токен за upload",
     "app.presentationUploder.upload.401": "Неуспешна заявка за презентация",
@@ -160,31 +228,69 @@
     "app.presentationUploder.conversion.generatingThumbnail": "Генериране на thumbnails ...",
     "app.presentationUploder.conversion.generatedSlides": "Генериране на слайдове ...",
     "app.presentationUploder.conversion.generatingSvg": "Генериране на SVG изобажения ...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Страниците надвишават максумума от {0}",
     "app.presentationUploder.conversion.officeDocConversionInvalid": "Грешка при обработка на office документа. Моля, по възможност качете PDF файл.",
     "app.presentationUploder.conversion.officeDocConversionFailed": "Грешка при обработка на office документа. Моля, по възможност качете PDF файл.",
+    "app.presentationUploder.conversion.pdfHasBigPage": "Проблем с конвертирането на PDF файла, моля опитайте да го оптимизирате. Максимален брой страници {0}",
     "app.presentationUploder.conversion.timeout": "Опс, обработката отне много време",
     "app.presentationUploder.conversion.pageCountFailed": "Проблем с установяването на броя на страниците.",
+    "app.presentationUploder.conversion.unsupportedDocument": "Неподържано файлово разширение",
+    "app.presentationUploder.isDownloadableLabel": "Свалянето на презентацията не е разрешено - кликнете за предоставяне на разрешение за сваляне ",
+    "app.presentationUploder.isNotDownloadableLabel": "Свалянето на презентацията е разрешено - кликнете за да забраните  свалянето",
     "app.presentationUploder.removePresentationLabel": "Премахни презентацията",
     "app.presentationUploder.setAsCurrentPresentation": "Направи презентацията активна",
     "app.presentationUploder.tableHeading.filename": "Име на файла",
     "app.presentationUploder.tableHeading.options": "Опции",
     "app.presentationUploder.tableHeading.status": "Статус",
+    "app.presentationUploder.uploading": "Качване {0} {1}",
+    "app.presentationUploder.uploadStatus": "{0} от {1} качвания приключиха ",
+    "app.presentationUploder.completed": "{0} качвания приключиха",
+    "app.presentationUploder.item" : "елемент",
+    "app.presentationUploder.itemPlural" : "елементи",
+    "app.presentationUploder.clearErrors": "Изчисти грешките",
+    "app.presentationUploder.clearErrorsDesc": "Изчиства неуспешно качените презентации",
+    "app.presentationUploder.uploadViewTitle": "Качи презентация",
     "app.poll.pollPaneTitle": "Проучване",
+    "app.poll.enableMultipleResponseLabel": "Разрешаване на повече от един отговор?",
     "app.poll.quickPollTitle": "Бързо проучване",
     "app.poll.hidePollDesc": "Скрии панела за гласуване",
     "app.poll.quickPollInstruction": "Изберете вариантите по-долу за да стартирате Вашето проучване",
     "app.poll.activePollInstruction": "Оставете панела отворен за да виждате в реално време отговорите на Вашето проучване. Когато сте готови, изберете 'Публикувай резултатите'",
+    "app.poll.dragDropPollInstruction": "За да попълните стойностите на анкетата, довлачете текстов файл със стойностите до маркираното поле",
+    "app.poll.customPollTextArea": "Попълнете стойностите на анкетата",
+    "app.poll.publishLabel": "Публикувай анкетата",
+    "app.poll.cancelPollLabel": "Отмяна",
+    "app.poll.backLabel": "Стартирай анкета",
     "app.poll.closeLabel": "Затвори",
     "app.poll.waitingLabel": "Очакват се отговорите ({0}/{1})",
     "app.poll.ariaInputCount": "Опции в проучването {0} от {1}",
     "app.poll.customPlaceholder": "Добави вариант в проучването",
     "app.poll.noPresentationSelected": "Не е избрана презентация! Моля изберете.",
     "app.poll.clickHereToSelect": "Щракнете туз за избор",
+    "app.poll.question.label" : "Напишете Вашия въпрос...",
+    "app.poll.optionalQuestion.label" : "Напишете Вашия въпрос (незадължително)...",
+    "app.poll.userResponse.label" : "Потребителски отговор",
+    "app.poll.responseTypes.label" : "Варианти на отговор",
+    "app.poll.optionDelete.label" : "Изтрий",
+    "app.poll.responseChoices.label" : "Изпор на отговори",
+    "app.poll.typedResponse.desc" : "На потребителите ще бъде показано текстово поле в което да попълнят отговора си.",
+    "app.poll.addItem.label" : "Добави елемент",
+    "app.poll.start.label" : "Стартирай анкета",
+    "app.poll.secretPoll.label" : "Анонимна анкета",
+    "app.poll.secretPoll.isSecretLabel": "Анкетата е анонимна - няма да можете да видите индивидуалните отговори.",
+    "app.poll.questionErr": "Въвеждането на въпрос е задължително.",
+    "app.poll.optionErr": "Въведете опции за анкетата",
+    "app.poll.startPollDesc": "Започнете анкетата",
+    "app.poll.showRespDesc": "Настройка на отговора",
+    "app.poll.addRespDesc": "Добавя възможност за въвеждане на отговр",
+    "app.poll.deleteRespDesc": "Премахва опция {0}",
     "app.poll.t": "Вярно",
     "app.poll.f": "Невярно",
     "app.poll.tf": "Вярно / Невярно",
     "app.poll.y": "Да",
     "app.poll.n": "Не",
+    "app.poll.abstention": "Въздържал се",
+    "app.poll.yna": "Да / Не / Въздържал се",
     "app.poll.a2": "A / B",
     "app.poll.a3": "A / B / C",
     "app.poll.a4": "A / B / C / D",
@@ -193,6 +299,7 @@
     "app.poll.answer.false": "Невярно",
     "app.poll.answer.yes": "Да",
     "app.poll.answer.no": "Не",
+    "app.poll.answer.abstention": "Въздържал се",
     "app.poll.answer.a": "A",
     "app.poll.answer.b": "B",
     "app.poll.answer.c": "C",
@@ -200,7 +307,16 @@
     "app.poll.answer.e": "E",
     "app.poll.liveResult.usersTitle": "Потребители",
     "app.poll.liveResult.responsesTitle": "Отговор",
+    "app.poll.liveResult.secretLabel": "Това е анонимна анкета. Индивидуалните отговори няма да бъдат показани.",
+    "app.poll.removePollOpt": "Премахната опция {0} от анкетата",
+    "app.poll.emptyPollOpt": "Празно",
     "app.polling.pollingTitle": "Опции за проучването",
+    "app.polling.pollQuestionTitle": "Въпрос за гласуване",
+    "app.polling.submitLabel": "Изпрати",
+    "app.polling.submitAriaLabel": "Изпрати отговора",
+    "app.polling.responsePlaceholder": "Въведи отговор",
+    "app.polling.responseSecret": "Анонимна анкета - презентатора няма да вижда Вашия отговор.",
+    "app.polling.responseNotSecret": "Нормална анкета - Презентатора ще вижда вашия отговор.",
     "app.polling.pollAnswerLabel": "Отговори на проучването {0}",
     "app.polling.pollAnswerDesc": "Изберете тази опция за да гласувате за {0}",
     "app.failedMessage": "Съжаляваме, има проблем с връзката до сървъра",
@@ -208,10 +324,14 @@
     "app.connectingMessage": "Свързване...",
     "app.waitingMessage": "Разкачен. Опит за свързване след {0} секунди ...",
     "app.retryNow": "Опитай сега",
+    "app.muteWarning.label": "Кликнете {0} за премахване на заглушаването",
+    "app.muteWarning.disableMessage": "Съобщенията за заглушаване са изключени до премахване на заглушаването",
+    "app.muteWarning.tooltip": "Кликнете за да затворите и изключите предупреждението до следващото премахване на заглушаването",
     "app.navBar.settingsDropdown.optionsLabel": "Опции",
     "app.navBar.settingsDropdown.fullscreenLabel": "Покажи на цял екран",
     "app.navBar.settingsDropdown.settingsLabel": "Настройки",
     "app.navBar.settingsDropdown.aboutLabel": "Относно",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Напускане на срещата",
     "app.navBar.settingsDropdown.exitFullscreenLabel": "Изход от цял екран",
     "app.navBar.settingsDropdown.fullscreenDesc": "Покажи менюто с настройките на цял екран",
     "app.navBar.settingsDropdown.settingsDesc": "Change the general settings",
@@ -226,15 +346,21 @@
     "app.navBar.userListToggleBtnLabel": "Показва списъка с потребители",
     "app.navBar.toggleUserList.ariaLabel": "Скрий/покажи потребителите и съобщенията",
     "app.navBar.toggleUserList.newMessages": "with new message notification",
+    "app.navBar.toggleUserList.newMsgAria": "Ново съобщение от {0} ",
     "app.navBar.recording": "Тази сесия се записва",
     "app.navBar.recording.on": "Запис",
     "app.navBar.recording.off": "Не се записва",
     "app.navBar.emptyAudioBrdige": "Няма активен микрофон. Включете микрофона за да има звук към този запис.",
     "app.leaveConfirmation.confirmLabel": "Напусни",
     "app.leaveConfirmation.confirmDesc": "Напускане на срещата",
+    "app.endMeeting.title": "Край {0}",
+    "app.endMeeting.description": "Ще прекратите сесията на {0} активни потребител/я. Сигурни ли сте, че желаете да прекратите сесията?",
+    "app.endMeeting.noUserDescription": "Сигурни ли сте че желаете да прекратите сесията?",
+    "app.endMeeting.contentWarning": "Съобщенията в чата, споделените бележки, съдържанието на дъската и споделените документи за тази сесия няма да бъдат директно достъпни.",
     "app.endMeeting.yesLabel": "Да",
     "app.endMeeting.noLabel": "Не",
     "app.about.title": "Относно",
+    "app.about.version_label": " Версия на BigBlueButton:",
     "app.about.copyright": "Copyright:",
     "app.about.confirmLabel": "OK",
     "app.about.confirmDesc": "OK",
@@ -245,10 +371,15 @@
     "app.actionsBar.unmuteLabel": "микрофон",
     "app.actionsBar.camOffLabel": "Камера изк.",
     "app.actionsBar.raiseLabel": "вдигни ръка",
+    "app.actionsBar.label": "Лента с действия",
     "app.actionsBar.actionsDropdown.restorePresentationLabel": "Покажи презентацията",
+    "app.actionsBar.actionsDropdown.restorePresentationDesc": "Бутон за възстановяване на презентацията след мимимизиране",
+    "app.actionsBar.actionsDropdown.minimizePresentationLabel": "Минимизирай презентацията",
+    "app.actionsBar.actionsDropdown.minimizePresentationDesc": "Бутон за минимизиране на презентацията",
     "app.screenshare.screenShareLabel" : "Споделяне на екрана",
     "app.submenu.application.applicationSectionTitle": "Приложение",
     "app.submenu.application.animationsLabel": "Анимации",
+    "app.submenu.application.audioFilterLabel": "Аудио филтри за микрофона",
     "app.submenu.application.fontSizeControlLabel": "Размер на шрифта",
     "app.submenu.application.increaseFontBtnLabel": "Увеличи размера на шрифта",
     "app.submenu.application.decreaseFontBtnLabel": "Намали размера на шрифта",
@@ -256,11 +387,16 @@
     "app.submenu.application.languageLabel": "Език на интерфейса",
     "app.submenu.application.languageOptionLabel": "Изберете език",
     "app.submenu.application.noLocaleOptionLabel": "Няма активна локализация",
+    "app.submenu.application.paginationEnabledLabel": "Видео страниране",
+    "app.submenu.application.layoutOptionLabel": "Видове изгледи",
     "app.submenu.notification.SectionTitle": "Съобщения",
     "app.submenu.notification.Desc": "Дефинира как и за какво ще бъдете информирани",
     "app.submenu.notification.audioAlertLabel": "Звукови предупреждения",
     "app.submenu.notification.pushAlertLabel": "Popup предупреждения",
     "app.submenu.notification.messagesLabel": "Чат съобщение",
+    "app.submenu.notification.userJoinLabel": "Влязъл потребител",
+    "app.submenu.notification.userLeaveLabel": "Излязъл потребител",
+    "app.submenu.notification.guestWaitingLabel": "Гост очаква одобрение",
     "app.submenu.audio.micSourceLabel": "Микрофон - източник",
     "app.submenu.audio.speakerSourceLabel": "Говорители - източник",
     "app.submenu.audio.streamVolumeLabel": "Сила на звука",
@@ -284,15 +420,23 @@
     "app.settings.dataSavingTab.screenShare": "Разреши споделянето на екрана",
     "app.settings.dataSavingTab.description": "За да ограничите използването на данни, определете какво да се показва",
     "app.settings.save-notification.label": "Настройките бяха записани",
+    "app.statusNotifier.lowerHands": "Смъкни ръцете",
+    "app.statusNotifier.lowerHandDescOneUser": "Смъкнати {0} ръце",
+    "app.statusNotifier.raisedHandsTitle": "Вдигнати ръце",
+    "app.statusNotifier.raisedHandDesc": "{0} вдигнаха ръка",
+    "app.statusNotifier.raisedHandDescOneUser": "{0} вдигнати ръце",
+    "app.statusNotifier.and": "и",
     "app.switch.onLabel": "ВКЛ",
     "app.switch.offLabel": "ИЗК",
     "app.talkingIndicator.ariaMuteDesc" : "Избери за да заглушиш потребителя",
     "app.talkingIndicator.isTalking" : "{0} говори",
+    "app.talkingIndicator.moreThanMaxIndicatorsTalking" : "{0}+ говорят",
+    "app.talkingIndicator.moreThanMaxIndicatorsWereTalking" : "{0}+ говореха",
     "app.talkingIndicator.wasTalking" : "{0} спря да говори",
     "app.actionsBar.actionsDropdown.actionsLabel": "Действия",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Управление на презентациите",
     "app.actionsBar.actionsDropdown.initPollLabel": "Стартирай проучване",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Сподели екрана",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Споделянето на екрана е забранено",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Спри споделянето на екрана",
     "app.actionsBar.actionsDropdown.presentationDesc": "Качи презентация",
     "app.actionsBar.actionsDropdown.initPollDesc": "Стартирай проучване",
@@ -307,9 +451,13 @@
     "app.actionsBar.actionsDropdown.captionsDesc": "Показва/скрива панела на субтитрите",
     "app.actionsBar.actionsDropdown.takePresenter": "Стани презентатор",
     "app.actionsBar.actionsDropdown.takePresenterDesc": "Правиш се презентатор",
+    "app.actionsBar.actionsDropdown.selectRandUserLabel": "Избери случаен потребител",
+    "app.actionsBar.actionsDropdown.selectRandUserDesc": "Избери случаен участник",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "Статус",
     "app.actionsBar.emojiMenu.awayLabel": "Отсъстващ",
     "app.actionsBar.emojiMenu.awayDesc": "Промени статуса си на отсъстващ",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Вдигни ръка",
+    "app.actionsBar.emojiMenu.lowerHandLabel": "Смъкни ръка",
     "app.actionsBar.emojiMenu.raiseHandDesc": "Вдигни ръка за да зададеш въпрос",
     "app.actionsBar.emojiMenu.neutralLabel": "Неопределено",
     "app.actionsBar.emojiMenu.neutralDesc": "Промени статуса си на неопределен",
@@ -349,12 +497,17 @@
     "app.breakoutJoinConfirmation.dismissLabel": "Отказ",
     "app.breakoutJoinConfirmation.dismissDesc": "Затвори и откажи влизането в екипна стая",
     "app.breakoutJoinConfirmation.freeJoinMessage": "Изберете екипна стая в която да влезете",
-    "app.breakoutTimeRemainingMessage": "Оставащо време в екипната стая:{0}",
+    "app.breakoutTimeRemainingMessage": "Оставащо време в екипната стая: {0}",
     "app.breakoutWillCloseMessage": "Времето изтече. Екипната стая ще се затвори след малко",
+    "app.breakout.dropdown.manageDuration": "Промени времетраенето",
+    "app.breakout.dropdown.destroyAll": "Затвори екипните стаи",
+    "app.breakout.dropdown.options": "Настройки на екипните стаи",
     "app.calculatingBreakoutTimeRemaining": "Изчисляване на оставащото време",
     "app.audioModal.ariaTitle": "Включи аудиото",
     "app.audioModal.microphoneLabel": "Със звук",
     "app.audioModal.listenOnlyLabel": "Като слушател",
+    "app.audioModal.microphoneDesc": "Влез в срещата с микрофон",
+    "app.audioModal.listenOnlyDesc": "Влез в срещата като слушател",
     "app.audioModal.audioChoiceLabel": "Как желаете да се включите?",
     "app.audioModal.iOSBrowser": "Аудио/Видео не се поддържа",
     "app.audioModal.iOSErrorDescription": "Към момента Chrome под iOS не поддържа аудио и видео. ",
@@ -380,24 +533,31 @@
     "app.audioModal.playAudio.arialabel" : "Пусни аудио",
     "app.audioDial.tipIndicator": "Подсказка",
     "app.audioDial.tipMessage": "Натиснете `0` на вашия телефон за да вкл/изк микрофона си.",
+    "app.audioModal.connecting": "Установяване на аудио връзка",
     "app.audioManager.joinedAudio": "Вие се присъединихте към аудио конференцията",
     "app.audioManager.joinedEcho": "Вие се присъединихте към ехо тест",
     "app.audioManager.leftAudio": "Вие напуснахте аудио конференцията",
     "app.audioManager.reconnectingAudio": "Опит за възтановяване на аудиото",
-    "app.audioManager.genericError": "Грешка: Възникна грешка, моля опитайте отнова",
+    "app.audioManager.genericError": "Грешка: Възникна грешка, моля опитайте отново",
     "app.audioManager.connectionError": "Грешка: Проблем с връзката",
     "app.audioManager.requestTimeout": "Грешка: Времето на заявката изтече",
     "app.audioManager.invalidTarget": "Грешка: Невалидна заявка",
     "app.audioManager.mediaError": "Грешка: Има проблем с досъпа до вашите камера/микрофон",
     "app.audio.joinAudio": "Включи аудиото",
     "app.audio.leaveAudio": "Изключи аудиото",
+    "app.audio.changeAudioDevice": "Премени аудио устройството",
     "app.audio.enterSessionLabel": "Влез в сесията",
     "app.audio.playSoundLabel": "Пусни звук",
     "app.audio.backLabel": "Назад",
+    "app.audio.loading": "Зареждане",
+    "app.audio.microphones": "Микрофони",
+    "app.audio.speakers": "Говорители",
+    "app.audio.noDeviceFound": "Не е намерено устройство",
     "app.audio.audioSettings.titleLabel": "Изберете Ваште аудио настройки",
     "app.audio.audioSettings.descriptionLabel": "Моля обърнете внимание, Вашият браузър ще поиска разрешение за споделяне на микрофона",
     "app.audio.audioSettings.microphoneSourceLabel": "Микрофон - източник",
     "app.audio.audioSettings.speakerSourceLabel": "Говорител - източник",
+    "app.audio.audioSettings.testSpeakerLabel": "Тествайте колоните си",
     "app.audio.audioSettings.microphoneStreamLabel": "Сила на звука",
     "app.audio.audioSettings.retryLabel": "Нов опит",
     "app.audio.listenOnly.backLabel": "Назад",
@@ -418,18 +578,45 @@
     "app.modal.confirm": "Завършено",
     "app.modal.newTab": "(отваря нов таб)",
     "app.modal.confirm.description": "Запази промяната и затвори избора",
+    "app.modal.randomUser.noViewers.description": "Не са налични участници от които да се избере случаен\n",
+    "app.modal.randomUser.selected.description": "Вие бяхте избран на случаен принцип",
+    "app.modal.randomUser.title": "Случайно избран потребител",
+    "app.modal.randomUser.who": "Кой ще бъде избран..?",
+    "app.modal.randomUser.alone": "Има само един участник",
+    "app.modal.randomUser.reselect.label": "Избери отново",
+    "app.modal.randomUser.ariaLabel.title": "Диалог за случаен избор на потребител",
     "app.dropdown.close": "Затвори",
+    "app.dropdown.list.item.activeLabel": "Активен",
     "app.error.400": "Грешна заявка",
     "app.error.401": "Неауторизиран",
     "app.error.403": "Вие бяхте изключен от срещата",
     "app.error.404": "Не е намерен",
+    "app.error.408": "Ауторизацията неуспешна",
     "app.error.410": "Срещата приключи",
     "app.error.500": "Опс, нещо не е наред",
+    "app.error.userLoggedOut": "Потребителя има невалиден sessionToken поради log out ",
+    "app.error.ejectedUser": "Потребителя има невалиден sessionToken поради изхвърляне",
+    "app.error.joinedAnotherWindow": "Тази сесия изглежда е отворена в друг прозорец на браузъра.",
+    "app.error.userBanned": "Потребителя беше изгонен",
     "app.error.leaveLabel": "Влезте отново",
     "app.error.fallback.presentation.title": "Възникна грешка",
     "app.error.fallback.presentation.description": "Влязъл е. Моля презаредете станицата",
     "app.error.fallback.presentation.reloadButton": "Презареждане",
     "app.guest.waiting": "Изчаква одобрение за вход",
+    "app.guest.errorSeeConsole": "Грешка: Повече подробности в конзолата.",
+    "app.guest.noModeratorResponse": "Няма отговор от модератора.",
+    "app.guest.noSessionToken": "Няма получен токен за сесия.",
+    "app.guest.windowTitle": "BigBlueButton - Лоби за гости",
+    "app.guest.missingMeeting": "Срещата не съществува.",
+    "app.guest.meetingEnded": "Срещата приключи.",
+    "app.guest.guestWait": "Моля изчакайте модератора да одобри участието Ви в срещата.",
+    "app.guest.guestDeny": "Участието на госта в срещата е отказано.",
+    "app.guest.seatWait": "Гост очаква одобрение за участие в срещата.",
+    "app.guest.allow": "Госта е одобрен и препратен към срещата.",
+    "app.guest.firstPositionInWaitingQueue": "Вие сте първи в списъка!",
+    "app.guest.positionInWaitingQueue": "Вашата текуща позиция в списъка на чакащите:",
+    "app.guest.guestInvalid": "Госта е невалиден",
+    "app.guest.meetingForciblyEnded": "Не можете да влезете в среща която принудително е приключила",
     "app.userList.guest.waitingUsers": "Изчаква потребители",
     "app.userList.guest.waitingUsersTitle": "Управление на потребителите",
     "app.userList.guest.optionTitle": "Преглеждане на чакващите потребители",
@@ -438,9 +625,16 @@
     "app.userList.guest.allowEveryone": "Разреши всички",
     "app.userList.guest.denyEveryone": "Забрани всички",
     "app.userList.guest.pendingUsers": "{0} Изчакващи потребители",
+    "app.userList.guest.noPendingUsers": "В момента няма изчакващи потребители...",
     "app.userList.guest.pendingGuestUsers": "{0} Изчакващи Гост потребители",
     "app.userList.guest.pendingGuestAlert": "Присъедини се към сесията и очаква Вашето одобрение",
     "app.userList.guest.rememberChoice": "Запомни избора",
+    "app.userList.guest.emptyMessage": "Няма нови съобщения",
+    "app.userList.guest.inputPlaceholder": "Съобщение до гостите в лобито",
+    "app.userList.guest.privateInputPlaceholder": "Съобщение до {0}",
+    "app.userList.guest.privateMessageLabel": "Съобщение",
+    "app.userList.guest.acceptLabel": "Приемам",
+    "app.userList.guest.denyLabel": "Забранявам",
     "app.user-info.title": "Преглед на директорията",
     "app.toast.breakoutRoomEnded": "Екипната стая бе затворена. Моля вкючете аудиото.",
     "app.toast.chat.public": "Ново съобщение в Общия чат",
@@ -450,13 +644,19 @@
     "app.toast.setEmoji.label": "Емоджи стутса е сменен на {0}",
     "app.toast.meetingMuteOn.label": "Всички потребители бяха заглушени",
     "app.toast.meetingMuteOff.label": "Заглушаването на срещата е изключено",
+    "app.toast.setEmoji.raiseHand": "Вие дигнахте ръка",
+    "app.toast.setEmoji.lowerHand": "Вие свалихте ръка",
+    "app.toast.promotedLabel": "Бяхте повишен в модератор",
+    "app.toast.demotedLabel": "Бяхта понижен до потребител",
     "app.notification.recordingStart": "Тази сесия се записва",
     "app.notification.recordingStop": "Тази сесия не се записва",
     "app.notification.recordingPaused": "Тази сесия вече не се записва",
     "app.notification.recordingAriaLabel": "Време на запис",
     "app.notification.userJoinPushAlert": "{0} се присъедини към сесията",
+    "app.notification.userLeavePushAlert": "{0} напуснаха сесията",
     "app.submenu.notification.raiseHandLabel": "Вдигни ръка",
     "app.shortcut-help.title": "Клавишни комбинации",
+    "app.shortcut-help.accessKeyNotAvailable": "Кода за достъп не е достъпен",
     "app.shortcut-help.comboLabel": "Комбинация",
     "app.shortcut-help.functionLabel": "Функция",
     "app.shortcut-help.closeLabel": "Затвори",
@@ -468,10 +668,16 @@
     "app.shortcut-help.hidePrivateChat": "Скрий личния чат",
     "app.shortcut-help.closePrivateChat": "Затвори личния чат",
     "app.shortcut-help.openActions": "Отвори менюто с възможни действия",
+    "app.shortcut-help.openDebugWindow": "Отворете прозореца за отстраняване на грешки",
     "app.shortcut-help.openStatus": "Отвори статус менюто",
     "app.shortcut-help.togglePan": "Активиране на показалеца (Презентатор)",
+    "app.shortcut-help.toggleFullscreen": "Превключи на пълен екран (Презентатор)",
     "app.shortcut-help.nextSlideDesc": "Следващ слайд (Презентатор)",
     "app.shortcut-help.previousSlideDesc": "Предишен слайд (Презентатор)",
+    "app.shortcut-help.togglePanKey": "Интервал",
+    "app.shortcut-help.toggleFullscreenKey": "Enter",
+    "app.shortcut-help.nextSlideKey": "Стрелка на дясно",
+    "app.shortcut-help.previousSlideKey": "Стрелка на ляво",
     "app.lock-viewers.title": "Задай ограничение",
     "app.lock-viewers.description": "Тези опции Ви позволяват да ограничите определени функционалности за участниците",
     "app.lock-viewers.featuresLable": "Функционалност",
@@ -486,9 +692,40 @@
     "app.lock-viewers.button.apply": "Приложи",
     "app.lock-viewers.button.cancel": "Отказ",
     "app.lock-viewers.locked": "Забранено",
+    "app.guest-policy.ariaTitle": "Настройка на политиката за гостите",
+    "app.guest-policy.title": "Политика за гостите",
+    "app.guest-policy.description": "Промени настройките за политиката за гостите",
+    "app.guest-policy.button.askModerator": "Попитай модератора",
+    "app.guest-policy.button.alwaysAccept": "Винаги приемам",
+    "app.guest-policy.button.alwaysDeny": "Винаги отказвам",
+    "app.guest-policy.policyBtnDesc": "Задава правила за гости на срещата",
+    "app.connection-status.ariaTitle": "Статус на връзката",
     "app.connection-status.title": "Статус на връзката",
     "app.connection-status.description": "Статус на връзката на потребителите",
+    "app.connection-status.empty": "Не са докладвани проблеми с връзката",
     "app.connection-status.more": "още",
+    "app.connection-status.copy": "Копирай мрежовите данни",
+    "app.connection-status.copied": "Копирани!",
+    "app.connection-status.label": "Статус на връзката",
+    "app.connection-status.settings": "Коригиране на вашите настройки",
+    "app.connection-status.no": "Не",
+    "app.connection-status.notification": "Установени са проблеми с връзката Ви",
+    "app.connection-status.offline": "offline",
+    "app.connection-status.audioUploadRate": "Аудио - скорост на качване",
+    "app.connection-status.audioDownloadRate": "Аудио - Скорост на сваляне",
+    "app.connection-status.videoUploadRate": "Видео - Скорост на качване",
+    "app.connection-status.videoDownloadRate": "Видео - Скорост на сваляне",
+    "app.connection-status.lostPackets": "Загуба на пакети",
+    "app.connection-status.usingTurn": "Използване на TURN",
+    "app.connection-status.yes": "Да",
+    "app.connection-status.connectionStats": "Състояние на връзката",
+    "app.connection-status.myLogs": "Моите логове",
+    "app.connection-status.sessionLogs": "Логове на сесията",
+    "app.connection-status.next": "Следваща страница",
+    "app.connection-status.prev": "Предишна страница",
+    "app.learning-dashboard.label": "Табло анализи на участието",
+    "app.learning-dashboard.description": "Отвори таблото с потребителските активности",
+    "app.learning-dashboard.clickHereToOpen": "Отвори таблото са анализи на обучението",
     "app.recording.startTitle": "Стартиране на записа",
     "app.recording.stopTitle": "Пауза на записа",
     "app.recording.resumeTitle": "Продължи записа",
@@ -496,27 +733,45 @@
     "app.recording.stopDescription": "Сигурни ли сте че желаете да паузирате записа? Можете да продължите записа при натискане на бутона отново.",
     "app.videoPreview.cameraLabel": "Камера",
     "app.videoPreview.profileLabel": "Качество",
+    "app.videoPreview.quality.low": "Ниско",
+    "app.videoPreview.quality.medium": "Средно",
+    "app.videoPreview.quality.high": "Високо",
+    "app.videoPreview.quality.hd": "Висока резолюция",
     "app.videoPreview.cancelLabel": "Отказ",
     "app.videoPreview.closeLabel": "Затвори",
     "app.videoPreview.findingWebcamsLabel": "Търсене на камери",
     "app.videoPreview.startSharingLabel": "Започване на споделянето",
     "app.videoPreview.stopSharingLabel": "Спри споделянето",
+    "app.videoPreview.stopSharingAllLabel": "Спри всички",
     "app.videoPreview.sharedCameraLabel": "Тази камера вече е споделена",
     "app.videoPreview.webcamOptionLabel": "Избери камера",
     "app.videoPreview.webcamPreviewLabel": "Камера преглед",
     "app.videoPreview.webcamSettingsTitle": "Настройки на камерата",
+    "app.videoPreview.webcamVirtualBackgroundLabel": "Настройки на виртуалния фон",
+    "app.videoPreview.webcamVirtualBackgroundDisabledLabel": "Това устройство не поддържа виртуален фон",
     "app.videoPreview.webcamNotFoundLabel": "Камерата не е намерена",
+    "app.videoPreview.profileNotFoundLabel": "Няма поддържан профил на камера",
     "app.video.joinVideo": "Сподели камерата",
+    "app.video.connecting": "Започва споделянето на камерата...",
     "app.video.leaveVideo": "Спри споделянето на камерата",
+    "app.video.advancedVideo": "Отвори разширените настройки",
     "app.video.iceCandidateError": "Грешка при добавянето на ICE кандидат",
     "app.video.iceConnectionStateError": "Проблем с връзката (ICE грешка 1107)",
     "app.video.permissionError": "Грешка при споделянето на камерата. Моля проверете разрешенията",
     "app.video.sharingError": "Грешка при споделянето на камерата",
+    "app.video.abortError": "Възникна непознат проблем, който възпрепятства използването на камерата",
+    "app.video.overconstrainedError": "Вашата камера не поддържа това качество",
+    "app.video.securityError": "Вашият браузър не позволява използването на камерата. Опитайте с друг браузър ",
+    "app.video.typeError": "Невалиден профил на качеството за камерата. Свържете се с администратор.",
     "app.video.notFoundError": "Камерата не беше намерена. Моля проверете дали е свързана",
     "app.video.notAllowed": "Липсва разрешение за споделяне на камерата, моля проверете разрешенията на браузъра",
     "app.video.notSupportedError": "Може да се споделя видео от камерата само от сигурни източници, проверете валидността на SSL сертификата",
     "app.video.notReadableError": "Няма достъп до видеото от камерата. Моля проверете дали друго приложение не я ползва.",
+    "app.video.timeoutError": "Браузърът не отговори навреме",
+    "app.video.genericError": "Възникна непозната грешка с устройството ({0})",
+    "app.video.mediaTimedOutError": "Видеопотока от Вашата камера беше прекъснат. Опитайте да я споделите отново",
     "app.video.mediaFlowTimeout1020": "Медията не може да достигне до сървъра  (грешка 1020)",
+    "app.video.suggestWebcamLock": "Да се ​​приложи ли настройката за заключване на уеб камерите на участниците?",
     "app.video.suggestWebcamLockReason": "(това ще подобри стабилността на срещата)",
     "app.video.enable": "Разреши",
     "app.video.cancel": "Отказ",
@@ -527,7 +782,24 @@
     "app.video.videoMenu": "Видео меню",
     "app.video.videoMenuDisabled": "Видео менюто на камерета е изключено в настройките",
     "app.video.videoMenuDesc": "Отвори падащото видео меню",
+    "app.video.pagination.prevPage": "Виж предишните видеа",
+    "app.video.pagination.nextPage": "Виж следващите видеа",
+    "app.video.clientDisconnected": "Поради проблеми с връзката камерата не може да бъде споделена",
+    "app.video.virtualBackground.none": "Нищо",
+    "app.video.virtualBackground.blur": "Замъглено",
+    "app.video.virtualBackground.home": "Дом",
+    "app.video.virtualBackground.board": "Дъска",
+    "app.video.virtualBackground.coffeeshop": "Кафене",
+    "app.video.virtualBackground.background": "Фон",
+    "app.video.virtualBackground.genericError": "Проблем с прилагане на ефекта. Опитайте отново",
+    "app.video.virtualBackground.camBgAriaDesc": "Приложи виртуален фон към {0}",
+    "app.video.camCapReached": "Вие не може да споделяте повече камери",
+    "app.video.meetingCamCapReached": "Максималния брой разрешени камери в срещата беше достигнат",
+    "app.video.dropZoneLabel": "Пусни тук",
     "app.fullscreenButton.label": "Покажи {0} на цял екран",
+    "app.fullscreenUndoButton.label": "Назад {0} fullscreen",
+    "app.switchButton.expandLabel": "Разпъни видеото на споделения екран",
+    "app.switchButton.shrinkLabel": "Намали видеото на споделения екран",
     "app.sfu.mediaServerConnectionError2000": "Връзката тс медия сървъра невъзможна (Грешка 2000)",
     "app.sfu.mediaServerOffline2001": "Медия сървъра е offline. Моля опитайте по-късно (грешка 2001)",
     "app.sfu.mediaServerNoResources2002": "Медия сървъра няма свободни ресурси (грешка 2002)",
@@ -537,6 +809,9 @@
     "app.sfu.invalidSdp2202":"Клиента генерира невалидна медия заявка (SDP грешка 2202)",
     "app.sfu.noAvailableCodec2203": "Сървъра на може да намери подходящ кодек (грешка 2203)",
     "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.annotations.poll": "Резултатите от анкетата са публикувани",
+    "app.whiteboard.annotations.pollResult": "Резултати от анкетата",
+    "app.whiteboard.annotations.noResponses": "Няма отговор",
     "app.whiteboard.toolbar.tools": "Инструменти",
     "app.whiteboard.toolbar.tools.hand": "Показалец",
     "app.whiteboard.toolbar.tools.pencil": "Молив",
@@ -564,15 +839,23 @@
     "app.whiteboard.toolbar.multiUserOn": "Включи многопотребителската бяла дъска",
     "app.whiteboard.toolbar.multiUserOff": "Изключи многопотребителската бяла дъска",
     "app.whiteboard.toolbar.fontSize": "Размер на шрифта",
+    "app.whiteboard.toolbarAriaLabel": "Инструменти за презентиране",
     "app.feedback.title": "Вие излязохте от конференцията",
     "app.feedback.subtitle": "Ще се радваме да чуем Вашия опит с BigBlueButton (опционално)",
     "app.feedback.textarea": "Как можем да подобрим BigBlueButton?",
     "app.feedback.sendFeedback": "Изпрати мнение",
     "app.feedback.sendFeedbackDesc": "Изпрати мнение и напусни срещата",
+    "app.videoDock.webcamMirrorLabel": "Огледало",
+    "app.videoDock.webcamMirrorDesc": "Огледален образ на избраната камера",
     "app.videoDock.webcamFocusLabel": "Фокус",
     "app.videoDock.webcamFocusDesc": "Премести фокуса върху избраната камера",
     "app.videoDock.webcamUnfocusLabel": "Премахни фокуса",
     "app.videoDock.webcamUnfocusDesc": "Премахни фокуса от избраната камера",
+    "app.videoDock.webcamPinLabel": "Закачи",
+    "app.videoDock.webcamPinDesc": "Закачи избраната камера",
+    "app.videoDock.webcamUnpinLabel": "Разкачи",
+    "app.videoDock.webcamUnpinLabelDisabled": "Само модераторите могат да разкачат участници",
+    "app.videoDock.webcamUnpinDesc": "Разкачи избраната камера",
     "app.videoDock.autoplayBlockedDesc": "Нуждаем се от Вашето разрешение да Ви покажем камерите да другите потребители",
     "app.videoDock.autoplayAllowLabel": "Прегледай камерите",
     "app.invitation.title": "Покана за екипна стая",
@@ -580,18 +863,26 @@
     "app.createBreakoutRoom.title": "Екипни стаи",
     "app.createBreakoutRoom.ariaTitle": "Скрий екипните стаи",
     "app.createBreakoutRoom.breakoutRoomLabel": "Екипни стаи {0}",
+    "app.createBreakoutRoom.askToJoin": "Поискайте да се присъедините",
     "app.createBreakoutRoom.generatingURL": "Генериране на URL",
+    "app.createBreakoutRoom.generatingURLMessage": "Генерира се URL за присъединяване към избраната екипна стая. Това ще отнеме няколко секунди...",
     "app.createBreakoutRoom.duration": "Продължителност {0}",
     "app.createBreakoutRoom.room": "Стая {0}",
     "app.createBreakoutRoom.notAssigned": "Неприсъединени ({0})",
     "app.createBreakoutRoom.join": "Влез в стаята",
+    "app.createBreakoutRoom.joinAudio": "Включи аудиото",
+    "app.createBreakoutRoom.returnAudio": "Възстанови аудиото",
     "app.createBreakoutRoom.alreadyConnected": "Вече сте в стаята",
     "app.createBreakoutRoom.confirm": "Създай",
     "app.createBreakoutRoom.record": "Запиши",
     "app.createBreakoutRoom.numberOfRooms": "Брой на стаите",
     "app.createBreakoutRoom.durationInMinutes": "Продължителност (минути)",
     "app.createBreakoutRoom.randomlyAssign": "Случайно записване",
+    "app.createBreakoutRoom.randomlyAssignDesc": "Разпредели участниците в екипните стаи на случаен принцип",
+    "app.createBreakoutRoom.resetAssignmentsDesc": "Нулирай всички записвания на потребители",
     "app.createBreakoutRoom.endAllBreakouts": "Затвори всички екипни стаи",
+    "app.createBreakoutRoom.chatTitleMsgAllRooms": "всички стаи",
+    "app.createBreakoutRoom.msgToBreakoutsSent": "Съобщението беше изпратено до {0} екипни стаи",
     "app.createBreakoutRoom.roomName": "{0} (Стая - {1})",
     "app.createBreakoutRoom.doneLabel": "Завършено",
     "app.createBreakoutRoom.nextLabel": "Следващ",
@@ -600,9 +891,17 @@
     "app.createBreakoutRoom.addParticipantLabel": "+ Добави участник",
     "app.createBreakoutRoom.freeJoin": "Разрешете на потребителите да изберат в коя екипна стая да влязат",
     "app.createBreakoutRoom.leastOneWarnBreakout": "Трябва да поставите поне един потребител в екипната стая.",
+    "app.createBreakoutRoom.minimumDurationWarnBreakout": "Минималното време за активност на екипната стая е {0} минути.",
     "app.createBreakoutRoom.modalDesc": "Съвет: Можете да влачите потребителските имена до конкретната екипна стая.",
     "app.createBreakoutRoom.roomTime": "{0} минути",
     "app.createBreakoutRoom.numberOfRoomsError": "Броя на стаите е невалиден",
+    "app.createBreakoutRoom.duplicatedRoomNameError": "Имената на стаите на могат да се дублират",
+    "app.createBreakoutRoom.emptyRoomNameError": "Името на стаята не може да е празно",
+    "app.createBreakoutRoom.setTimeInMinutes": "Промени времетраенето на (минути)",
+    "app.createBreakoutRoom.setTimeLabel": "Приложи",
+    "app.createBreakoutRoom.setTimeCancel": "Откажи",
+    "app.createBreakoutRoom.setTimeHigherThanMeetingTimeError": "Времетраенето на екипните стаи не може да надвишава оставащото време на основната стая.",
+    "app.createBreakoutRoom.roomNameInputDesc": "Обновява името на екипната стая",
     "app.externalVideo.start": "Сподели ново видео",
     "app.externalVideo.title": "Сподели външно видео",
     "app.externalVideo.input": "Външно видео URl",
@@ -610,12 +909,128 @@
     "app.externalVideo.urlError": "Този видеоизточник не се поддържа.",
     "app.externalVideo.close": "Затвори",
     "app.externalVideo.autoPlayWarning": "Щракнете вълхо видеото за да го пуснете",
+    "app.externalVideo.refreshLabel": "Обнови Video Player",
+    "app.externalVideo.noteLabel": "Бележка: Споделеното външно видео няма да се появи във записа. Поддържат се YouTube, Vimeo, Instructure Media, Twitch, Dailymotion and  URLs на медийни файлове (e.g. https://example.com/xy.mp4) .",
+    "app.externalVideo.subtitlesOn": "Изключи",
+    "app.externalVideo.subtitlesOff": "Влючи (ако е налично)",
     "app.actionsBar.actionsDropdown.shareExternalVideo": "Сподели външно видео",
     "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Спри споделянето на видео",
     "app.iOSWarning.label": "Моля обновете до iOS 12.2 или по-висока",
     "app.legacy.unsupportedBrowser": "Вие използвате браузър който не се поддържа.За пълна функционалност, моля използвайте {0} или {1}",
     "app.legacy.upgradeBrowser": "Вие използвате стара версия на браузър който се поддържа. За постигане на пълна функционалнаст, моля обновете браузъра си.",
-    "app.legacy.criosBrowser": "За пълна функционалност под iOS моля използвайте Safari"
+    "app.legacy.criosBrowser": "За пълна функционалност под iOS моля използвайте Safari",
+    "app.debugWindow.form.button.copy": "Копирай",
+    "app.debugWindow.form.enableAutoarrangeLayoutLabel": "Включи автоматично подреждане на изгледа",
+    "app.debugWindow.form.enableAutoarrangeLayoutDescription": "(ще бъде изключено ако влачите или преоразмерите прозореца на камерата)",
+    "app.debugWindow.form.button.apply": "Приложи",
+    "app.layout.style.custom": "Персонализиран",
+    "app.layout.style.smart": "Умно оформление",
+    "app.layout.style.presentationFocus": "Фокус върху презентацията",
+    "app.layout.style.videoFocus": "Фокус върху видеото",
+    "app.layout.style.customPush": "Персонализиран (налага оформлението на всички)",
+    "app.layout.style.smartPush": "Умно оформление(налага оформлението на всички)",
+    "app.layout.style.presentationFocusPush": "Фокус върху презентацията (налага оформлението на всички)",
+    "app.layout.style.videoFocusPush": "Фокус върху видеото(налага оформлението на всички)",
+    "playback.button.about.aria": "Относно",
+    "playback.button.clear.aria": "Изчисти търсенето",
+    "playback.button.close.aria": "Затвори",
+    "playback.button.fullscreen.aria": "Съдържанието на цял екран",
+    "playback.button.restore.aria": "Възстанови съдържанието",
+    "playback.button.search.aria": "Търси",
+    "playback.button.section.aria": "Странична секция",
+    "playback.button.swap.aria": "Размени съдържанието",
+    "playback.error.wrapper.aria": "Зона за грешки",
+    "playback.loader.wrapper.aria": "Зона за зареждане",
+    "playback.player.wrapper.aria": "Зона на плейъра",
+    "playback.player.about.modal.shortcuts.title": "Пряк път",
+    "playback.player.about.modal.shortcuts.alt": "Alt",
+    "playback.player.about.modal.shortcuts.shift": "Shift",
+    "playback.player.about.modal.shortcuts.fullscreen": "Превключи на цял екран",
+    "playback.player.about.modal.shortcuts.play": "Пусни / Пауза",
+    "playback.player.about.modal.shortcuts.section": "Превключи страничната секция",
+    "playback.player.about.modal.shortcuts.seek.backward": "Търси назад",
+    "playback.player.about.modal.shortcuts.seek.forward": "Търси напред",
+    "playback.player.about.modal.shortcuts.skip.next": "Следващ слайд",
+    "playback.player.about.modal.shortcuts.skip.previous": "Предишен слайд",
+    "playback.player.about.modal.shortcuts.swap": "Размени съдържанието",
+    "playback.player.chat.message.poll.name": "Резултат от анкетата",
+    "playback.player.chat.message.poll.question": "Въпрос",
+    "playback.player.chat.message.poll.options": "Опции",
+    "playback.player.chat.message.poll.option.yes": "Да",
+    "playback.player.chat.message.poll.option.no": "е",
+    "playback.player.chat.message.poll.option.abstention": "Въздържал се",
+    "playback.player.chat.message.poll.option.true": "Вярно",
+    "playback.player.chat.message.poll.option.false": "Невярно",
+    "playback.player.chat.message.video.name": "Външно видео",
+    "playback.player.chat.wrapper.aria": "Зона за чат",
+    "playback.player.notes.wrapper.aria": "Зона за бележки",
+    "playback.player.presentation.wrapper.aria": "Зона за презентация",
+    "playback.player.screenshare.wrapper.aria": "Зона за споделен екран",
+    "playback.player.search.modal.title": "Търсене",
+    "playback.player.search.modal.subtitle": "Намери съдържание в презентацията",
+    "playback.player.thumbnails.wrapper.aria": "Зона с миниатюри",
+    "playback.player.webcams.wrapper.aria": "Зона за камери",
+    "app.learningDashboard.dashboardTitle": "Табло за анализ на обучението",
+    "app.learningDashboard.downloadSessionDataLabel": "Смъкни сесийните данни",
+    "app.learningDashboard.lastUpdatedLabel": "Последно обновяване в:",
+    "app.learningDashboard.sessionDataDownloadedLabel": "Изтеглено!",
+    "app.learningDashboard.shareButton": "Сподели с останалите",
+    "app.learningDashboard.shareLinkCopied": "Линка беше копиран!",
+    "app.learningDashboard.user": "Потребител",
+    "app.learningDashboard.indicators.meetingStatusEnded": "Приключил",
+    "app.learningDashboard.indicators.meetingStatusActive": "Активен",
+    "app.learningDashboard.indicators.usersOnline": "Активни потребители",
+    "app.learningDashboard.indicators.usersTotal": "Общ брой на участниците",
+    "app.learningDashboard.indicators.polls": "Анкети",
+    "app.learningDashboard.indicators.timeline": "Времева линия",
+    "app.learningDashboard.indicators.activityScore": "Точки на активност",
+    "app.learningDashboard.indicators.duration": "Продължителност",
+    "app.learningDashboard.userDetails.startTime": "Време на започване",
+    "app.learningDashboard.userDetails.endTime": "Време на приключване",
+    "app.learningDashboard.userDetails.joined": "Влязъл",
+    "app.learningDashboard.userDetails.category": "Категория",
+    "app.learningDashboard.userDetails.average": "Средно",
+    "app.learningDashboard.userDetails.activityPoints": "Точки за активност",
+    "app.learningDashboard.userDetails.poll": "Анкета",
+    "app.learningDashboard.userDetails.response": "Отговор",
+    "app.learningDashboard.userDetails.mostCommonAnswer": "Най-популярен отговор",
+    "app.learningDashboard.userDetails.anonymousAnswer": "Анонимна анкета",
+    "app.learningDashboard.usersTable.title": "Преглед",
+    "app.learningDashboard.usersTable.colOnline": "Време онлайн",
+    "app.learningDashboard.usersTable.colTalk": "Време за дискусия",
+    "app.learningDashboard.usersTable.colWebcam": "Време с камера",
+    "app.learningDashboard.usersTable.colMessages": "Съобщения",
+    "app.learningDashboard.usersTable.colEmojis": "Емотикони",
+    "app.learningDashboard.usersTable.colRaiseHands": "Вдигнати ръце",
+    "app.learningDashboard.usersTable.colActivityScore": "Точки на активност",
+    "app.learningDashboard.usersTable.colStatus": "Статус",
+    "app.learningDashboard.usersTable.userStatusOnline": "Онлайн",
+    "app.learningDashboard.usersTable.userStatusOffline": "Офлайн",
+    "app.learningDashboard.usersTable.noUsers": "Все още няма потребители",
+    "app.learningDashboard.usersTable.name": "Име",
+    "app.learningDashboard.usersTable.moderator": "Модератор",
+    "app.learningDashboard.usersTable.pollVotes": "Гласове в анкетата",
+    "app.learningDashboard.usersTable.join": "Влез",
+    "app.learningDashboard.usersTable.left": "Ляво",
+    "app.learningDashboard.usersTable.notAvailable": "Не е налично",
+    "app.learningDashboard.pollsTable.title": "Анкетиране",
+    "app.learningDashboard.pollsTable.anonymousAnswer": "Анонимна анкета (отговорите в последния ред)",
+    "app.learningDashboard.pollsTable.anonymousRowName": "Анонимен",
+    "app.learningDashboard.pollsTable.noPollsCreatedHeading": "Не са създадени анкети",
+    "app.learningDashboard.pollsTable.noPollsCreatedMessage": "Когато анкетата бъде изпратена към потребителите, техните резултати ще се появят в този списък",
+    "app.learningDashboard.statusTimelineTable.title": "Времева линия на статуса  ",
+    "app.learningDashboard.errors.invalidToken": "Невалиден токен на сесията",
+    "app.learningDashboard.errors.dataUnavailable": "Данните вече не са достъпни",
+    "mobileApp.portals.list.empty.addFirstPortal.label": "Добавете своя първи портал с бутона по-горе,",
+    "mobileApp.portals.list.empty.orUseOurDemoServer.label": "или използвайте нашия демо сървър.",
+    "mobileApp.portals.list.add.button.label": "Добави портал",
+    "mobileApp.portals.fields.name.label": "Име на портала",
+    "mobileApp.portals.fields.url.label": "URL на сървъра",
+    "mobileApp.portals.addPortalPopup.confirm.button.label": "Запис",
+    "mobileApp.portals.drawerNavigation.button.label": "Портали",
+    "mobileApp.portals.addPortalPopup.validation.emptyFields": "Задължителни полета",
+    "mobileApp.portals.addPortalPopup.validation.portalNameAlreadyExists": "Името вече се използва",
+    "mobileApp.portals.addPortalPopup.validation.urlInvalid": "Грешка при зареждането на страницата - Проверете URL-а и мрежовата връзка"
 
 }
 
diff --git a/bigbluebutton-html5/public/locales/bn.json b/bigbluebutton-html5/public/locales/bn.json
index d19f897fe5..9f82a2c7b9 100644
--- a/bigbluebutton-html5/public/locales/bn.json
+++ b/bigbluebutton-html5/public/locales/bn.json
@@ -362,7 +362,6 @@
     "app.settings.main.save.label.description": "পরিবর্তনগুলি সংরক্ষণ করে এবং সেটিংস মেনু বন্ধ করে",
     "app.settings.dataSavingTab.label": "ডেটা সাশ্রয়",
     "app.settings.dataSavingTab.webcam": "ওয়েবক্যাম সক্ষম করুন",
-    "app.settings.dataSavingTab.screenShare": "ডেস্কটপ ভাগ করে নেওয়া সক্ষম করুন",
     "app.settings.dataSavingTab.description": "আপনার ব্যান্ডউইথ সংরক্ষণ করতে বর্তমানে যা প্রদর্শিত হচ্ছে তা সামঞ্জস্য করুন।",
     "app.settings.save-notification.label": "সেটিংস সংরক্ষণ করা হয়েছে",
     "app.statusNotifier.lowerHands": "নিম্ন হাত",
@@ -379,7 +378,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "উপস্থাপনা পরিচালনা করুন",
     "app.actionsBar.actionsDropdown.initPollLabel": "একটি পোল শুরু করুন",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "আপনার পর্দা ভাগ করুন",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "স্ক্রীনশেয়ার লক হয়েছে",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "আপনার স্ক্রিন ভাগ করে নেওয়া বন্ধ করুন",
     "app.actionsBar.actionsDropdown.presentationDesc": "আপনার উপস্থাপনা আপলোড করুন",
     "app.actionsBar.actionsDropdown.initPollDesc": "একটি পোল শুরু করুন",
diff --git a/bigbluebutton-html5/public/locales/ca.json b/bigbluebutton-html5/public/locales/ca.json
index b4be5a6071..df1e30aaf5 100644
--- a/bigbluebutton-html5/public/locales/ca.json
+++ b/bigbluebutton-html5/public/locales/ca.json
@@ -417,7 +417,6 @@
     "app.settings.main.save.label.description": "Desa els canvis i tanca el menú de configuració",
     "app.settings.dataSavingTab.label": "Estalvi de dades",
     "app.settings.dataSavingTab.webcam": "Activa les càmeres",
-    "app.settings.dataSavingTab.screenShare": "Activa la compartició de l'escriptori",
     "app.settings.dataSavingTab.description": "Per a estalviar amplada de banda, ajusteu el que s'està mostrant.",
     "app.settings.save-notification.label": "La configuració ha estat desada.",
     "app.statusNotifier.lowerHands": "Mans abaixades",
@@ -437,7 +436,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Gestionar les presentacions",
     "app.actionsBar.actionsDropdown.initPollLabel": "Inicia una enquesta",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Comparteix la teva pantalla",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Compartir pantalla bloquejat",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Deixa de compartir pantalla",
     "app.actionsBar.actionsDropdown.presentationDesc": "Puja la teva presentació",
     "app.actionsBar.actionsDropdown.initPollDesc": "Inicia una enquesta",
diff --git a/bigbluebutton-html5/public/locales/cs_CZ.json b/bigbluebutton-html5/public/locales/cs_CZ.json
index 77126e7e72..acaa04aa8d 100644
--- a/bigbluebutton-html5/public/locales/cs_CZ.json
+++ b/bigbluebutton-html5/public/locales/cs_CZ.json
@@ -388,7 +388,6 @@
     "app.settings.main.save.label.description": "Uloží změny a zavře menu nastavení",
     "app.settings.dataSavingTab.label": "Úspora datového přenosu",
     "app.settings.dataSavingTab.webcam": "Povolit webkameru",
-    "app.settings.dataSavingTab.screenShare": "Povolit sdílení obrazovky",
     "app.settings.dataSavingTab.description": "Pro úsporu datového přenosu upravte, co bude zobrazováno.",
     "app.settings.save-notification.label": "Nastavení byla uložena",
     "app.statusNotifier.lowerHands": "Ruce dané dolů",
@@ -407,7 +406,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Správa prezentací",
     "app.actionsBar.actionsDropdown.initPollLabel": "Zahájit anketu",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Sdílet obrazovku",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Sdílení obrazovky uzamčeno",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ukončit sdílení obrazovky",
     "app.actionsBar.actionsDropdown.presentationDesc": "Nahrát Vaší prezentaci",
     "app.actionsBar.actionsDropdown.initPollDesc": "Zahájit anketu",
diff --git a/bigbluebutton-html5/public/locales/da.json b/bigbluebutton-html5/public/locales/da.json
index 24231ff0d8..527e379e9d 100644
--- a/bigbluebutton-html5/public/locales/da.json
+++ b/bigbluebutton-html5/public/locales/da.json
@@ -331,7 +331,6 @@
     "app.settings.main.save.label.description": "Gemmer ændringerne og lukker instillingsmenuen",
     "app.settings.dataSavingTab.label": "Gemte data",
     "app.settings.dataSavingTab.webcam": "Aktiver webkamera ",
-    "app.settings.dataSavingTab.screenShare": "Aktiver deling af skrivebord",
     "app.settings.dataSavingTab.description": "For at spare på din båndbredde, juster hvad der bliver vist på  nuværende tidspunkt. ",
     "app.settings.save-notification.label": "Indstillingerne er blevet gemt",
     "app.statusNotifier.lowerHands": "Sænk Hænder",
@@ -345,7 +344,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Handlinger",
     "app.actionsBar.actionsDropdown.initPollLabel": "læg op til en afstemning",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Del din skærm",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Skærmdeling låst",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stop med at dele din skærm",
     "app.actionsBar.actionsDropdown.presentationDesc": "Upload din præsentation",
     "app.actionsBar.actionsDropdown.initPollDesc": "læg op til en afstemning",
diff --git a/bigbluebutton-html5/public/locales/de.json b/bigbluebutton-html5/public/locales/de.json
index 6744c78e5a..198cd81ab2 100644
--- a/bigbluebutton-html5/public/locales/de.json
+++ b/bigbluebutton-html5/public/locales/de.json
@@ -420,7 +420,7 @@
     "app.settings.main.save.label.description": "Speichert die Einstellungen und schließt das Einstellungsmenü",
     "app.settings.dataSavingTab.label": "Datensparmodus",
     "app.settings.dataSavingTab.webcam": "Webcams aktiviert",
-    "app.settings.dataSavingTab.screenShare": "Bildschirmfreigabe aktiviert",
+    "app.settings.dataSavingTab.screenShare": "Bildschirmfreigabe für andere Teilnehmer aktivieren",
     "app.settings.dataSavingTab.description": "Um Datentransfervolumen zu sparen, können hier eingestellt werden, was angezeigt wird.",
     "app.settings.save-notification.label": "Einstellungen wurden gespeichert",
     "app.statusNotifier.lowerHands": "Hände senken",
@@ -440,7 +440,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Präsentationen verwalten",
     "app.actionsBar.actionsDropdown.initPollLabel": "Eine Umfrage starten",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Bildschirm freigeben",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Bildschirmfreigabe gesperrt",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Bildschirmfreigabe beenden",
     "app.actionsBar.actionsDropdown.presentationDesc": "Präsentation hochladen",
     "app.actionsBar.actionsDropdown.initPollDesc": "Eine Umfrage starten",
diff --git a/bigbluebutton-html5/public/locales/dv.json b/bigbluebutton-html5/public/locales/dv.json
index 5aa1424dbf..3e83f7775c 100644
--- a/bigbluebutton-html5/public/locales/dv.json
+++ b/bigbluebutton-html5/public/locales/dv.json
@@ -348,7 +348,6 @@
     "app.settings.main.save.label.description": "ގެނެވުނުް ބަދަލުތައް ސޭވްކޮށްލާފައި ސެޓިންގސް މެނޫ ލައްޕާލައި",
     "app.settings.dataSavingTab.label": "ޑޭޓާ ސޭވިންގްސް",
     "app.settings.dataSavingTab.webcam": "ވެބްކެމްތައް ޖައްސާލާ",
-    "app.settings.dataSavingTab.screenShare": "ޑެސްކްޓޮޕް ޝެއާރިންގް ޖައްސާލާ",
     "app.settings.dataSavingTab.description": "ނެޓް ބޭނުންކުރާވަރު މަދުކުރުމަށް މިހާރު ފެންނަމުންދާ އެތި އެޖަސްޓްކުރައްވާ.",
     "app.settings.save-notification.label": "ސެޓިންގސް ތައް ސޭވް ކުރެވިއްޖެ",
     "app.statusNotifier.lowerHands": "އަތްތައް ތިރިކޮށްލުމަށް",
@@ -365,7 +364,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "ޕްރެޒެންޓޭޝަންތައް މެނޭޖު ކުރުމަށް",
     "app.actionsBar.actionsDropdown.initPollLabel": "ޕޯލް / ވޯޓް އެއް ފަށާ",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "ތިޔަ ފަރާތުގެ ސްކްރީން ޝެއަރ ކުރޭ",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "ސްކްރީން ޝެއަރ ނުކުރެވޭގޮތައް ތަޅުލެވިފައި",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "ތިޔަ ފަރާތުގެ ސްކްރީން ޝެއަރިންގ ހުއްޓާލައި",
     "app.actionsBar.actionsDropdown.presentationDesc": "ޕްރެޒެންޓޭޝަން އަޕްލޯޑް ކުރޭ",
     "app.actionsBar.actionsDropdown.initPollDesc": "ޕޯލް / ވޯޓް އެއް ފަށާ",
diff --git a/bigbluebutton-html5/public/locales/el_GR.json b/bigbluebutton-html5/public/locales/el_GR.json
index e33e357a76..fb552e4cba 100644
--- a/bigbluebutton-html5/public/locales/el_GR.json
+++ b/bigbluebutton-html5/public/locales/el_GR.json
@@ -397,7 +397,6 @@
     "app.settings.main.save.label.description": "Αποθήκευση αλλαγών και κλείσιμο του μενού ρυθμίσεων",
     "app.settings.dataSavingTab.label": "Εξοικονόμηση δεδομένων",
     "app.settings.dataSavingTab.webcam": "Ενεργοποίηση καμερών",
-    "app.settings.dataSavingTab.screenShare": "Ενεργοποίηση διαμοιρασμού οθόνης",
     "app.settings.dataSavingTab.description": "Για καλύτερη διαχείριση της ταχύτητάς σας, επιλέξτε τι θα εμφανίζεται.",
     "app.settings.save-notification.label": "Οι ρυθμίσεις έχουν αποθηκευτεί",
     "app.statusNotifier.lowerHands": "Να κατέβουν τα χέρια",
@@ -414,7 +413,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Διαχείριση παρουσιάσεων",
     "app.actionsBar.actionsDropdown.initPollLabel": "Ξεκινήστε μια δημοσκόπηση",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Διαμοιρασμός της οθόνης σας",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ο διαμοιρασμός οθόνης είναι κλειδωμένος",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Τερματισμός διαμοιρασμού οθόνης",
     "app.actionsBar.actionsDropdown.presentationDesc": "Ανέβασμα της παρουσίασής σας",
     "app.actionsBar.actionsDropdown.initPollDesc": "Ξεκινήστε μια δημοσκόπηση",
diff --git a/bigbluebutton-html5/public/locales/eo.json b/bigbluebutton-html5/public/locales/eo.json
index ef04d0b091..45b6850cec 100644
--- a/bigbluebutton-html5/public/locales/eo.json
+++ b/bigbluebutton-html5/public/locales/eo.json
@@ -306,7 +306,6 @@
     "app.settings.main.save.label.description": "Konservas la ŝanĝojn kaj fermas la menuon de agordoj",
     "app.settings.dataSavingTab.label": "Datumŝparoj",
     "app.settings.dataSavingTab.webcam": "Ebligi kameraojn",
-    "app.settings.dataSavingTab.screenShare": "Ebligi ekrankundividon",
     "app.settings.dataSavingTab.description": "Por ŝpari rettrafikon, agordu tion, kio montriĝu.",
     "app.settings.save-notification.label": "La agordoj konserviĝis",
     "app.statusNotifier.and": "kaj",
@@ -319,7 +318,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Mastrumi prezentaĵojn",
     "app.actionsBar.actionsDropdown.initPollLabel": "Iniciati enketon",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Kundividi vian ekranon",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekrankundivido malebligita",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ĉesi kundividi vian ekranon",
     "app.actionsBar.actionsDropdown.presentationDesc": "Alŝuti vian prezentaĵon",
     "app.actionsBar.actionsDropdown.initPollDesc": "Komenci enketon",
diff --git a/bigbluebutton-html5/public/locales/es.json b/bigbluebutton-html5/public/locales/es.json
index 0b72c5fb78..d6bdc0f881 100644
--- a/bigbluebutton-html5/public/locales/es.json
+++ b/bigbluebutton-html5/public/locales/es.json
@@ -349,7 +349,6 @@
     "app.settings.main.save.label.description": "Gurada cambios y cierra el menú de configuración",
     "app.settings.dataSavingTab.label": "Ahorro de datos",
     "app.settings.dataSavingTab.webcam": "Habilitar webcams",
-    "app.settings.dataSavingTab.screenShare": "Habilitar escritorio compartido",
     "app.settings.dataSavingTab.description": "Para ahorrar ancho de banda ajusta lo que se se está mostrando",
     "app.settings.save-notification.label": "La configuración se ha guardado",
     "app.statusNotifier.lowerHands": "Manos bajadas",
@@ -366,7 +365,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Gestionar presentaciones",
     "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar una encuesta",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir tu pantalla",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Compartir pantalla está bloqueado",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Dejar de compartir tu pantalla",
     "app.actionsBar.actionsDropdown.presentationDesc": "Subir tu presentación",
     "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar una encuesta",
diff --git a/bigbluebutton-html5/public/locales/es_ES.json b/bigbluebutton-html5/public/locales/es_ES.json
index 7426fdc721..77f226dcf9 100644
--- a/bigbluebutton-html5/public/locales/es_ES.json
+++ b/bigbluebutton-html5/public/locales/es_ES.json
@@ -2,10 +2,11 @@
     "app.home.greeting": "Su presentación se iniciará pronto...",
     "app.chat.submitLabel": "Enviar mensaje",
     "app.chat.loading": "Mensajes de chat cargados: {0}%",
-    "app.chat.errorMaxMessageLength": "El mensaje tiene {0} caracteres de exceso",
+    "app.chat.errorMaxMessageLength": "El mensaje tiene {0} caracter(es) de exceso",
     "app.chat.disconnected": "Usted está desconectado. Los mensajes no serán enviados",
     "app.chat.locked": "El chat está bloqueado. Los mensajes no pueden ser enviados",
     "app.chat.inputLabel": "Entrada de mensaje para chat {0}",
+    "app.chat.inputPlaceholder": "Mensaje {0}",
     "app.chat.titlePublic": "Chat público",
     "app.chat.titlePrivate": "Chat privado con {0}",
     "app.chat.partnerDisconnected": "{0} ha abandonado la reunión",
@@ -19,11 +20,14 @@
     "app.chat.label": "Chat",
     "app.chat.offline": "Fuera de linea",
     "app.chat.pollResult": "Resultados de la encuesta o votación",
+    "app.chat.breakoutDurationUpdated": "La duración del grupo de trabajo es ahora de {0} minutos",
     "app.chat.emptyLogLabel": "Registro de chat vacío",
     "app.chat.clearPublicChatMessage": "El histórico del chat público fue borrado por un moderador",
     "app.chat.multi.typing": "Múltiples usuarios están escribiendo",
     "app.chat.one.typing": "{0} está escribiendo",
     "app.chat.two.typing": "{0} y {1} están escribiendo",
+    "app.chat.copySuccess": "Transcripción de chat copiada",
+    "app.chat.copyErr": "Copiar la transcripción del chat ha fallado",
     "app.captions.label": "Subtítulos",
     "app.captions.menu.close": "Cerrar",
     "app.captions.menu.start": "Iniciar",
@@ -39,7 +43,23 @@
     "app.captions.menu.backgroundColor": "Color de fondo",
     "app.captions.menu.previewLabel": "Previsualizar",
     "app.captions.menu.cancelLabel": "Cancelar",
+    "app.captions.hide": "Esconder subtítulos",
+    "app.captions.ownership": "Tomar el control",
+    "app.captions.ownershipTooltip": "Se le asignará como propietario de {0} subtítulos",
+    "app.captions.dictationStart": "Iniciar dictado",
+    "app.captions.dictationStop": "Parar dictado",
+    "app.captions.dictationOnDesc": "Activar el reconocimiento de voz",
+    "app.captions.dictationOffDesc": "Desactivar el reconocimiento de voz",
+    "app.captions.speech.start": "Reconocimiento de voz iniciado",
+    "app.captions.speech.stop": "Reconocimiento de voz detenido",
+    "app.captions.speech.error": "Reconocimiento de voz detenido debido a incompatibilidad con el navegador o algún tiempo de silencio",
     "app.textInput.sendLabel": "Enviar",
+    "app.title.defaultViewLabel": "Vista de presentación predeterminada",
+    "app.notes.title": "Notas compartidas",
+    "app.notes.label": "Notas",
+    "app.notes.hide": "Ocultar notas",
+    "app.notes.locked": "Bloqueado",
+    "app.pads.hint": "Pulsa Esc para enfocar la barra de herramientas del pad",
     "app.user.activityCheck": "Comprobación de la actividad del usuario",
     "app.user.activityCheck.label": "Comprobar si el usuario continúa en la reunión ({0})",
     "app.user.activityCheck.check": "Comprobar",
@@ -58,7 +78,10 @@
     "app.userList.moderator": "Moderador",
     "app.userList.mobile": "Móvil",
     "app.userList.guest": "Invitado/a",
+    "app.userList.sharingWebcam": "Cámara web",
     "app.userList.menuTitleContext": "Opciones disponibles",
+    "app.userList.chatListItem.unreadSingular": "Un nuevo mensaje",
+    "app.userList.chatListItem.unreadPlural": "{0} nuevos mensajes",
     "app.userList.menu.chat.label": "Iniciar un chat privado",
     "app.userList.menu.clearStatus.label": "Limpiar estado",
     "app.userList.menu.removeUser.label": "Eliminar usuario",
@@ -66,8 +89,11 @@
     "app.userlist.menu.removeConfirmation.desc": "Evitar que este/a usuario/a vuelva a unirse a la sesión.",
     "app.userList.menu.muteUserAudio.label": "Silenciar usuario",
     "app.userList.menu.unmuteUserAudio.label": "Desilenciar usuario",
+    "app.userList.menu.webcamPin.label": "Fijar la cámara web del usuario",
+    "app.userList.menu.webcamUnpin.label": "Desanclar la cámara web del usuario",
     "app.userList.menu.giveWhiteboardAccess.label" : "Permitir acceso a la pizarra",
     "app.userList.menu.removeWhiteboardAccess.label": "Quitar acceso a la pizarra",
+    "app.userList.menu.ejectUserCameras.label": "Cerrar cámaras",
     "app.userList.userAriaLabel": "{0} {1} {2} Estado {3}",
     "app.userList.menu.promoteUser.label": "Promover a moderador",
     "app.userList.menu.demoteUser.label": "Degradar a espectador",
@@ -92,6 +118,7 @@
     "app.userList.userOptions.disableMic": "Los micrófonos de los espectadores están deshabilitados",
     "app.userList.userOptions.disablePrivChat": "El chat privado está deshabilitado",
     "app.userList.userOptions.disablePubChat": "El chat público está deshabilitado",
+    "app.userList.userOptions.disableNotes": "Las notas compartidas se han bloqueado",
     "app.userList.userOptions.hideUserList": "La lista de usuarios ahora está oculta para los espectadores",
     "app.userList.userOptions.webcamsOnlyForModerator": "Solo los moderadores pueden ver las webcams de los espectadores (debido a la configuración de bloqueo)",
     "app.userList.content.participants.options.clearedStatus": "Estado de los usuarios reestablecido",
@@ -99,19 +126,26 @@
     "app.userList.userOptions.enableMic": "Los micrófonos de los espectadores están habilitados",
     "app.userList.userOptions.enablePrivChat": "El chat privado está habilitado",
     "app.userList.userOptions.enablePubChat": "El chat público está habilitado",
+    "app.userList.userOptions.enableNotes": "Las notas compartidas se han activado",
     "app.userList.userOptions.showUserList": "La lista de usuarios ahora se muestra a los espectadores",
     "app.userList.userOptions.enableOnlyModeratorWebcam": "Usted puede habilitar su webcam ahora. Todos le verán.",
     "app.userList.userOptions.savedNames.title": "Lista de usuarios/as en la reunión {0} en {1}",
     "app.userList.userOptions.sortedFirstName.heading": "Ordenados por nombre:",
     "app.userList.userOptions.sortedLastName.heading": "Ordenados por apellido:",
+    "app.userList.userOptions.hideViewersCursor": "Los cursores del Espectador están bloqueados",
+    "app.userList.userOptions.showViewersCursor": "Los cursores del Espectador están desbloqueados",
     "app.media.label": "Media",
     "app.media.autoplayAlertDesc": "Permitir acceso",
     "app.media.screenshare.start": "Compartir pantalla se ha iniciado",
     "app.media.screenshare.end": "Compartir pantalla se ha finalizado",
+    "app.media.screenshare.endDueToDataSaving": "Pantalla compartida detenida debido al ahorro de datos",
     "app.media.screenshare.unavailable": "Compartir pantalla no disponible",
     "app.media.screenshare.notSupported": "Compartir pantalla no está soportado en este navegador.",
     "app.media.screenshare.autoplayBlockedDesc": "Necesitamos su consentimiento para mostrarle la pantalla del presentador.",
     "app.media.screenshare.autoplayAllowLabel": "Ver pantalla compartida",
+    "app.screenshare.presenterLoadingLabel": "Se está cargando tu pantalla compartida",
+    "app.screenshare.viewerLoadingLabel": "La pantalla del presentador se está cargando",
+    "app.screenshare.presenterSharingLabel": "Estás compartiendo tu pantalla",
     "app.screenshare.screenshareFinalError": "Código {0}. No puede compartir la pantalla.",
     "app.screenshare.screenshareRetryError": "Código {0}. Intente compartir la pantalla nuevamente.",
     "app.screenshare.screenshareRetryOtherEnvError": "Código {0}. No puede compartir la pantalla. Inténtelo nuevamente con otro navegador o dispositivo.",
@@ -120,6 +154,9 @@
     "app.meeting.ended": "Esta sesión ha finalizado",
     "app.meeting.meetingTimeRemaining": "Tiempo restante de la reunión: {0}",
     "app.meeting.meetingTimeHasEnded": "Tiempo finalizado. La reunión se cerrará pronto",
+    "app.meeting.endedByUserMessage": "Esta sesión fue finalizada por {0}",
+    "app.meeting.endedByNoModeratorMessageSingular": "Se ha finalizado la reunión debido a la ausencia de moderadores tras un minuto",
+    "app.meeting.endedByNoModeratorMessagePlural": "Se ha finalizado la reunión debido a la ausencia de moderadores tras {0} minutos",
     "app.meeting.endedMessage": "Será reenviado a la pantalla de inicio",
     "app.meeting.alertMeetingEndsUnderMinutesSingular": "La reunión finalizará en un minuto.",
     "app.meeting.alertMeetingEndsUnderMinutesPlural": "La reunión finalizará en {0} minutos.",
@@ -131,7 +168,15 @@
     "app.presentation.slideContent": "Contenido de diapositiva",
     "app.presentation.startSlideContent": "Inicio del contenido de diapositiva",
     "app.presentation.endSlideContent": "Fin del contenido de diapositiva",
+    "app.presentation.changedSlideContent": "Presentación cambiada a diapositiva: {0}",
     "app.presentation.emptySlideContent": "No hay contenido en la diapositiva actual",
+    "app.presentation.options.fullscreen": "Pantalla completa",
+    "app.presentation.options.exitFullscreen": "Salir de pantalla completa",
+    "app.presentation.options.minimize": "Minimizar",
+    "app.presentation.options.snapshot": "Realizar instantánea de la diapositiva actual",
+    "app.presentation.options.downloading": "Descargando...",
+    "app.presentation.options.downloaded": "La presentación actual fue descargada",
+    "app.presentation.options.downloadFailed": "No se pudo descargar la presentación actual",
     "app.presentation.presentationToolbar.noNextSlideDesc": "fin de la presentación",
     "app.presentation.presentationToolbar.noPrevSlideDesc": "Inicio de la presentación",
     "app.presentation.presentationToolbar.selectLabel": "Seleccione dispositiva",
@@ -156,8 +201,10 @@
     "app.presentation.presentationToolbar.fitToWidth": "Ajustar al ancho",
     "app.presentation.presentationToolbar.fitToPage": "Ajustar a la página",
     "app.presentation.presentationToolbar.goToSlide": "Diapositiva {0}",
+    "app.presentation.placeholder": "No hay actualmente una presentación activa",
     "app.presentationUploder.title": "Presentación",
     "app.presentationUploder.message": "Como presentador, usted tiene la posibilidad de cargar cualquier documento o archivo PDF. Se recomienda PDF para mejores resultados. Por favor, asegúrese de seleccionar la presentación mediante el círculo de verificación situado en el lado derecho.",
+    "app.presentationUploder.extraHint": "IMPORTANTE: cada fichero no puede exceder {0} MB y {1} páginas",
     "app.presentationUploder.uploadLabel": "Cargar",
     "app.presentationUploder.confirmLabel": "Confirmar",
     "app.presentationUploder.confirmDesc": "Guarde sus cambios e inicie la presentación",
@@ -170,6 +217,7 @@
     "app.presentationUploder.fileToUpload": "Para ser cargados...",
     "app.presentationUploder.currentBadge": "Actual",
     "app.presentationUploder.rejectedError": "El(los) archivo(s) seleccionado(s) ha(n) sido rechazado(s). Por favor, revise el(los) tipo(s) de archivo(s).",
+    "app.presentationUploder.connectionClosedError": "Interrumpido debido a deficiente conectividad. Por favor, inténtalo de nuevo.",
     "app.presentationUploder.upload.progress": "Cargando  ({0}%)",
     "app.presentationUploder.upload.413": "El archivo es demasiado grande, excede el máximo de {0} MB",
     "app.presentationUploder.genericError": "Oops, algo salió mal...",
@@ -202,13 +250,17 @@
     "app.presentationUploder.itemPlural" : "elementos",
     "app.presentationUploder.clearErrors": "Limpiar errores",
     "app.presentationUploder.clearErrorsDesc": "Limpiar subidas de presentación falladas",
+    "app.presentationUploder.uploadViewTitle": "Subir presentación",
     "app.poll.pollPaneTitle": "Votación",
+    "app.poll.enableMultipleResponseLabel": "¿Permitir múltiples respuestas por cada persona?",
     "app.poll.quickPollTitle": "Encuesta rápida",
     "app.poll.hidePollDesc": "Oculta el panel del menú de encuestas",
     "app.poll.quickPollInstruction": "Seleccione una opción a continuación para iniciar su encuesta.",
     "app.poll.activePollInstruction": "Deje este panel abierto para ver las respuestas en vivo a su encuesta. Cuando esté listo, seleccione 'Publicar resultados de la encuesta' para publicar los resultados y finalizar la encuesta.",
     "app.poll.dragDropPollInstruction": "Para completar los valores de la encuesta, arrastre un archivo de texto con los valores de la encuesta al campo resaltado",
     "app.poll.customPollTextArea": "Completar valores de la encuesta",
+    "app.poll.publishLabel": "Publicar encuesta",
+    "app.poll.cancelPollLabel": "Cancelar",
     "app.poll.backLabel": "Iniciar una encuesta",
     "app.poll.closeLabel": "Cerrar",
     "app.poll.waitingLabel": "Esperando respuestas  ({0}/{1})",
@@ -216,6 +268,8 @@
     "app.poll.customPlaceholder": "Añadir opción a la encuesta",
     "app.poll.noPresentationSelected": "¡Ninguna presentación seleccionada! Por favor, seleccione una.",
     "app.poll.clickHereToSelect": "'Click' aquí para seleccionar",
+    "app.poll.question.label" : "Escribe tu pregunta...",
+    "app.poll.optionalQuestion.label" : "Escribe tu pregunta (opcional)...",
     "app.poll.userResponse.label" : "Respuesta del usuario",
     "app.poll.responseTypes.label" : "Tipos de respuesta",
     "app.poll.optionDelete.label" : "Borrar",
@@ -223,7 +277,14 @@
     "app.poll.typedResponse.desc" : "A los usuarios se les presentará un cuadro de texto para completar su respuesta.",
     "app.poll.addItem.label" : "Añadir opción",
     "app.poll.start.label" : "Iniciar encuesta",
+    "app.poll.secretPoll.label" : "Encuesta anónima",
+    "app.poll.secretPoll.isSecretLabel": "La encuesta es anónima. No podrás ver las respuestas individuales.",
+    "app.poll.questionErr": "Se requiere una respuesta.",
     "app.poll.optionErr": "Introducir una opción a la encuesta",
+    "app.poll.startPollDesc": "Inicia la encuesta",
+    "app.poll.showRespDesc": "Muestra la configuración de respuestas",
+    "app.poll.addRespDesc": "Añade la respuesta de la encuesta",
+    "app.poll.deleteRespDesc": "Elimina la opción {0}",
     "app.poll.t": "Verdadero",
     "app.poll.f": "Falso",
     "app.poll.tf": "Verdadero / Falso",
@@ -247,11 +308,16 @@
     "app.poll.answer.e": "E",
     "app.poll.liveResult.usersTitle": "Usuarios",
     "app.poll.liveResult.responsesTitle": "Respuesta",
+    "app.poll.liveResult.secretLabel": "Esta es una encuesta anónima. No se mostrarán las respuestas individuales.",
+    "app.poll.removePollOpt": "Opción {0} eliminada en la encuesta",
+    "app.poll.emptyPollOpt": "Vacío",
     "app.polling.pollingTitle": "Opciones de encuesta",
     "app.polling.pollQuestionTitle": "Pregunta de encuesta",
     "app.polling.submitLabel": "Enviar",
     "app.polling.submitAriaLabel": "Enviar respuesta",
     "app.polling.responsePlaceholder": "Introducir respuesta",
+    "app.polling.responseSecret": "Encuesta anónima - El presentador no puede ver tu respuesta.",
+    "app.polling.responseNotSecret": "Encuesta normal - El presentador puede ver tu respuesta.",
     "app.polling.pollAnswerLabel": "Respuesta a la votación/encuesta {0}",
     "app.polling.pollAnswerDesc": "Seleccione esta opción para votar por {0}",
     "app.failedMessage": "Disculpe, hubo problemas mientras conectaba con el servidor.",
@@ -282,6 +348,7 @@
     "app.navBar.userListToggleBtnLabel": "Alternar lista de usuarios",
     "app.navBar.toggleUserList.ariaLabel": "Alternar usuarios y mensajes",
     "app.navBar.toggleUserList.newMessages": "con nueva notificación de mensaje ",
+    "app.navBar.toggleUserList.newMsgAria": "Nuevo mensaje de {0}",
     "app.navBar.recording": "Esta sesión está siendo grabada",
     "app.navBar.recording.on": "Grabando",
     "app.navBar.recording.off": "No grabando",
@@ -296,6 +363,7 @@
     "app.endMeeting.noLabel": "No",
     "app.about.title": "Acerca de",
     "app.about.version": "Versión de la interfaz cliente:",
+    "app.about.version_label": "Versión de BigBlueButton:",
     "app.about.copyright": "Derechos de autor:",
     "app.about.confirmLabel": "OK",
     "app.about.confirmDesc": "OK",
@@ -308,6 +376,9 @@
     "app.actionsBar.raiseLabel": "Alzar",
     "app.actionsBar.label": "Barra de acciones",
     "app.actionsBar.actionsDropdown.restorePresentationLabel": "Restaurar presentación",
+    "app.actionsBar.actionsDropdown.restorePresentationDesc": "Botón para restaurar la presentación después de haber sido minimizada",
+    "app.actionsBar.actionsDropdown.minimizePresentationLabel": "Minimizar presentación",
+    "app.actionsBar.actionsDropdown.minimizePresentationDesc": "Botón usado para minimizar presentación",
     "app.screenshare.screenShareLabel" : "Compartir pantalla",
     "app.submenu.application.applicationSectionTitle": "Aplicación",
     "app.submenu.application.animationsLabel": "Animaciones",
@@ -320,12 +391,14 @@
     "app.submenu.application.languageOptionLabel": "Seleccionar idioma",
     "app.submenu.application.noLocaleOptionLabel": "No hay locales activos",
     "app.submenu.application.paginationEnabledLabel": "Paginación de vídeo",
+    "app.submenu.application.layoutOptionLabel": "Tipo de diseño",
     "app.submenu.notification.SectionTitle": "Notificaciones",
     "app.submenu.notification.Desc": "Define cómo y qué quieres que te sea notificado.",
     "app.submenu.notification.audioAlertLabel": "Alertas sonoras",
     "app.submenu.notification.pushAlertLabel": "Alertas visuales",
     "app.submenu.notification.messagesLabel": "Mensaje de chat",
     "app.submenu.notification.userJoinLabel": "Ha entrado un usuario",
+    "app.submenu.notification.userLeaveLabel": "Usuario se marcha",
     "app.submenu.notification.guestWaitingLabel": "Invitado en espera de aprobación",
     "app.submenu.audio.micSourceLabel": "Fuente de micrófono",
     "app.submenu.audio.speakerSourceLabel": "Fuente de altavoces",
@@ -347,10 +420,11 @@
     "app.settings.main.save.label.description": "Guarda los cambios y cierra el menú de configuración",
     "app.settings.dataSavingTab.label": "Ahorro de datos",
     "app.settings.dataSavingTab.webcam": "Habilitar webcams",
-    "app.settings.dataSavingTab.screenShare": "Habilitar compartir escritorio",
+    "app.settings.dataSavingTab.screenShare": "Activar compartir escritorio para otros participantes",
     "app.settings.dataSavingTab.description": "Para ahorrar ancho de banda, ajuste lo que se muestra actualmente.",
     "app.settings.save-notification.label": "Las configuraciones han sido guardadas",
     "app.statusNotifier.lowerHands": "Bajar manos",
+    "app.statusNotifier.lowerHandDescOneUser": "Bajar la mano de {0}",
     "app.statusNotifier.raisedHandsTitle": "Manos levantadas",
     "app.statusNotifier.raisedHandDesc": "{0} levantaron la mano",
     "app.statusNotifier.raisedHandDescOneUser": "{0} con la mano levantada",
@@ -359,12 +433,13 @@
     "app.switch.offLabel": "APAGAR",
     "app.talkingIndicator.ariaMuteDesc" : "Seleccione para silenciar usuario",
     "app.talkingIndicator.isTalking" : "{0} está hablando",
+    "app.talkingIndicator.moreThanMaxIndicatorsTalking" : "{0}+ están hablando",
+    "app.talkingIndicator.moreThanMaxIndicatorsWereTalking" : "{0}+ estaban hablando",
     "app.talkingIndicator.wasTalking" : "{0} dejaron de hablar",
     "app.actionsBar.actionsDropdown.actionsLabel": "Acciones",
     "app.actionsBar.actionsDropdown.presentationLabel": "Gestionar presentaciones",
     "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar una encuesta",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir su pantalla",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Compartir pantalla bloqueado",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Detener compartir su pantalla",
     "app.actionsBar.actionsDropdown.presentationDesc": "Subir su presentación",
     "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar una encuesta",
@@ -430,10 +505,15 @@
     "app.breakoutJoinConfirmation.freeJoinMessage": "Escoja una sala externa a la que unirse",
     "app.breakoutTimeRemainingMessage": "Tiempo restante de la sala externa: {0}",
     "app.breakoutWillCloseMessage": "Tiempo finalizado. La sala externa se cerrará pronto",
+    "app.breakout.dropdown.manageDuration": "Cambiar duración",
+    "app.breakout.dropdown.destroyAll": "Finalizar grupos de trabajo",
+    "app.breakout.dropdown.options": "Opciones de las salas de grupos de trabajo",
     "app.calculatingBreakoutTimeRemaining": "Calculando el tiempo restante...",
     "app.audioModal.ariaTitle": "Cuadro de diálogo para unirse al audio",
     "app.audioModal.microphoneLabel": "Micrófono",
     "app.audioModal.listenOnlyLabel": "Oyente",
+    "app.audioModal.microphoneDesc": "Unirse al audio de la conferencia con micrófono",
+    "app.audioModal.listenOnlyDesc": "Unirse al audio de la conferencia como oyente",
     "app.audioModal.audioChoiceLabel": "¿Como quieres unirte al audio?",
     "app.audioModal.iOSBrowser": "Audio/Video no soportado",
     "app.audioModal.iOSErrorDescription": "En este momento el audio y el video no están soportados en Chrome para iOS",
@@ -459,6 +539,7 @@
     "app.audioModal.playAudio.arialabel" : "Reproducir audio",
     "app.audioDial.tipIndicator": "Tip",
     "app.audioDial.tipMessage": "Presione la tecla '0' en su teléfono para silenciarse/desilenciarse.",
+    "app.audioModal.connecting": "Estableciendo conexión de audio",
     "app.audioManager.joinedAudio": "Se ha unido a la audio conferencia",
     "app.audioManager.joinedEcho": "Se ha unido a la prueba de eco",
     "app.audioManager.leftAudio": "Ha abandonado la audio conferencia",
@@ -470,6 +551,7 @@
     "app.audioManager.mediaError": "Error: Hubo un problema al obtener sus dispositivos multimedia",
     "app.audio.joinAudio": "Unirse al audio",
     "app.audio.leaveAudio": "Abandonar audio",
+    "app.audio.changeAudioDevice": "Cambiar dispositivo de audio",
     "app.audio.enterSessionLabel": "Entrar en la sesión",
     "app.audio.playSoundLabel": "Reproducir sonido",
     "app.audio.backLabel": "Atrás",
@@ -481,6 +563,7 @@
     "app.audio.audioSettings.descriptionLabel": "Por favor, observe que un diálogo aparecerá en su navegador solicitándole acepte compartir su micrófono.",
     "app.audio.audioSettings.microphoneSourceLabel": "Fuente del micrófono",
     "app.audio.audioSettings.speakerSourceLabel": "Fuente de altavoz",
+    "app.audio.audioSettings.testSpeakerLabel": "Comprobar tu altavoz",
     "app.audio.audioSettings.microphoneStreamLabel": "Su volúmen para el flujo de audio",
     "app.audio.audioSettings.retryLabel": "Reintentar",
     "app.audio.listenOnly.backLabel": "Atrás",
@@ -514,10 +597,12 @@
     "app.error.401": "No autorizado",
     "app.error.403": "Ha sido eliminado de la reunión",
     "app.error.404": "No se encontró",
+    "app.error.408": "Autentificación fallida",
     "app.error.410": "La reunión ha finalizado",
     "app.error.500": "Ups, algo salió mal",
     "app.error.userLoggedOut": "El usuario tiene un Token de sesión no válido debido al cierre de sesión",
     "app.error.ejectedUser": "El usuario tiene un Token de sesión no válido debido a su expulsión",
+    "app.error.joinedAnotherWindow": "Parece que esta sesión ya está abierta en otra ventana del navegador.",
     "app.error.userBanned": "El usuario ha sido baneado",
     "app.error.leaveLabel": "Ingresar de nuevo",
     "app.error.fallback.presentation.title": "Ocurrió un error",
@@ -527,6 +612,7 @@
     "app.guest.errorSeeConsole": "Error: más detalles en la consola.",
     "app.guest.noModeratorResponse": "Sin respuesta del moderador.",
     "app.guest.noSessionToken": "No se recibió ningún token de sesión.",
+    "app.guest.windowTitle": "Bigbluebutton - Sala de espera de invitados",
     "app.guest.missingToken": "Token de sesión faltante del invitado.",
     "app.guest.missingSession": "Sesión perdida de invitado.",
     "app.guest.missingMeeting": "La reunión no existe.",
@@ -534,6 +620,11 @@
     "app.guest.guestWait": "Espere a que un moderador apruebe su participación en la reunión.",
     "app.guest.guestDeny": "Invitado negado de unirse a la reunión.",
     "app.guest.seatWait": "Invitado esperando un asiento en la reunión.",
+    "app.guest.allow": "Invitado aceptado y siendo llevado a la sala de conferencia.",
+    "app.guest.firstPositionInWaitingQueue": "Eres el primero en la fila!",
+    "app.guest.positionInWaitingQueue": "Tu posición actual en la lista de espera: ",
+    "app.guest.guestInvalid": "El/La usuario/a invitado/a no es válido",
+    "app.guest.meetingForciblyEnded": "No puedes unirte a una reunión que ya ha finalizado.",
     "app.userList.guest.waitingUsers": "Esperando usuarios",
     "app.userList.guest.waitingUsersTitle": "Gestión de usuarios",
     "app.userList.guest.optionTitle": "Revisar usuarios pendientes",
@@ -542,11 +633,14 @@
     "app.userList.guest.allowEveryone": "Permitir a todos",
     "app.userList.guest.denyEveryone": "Denegar a todos",
     "app.userList.guest.pendingUsers": "{0} Usuarios pendientes",
+    "app.userList.guest.noPendingUsers": "Actualmente no hay usuarios pendientes...",
     "app.userList.guest.pendingGuestUsers": "{0} Invitados pendientes",
     "app.userList.guest.pendingGuestAlert": "Se ha unido a la sesión y está esperando su aprobación.",
     "app.userList.guest.rememberChoice": "Recordar selección",
     "app.userList.guest.emptyMessage": "Actualmente no hay mensajes",
     "app.userList.guest.inputPlaceholder": "Mensaje al grupo de invitados",
+    "app.userList.guest.privateInputPlaceholder": "Mensaje a {0}",
+    "app.userList.guest.privateMessageLabel": "Mensaje",
     "app.userList.guest.acceptLabel": "Aceptar",
     "app.userList.guest.denyLabel": "Denegar",
     "app.user-info.title": "Buscar en directorio",
@@ -559,11 +653,15 @@
     "app.toast.meetingMuteOn.label": "Todos los usuarios han sido silenciados",
     "app.toast.meetingMuteOff.label": "Reunión silenciada desactivada",
     "app.toast.setEmoji.raiseHand": "Ud. ha levantado la mano",
+    "app.toast.setEmoji.lowerHand": "Se ha bajado tu mano",
+    "app.toast.promotedLabel": "Has sido promocionado/a a Moderador",
+    "app.toast.demotedLabel": "Has sido degradado/a a Espectador",
     "app.notification.recordingStart": "Esta sesión, ahora está siendo grabada",
     "app.notification.recordingStop": "Esta sesión no está siendo grabada",
     "app.notification.recordingPaused": "Esta sesión ya no se está grabando",
     "app.notification.recordingAriaLabel": "Tiempo de grabación",
     "app.notification.userJoinPushAlert": "{0} se unieron a la sesión",
+    "app.notification.userLeavePushAlert": "{0} abandonó la reunión",
     "app.submenu.notification.raiseHandLabel": "Levantar la mano",
     "app.shortcut-help.title": "Atajos de teclado",
     "app.shortcut-help.accessKeyNotAvailable": "Claves de acceso no disponibles",
@@ -585,6 +683,10 @@
     "app.shortcut-help.toggleFullscreen": "Alternar pantalla completa (Presentador)",
     "app.shortcut-help.nextSlideDesc": "Siguiente diapositiva (Presentador)",
     "app.shortcut-help.previousSlideDesc": "Anterior diapositiva (Presentador)",
+    "app.shortcut-help.togglePanKey": "Barra espaciadora",
+    "app.shortcut-help.toggleFullscreenKey": "Enter",
+    "app.shortcut-help.nextSlideKey": "Flecha derecha",
+    "app.shortcut-help.previousSlideKey": "Flecha izquierda",
     "app.lock-viewers.title": "Bloquear espectadores",
     "app.lock-viewers.description": "Estas opciones le habilitan a restringir el uso de características específicas a los espectadores",
     "app.lock-viewers.featuresLable": "Característica",
@@ -600,20 +702,42 @@
     "app.lock-viewers.button.apply": "Aplicar",
     "app.lock-viewers.button.cancel": "Cancelar",
     "app.lock-viewers.locked": "Bloqueado",
+    "app.lock-viewers.hideViewersCursor": "Ver los cursores de otros participantes",
     "app.guest-policy.ariaTitle": "Modo de configuración de la política de invitados",
     "app.guest-policy.title": "Política de invitados",
     "app.guest-policy.description": "Cambiar la configuración de la política de invitados a la reunión",
     "app.guest-policy.button.askModerator": "Preguntar al moderador",
     "app.guest-policy.button.alwaysAccept": "Aceptar siempre",
     "app.guest-policy.button.alwaysDeny": "Denegar siempre",
+    "app.guest-policy.policyBtnDesc": "Establecer la política de invitados a la reunión",
     "app.connection-status.ariaTitle": "Conexión en estado modal",
     "app.connection-status.title": "Estado de la conexión",
     "app.connection-status.description": "Ver el estado de conexión del usuario",
     "app.connection-status.empty": "Actualmente no se han reportado errores de conexión",
     "app.connection-status.more": "más",
+    "app.connection-status.copy": "Copiar estadísticas",
+    "app.connection-status.copied": "¡Copiado!",
+    "app.connection-status.jitter": "Fluctuación del retardo",
     "app.connection-status.label": "Estado de la conexión",
+    "app.connection-status.settings": "Estableciendo tu configuración",
+    "app.connection-status.no": "No",
     "app.connection-status.notification": "Se ha detectado la pérdida de su conexión",
     "app.connection-status.offline": "Desconectado",
+    "app.connection-status.audioUploadRate": "Tasa de subida del audio",
+    "app.connection-status.audioDownloadRate": "Tasa de bajada del audio",
+    "app.connection-status.videoUploadRate": "Tasa de subida del vídeo",
+    "app.connection-status.videoDownloadRate": "Tasa de bajada del vídeo",
+    "app.connection-status.lostPackets": "Paquetes perdidos",
+    "app.connection-status.usingTurn": "Utilizando TURN",
+    "app.connection-status.yes": "Sí",
+    "app.connection-status.connectionStats": "Estadísticas de la conexión",
+    "app.connection-status.myLogs": "Mis registrosv",
+    "app.connection-status.sessionLogs": "Registros de la sesión",
+    "app.connection-status.next": "Página siguiente",
+    "app.connection-status.prev": "Página anterior",
+    "app.learning-dashboard.label": "Panel de análisis del aprendizaje",
+    "app.learning-dashboard.description": "Abrir panel con actividades de los usuarios",
+    "app.learning-dashboard.clickHereToOpen": "Abrir Panel de análisis del aprendizaje",
     "app.recording.startTitle": "Iniciar grabación",
     "app.recording.stopTitle": "Pausar grabación",
     "app.recording.resumeTitle": "Continuar grabación",
@@ -635,11 +759,14 @@
     "app.videoPreview.webcamOptionLabel": "Escoger webcam",
     "app.videoPreview.webcamPreviewLabel": "Vista previa de la webcam",
     "app.videoPreview.webcamSettingsTitle": "Configuración de la webcam",
+    "app.videoPreview.webcamVirtualBackgroundLabel": "Ajustes del fondo virtual",
+    "app.videoPreview.webcamVirtualBackgroundDisabledLabel": "Este dispositivo no soporta fondos virtuales",
     "app.videoPreview.webcamNotFoundLabel": "Webcam no encontrada",
     "app.videoPreview.profileNotFoundLabel": "Perfil de cámara no soportado",
     "app.video.joinVideo": "Compartir webcam",
     "app.video.connecting": "Ha empezado a compartir la cámara",
     "app.video.leaveVideo": "Detener compartir webcam",
+    "app.video.advancedVideo": "Abrir ajustes avanzados",
     "app.video.iceCandidateError": "Error añadiendo candidato ICE",
     "app.video.iceConnectionStateError": "Fallo de conexión (error ICE 1107)",
     "app.video.permissionError": "Error compartiendo la webcam. Por favor, compruebe los permisos",
@@ -654,6 +781,7 @@
     "app.video.notReadableError": "No se pudo obtener video webcam. Por favor, asegúrese de que otro programa no está utilizándola",
     "app.video.timeoutError": "El navegador no respondió a tiempo",
     "app.video.genericError": "Un error desconocido ocurrió con el dispositivo (Error {0})",
+    "app.video.mediaTimedOutError": "Se ha interrumpido la transmisión de tu cámara web. Prueba a compartirla de nuevo",
     "app.video.mediaFlowTimeout1020": "Los medios audiovisuales no han podido alcanzar el servidor (error 1020)",
     "app.video.suggestWebcamLock": "¿Aplicar la configuración de bloqueo a las cámaras web de los espectadores?",
     "app.video.suggestWebcamLockReason": "(esto mejorará la estabilidad de la reunión)",
@@ -669,8 +797,21 @@
     "app.video.pagination.prevPage": "Ver los vídeos anteriores",
     "app.video.pagination.nextPage": "Ver los siguientes vídeos",
     "app.video.clientDisconnected": "No se puede compartir la cámara por problemas de conexión",
+    "app.video.virtualBackground.none": "Ninguno",
+    "app.video.virtualBackground.blur": "Desenfocado",
+    "app.video.virtualBackground.home": "Casa",
+    "app.video.virtualBackground.board": "Pizarra",
+    "app.video.virtualBackground.coffeeshop": "Cafetería",
+    "app.video.virtualBackground.background": "Fondo",
+    "app.video.virtualBackground.genericError": "No se pudo aplicar el efecto de la cámara. Inténtalo de nuevo.",
+    "app.video.virtualBackground.camBgAriaDesc": "Ajusta el fondo virtual de la cámara web a {0}",
+    "app.video.camCapReached": "No puedes compartir más cámaras",
+    "app.video.meetingCamCapReached": "Se ha alcanzado el límite de cámaras web simultáneas para esta reunión.",
+    "app.video.dropZoneLabel": "Soltar aquí",
     "app.fullscreenButton.label": "Hacer {0} pantalla completa",
     "app.fullscreenUndoButton.label": "Deshacer {0} en pantalla completa",
+    "app.switchButton.expandLabel": "Expandir pantalla compartida de vídeo",
+    "app.switchButton.shrinkLabel": "Encoger pantalla compartida de vídeo",
     "app.sfu.mediaServerConnectionError2000": "No se ha podido conectar al servidor de medios audiovisuales (error 2000)",
     "app.sfu.mediaServerOffline2001": "El servidor de medios audiovisuales está desconectado. Por favor, inténtelo más tarde (error 2001)",
     "app.sfu.mediaServerNoResources2002": "El servidor de medios audiovisuales no tiene recursos disponibles (error 2002)",
@@ -683,6 +824,7 @@
     "app.meeting.endNotification.ok.label": "OK",
     "app.whiteboard.annotations.poll": "Se han publicado los resultados de la encuesta",
     "app.whiteboard.annotations.pollResult": "Resultados de la encuesta",
+    "app.whiteboard.annotations.noResponses": "Sin respuestas",
     "app.whiteboard.toolbar.tools": "Herramientas",
     "app.whiteboard.toolbar.tools.hand": "Expandir",
     "app.whiteboard.toolbar.tools.pencil": "Lápiz",
@@ -714,6 +856,7 @@
     "app.whiteboard.toolbar.palmRejectionOn": "Activar rechazo de petición de palabra",
     "app.whiteboard.toolbar.palmRejectionOff": "Desactivar rechazo de petición de palabra",
     "app.whiteboard.toolbar.fontSize": "Listado de tamaños de fuente",
+    "app.whiteboard.toolbarAriaLabel": "Herramientas de presentación",
     "app.feedback.title": "Ha salido de la conferencia",
     "app.feedback.subtitle": "Nos encantaría oírle acerca de su experiencia con BigBlueButton (opcional)",
     "app.feedback.textarea": "¿Cómo podemos hacer BigBlueButton mejor?",
@@ -725,6 +868,11 @@
     "app.videoDock.webcamFocusDesc": "Enfoque la cámara seleccionada",
     "app.videoDock.webcamUnfocusLabel": "Desenfoque",
     "app.videoDock.webcamUnfocusDesc": "Desenfoque la cámara seleccionada",
+    "app.videoDock.webcamPinLabel": "Bloquear",
+    "app.videoDock.webcamPinDesc": "Bloquear la cámara web seleccionada",
+    "app.videoDock.webcamUnpinLabel": "Desbloquear",
+    "app.videoDock.webcamUnpinLabelDisabled": "Solo Moderadores pueden desbloquear usuarios",
+    "app.videoDock.webcamUnpinDesc": "Desbloquear la cámara web seleccionada",
     "app.videoDock.autoplayBlockedDesc": "Necesitamos su permiso para mostrarle las webcams de otros usuarios",
     "app.videoDock.autoplayAllowLabel": "Ver webcams",
     "app.invitation.title": "Invitación a sala externa",
@@ -732,7 +880,9 @@
     "app.createBreakoutRoom.title": "Salas externas",
     "app.createBreakoutRoom.ariaTitle": "Ocultar salas externas",
     "app.createBreakoutRoom.breakoutRoomLabel": "Salas externas {0}",
+    "app.createBreakoutRoom.askToJoin": "Solicitar unirte",
     "app.createBreakoutRoom.generatingURL": "Generando URL",
+    "app.createBreakoutRoom.generatingURLMessage": "Estamos generando una URL para unirte al grupo de trabajo seleccionado. Puede llevar unos pocos segundos...",
     "app.createBreakoutRoom.duration": "Duración {0}",
     "app.createBreakoutRoom.room": "Sala {0}",
     "app.createBreakoutRoom.notAssigned": "No asignado ({0})",
@@ -745,7 +895,12 @@
     "app.createBreakoutRoom.numberOfRooms": "Número de salas",
     "app.createBreakoutRoom.durationInMinutes": "Duración (minutos)",
     "app.createBreakoutRoom.randomlyAssign": "Asignar aleatoriamente",
+    "app.createBreakoutRoom.randomlyAssignDesc": "Asignar usuarios aleatoriamente a las salas de grupos de trabajo",
+    "app.createBreakoutRoom.resetAssignments": "Restablecer asignaciones",
+    "app.createBreakoutRoom.resetAssignmentsDesc": "Restablecer todas las asignaciones de la sala para todos los usuarios",
     "app.createBreakoutRoom.endAllBreakouts": "Finalizar todas las salas externas",
+    "app.createBreakoutRoom.chatTitleMsgAllRooms": "todas las salas",
+    "app.createBreakoutRoom.msgToBreakoutsSent": "Mensaje enviado a {0} grupos de trabajo",
     "app.createBreakoutRoom.roomName": "{0} (Sala - {1})",
     "app.createBreakoutRoom.doneLabel": "Hecho",
     "app.createBreakoutRoom.nextLabel": "Siguiente",
@@ -754,9 +909,17 @@
     "app.createBreakoutRoom.addParticipantLabel": "+ Añadir participante",
     "app.createBreakoutRoom.freeJoin": "Permitir a los usuarios escoger una sala externa a la que unirse",
     "app.createBreakoutRoom.leastOneWarnBreakout": "Debe colocar al menos un usuario en la sala externa",
+    "app.createBreakoutRoom.minimumDurationWarnBreakout": "La duración mínima para una sala de un grupo de trabajo es de {0} minutos.",
     "app.createBreakoutRoom.modalDesc": "Sugerencia: puede arrastrar y soltar el nombre de un usuario para asignarlo a una sala externa específica.",
     "app.createBreakoutRoom.roomTime": "{0} minutos",
     "app.createBreakoutRoom.numberOfRoomsError": "El número de salas es inválido",
+    "app.createBreakoutRoom.duplicatedRoomNameError": "El nombre de la sala no puede estar duplicado",
+    "app.createBreakoutRoom.emptyRoomNameError": "El nombre de la sala no puede estar vacío",
+    "app.createBreakoutRoom.setTimeInMinutes": "Ajustar duración a (minutos)",
+    "app.createBreakoutRoom.setTimeLabel": "Aplicar",
+    "app.createBreakoutRoom.setTimeCancel": "Cancelar",
+    "app.createBreakoutRoom.setTimeHigherThanMeetingTimeError": "La duración de los grupos de trabajo no puede exceder el tiempo de reunión restante.",
+    "app.createBreakoutRoom.roomNameInputDesc": "Actualiza el nombre de la sala de los grupos de trabajo",
     "app.externalVideo.start": "Compartir un nuevo video",
     "app.externalVideo.title": "Compartir un video externo",
     "app.externalVideo.input": "URL de video externo",
@@ -764,7 +927,11 @@
     "app.externalVideo.urlError": "La URL de este video no está soportada",
     "app.externalVideo.close": "Cerrar",
     "app.externalVideo.autoPlayWarning": "Reproduzca el video para habilitar la sincronización de medios",
+    "app.externalVideo.refreshLabel": "Refrescar reproductor de vídeo",
+    "app.externalVideo.fullscreenLabel": "Reproductor de vídeo",
     "app.externalVideo.noteLabel": "Nota: Los vídeos externos compartidos no se mostrarán en las grabaciones. Están soportados Youtube, Vimeo, Instructure Media, Twitch, Dailymotion y enlaces tipo URL a archivos audiovisuales (p.ej. https://ejemplo.es/xy.mp4)",
+    "app.externalVideo.subtitlesOn": "Apagar",
+    "app.externalVideo.subtitlesOff": "Encender (si está disponible)",
     "app.actionsBar.actionsDropdown.shareExternalVideo": "Compartir un video externo",
     "app.actionsBar.actionsDropdown.stopShareExternalVideo": "Detener compartir video externo",
     "app.iOSWarning.label": "Por favor, actualice a iOS 12.2 o mayor",
@@ -775,7 +942,120 @@
     "app.debugWindow.form.userAgentLabel": "Agente de usuario",
     "app.debugWindow.form.button.copy": "Copia",
     "app.debugWindow.form.enableAutoarrangeLayoutLabel": "Activar disposición automática",
-    "app.debugWindow.form.enableAutoarrangeLayoutDescription": "(se deshabilitará si se arrastra o redimensiona el área de las cámaras)"
+    "app.debugWindow.form.enableAutoarrangeLayoutDescription": "(se deshabilitará si se arrastra o redimensiona el área de las cámaras)",
+    "app.debugWindow.form.chatLoggerLabel": " Probar los niveles de registro de la conversación",
+    "app.debugWindow.form.button.apply": "Aplicar",
+    "app.layout.style.custom": "Personalizado",
+    "app.layout.style.smart": "Diseño inteligente",
+    "app.layout.style.presentationFocus": "Establecer foco en la presentación",
+    "app.layout.style.videoFocus": "Establecer foco en el vídeo",
+    "app.layout.style.customPush": "Personalizado (forzar diseño a todos los asistentes)",
+    "app.layout.style.smartPush": "Diseño inteligente (forzar diseño a todos los asistentes)",
+    "app.layout.style.presentationFocusPush": "Establecer foco en la presentación (forzar diseño a todos los asistentes)",
+    "app.layout.style.videoFocusPush": "Establecer foco en el vídeo (forzar diseño a todos los asistentes)",
+    "playback.button.about.aria": "Acerca de",
+    "playback.button.clear.aria": "Borrar búsqueda",
+    "playback.button.close.aria": "Cerrar modal",
+    "playback.button.fullscreen.aria": "Contenido en pantalla completa",
+    "playback.button.restore.aria": "Restaurar contenido",
+    "playback.button.search.aria": "Buscar",
+    "playback.button.section.aria": "Sección lateral",
+    "playback.button.swap.aria": "Intercambiar contenido",
+    "playback.button.theme.aria": "Alternar tema",
+    "playback.error.wrapper.aria": "Zona de error",
+    "playback.loader.wrapper.aria": "Zona de carga",
+    "playback.player.wrapper.aria": "Zona del reproductor",
+    "playback.player.about.modal.shortcuts.title": "Atajos de teclado",
+    "playback.player.about.modal.shortcuts.alt": "Alt",
+    "playback.player.about.modal.shortcuts.shift": "Shift",
+    "playback.player.about.modal.shortcuts.fullscreen": "Alternar a pantalla completa",
+    "playback.player.about.modal.shortcuts.play": "Reproducir / Pausar",
+    "playback.player.about.modal.shortcuts.section": "Alternar a sección lateral",
+    "playback.player.about.modal.shortcuts.seek.backward": "Buscar hacia atrás",
+    "playback.player.about.modal.shortcuts.seek.forward": "Buscar hacia adelante",
+    "playback.player.about.modal.shortcuts.skip.next": "Diapositiva siguiente ",
+    "playback.player.about.modal.shortcuts.skip.previous": "Diapositiva anterior",
+    "playback.player.about.modal.shortcuts.swap": "Intercambiar contenido",
+    "playback.player.chat.message.poll.name": "Resultados de la encuesta",
+    "playback.player.chat.message.poll.question": "Pregunta",
+    "playback.player.chat.message.poll.options": "Opciones",
+    "playback.player.chat.message.poll.option.yes": "Sí",
+    "playback.player.chat.message.poll.option.no": "No",
+    "playback.player.chat.message.poll.option.abstention": "Absteción",
+    "playback.player.chat.message.poll.option.true": "Verdadero/a",
+    "playback.player.chat.message.poll.option.false": "Falso/a",
+    "playback.player.chat.message.video.name": "Vídeo externo",
+    "playback.player.chat.wrapper.aria": "Zona del chat",
+    "playback.player.notes.wrapper.aria": "Zona de notas",
+    "playback.player.presentation.wrapper.aria": "Zona de Presentación",
+    "playback.player.screenshare.wrapper.aria": "Zona de Pantalla compartida",
+    "playback.player.search.modal.title": "Buscar",
+    "playback.player.search.modal.subtitle": "Buscar contenido en diapositivas",
+    "playback.player.thumbnails.wrapper.aria": "Zona de miniaturas",
+    "playback.player.webcams.wrapper.aria": "Zona de webcams",
+    "app.learningDashboard.dashboardTitle": "Panel de análisis del aprendizaje",
+    "app.learningDashboard.downloadSessionDataLabel": "Descargar datos de la sesión",
+    "app.learningDashboard.lastUpdatedLabel": "Última actualización",
+    "app.learningDashboard.sessionDataDownloadedLabel": "¡Descargado!",
+    "app.learningDashboard.shareButton": "Compartir",
+    "app.learningDashboard.shareLinkCopied": "Enlace copiado satisfactoriamente",
+    "app.learningDashboard.user": "Usuario",
+    "app.learningDashboard.indicators.meetingStatusEnded": "Finalizado",
+    "app.learningDashboard.indicators.meetingStatusActive": "Activo",
+    "app.learningDashboard.indicators.usersOnline": "Usuarios/as activos/as",
+    "app.learningDashboard.indicators.usersTotal": "Número total de usuarios/as",
+    "app.learningDashboard.indicators.polls": "Encuestas",
+    "app.learningDashboard.indicators.timeline": "Cronología",
+    "app.learningDashboard.indicators.activityScore": "Resultado de la actividad",
+    "app.learningDashboard.indicators.duration": "Duración",
+    "app.learningDashboard.userDetails.startTime": "Hora de inicio",
+    "app.learningDashboard.userDetails.endTime": "Hora de finalización",
+    "app.learningDashboard.userDetails.joined": "Unido",
+    "app.learningDashboard.userDetails.category": "Categoría",
+    "app.learningDashboard.userDetails.average": "Promedio",
+    "app.learningDashboard.userDetails.activityPoints": "Puntos en la actividad",
+    "app.learningDashboard.userDetails.poll": "Encuesta",
+    "app.learningDashboard.userDetails.response": "Respuesta",
+    "app.learningDashboard.userDetails.mostCommonAnswer": "Respuesta más frecuente",
+    "app.learningDashboard.userDetails.anonymousAnswer": "Encuesta anónima",
+    "app.learningDashboard.usersTable.title": "Vistazo general",
+    "app.learningDashboard.usersTable.colOnline": "Tiempo de conexión",
+    "app.learningDashboard.usersTable.colTalk": "Tiempo de conversación",
+    "app.learningDashboard.usersTable.colWebcam": "Tiempo de uso de cámara web",
+    "app.learningDashboard.usersTable.colMessages": "Mensajes",
+    "app.learningDashboard.usersTable.colEmojis": "Emojis",
+    "app.learningDashboard.usersTable.colRaiseHands": "Manos levantadas",
+    "app.learningDashboard.usersTable.colActivityScore": "Puntuación de la actividad",
+    "app.learningDashboard.usersTable.colStatus": "Estado",
+    "app.learningDashboard.usersTable.userStatusOnline": "Conectado/a",
+    "app.learningDashboard.usersTable.userStatusOffline": "Desconectado/a",
+    "app.learningDashboard.usersTable.noUsers": "Aún no hay usuarios",
+    "app.learningDashboard.usersTable.name": "Nombre",
+    "app.learningDashboard.usersTable.moderator": "Moderador",
+    "app.learningDashboard.usersTable.pollVotes": "Votos en la encuesta",
+    "app.learningDashboard.usersTable.join": "Accedió",
+    "app.learningDashboard.usersTable.left": "Salió",
+    "app.learningDashboard.usersTable.notAvailable": "No disponible",
+    "app.learningDashboard.pollsTable.title": "Encuestas",
+    "app.learningDashboard.pollsTable.anonymousAnswer": "Encuesta anónima (respuestas en la última fila)",
+    "app.learningDashboard.pollsTable.anonymousRowName": "Anónimo/a",
+    "app.learningDashboard.pollsTable.noPollsCreatedHeading": "No se han creado encuestas",
+    "app.learningDashboard.pollsTable.noPollsCreatedMessage": "Una vez enviada la encuesta, el resultado de los participantes aparecerá en esta lista.",
+    "app.learningDashboard.statusTimelineTable.title": "Cronología",
+    "app.learningDashboard.statusTimelineTable.thumbnail": "Minuatura de la presentación",
+    "app.learningDashboard.errors.invalidToken": "Token de sesión inválido",
+    "app.learningDashboard.errors.dataUnavailable": "Los datos ya no están accesibles",
+    "mobileApp.portals.list.empty.addFirstPortal.label": "Añade tu primer portal utilizando el botón superior,",
+    "mobileApp.portals.list.empty.orUseOurDemoServer.label": "o utiliza nuestro servidor de demostración.",
+    "mobileApp.portals.list.add.button.label": "Añadir portal",
+    "mobileApp.portals.fields.name.label": "Nombre del portal",
+    "mobileApp.portals.fields.name.placeholder": "BigBlueButton demo",
+    "mobileApp.portals.fields.url.label": "URL del servidor",
+    "mobileApp.portals.addPortalPopup.confirm.button.label": "Guardar",
+    "mobileApp.portals.drawerNavigation.button.label": "Portales",
+    "mobileApp.portals.addPortalPopup.validation.emptyFields": "Campos requeridos",
+    "mobileApp.portals.addPortalPopup.validation.portalNameAlreadyExists": "El nombre ya está en uso",
+    "mobileApp.portals.addPortalPopup.validation.urlInvalid": "Error al tratar de cargar la página - comprueba la URL y la conexión a la red"
 
 }
 
diff --git a/bigbluebutton-html5/public/locales/es_MX.json b/bigbluebutton-html5/public/locales/es_MX.json
index 09d9b98d71..bffc38a975 100644
--- a/bigbluebutton-html5/public/locales/es_MX.json
+++ b/bigbluebutton-html5/public/locales/es_MX.json
@@ -212,7 +212,6 @@
     "app.settings.main.save.label.description": "Gurada cambios y cierra el menú de configuración",
     "app.settings.dataSavingTab.label": "Ahorro de datos",
     "app.settings.dataSavingTab.webcam": "Habilitar webcams",
-    "app.settings.dataSavingTab.screenShare": "Habilitar escritorio compartido",
     "app.settings.dataSavingTab.description": "Para ahorrar ancho de banda ajusta lo que se se está mostrando",
     "app.switch.onLabel": "Encendido",
     "app.switch.offLabel": "Apagado",
diff --git a/bigbluebutton-html5/public/locales/et.json b/bigbluebutton-html5/public/locales/et.json
index 44c48d6a90..f126255321 100644
--- a/bigbluebutton-html5/public/locales/et.json
+++ b/bigbluebutton-html5/public/locales/et.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "Salvestab muudatused ning sulgeb seadete menüü",
     "app.settings.dataSavingTab.label": "Andmemahu säästmine",
     "app.settings.dataSavingTab.webcam": "Luba veebikaamerad",
-    "app.settings.dataSavingTab.screenShare": "Luba ekraanijagamine",
     "app.settings.dataSavingTab.description": "Andmemahu säästmiseks võid muuta, mida ekraanil näidatakse.",
     "app.settings.save-notification.label": "Seaded on salvestatud",
     "app.statusNotifier.lowerHands": "Langeta käed",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Halda esitlusi",
     "app.actionsBar.actionsDropdown.initPollLabel": "Alusta küsitlust",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Jaga ekraani",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekraanijagamine on lukustatud",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Lõpeta ekraanijagamine",
     "app.actionsBar.actionsDropdown.presentationDesc": "Laadi esitlus üles",
     "app.actionsBar.actionsDropdown.initPollDesc": "Alusta küsitlust",
diff --git a/bigbluebutton-html5/public/locales/eu.json b/bigbluebutton-html5/public/locales/eu.json
index 172fcf515e..071d7f51fb 100644
--- a/bigbluebutton-html5/public/locales/eu.json
+++ b/bigbluebutton-html5/public/locales/eu.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "Aldaketak gordetzen ditu eta ezarpenen menua ixten du",
     "app.settings.dataSavingTab.label": "Datuen aurrezteak",
     "app.settings.dataSavingTab.webcam": "Gaitu web-kamerak",
-    "app.settings.dataSavingTab.screenShare": "Gaitu mahaigaina partekatzea",
     "app.settings.dataSavingTab.description": "Zure banda zabalera aurrezteko, doitu ezazu une honetan erakusten dena.",
     "app.settings.save-notification.label": "Ezarpenak gorde dira",
     "app.statusNotifier.lowerHands": "Jaitsi eskuak",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Kudeatu aurkezpenak",
     "app.actionsBar.actionsDropdown.initPollLabel": "Hasi inkesta bat",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Partekatu zure pantaila",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Pantailaren partekatzea blokeatuta dago",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Gelditu pantailaren partekatzea",
     "app.actionsBar.actionsDropdown.presentationDesc": "Kargatu zure aurkezpena",
     "app.actionsBar.actionsDropdown.initPollDesc": "Hasi inkesta bat",
diff --git a/bigbluebutton-html5/public/locales/fa_IR.json b/bigbluebutton-html5/public/locales/fa_IR.json
index c72cea3663..261f0d2855 100644
--- a/bigbluebutton-html5/public/locales/fa_IR.json
+++ b/bigbluebutton-html5/public/locales/fa_IR.json
@@ -108,18 +108,18 @@
     "app.userList.userOptions.clearAllDesc": "همه نمادهای وضعیت را از کاربران پاک می‌کند",
     "app.userList.userOptions.muteAllExceptPresenterLabel": "بستن صدای همه کاربران به جز ارائه‌دهنده",
     "app.userList.userOptions.muteAllExceptPresenterDesc": "همه کاربران حاضر در جلسه به جز ارائه‌دهنده را بی‌صدا می‌کند",
-    "app.userList.userOptions.unmuteAllLabel": "غیرفعال کردن امکان بستن صدای جلسه",
+    "app.userList.userOptions.unmuteAllLabel": "بازگردانی حالت بی‌صدای جلسه",
     "app.userList.userOptions.unmuteAllDesc": "صدای جلسه را باز می‌کند",
     "app.userList.userOptions.lockViewersLabel": "قفل‌کردن کاربران",
     "app.userList.userOptions.lockViewersDesc": "قفل‌کردن امکانات خاص برای شرکت‌کنندگان در جلسه",
     "app.userList.userOptions.guestPolicyLabel": "سیاست پذیرش مهمان",
     "app.userList.userOptions.guestPolicyDesc": "تغییر تنظیمات سیاست پذیرش مهمان در جلسه",
-    "app.userList.userOptions.disableCam": "اشتراک‌گذاری دوربین‌های کاربران غیرفعال شده است",
+    "app.userList.userOptions.disableCam": "دوربین‌های کاربران غیرفعال شده است",
     "app.userList.userOptions.disableMic": "میکروفون‌های کاربران غیرفعال شده است",
     "app.userList.userOptions.disablePrivChat": "گفتگوی خصوصی غیرفعال شده است",
     "app.userList.userOptions.disablePubChat": "گفتگوی عمومی غیرفعال شده است",
     "app.userList.userOptions.disableNotes": "یادداشت‌های اشتراکی اکنون قفل شده‌اند",
-    "app.userList.userOptions.hideUserList": "فهرست کاربران اکنون برای شرکت‌کنندگان پنهان است",
+    "app.userList.userOptions.hideUserList": "اکنون فهرست کاربران برای شرکت‌کنندگان پنهان است",
     "app.userList.userOptions.webcamsOnlyForModerator": "تنها مدیران امکان مشاهده دوربین‌های کاربران را دارند (به دلیل تنظیمات قفل)",
     "app.userList.content.participants.options.clearedStatus": "وضعیت همه کاربرها پاک شد",
     "app.userList.userOptions.enableCam": "دوربین‌های کاربران فعال شد",
@@ -127,8 +127,8 @@
     "app.userList.userOptions.enablePrivChat": "گفتگوی خصوصی فعال شد",
     "app.userList.userOptions.enablePubChat": "گفتگوی عمومی فعال شد",
     "app.userList.userOptions.enableNotes": "یادداشت‌های اشتراکی اکنون فعال هستند",
-    "app.userList.userOptions.showUserList": "فهرست کاربران اکنون برای شرکت‌کنندگان قابل مشاهده است",
-    "app.userList.userOptions.enableOnlyModeratorWebcam": "شما اکنون می‌توانید دوربین خود را فعال کنید، همه تصویر شما را خواهند دید",
+    "app.userList.userOptions.showUserList": "اکنون فهرست کاربران برای شرکت‌کنندگان قابل مشاهده است",
+    "app.userList.userOptions.enableOnlyModeratorWebcam": "اکنون شما می‌توانید دوربین خود را فعال کنید، همه تصویر شما را خواهند دید",
     "app.userList.userOptions.savedNames.title": "فهرست کاربران در جلسه {0} در {1}",
     "app.userList.userOptions.sortedFirstName.heading": "مرتب‌شده بر اساس نام:",
     "app.userList.userOptions.sortedLastName.heading": "مرتب‌شده بر اساس نام خانوادگی:",
@@ -160,8 +160,8 @@
     "app.meeting.endedMessage": "شما در حال انتقال به صفحه اصلی هستید",
     "app.meeting.alertMeetingEndsUnderMinutesSingular": "جلسه تا یک دقیقه دیگر به پایان می‌رسد.",
     "app.meeting.alertMeetingEndsUnderMinutesPlural": "جلسه تا {0} دقیقه دیگر به پایان می‌رسد.",
-    "app.meeting.alertBreakoutEndsUnderMinutesPlural": "اتمام جلسه زیرمجموعه تا {0} دقیقه دیگر",
-    "app.meeting.alertBreakoutEndsUnderMinutesSingular": "اتمام جلسه زیرمجموعه تا یک دقیقه دیگر",
+    "app.meeting.alertBreakoutEndsUnderMinutesPlural": "جلسه زیرمجموعه تا {0} دقیقه دیگر به پایان می‌رسد.",
+    "app.meeting.alertBreakoutEndsUnderMinutesSingular": "جلسه زیرمجموعه تا یک دقیقه دیگر به پایان می‌رسد.",
     "app.presentation.hide": "پنهان‌سازی ارائه",
     "app.presentation.notificationLabel": "ارائه کنونی",
     "app.presentation.downloadLabel": "بارگیری",
@@ -171,7 +171,7 @@
     "app.presentation.changedSlideContent": "ارائه به اسلاید {0} تغییر کرد",
     "app.presentation.emptySlideContent": "محتوایی برای اسلاید کنونی وجود ندارد",
     "app.presentation.options.fullscreen": "تمام‌صفحه",
-    "app.presentation.options.exitFullscreen": "خروج از حالت تمام‌صفحه",
+    "app.presentation.options.exitFullscreen": "خروج از تمام‌صفحه",
     "app.presentation.options.minimize": "کوچک‌کردن",
     "app.presentation.options.snapshot": "تصویر لحظه‌ای اسلاید کنونی",
     "app.presentation.options.downloading": "در حال بارگیری...",
@@ -199,7 +199,7 @@
     "app.presentation.presentationToolbar.zoomReset": "بازنشانی بزرگ‌نمایی",
     "app.presentation.presentationToolbar.zoomIndicator": "درصد بزرگ‌نمایی کنونی",
     "app.presentation.presentationToolbar.fitToWidth": "اندازه متناسب با عرض صفحه",
-    "app.presentation.presentationToolbar.fitToPage": "اندازه متناسب با صفحه نمایش",
+    "app.presentation.presentationToolbar.fitToPage": "اندازه متناسب با صفحه",
     "app.presentation.presentationToolbar.goToSlide": "اسلاید {0}",
     "app.presentation.placeholder": "در حال حاضر هیچ ارائه فعالی وجود ندارد",
     "app.presentationUploder.title": "ارائه",
@@ -323,13 +323,13 @@
     "app.failedMessage": "با عرض پوزش، اتصال به سرور دچار مشکل شد.",
     "app.downloadPresentationButton.label": "بارگیری پرونده اصلی ارائه",
     "app.connectingMessage": "در حال اتصال ...",
-    "app.waitingMessage": "ارتباط قطع شد. تلاش مجدد برای اتصال در {0} ثانیه ...",
+    "app.waitingMessage": "اتصال قطع شد. تلاش مجدد برای اتصال در {0} ثانیه ...",
     "app.retryNow": "تلاش مجدد",
     "app.muteWarning.label": "برروی {0} کلیک کنید تا صدای خود را فعال کنید.",
-    "app.muteWarning.disableMessage": "هشدارهای بی‌صدا تا زمان فعال‌سازی صدا غیرفعال شدند",
+    "app.muteWarning.disableMessage": "هشدارهای بی‌صدابودن تا زمان فعال‌سازی صدا غیرفعال شدند",
     "app.muteWarning.tooltip": "برای بستن و غیرفعال‌کردن هشدار تا فعال‌سازی مجدد صدا، کلیک کنید",
     "app.navBar.settingsDropdown.optionsLabel": "گزینه‌ها",
-    "app.navBar.settingsDropdown.fullscreenLabel": "تمام‌صفحه",
+    "app.navBar.settingsDropdown.fullscreenLabel": "تغییر به تمام‌صفحه",
     "app.navBar.settingsDropdown.settingsLabel": "تنظیمات",
     "app.navBar.settingsDropdown.aboutLabel": "درباره",
     "app.navBar.settingsDropdown.leaveSessionLabel": "ترک جلسه",
@@ -357,8 +357,8 @@
     "app.leaveConfirmation.confirmDesc": "شما را از جلسه خارج می‌کند",
     "app.endMeeting.title": "پایان {0}",
     "app.endMeeting.description": "این عمل جلسه را برای {0} کاربر فعال به پایان می‌رساند. آیا مطمئن هستید که می‌خواهید این جلسه را به پایان برسانید؟",
-    "app.endMeeting.noUserDescription": "از اتمام جلسه اطمینان دارید؟ (جلسه پایان یافته و همه کاربران خارج خواهند شد)",
-    "app.endMeeting.contentWarning": "پیام‌های گفتگو، یادداشت‌های اشتراکی، محتوای تخته‌سفید و اسناد به اشتراک گذاشته شده برای این جلسه دیگر مستقیماً قابل دسترس نخواهند بود",
+    "app.endMeeting.noUserDescription": "آیا مطمئن هستید که می‌خواهید این جلسه را به پایان برسانید؟",
+    "app.endMeeting.contentWarning": "پیام‌های گفتگو، یادداشت‌های اشتراکی، محتوای تخته‌سفید و اسناد به اشتراک گذاشته‌شده برای این جلسه دیگر مستقیماً قابل دسترس نخواهند بود",
     "app.endMeeting.yesLabel": "بله",
     "app.endMeeting.noLabel": "خیر",
     "app.about.title": "درباره",
@@ -392,10 +392,10 @@
     "app.submenu.application.noLocaleOptionLabel": "هیچ زبان فعالی وجود ندارد",
     "app.submenu.application.paginationEnabledLabel": "صفحه‌بندی ویدیو",
     "app.submenu.application.layoutOptionLabel": "نوع چیدمان",
-    "app.submenu.notification.SectionTitle": "اطلاعیه",
+    "app.submenu.notification.SectionTitle": "اعلان‌ها",
     "app.submenu.notification.Desc": "تعریف کنید که چگونه و چه چیزی به شما اطلاع داده شود.",
     "app.submenu.notification.audioAlertLabel": "هشدارهای صوتی",
-    "app.submenu.notification.pushAlertLabel": "هشدارهای پدیدارشونده",
+    "app.submenu.notification.pushAlertLabel": "هشدارهای پدیدارشونده (popup)",
     "app.submenu.notification.messagesLabel": "پیام گفتگو",
     "app.submenu.notification.userJoinLabel": "پیوستن کاربر",
     "app.submenu.notification.userLeaveLabel": "ترک‌کردن کاربر",
@@ -408,8 +408,8 @@
     "app.submenu.video.videoOptionLabel": "انتخاب منبع مشاهده",
     "app.submenu.video.videoQualityLabel": "کیفیت ویدیو",
     "app.submenu.video.qualityOptionLabel": "کیفیت ویدیو را انتخاب کنید",
-    "app.submenu.video.participantsCamLabel": "مشاهده دوربین شرکت‌کنندگان",
-    "app.settings.applicationTab.label": "نرم‌افزار",
+    "app.submenu.video.participantsCamLabel": "مشاهده دوربین‌های شرکت‌کنندگان",
+    "app.settings.applicationTab.label": "برنامه",
     "app.settings.audioTab.label": "صدا",
     "app.settings.videoTab.label": "ویدیو",
     "app.settings.usersTab.label": "شرکت‌کنندگان",
@@ -420,7 +420,7 @@
     "app.settings.main.save.label.description": "تغییرات را ذخیره کرده و منوی تنظیمات را می‌بندد",
     "app.settings.dataSavingTab.label": "صرفه‌جویی در مصرف داده",
     "app.settings.dataSavingTab.webcam": "فعال‌سازی دوربین‌های دیگر شرکت‌کنندگان",
-    "app.settings.dataSavingTab.screenShare": "فعال‌سازی اشتراک‌گذاری صفحه",
+    "app.settings.dataSavingTab.screenShare": "فعال‌سازی اشتراک‌گذاری صفحه شرکت‌کنندگان دیگر",
     "app.settings.dataSavingTab.description": "برای صرفه جویی در مصرف پهنای باند اینترنت، آنچه را که باید نمایش داده شود انتخاب کنید.",
     "app.settings.save-notification.label": "تنظیمات ذخیره شدند",
     "app.statusNotifier.lowerHands": "پایین آوردن دست‌ها",
@@ -440,12 +440,11 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "مدیریت ارائه‌ها",
     "app.actionsBar.actionsDropdown.initPollLabel": "آغاز یک نظرسنجی",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "اشتراک‌گذاری صفحه خود",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "اشتراک‌گذاری صفحه قفل شد",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "متوقف‌کردن اشتراک‌گذاری صفحه خود",
     "app.actionsBar.actionsDropdown.presentationDesc": "بارگذاری پرونده ارائه شما",
     "app.actionsBar.actionsDropdown.initPollDesc": "آغاز یک نظرسنجی",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "صفحه خود را با دیگران به اشتراک بگذارید",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "توقف اشتراک گذاری تصویر میز کار با دیگران",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "متوقف‌کردن اشتراک‌گذاری صفحه خود با",
     "app.actionsBar.actionsDropdown.pollBtnLabel": "آغاز یک نظرسنجی",
     "app.actionsBar.actionsDropdown.pollBtnDesc": "وضعیت پنجره نظرسنجی را تغییر می‌دهد ",
     "app.actionsBar.actionsDropdown.saveUserNames": "ذخیره نام‌های کاربری",
@@ -458,8 +457,8 @@
     "app.actionsBar.actionsDropdown.selectRandUserLabel": "انتخاب کاربر تصادفی",
     "app.actionsBar.actionsDropdown.selectRandUserDesc": "انتخاب تصادفی کاربر از بینندگان موجود",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "تنظیم وضعیت",
-    "app.actionsBar.emojiMenu.awayLabel": "عدم حضور در جلسه",
-    "app.actionsBar.emojiMenu.awayDesc": "تغییر وضعیت خود به عدم حضور در جلسه",
+    "app.actionsBar.emojiMenu.awayLabel": "عدم حضور",
+    "app.actionsBar.emojiMenu.awayDesc": "تغییر وضعیت خود به عدم حضور",
     "app.actionsBar.emojiMenu.raiseHandLabel": "بالابردن دست",
     "app.actionsBar.emojiMenu.lowerHandLabel": "پایین آوردن دست",
     "app.actionsBar.emojiMenu.raiseHandDesc": "دست خود را بالا برده تا سوالی بپرسید",
@@ -505,7 +504,7 @@
     "app.breakoutJoinConfirmation.dismissDesc": "امکان پیوستن به اتاق زیرمجموعه را بسته و رد می‌کند",
     "app.breakoutJoinConfirmation.freeJoinMessage": "یک اتاق زیرمجموعه را برای پیوستن انتخاب کنید",
     "app.breakoutTimeRemainingMessage": "زمان باقی‌مانده از اتاق زیرمجموعه: {0}",
-    "app.breakoutWillCloseMessage": "زمان به اتمام رسید. اتاق زیرمجموعه به زودی بسته خواهد شد",
+    "app.breakoutWillCloseMessage": "زمان به پایان رسید. اتاق زیرمجموعه به زودی بسته خواهد شد",
     "app.breakout.dropdown.manageDuration": "تغییر مدت زمان",
     "app.breakout.dropdown.destroyAll": "اتمام اتاق‌های زیرمجموعه",
     "app.breakout.dropdown.options": "گزینه‌های اتاق‌های زیرمجموعه",
@@ -540,10 +539,10 @@
     "app.audioModal.playAudio.arialabel" : "پخش صدا",
     "app.audioDial.tipIndicator": "نکته",
     "app.audioDial.tipMessage": "برای قطع/وصل صدا کلید 0 را روی تلفن همراه خود شماره‌گیری کنید.",
-    "app.audioModal.connecting": "درحال برقراری ارتباط صوتی",
+    "app.audioModal.connecting": "در حال برقراری ارتباط صوتی",
     "app.audioManager.joinedAudio": "شما به جلسه صوتی پیوسته‌اید",
     "app.audioManager.joinedEcho": "شما به تست اکو پیوسته‌اید",
-    "app.audioManager.leftAudio": "شما جلسه صوتی را ترک کرده اید",
+    "app.audioManager.leftAudio": "شما جلسه صوتی را ترک کرده‌اید",
     "app.audioManager.reconnectingAudio": "تلاش برای اتصال مجدد صدا",
     "app.audioManager.genericError": "خطا: مشکلی پیش آمده است، لطفا مجدد سعی کنید.",
     "app.audioManager.connectionError": "خطا: خطای ارتباط",
@@ -619,7 +618,7 @@
     "app.guest.missingMeeting": "جلسه وجود ندارد.",
     "app.guest.meetingEnded": "جلسه به پایان رسید.",
     "app.guest.guestWait": "لطفا منتظر بمانید تا یک مدیر شما را برای پیوستن به جلسه تایید کند.",
-    "app.guest.guestDeny": "درخواست ورود به جلسه مورد پذیرش قرار نگرفت",
+    "app.guest.guestDeny": "مهمان از پیوستن به جلسه خودداری کرد.",
     "app.guest.seatWait": "میهمان در انتظار اجازه ورود به اتاق است.",
     "app.guest.allow": "مهمان تأیید شد و به جلسه هدایت گردید.",
     "app.guest.firstPositionInWaitingQueue": "شما اولین نفر در صف هستید!",
@@ -641,7 +640,7 @@
     "app.userList.guest.emptyMessage": "فعلا پیامی نیست",
     "app.userList.guest.inputPlaceholder": "ارسال پیام به اتاق انتظار مهمانان",
     "app.userList.guest.privateInputPlaceholder": "پیام به {0}",
-    "app.userList.guest.privateMessageLabel": "پیام‌دادن",
+    "app.userList.guest.privateMessageLabel": "پیام",
     "app.userList.guest.acceptLabel": "پذیرفتن",
     "app.userList.guest.denyLabel": "ردکردن",
     "app.user-info.title": "جستجوی دایرکتوری",
@@ -651,13 +650,13 @@
     "app.toast.chat.system": "سیستم",
     "app.toast.clearedEmoji.label": "وضعیت شکلک‌ها پاک شد",
     "app.toast.setEmoji.label": "وضعیت شکلک‌ها به {0} تغییر داده شد",
-    "app.toast.meetingMuteOn.label": "صدای همه کاربران به حالت بی‌صدا تغییر کرد",
+    "app.toast.meetingMuteOn.label": "همه کاربران بی‌صدا شده‌اند",
     "app.toast.meetingMuteOff.label": "امکان بی‌صدا کردن جلسه غیرفعال شد",
     "app.toast.setEmoji.raiseHand": "شما دستتان را بالا برده‌اید",
     "app.toast.setEmoji.lowerHand": "دست شما پایین آورده شد",
     "app.toast.promotedLabel": "نقش شما به مدیر ارتقا یافت",
     "app.toast.demotedLabel": "نقش شما به کاربر عادی تنزل یافت",
-    "app.notification.recordingStart": "جلسه اکنون در حال ضبط شدن است",
+    "app.notification.recordingStart": "اکنون جلسه در حال ضبط شدن است",
     "app.notification.recordingStop": "این جلسه ضبط نمی‌شود",
     "app.notification.recordingPaused": "این جلسه دیگر ضبط نمی‌شود",
     "app.notification.recordingAriaLabel": "زمان ضبط‌شده",
@@ -693,7 +692,7 @@
     "app.lock-viewers.featuresLable": "ویژگی",
     "app.lock-viewers.lockStatusLabel": "وضعیت",
     "app.lock-viewers.webcamLabel": "اشتراک‌گذاری دوربین",
-    "app.lock-viewers.otherViewersWebcamLabel": "مشاهده دوربین سایر کاربران",
+    "app.lock-viewers.otherViewersWebcamLabel": "مشاهده دوربین کاربران دیگر",
     "app.lock-viewers.microphoneLable": "اشتراک‌گذاری میکروفون",
     "app.lock-viewers.PublicChatLabel": "ارسال پیام عمومی",
     "app.lock-viewers.PrivateChatLable": "ارسال پیام خصوصی",
@@ -702,7 +701,7 @@
     "app.lock-viewers.ariaTitle": "پنجره تنظیمات قفل‌کردن بینندگان",
     "app.lock-viewers.button.apply": "اعمال",
     "app.lock-viewers.button.cancel": "لغو",
-    "app.lock-viewers.locked": "قفل‌شده",
+    "app.lock-viewers.locked": "قفل شده",
     "app.lock-viewers.hideViewersCursor": "مشاهده مکان‌نمای کاربران دیگر",
     "app.guest-policy.ariaTitle": "پنجره تنظیمات سیاست پذیرش مهمان",
     "app.guest-policy.title": "سیاست پذیرش مهمان",
@@ -788,8 +787,8 @@
     "app.video.suggestWebcamLockReason": "(این مورد باعث بهبود پایداری جلسه خواهد شد)",
     "app.video.enable": "فعال",
     "app.video.cancel": "لغو",
-    "app.video.swapCam": "جابجاکردن",
-    "app.video.swapCamDesc": "جابجاکردن جهت تصویر دوربین‌ها",
+    "app.video.swapCam": "جابه‌جاکردن",
+    "app.video.swapCamDesc": "جابه‌جاکردن جهت تصویر دوربین‌ها",
     "app.video.videoLocked": "اشتراک‌گذاری دوربین قفل شده است",
     "app.video.videoButtonDesc": "اشتراک‌گذاری دوربین",
     "app.video.videoMenu": "منوی ویدیو",
@@ -809,8 +808,8 @@
     "app.video.camCapReached": "نمی‌توانید دوربین‌های بیشتری را به اشتراک بگذارید",
     "app.video.meetingCamCapReached": "جلسه به حد مجاز دوربین‌های همزمان خود رسیده است",
     "app.video.dropZoneLabel": "اینجا رها کنید",
-    "app.fullscreenButton.label": "تغییر {0} به تمام صفحه",
-    "app.fullscreenUndoButton.label": "{0} تمام صفحه را واگرد کنید",
+    "app.fullscreenButton.label": "تغییر {0} به تمام‌صفحه",
+    "app.fullscreenUndoButton.label": "حالت تمام‌صفحه {0} را واگرد کنید",
     "app.switchButton.expandLabel": "بزرگ‌کردن تصویر اشتراک‌گذاری صفحه نمایش",
     "app.switchButton.shrinkLabel": "کوچک‌کردن تصویر اشتراک‌گذاری صفحه نمایش",
     "app.sfu.mediaServerConnectionError2000": "امکان اتصال به مدیا سرور وجود ندارد (خطای 2000)",
@@ -874,7 +873,7 @@
     "app.videoDock.webcamUnpinLabel": "برداشتن سنجاق",
     "app.videoDock.webcamUnpinLabelDisabled": "فقط مدیران می‌توانند سنجاق کاربران را بردارند",
     "app.videoDock.webcamUnpinDesc": "سنجاق دوربین انتخاب‌شده را بردارید",
-    "app.videoDock.autoplayBlockedDesc": "ما برای نمایش دوربین دیگر کاربران به شما به اجازهٔ شما نیازمندیم.",
+    "app.videoDock.autoplayBlockedDesc": "ما برای نمایش دوربین کاربران دیگر به شما، به اجازهٔ شما نیازمندیم.",
     "app.videoDock.autoplayAllowLabel": "مشاهده دوربین‌ها",
     "app.invitation.title": "دعوت به اتاق زیرمجموعه",
     "app.invitation.confirm": "دعوت",
@@ -927,7 +926,7 @@
     "app.externalVideo.urlInput": "افزودن آدرس ویدیو",
     "app.externalVideo.urlError": "این آدرس ویدیو پشتیبانی نمی‌شود",
     "app.externalVideo.close": "بستن",
-    "app.externalVideo.autoPlayWarning": "برای فعال‌سازی به‌هنگام‌سازی ویدیو را پخش کنید",
+    "app.externalVideo.autoPlayWarning": "برای فعال‌سازی به‌هنگام‌سازی، ویدیو را پخش کنید",
     "app.externalVideo.refreshLabel": "تازه‌سازی پخش‌کننده ویدیو",
     "app.externalVideo.fullscreenLabel": "پخش‌کننده ویدیو",
     "app.externalVideo.noteLabel": "نکته: ویدیوهای خارجی به اشتراک گذاشته‌شده در ضبط ظاهر نمی‌شوند.نشانی‌های وب YouTube، Vimeo، Instructure Media، Twitch، Dailymotion و پرونده‌های رسانه‌ای (به عنوان مثال https://example.com/xy.mp4) پشتیبانی می‌شوند.",
@@ -957,11 +956,11 @@
     "playback.button.about.aria": "درباره",
     "playback.button.clear.aria": "پاک‌سازی جستجو",
     "playback.button.close.aria": "بستن پنجره",
-    "playback.button.fullscreen.aria": "محتوای تمام‌صفحه",
+    "playback.button.fullscreen.aria": "تمام‌صفحه‌کردن محتوا",
     "playback.button.restore.aria": "بازگردانی محتوا",
     "playback.button.search.aria": "جستجو",
     "playback.button.section.aria": "بخش کناری",
-    "playback.button.swap.aria": "جابجاکردن محتوا",
+    "playback.button.swap.aria": "جابه‌جاکردن محتوا",
     "playback.button.theme.aria": "تغییر پوسته",
     "playback.error.wrapper.aria": "ناحیه خطا",
     "playback.loader.wrapper.aria": "ناحیه بارکننده",
@@ -976,7 +975,7 @@
     "playback.player.about.modal.shortcuts.seek.forward": "پویش به جلو",
     "playback.player.about.modal.shortcuts.skip.next": "اسلاید بعدی",
     "playback.player.about.modal.shortcuts.skip.previous": "اسلاید قبلی",
-    "playback.player.about.modal.shortcuts.swap": "جابجاکردن محتوا",
+    "playback.player.about.modal.shortcuts.swap": "جابه‌جاکردن محتوا",
     "playback.player.chat.message.poll.name": "نتیجه نظرسنجی",
     "playback.player.chat.message.poll.question": "پرسش",
     "playback.player.chat.message.poll.options": "گزینه‌ها",
@@ -993,7 +992,7 @@
     "playback.player.search.modal.title": "جستجو",
     "playback.player.search.modal.subtitle": "یافتن محتوای اسلاید‌های ارائه",
     "playback.player.thumbnails.wrapper.aria": "ناحیه تصاویر بندانگشتی",
-    "playback.player.webcams.wrapper.aria": "ناحیه دوربین",
+    "playback.player.webcams.wrapper.aria": "ناحیه دوربین‌ها",
     "app.learningDashboard.dashboardTitle": "پیشخوان تحلیل یادگیری",
     "app.learningDashboard.downloadSessionDataLabel": "بارگیری داده‌های جلسه",
     "app.learningDashboard.lastUpdatedLabel": "آخرین به‌روز‌رسانی در",
@@ -1020,7 +1019,7 @@
     "app.learningDashboard.userDetails.mostCommonAnswer": "رایج‌ترین پاسخ",
     "app.learningDashboard.userDetails.anonymousAnswer": "نظرسنجی ناشناس",
     "app.learningDashboard.usersTable.title": "مرور کلی",
-    "app.learningDashboard.usersTable.colOnline": "زمان آنلاین بودن",
+    "app.learningDashboard.usersTable.colOnline": "زمان آنلاین‌بودن",
     "app.learningDashboard.usersTable.colTalk": "زمان صحبت‌کردن",
     "app.learningDashboard.usersTable.colWebcam": "زمان فعالیت دوربین",
     "app.learningDashboard.usersTable.colMessages": "پیام‌ها",
diff --git a/bigbluebutton-html5/public/locales/fi.json b/bigbluebutton-html5/public/locales/fi.json
index 08db2660a8..5005969db4 100644
--- a/bigbluebutton-html5/public/locales/fi.json
+++ b/bigbluebutton-html5/public/locales/fi.json
@@ -250,7 +250,6 @@
     "app.settings.main.save.label.description": "Tallentaa muutokset ja sulkee asetusikkunan.",
     "app.settings.dataSavingTab.label": "Yhteyden datansäästö",
     "app.settings.dataSavingTab.webcam": "Salli webkamerat",
-    "app.settings.dataSavingTab.screenShare": "Salli ruudunjako",
     "app.settings.dataSavingTab.description": "Säästääksesi internetyhteytesi dataa voit säätää mitä sinulle näytetään.",
     "app.settings.save-notification.label": "Asetukset ovat nyt tallennettu.",
     "app.switch.onLabel": "ON",
@@ -258,7 +257,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Toiminnot",
     "app.actionsBar.actionsDropdown.initPollLabel": "Käynnistä kysely",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Jaa oma ruutusi",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ruudunjako lukittu",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Lopeta ruudunjakaminen",
     "app.actionsBar.actionsDropdown.presentationDesc": "Lataa esityksesi",
     "app.actionsBar.actionsDropdown.initPollDesc": "Käynnistä kysely",
diff --git a/bigbluebutton-html5/public/locales/fr.json b/bigbluebutton-html5/public/locales/fr.json
index dc5111dfe2..726b82045f 100644
--- a/bigbluebutton-html5/public/locales/fr.json
+++ b/bigbluebutton-html5/public/locales/fr.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "Enregistre les changements et ferme le menu des paramètres",
     "app.settings.dataSavingTab.label": "Économies de données",
     "app.settings.dataSavingTab.webcam": "Activer les webcams des autres participants",
-    "app.settings.dataSavingTab.screenShare": "Activer le partage d'écran",
     "app.settings.dataSavingTab.description": "Pour économiser votre bande passante, ajustez l'affichage actuel.",
     "app.settings.save-notification.label": "Les paramètres ont été enregistrés",
     "app.statusNotifier.lowerHands": "Mains baissées",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Gérer les documents de présentation",
     "app.actionsBar.actionsDropdown.initPollLabel": "Préparer un sondage",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Partager votre écran",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Partage d'écran verrouillé",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Cesser le partage d'écran",
     "app.actionsBar.actionsDropdown.presentationDesc": "Charger votre présentation",
     "app.actionsBar.actionsDropdown.initPollDesc": "Préparer un sondage",
diff --git a/bigbluebutton-html5/public/locales/gl.json b/bigbluebutton-html5/public/locales/gl.json
index 866e4b1f5c..25c2c829a4 100644
--- a/bigbluebutton-html5/public/locales/gl.json
+++ b/bigbluebutton-html5/public/locales/gl.json
@@ -420,7 +420,7 @@
     "app.settings.main.save.label.description": "Gardar os cambios e pechar o menú de axustes",
     "app.settings.dataSavingTab.label": "Aforro de datos",
     "app.settings.dataSavingTab.webcam": "Activar as cámaras web",
-    "app.settings.dataSavingTab.screenShare": "Activar o escritorio compartido",
+    "app.settings.dataSavingTab.screenShare": "Activar o uso compartido do escritorio doutros participantes",
     "app.settings.dataSavingTab.description": "Para aforrar largo de banda axuste o que se se está a amosar",
     "app.settings.save-notification.label": "Gardáronse os axustes",
     "app.statusNotifier.lowerHands": "Mans baixadas",
@@ -440,7 +440,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Xestionar presentacións",
     "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar unha enquisa",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir a súa pantalla",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "A pantalla compartida está bloqueada",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Deixar de compartir a súa pantalla",
     "app.actionsBar.actionsDropdown.presentationDesc": "Enviar a súa presentación",
     "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar unha enquisa",
diff --git a/bigbluebutton-html5/public/locales/he.json b/bigbluebutton-html5/public/locales/he.json
index 5745c09a5b..1d0f98caf8 100644
--- a/bigbluebutton-html5/public/locales/he.json
+++ b/bigbluebutton-html5/public/locales/he.json
@@ -275,7 +275,6 @@
     "app.settings.main.save.label.description": "שמירת השינויים וסגירת מסך ההתראות",
     "app.settings.dataSavingTab.label": "חסכון בנתונים",
     "app.settings.dataSavingTab.webcam": "אפשרו מצלמות רשת",
-    "app.settings.dataSavingTab.screenShare": "אפשרו שיתוף מסך",
     "app.settings.dataSavingTab.description": "כדי לחסוך ברוחב פס מיותר, אנא התאימו את הגודל למסך הנצפה כרגע.",
     "app.settings.save-notification.label": "הגדרת נשמרו",
     "app.switch.onLabel": "לא",
@@ -286,7 +285,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "פעולות נוספות",
     "app.actionsBar.actionsDropdown.initPollLabel": "התחלת סקר",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "שיתוף מסך",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "שיתוף מסך לא מאופשר במפגש זה",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "הפסקת שיתוף מסך",
     "app.actionsBar.actionsDropdown.presentationDesc": "העלאת המצגת שלך",
     "app.actionsBar.actionsDropdown.initPollDesc": "התחלת סקר",
diff --git a/bigbluebutton-html5/public/locales/hi_IN.json b/bigbluebutton-html5/public/locales/hi_IN.json
index fe1ff8f622..9e0fb24401 100644
--- a/bigbluebutton-html5/public/locales/hi_IN.json
+++ b/bigbluebutton-html5/public/locales/hi_IN.json
@@ -231,7 +231,6 @@
     "app.settings.main.save.label.description": "परिवर्तन सहेजता है और सेटिंग मेनू बंद करता है",
     "app.settings.dataSavingTab.label": "डेटा की बचत",
     "app.settings.dataSavingTab.webcam": "वेबकैम सक्षम करें",
-    "app.settings.dataSavingTab.screenShare": "डेस्कटॉप साझाकरण सक्षम करें",
     "app.settings.dataSavingTab.description": "अपने बैंडविड्थ को बचाने के लिए जो वर्तमान में प्रदर्शित हो रहा है उसे समायोजित करें।",
     "app.switch.onLabel": "ओन्न",
     "app.switch.offLabel": "ओफ़्",
diff --git a/bigbluebutton-html5/public/locales/hr.json b/bigbluebutton-html5/public/locales/hr.json
index e4bce4b5ae..e375376bd8 100644
--- a/bigbluebutton-html5/public/locales/hr.json
+++ b/bigbluebutton-html5/public/locales/hr.json
@@ -252,7 +252,6 @@
     "app.settings.main.save.label": "Spremi",
     "app.settings.dataSavingTab.label": "Ušteda internetskog prometa",
     "app.settings.dataSavingTab.webcam": "Omogući web-kamere",
-    "app.settings.dataSavingTab.screenShare": "Omogući dijeljenje zaslona",
     "app.settings.save-notification.label": "Postavke su pohranjene",
     "app.statusNotifier.lowerHands": "Spusti ruke",
     "app.statusNotifier.raisedHandsTitle": "Dignute ruke",
@@ -266,7 +265,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Upravljanje prezentacijama",
     "app.actionsBar.actionsDropdown.initPollLabel": "Pokreni anketu",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Podijeli zaslon",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Dijeljenje zaslona je zaključano",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Zaustavite dijeljenje vašeg zaslona",
     "app.actionsBar.actionsDropdown.presentationDesc": "Prenesite svoju prezentaciju",
     "app.actionsBar.actionsDropdown.initPollDesc": "Pokreni anketu",
diff --git a/bigbluebutton-html5/public/locales/hu_HU.json b/bigbluebutton-html5/public/locales/hu_HU.json
index fae023f5ab..03b33ccd42 100644
--- a/bigbluebutton-html5/public/locales/hu_HU.json
+++ b/bigbluebutton-html5/public/locales/hu_HU.json
@@ -420,7 +420,7 @@
     "app.settings.main.save.label.description": "Módosítások mentése és a beállítások menü bezárása",
     "app.settings.dataSavingTab.label": "Adatmegtakarítás",
     "app.settings.dataSavingTab.webcam": "Webkamerák engedélyezése",
-    "app.settings.dataSavingTab.screenShare": "Képernyőmegosztás engedélyezése",
+    "app.settings.dataSavingTab.screenShare": "Többi résztvevő képernyőmegosztásának engedélyezése",
     "app.settings.dataSavingTab.description": "Igazítsd a sávszélességedhez, hogy mi jelenhessen meg a képernyődön.",
     "app.settings.save-notification.label": "A beállításokat mentettük",
     "app.statusNotifier.lowerHands": "Kezek leengedése",
@@ -440,7 +440,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Prezentációs anyag előkészítése",
     "app.actionsBar.actionsDropdown.initPollLabel": "Meghívás szavazásra",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Képernyőm megosztása",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "A képernyőmegosztás le van zárolva",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Képernyőm megosztásának befejezése",
     "app.actionsBar.actionsDropdown.presentationDesc": "Prezentációd feltöltése",
     "app.actionsBar.actionsDropdown.initPollDesc": "Meghívás szavazásra",
diff --git a/bigbluebutton-html5/public/locales/hy.json b/bigbluebutton-html5/public/locales/hy.json
index 3d23647fb6..b0adb6960e 100644
--- a/bigbluebutton-html5/public/locales/hy.json
+++ b/bigbluebutton-html5/public/locales/hy.json
@@ -417,7 +417,6 @@
     "app.settings.main.save.label.description": "Պահպանում է կարգավորման փոփոխությունները և կարգավորման մենյուն փակում է",
     "app.settings.dataSavingTab.label": "Պահպանել տվյալները",
     "app.settings.dataSavingTab.webcam": "Միացնել տեսախցիկը",
-    "app.settings.dataSavingTab.screenShare": "Միացնել էկրանի ցուցադրումը",
     "app.settings.dataSavingTab.description": "Միացման բարձր որակ ապահովելու համար ընտրեք, թե ինչ է ցուցադրվելու",
     "app.settings.save-notification.label": "Կարգավորումները պահպանվեցին",
     "app.statusNotifier.lowerHands": "Իջեցնել ձեռքերը",
@@ -437,7 +436,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Ներկայացումների կառավարում",
     "app.actionsBar.actionsDropdown.initPollLabel": "Սկսել հարցումը",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Ցուցադրել Ձեր էկրանը",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Էկրանի ցուցադրումն արգելափակված է",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ընդհատել էկրանի ցուցադրումը",
     "app.actionsBar.actionsDropdown.presentationDesc": "Բեռնեք Ձեր ներկայացումը",
     "app.actionsBar.actionsDropdown.initPollDesc": "Սկսել հարցումը",
diff --git a/bigbluebutton-html5/public/locales/id.json b/bigbluebutton-html5/public/locales/id.json
index 07380cf29f..1004ffe80f 100644
--- a/bigbluebutton-html5/public/locales/id.json
+++ b/bigbluebutton-html5/public/locales/id.json
@@ -386,7 +386,6 @@
     "app.settings.main.save.label.description": "Simpan perubahan dan tutup menu pengaturan",
     "app.settings.dataSavingTab.label": "Penghematan data",
     "app.settings.dataSavingTab.webcam": "Fungsikan webcam",
-    "app.settings.dataSavingTab.screenShare": "Fungsikan berbagi desktop",
     "app.settings.dataSavingTab.description": "Untuk menghemat bandwidth Anda setel apa yang saat ini sedang ditampilkan.",
     "app.settings.save-notification.label": "Pengaturan telah disimpan",
     "app.statusNotifier.lowerHands": "Menurunkan Tangan",
@@ -405,7 +404,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Kelola presentasi",
     "app.actionsBar.actionsDropdown.initPollLabel": "Mulai polling",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Bagikan layar Anda",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Berbagi layar dikunci",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Berhenti membagikan layar Anda",
     "app.actionsBar.actionsDropdown.presentationDesc": "Unggah presentasi Anda",
     "app.actionsBar.actionsDropdown.initPollDesc": "Mulai polling",
diff --git a/bigbluebutton-html5/public/locales/it_IT.json b/bigbluebutton-html5/public/locales/it_IT.json
index 1effbfb4f6..53d7d09218 100644
--- a/bigbluebutton-html5/public/locales/it_IT.json
+++ b/bigbluebutton-html5/public/locales/it_IT.json
@@ -404,7 +404,6 @@
     "app.settings.main.save.label.description": "Salva le modifiche e chiudi il menu impostazioni",
     "app.settings.dataSavingTab.label": "Risparmio dati",
     "app.settings.dataSavingTab.webcam": "Abilita Webcam",
-    "app.settings.dataSavingTab.screenShare": "Abilita Condivisione schermo",
     "app.settings.dataSavingTab.description": "Per risparmiare banda controlla quello che viene visualizzato",
     "app.settings.save-notification.label": "Impostazioni salvate",
     "app.statusNotifier.lowerHands": "Mani abbassate",
@@ -423,7 +422,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Gestisci presentazioni",
     "app.actionsBar.actionsDropdown.initPollLabel": "Crea un sondaggio",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Condividi lo schermo",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "La condivisione dello schermo è bloccata",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Termina condivisione schermo",
     "app.actionsBar.actionsDropdown.presentationDesc": "Carica la tua presentazione",
     "app.actionsBar.actionsDropdown.initPollDesc": "Crea un sondaggio",
diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 3fb1bf7f79..e8bf92e239 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -331,7 +331,7 @@
     "app.navBar.settingsDropdown.optionsLabel": "オプション",
     "app.navBar.settingsDropdown.fullscreenLabel": "全画面表示に切替",
     "app.navBar.settingsDropdown.settingsLabel": "設定を開く",
-    "app.navBar.settingsDropdown.aboutLabel": "製品情報",
+    "app.navBar.settingsDropdown.aboutLabel": "このソフトウェアについて",
     "app.navBar.settingsDropdown.leaveSessionLabel": "退室する",
     "app.navBar.settingsDropdown.exitFullscreenLabel": "全画面表示解除",
     "app.navBar.settingsDropdown.fullscreenDesc": "設定メニューを全画面表示",
@@ -361,7 +361,7 @@
     "app.endMeeting.contentWarning": "このセッションのチャットメッセージ、共有メモ、ホワイトボードの書き込み、そして共有ドキュメントにはもうアクセスできなくなります",
     "app.endMeeting.yesLabel": "はい",
     "app.endMeeting.noLabel": "いいえ",
-    "app.about.title": "製品情報",
+    "app.about.title": "このソフトウェアについて",
     "app.about.version": "ビルド番号：",
     "app.about.version_label": "BigBlueButtonバージョン:",
     "app.about.copyright": "Copyright:",
@@ -420,7 +420,7 @@
     "app.settings.main.save.label.description": "変更を保存し設定メニューを閉じる",
     "app.settings.dataSavingTab.label": "通信量抑制",
     "app.settings.dataSavingTab.webcam": "ウェブカメラを有効にする",
-    "app.settings.dataSavingTab.screenShare": "デスクトップ共有を有効にする",
+    "app.settings.dataSavingTab.screenShare": "他の参加者のデスクトップ共有を有効にする",
     "app.settings.dataSavingTab.description": "これらの設定により通信量を抑制できます。",
     "app.settings.save-notification.label": "設定が保存されました",
     "app.statusNotifier.lowerHands": "手をおろす",
@@ -440,7 +440,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "プレゼン用ファイルの管理",
     "app.actionsBar.actionsDropdown.initPollLabel": "投票を初期化",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "画面を共有",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "画面共有ロック",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有をやめる",
     "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
     "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
@@ -550,7 +549,7 @@
     "app.audioManager.requestTimeout": "エラー：リクエストに時間がかかりすぎました",
     "app.audioManager.invalidTarget": "エラー：リクエスト先がいませんでした",
     "app.audioManager.mediaError": "エラー：デバイスが見つかりませんでした",
-    "app.audio.joinAudio": "音声を聴く",
+    "app.audio.joinAudio": "音声で参加",
     "app.audio.leaveAudio": "音声を停止",
     "app.audio.changeAudioDevice": "オーディオデバイスを変更",
     "app.audio.enterSessionLabel": "セッションに参加",
@@ -654,7 +653,7 @@
     "app.toast.meetingMuteOn.label": "全てのユーザーがミュートされました",
     "app.toast.meetingMuteOff.label": "会議のミュートを解除しました",
     "app.toast.setEmoji.raiseHand": "手を挙げました",
-    "app.toast.setEmoji.lowerHand": "上げていた手をおろされました",
+    "app.toast.setEmoji.lowerHand": "手を下ろしました",
     "app.toast.promotedLabel": "あなたはモデレーターになりました",
     "app.toast.demotedLabel": "あなたはビューアーになりました",
     "app.notification.recordingStart": "録画が開始しました",
@@ -716,11 +715,11 @@
     "app.connection-status.description": "ユーザーの接続状況の閲覧",
     "app.connection-status.empty": "現在のところ接続の問題は報告されていません。",
     "app.connection-status.more": "更に見る",
-    "app.connection-status.copy": "値をコピー",
+    "app.connection-status.copy": "スタッツをコピー",
     "app.connection-status.copied": "コピーしました！",
     "app.connection-status.jitter": "ジッター",
     "app.connection-status.label": "接続状況",
-    "app.connection-status.settings": "設定調整中",
+    "app.connection-status.settings": "設定の調整",
     "app.connection-status.no": "なし",
     "app.connection-status.notification": "接続の切断がありました",
     "app.connection-status.offline": "オフライン",
@@ -859,7 +858,7 @@
     "app.whiteboard.toolbar.fontSize": "フォントサイズ一覧",
     "app.whiteboard.toolbarAriaLabel": "プレゼンテーションツール",
     "app.feedback.title": "セッションからログアウトしました",
-    "app.feedback.subtitle": "BigBlueButtonの感想は？（任意）",
+    "app.feedback.subtitle": "BigBlueButtonの感想を聞かせてください（任意）",
     "app.feedback.textarea": "改善案をお聞かせください。",
     "app.feedback.sendFeedback": "フィードバックを送る",
     "app.feedback.sendFeedbackDesc": "フィードバックを送り、会議から退室する",
diff --git a/bigbluebutton-html5/public/locales/ka.json b/bigbluebutton-html5/public/locales/ka.json
index cd8121c061..be60bd3d55 100644
--- a/bigbluebutton-html5/public/locales/ka.json
+++ b/bigbluebutton-html5/public/locales/ka.json
@@ -312,7 +312,6 @@
     "app.settings.main.save.label.description": "ინახავს ცვლილებებს და ხურავს პარამეტრების მენიუს",
     "app.settings.dataSavingTab.label": "მონაცემების შენახვა",
     "app.settings.dataSavingTab.webcam": "ვებ-კამერის ჩართვა",
-    "app.settings.dataSavingTab.screenShare": "ეკრანის გაზიარების ჩართვა",
     "app.settings.dataSavingTab.description": "თქვენი ინტერნეტის დატვირთვის დასაზოგად, გააკონტროლეთ, რისი ჩვენება ხდება მიმდინარე მომენტში ",
     "app.settings.save-notification.label": "პარამეტრები შენახულია",
     "app.statusNotifier.raisedHandsTitle": "აწეული ხელები",
@@ -329,7 +328,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "პრეზენტაციების მართვა",
     "app.actionsBar.actionsDropdown.initPollLabel": "გამოკითხვის ინიცირება",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "გააზიარეთ თქვენი ეკრანი",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "ეკრანის გაზიარება ჩაკეტილია",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "ეკრანის გაზიარების შეჩერება",
     "app.actionsBar.actionsDropdown.presentationDesc": "ატვირთეთ თქვენი პრეზენტაცია",
     "app.actionsBar.actionsDropdown.initPollDesc": "გამოკითხვის ინიცირება",
diff --git a/bigbluebutton-html5/public/locales/km.json b/bigbluebutton-html5/public/locales/km.json
index 2274a6961b..2cbb778c73 100644
--- a/bigbluebutton-html5/public/locales/km.json
+++ b/bigbluebutton-html5/public/locales/km.json
@@ -264,7 +264,6 @@
     "app.settings.main.save.label.description": "រក្សា​ការ​ផ្លាស់​ប្តូរ និង​បិទ​ម៉ឺនុយ​សម្រាប់​ការ​កំណត់",
     "app.settings.dataSavingTab.label": "ការសន្សំទិន្នន័យ",
     "app.settings.dataSavingTab.webcam": "បើកវេបខេម",
-    "app.settings.dataSavingTab.screenShare": "បើកការចែករំលែកអេក្រង់",
     "app.settings.dataSavingTab.description": "ដើម្បីសន្សំបែនវីត សូមលៃលកអ្វីដែលអ្នកកំពុងបង្ហាញ។",
     "app.settings.save-notification.label": "ការកំណត់ត្រូវបានរក្សាទុក",
     "app.switch.onLabel": "បើក",
@@ -272,7 +271,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "សកម្មភាព",
     "app.actionsBar.actionsDropdown.initPollLabel": "ចាប់ផ្តើម​ការ​ស្ទង់​មតិ",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "ចែក​រំលែក​អេក្រង់​របស់​អ្នក",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "អេក្រង់ចែករំលែកបានជាប់សោ",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "ឈប់ចែករំលែកអេក្រង់",
     "app.actionsBar.actionsDropdown.presentationDesc": "ផ្ទុក​ឡើង​បទ​បង្ហាញ​របស់​អ្នក",
     "app.actionsBar.actionsDropdown.initPollDesc": "ចាប់​ផ្តើម​ការ​ស្ទង់មតិ",
diff --git a/bigbluebutton-html5/public/locales/kn.json b/bigbluebutton-html5/public/locales/kn.json
index 7d020b77fc..1eda8d2821 100644
--- a/bigbluebutton-html5/public/locales/kn.json
+++ b/bigbluebutton-html5/public/locales/kn.json
@@ -272,7 +272,6 @@
     "app.settings.main.save.label.description": "ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸುತ್ತದೆ ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೆನುವನ್ನು ಮುಚ್ಚುತ್ತದೆ",
     "app.settings.dataSavingTab.label": "ಡೇಟಾ ಉಳಿತಾಯ",
     "app.settings.dataSavingTab.webcam": "ವೆಬ್‌ಕ್ಯಾಮ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ",
-    "app.settings.dataSavingTab.screenShare": "ಡೆಸ್ಕ್‌ಟಾಪ್ ಹಂಚಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ",
     "app.settings.dataSavingTab.description": "ನಿಮ್ಮ ಬ್ಯಾಂಡ್‌ವಿಡ್ತ್ ಉಳಿಸಲು ಪ್ರಸ್ತುತ ಪ್ರದರ್ಶಿಸಲಾಗುತ್ತಿರುವದನ್ನು ಹೊಂದಿಸಿ.",
     "app.settings.save-notification.label": "ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಉಳಿಸಲಾಗಿದೆ",
     "app.switch.onLabel": "ಆನ್ ಆಗಿದೆ",
@@ -283,7 +282,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "ಕ್ರಿಯೆಗಳು",
     "app.actionsBar.actionsDropdown.initPollLabel": "ಸಮೀಕ್ಷೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "ನಿಮ್ಮ ಪರದೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "ಸ್ಕ್ರೀನ್‌ಶೇರ್ ಲಾಕ್ ಮಾಡಲಾಗಿದೆ",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "ನಿಮ್ಮ ಪರದೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳುವುದನ್ನು ನಿಲ್ಲಿಸಿ",
     "app.actionsBar.actionsDropdown.presentationDesc": "ನಿಮ್ಮ ಪ್ರಸ್ತುತಿಯನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಿ",
     "app.actionsBar.actionsDropdown.initPollDesc": "ಸಮೀಕ್ಷೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ",
diff --git a/bigbluebutton-html5/public/locales/ko_KR.json b/bigbluebutton-html5/public/locales/ko_KR.json
index fa6f4c2ef5..3e9ae0f31d 100644
--- a/bigbluebutton-html5/public/locales/ko_KR.json
+++ b/bigbluebutton-html5/public/locales/ko_KR.json
@@ -172,6 +172,7 @@
     "app.presentation.options.fullscreen": "전체화면",
     "app.presentation.options.exitFullscreen": "전체화면 나가기",
     "app.presentation.options.minimize": "최소화",
+    "app.presentation.options.snapshot": "현 슬라이드의 스냅샷",
     "app.presentation.options.downloading": "다운로드 중",
     "app.presentation.options.downloaded": "현 프레젠테이션은 다운로드 되었습니다",
     "app.presentation.options.downloadFailed": "현 프레젠테이션을 다운로드 할 수 없습니다",
@@ -418,7 +419,7 @@
     "app.settings.main.save.label.description": "변경을 저장하고 설정메뉴 닫기 ",
     "app.settings.dataSavingTab.label": "데이터 절약",
     "app.settings.dataSavingTab.webcam": "웹캠 사용 가능",
-    "app.settings.dataSavingTab.screenShare": "데스크탑 공유 사용 가능 ",
+    "app.settings.dataSavingTab.screenShare": "다른 참가자 데스크톱 공유 활성화",
     "app.settings.dataSavingTab.description": "네트워크 절약을 위해 현재 보이는것을 조정",
     "app.settings.save-notification.label": "설정이 저장되었습니다 ",
     "app.statusNotifier.lowerHands": "손 내리기",
@@ -438,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "프레젠테이션 관리",
     "app.actionsBar.actionsDropdown.initPollLabel": "설문조사 초기화",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "화면 공유",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "화면 공유 잠금",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "화면 공유 중지",
     "app.actionsBar.actionsDropdown.presentationDesc": "프레젠테이션을 업로드하세요",
     "app.actionsBar.actionsDropdown.initPollDesc": "설문조사 초기화",
@@ -504,6 +504,9 @@
     "app.breakoutJoinConfirmation.freeJoinMessage": "합류할 브레이크아웃 룸 선택",
     "app.breakoutTimeRemainingMessage": "브레이크아웃 룸 남은 시간 : {0}",
     "app.breakoutWillCloseMessage": "시간 종료. 브레이크아웃 룸은 곧 닫힙니다 ",
+    "app.breakout.dropdown.manageDuration": "지속시간 변경",
+    "app.breakout.dropdown.destroyAll": "브레이크아웃 룸 종료",
+    "app.breakout.dropdown.options": "브레이크아웃 옵션",
     "app.calculatingBreakoutTimeRemaining": "남은 시간 계산중 ...",
     "app.audioModal.ariaTitle": "오디오 창 합류",
     "app.audioModal.microphoneLabel": "마이크",
@@ -598,6 +601,7 @@
     "app.error.500": "어머나 ! 뭔가 잘못 되었어요 ",
     "app.error.userLoggedOut": "로그 아웃으로 인해 사용자에게 잘못된 sessionToken이 있습니다.",
     "app.error.ejectedUser": "사용자에게 제거로 인해 잘못된 sessionToken이 있습니다.",
+    "app.error.joinedAnotherWindow": "이 세션 다른 브라우저 창에서 열려 있는 것 같습니다.",
     "app.error.userBanned": "사용자가 차단되었습니다.",
     "app.error.leaveLabel": "재 접속",
     "app.error.fallback.presentation.title": "에러 발생",
@@ -625,6 +629,7 @@
     "app.userList.guest.allowEveryone": "모두 허용",
     "app.userList.guest.denyEveryone": "모두 거절",
     "app.userList.guest.pendingUsers": "{0} 명 보류된 사용자 ",
+    "app.userList.guest.noPendingUsers": "대기중인 사용자가 없음",
     "app.userList.guest.pendingGuestUsers": "{0} 명 보류된 손님 ",
     "app.userList.guest.pendingGuestAlert": "세션에 합류후 당신의 승인을 기다림",
     "app.userList.guest.rememberChoice": "선택을 기억",
@@ -674,6 +679,8 @@
     "app.shortcut-help.nextSlideDesc": "다음 슬라이드 (발표자)",
     "app.shortcut-help.previousSlideDesc": "이전 슬라이드 (발표자)",
     "app.shortcut-help.togglePanKey": "스페이스바",
+    "app.shortcut-help.nextSlideKey": "오른쪽 화살표",
+    "app.shortcut-help.previousSlideKey": "왼쪽 화살표",
     "app.lock-viewers.title": "참여자 잠그기",
     "app.lock-viewers.description": "이 옵션을 사용하면 참여자가 특정 기능을 사용하지 못하도록 제한 할 수 있습니다",
     "app.lock-viewers.featuresLable": "특징",
@@ -705,6 +712,7 @@
     "app.connection-status.copied": "복사 됨!",
     "app.connection-status.jitter": "지터",
     "app.connection-status.label": "연결 상태",
+    "app.connection-status.settings": "설정 조정",
     "app.connection-status.no": "아니오",
     "app.connection-status.notification": "연결 끊김이 감지되었습니다.",
     "app.connection-status.offline": "오프라인",
@@ -720,7 +728,9 @@
     "app.connection-status.sessionLogs": "세션 로그",
     "app.connection-status.next": "다음 페이지",
     "app.connection-status.prev": "이전 페이지",
+    "app.learning-dashboard.label": "학습 분석 대시보드",
     "app.learning-dashboard.description": "사용자 활동 기반 현황판 열기",
+    "app.learning-dashboard.clickHereToOpen": "학습 분석 대시보드 열기",
     "app.recording.startTitle": "녹화 시작",
     "app.recording.stopTitle": "녹화 일시중지",
     "app.recording.resumeTitle": "녹화 재시작",
@@ -993,6 +1003,9 @@
     "app.learningDashboard.usersTable.userStatusOffline": "오프라인",
     "app.learningDashboard.usersTable.noUsers": "아직 사용자 없음",
     "app.learningDashboard.usersTable.name": "이름",
+    "app.learningDashboard.usersTable.moderator": "주관자",
+    "app.learningDashboard.usersTable.join": "참여",
+    "app.learningDashboard.usersTable.left": "왼쪽",
     "app.learningDashboard.usersTable.notAvailable": "N/A",
     "app.learningDashboard.pollsTable.anonymousAnswer": "무기명 투표 (마지막 행의 답변)",
     "app.learningDashboard.pollsTable.anonymousRowName": "무기명의",
diff --git a/bigbluebutton-html5/public/locales/lt_LT.json b/bigbluebutton-html5/public/locales/lt_LT.json
index e81172758b..ce439c7180 100644
--- a/bigbluebutton-html5/public/locales/lt_LT.json
+++ b/bigbluebutton-html5/public/locales/lt_LT.json
@@ -313,7 +313,6 @@
     "app.settings.main.save.label.description": "Išsaugo pakeitimus ir uždaro nustatymų meniu",
     "app.settings.dataSavingTab.label": "Duomenų saugojimas",
     "app.settings.dataSavingTab.webcam": "Įgalinti kameras",
-    "app.settings.dataSavingTab.screenShare": "Įgalinti darbalaukio bendrinimą",
     "app.settings.dataSavingTab.description": "Norėdami išsaugoti pralaidumą, pakoreguokite tai, kas šiuo metu rodoma.",
     "app.settings.save-notification.label": "Nustatymai išsaugoti",
     "app.statusNotifier.lowerHands": "Nuleistos rankos",
@@ -327,7 +326,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Veiksmai",
     "app.actionsBar.actionsDropdown.initPollLabel": "Inicijuoti apklausą",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Bendrinti savo ekraną",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekrano bendrinimas užrakintas",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Nebebendrinkite ekrano",
     "app.actionsBar.actionsDropdown.presentationDesc": "Įkelti savo pristatymą",
     "app.actionsBar.actionsDropdown.initPollDesc": "Inicijuoti apklausą",
diff --git a/bigbluebutton-html5/public/locales/lv.json b/bigbluebutton-html5/public/locales/lv.json
index af99851bd0..08c18d3eb6 100644
--- a/bigbluebutton-html5/public/locales/lv.json
+++ b/bigbluebutton-html5/public/locales/lv.json
@@ -270,7 +270,6 @@
     "app.settings.main.save.label.description": "Saglabā izmaiņas un aizver iestatījumu izvēlni",
     "app.settings.dataSavingTab.label": "Trafika taupīšana",
     "app.settings.dataSavingTab.webcam": "Iespējot kameras",
-    "app.settings.dataSavingTab.screenShare": "Iespējot darbvirsmu kopīgošanu",
     "app.settings.dataSavingTab.description": "Lai kontrolētu patērēto interneta trafiku, iespējojiet/atspējojiet zemāk redzamos parametrus.",
     "app.settings.save-notification.label": "Iestatījumi saglabāti",
     "app.switch.onLabel": "IESLĒGTS",
@@ -281,7 +280,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Rīcība",
     "app.actionsBar.actionsDropdown.initPollLabel": "ierosināt balsojumu/aptauju",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "kopīgot jūsu ekrānu",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekrānu kopīgošana bloķēta",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "beigt kopīgot jūsu ekrānu",
     "app.actionsBar.actionsDropdown.presentationDesc": "augšuplādēt jūsu prezentāciju",
     "app.actionsBar.actionsDropdown.initPollDesc": "ierosināt balsojumu/aptauju",
diff --git a/bigbluebutton-html5/public/locales/ml.json b/bigbluebutton-html5/public/locales/ml.json
index 2d2a69ece5..e943ed322d 100644
--- a/bigbluebutton-html5/public/locales/ml.json
+++ b/bigbluebutton-html5/public/locales/ml.json
@@ -376,7 +376,6 @@
     "app.settings.main.save.label.description": "മാറ്റങ്ങൾ സംരക്ഷിക്കുകയും ക്രമീകരണ മെനു അടയ്ക്കുകയും ചെയ്യുന്നു",
     "app.settings.dataSavingTab.label": "ഡാറ്റ ലാഭിക്കൽ",
     "app.settings.dataSavingTab.webcam": "വെബ്‌ക്യാമുകൾ പ്രവർത്തനക്ഷമമാക്കുക",
-    "app.settings.dataSavingTab.screenShare": "ഡെസ്ക്ടോപ്പ് പങ്കിടൽ പ്രാപ്തമാക്കുക",
     "app.settings.dataSavingTab.description": "നിങ്ങളുടെ ബാൻഡ്‌വിഡ്ത്ത് സംരക്ഷിക്കുന്നതിന് നിലവിൽ പ്രദർശിപ്പിച്ചിരിക്കുന്നവ ക്രമീകരിക്കുക.",
     "app.settings.save-notification.label": "ക്രമീകരണങ്ങൾ സംരക്ഷിച്ചു",
     "app.statusNotifier.lowerHands": "താഴ്ന്ന കൈകൾ",
@@ -393,7 +392,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "അവതരണങ്ങൾ നിയന്ത്രിക്കുക",
     "app.actionsBar.actionsDropdown.initPollLabel": "ഒരു വോട്ടെടുപ്പ് ആരംഭിക്കുക",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "നിങ്ങളുടെ സ്ക്രീൻ പങ്കിടുക",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "സ്ക്രീൻഷെയർ ലോക്കുചെയ്‌തു",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "നിങ്ങളുടെ സ്ക്രീൻ പങ്കിടുന്നത് നിർത്തുക",
     "app.actionsBar.actionsDropdown.presentationDesc": "നിങ്ങളുടെ അവതരണം അപ്‌ലോഡുചെയ്യുക",
     "app.actionsBar.actionsDropdown.initPollDesc": "ഒരു വോട്ടെടുപ്പ് ആരംഭിക്കുക",
diff --git a/bigbluebutton-html5/public/locales/nb_NO.json b/bigbluebutton-html5/public/locales/nb_NO.json
index 3e388f47de..d534c21db0 100644
--- a/bigbluebutton-html5/public/locales/nb_NO.json
+++ b/bigbluebutton-html5/public/locales/nb_NO.json
@@ -275,7 +275,6 @@
     "app.settings.main.save.label.description": "Lagrer endringer og lukker innstillingsmenyen",
     "app.settings.dataSavingTab.label": "Datasparing",
     "app.settings.dataSavingTab.webcam": "Skru på webkamera",
-    "app.settings.dataSavingTab.screenShare": "Skru på skjermdeling",
     "app.settings.dataSavingTab.description": "For å spare båndbredde juster hva som for øyeblikket blir vist",
     "app.settings.save-notification.label": "Innstillinger har blitt lagret",
     "app.switch.onLabel": "På",
@@ -287,7 +286,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Laste opp presentasjoner",
     "app.actionsBar.actionsDropdown.initPollLabel": "Start en spørrerunde",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Del skjermen din",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Skjermdeling låst",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stopp skjermdeling",
     "app.actionsBar.actionsDropdown.presentationDesc": "Last opp presentasjonen",
     "app.actionsBar.actionsDropdown.initPollDesc": "Start en spørrerunde",
diff --git a/bigbluebutton-html5/public/locales/nl.json b/bigbluebutton-html5/public/locales/nl.json
index 9ea7dc63c9..7de2537cdd 100644
--- a/bigbluebutton-html5/public/locales/nl.json
+++ b/bigbluebutton-html5/public/locales/nl.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "Slaat de wijzigingen op en sluit het instellingenmenu",
     "app.settings.dataSavingTab.label": "Gegevensbesparing",
     "app.settings.dataSavingTab.webcam": "Webcams inschakelen",
-    "app.settings.dataSavingTab.screenShare": "Desktop delen inschakelen",
     "app.settings.dataSavingTab.description": "Om uw bandbreedte te besparen, kunt u aanpassen wat momenteel wordt weergegeven.",
     "app.settings.save-notification.label": "Instellingen zijn opgeslagen",
     "app.statusNotifier.lowerHands": "Handen omlaag",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Presentaties beheren",
     "app.actionsBar.actionsDropdown.initPollLabel": "Een peiling initiëren",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Deel uw scherm",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Schermdeling vergrendeld",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stop met het delen van uw scherm",
     "app.actionsBar.actionsDropdown.presentationDesc": "Upload uw presentatie",
     "app.actionsBar.actionsDropdown.initPollDesc": "Een peiling initiëren",
diff --git a/bigbluebutton-html5/public/locales/oc.json b/bigbluebutton-html5/public/locales/oc.json
index 86ce5ecef0..5bd2b2e904 100644
--- a/bigbluebutton-html5/public/locales/oc.json
+++ b/bigbluebutton-html5/public/locales/oc.json
@@ -192,12 +192,10 @@
     "app.settings.main.save.label": "Enregistrar",
     "app.settings.dataSavingTab.label": "Estalvi de donadas",
     "app.settings.dataSavingTab.webcam": "Activar las camèras",
-    "app.settings.dataSavingTab.screenShare": "Activar lo partatge d’ecran",
     "app.talkingIndicator.isTalking" : "{0} parla",
     "app.actionsBar.actionsDropdown.actionsLabel": "Accions",
     "app.actionsBar.actionsDropdown.initPollLabel": "Aviar un sondatge",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Partejar vòstre ecran",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Partatge d’ecran blocat",
     "app.actionsBar.actionsDropdown.initPollDesc": "Aviar un sondatge",
     "app.actionsBar.actionsDropdown.pollBtnLabel": "Aviar un sondatge",
     "app.actionsBar.emojiMenu.awayLabel": "Absent",
diff --git a/bigbluebutton-html5/public/locales/pl_PL.json b/bigbluebutton-html5/public/locales/pl_PL.json
index 3cd3094b40..e442e11120 100644
--- a/bigbluebutton-html5/public/locales/pl_PL.json
+++ b/bigbluebutton-html5/public/locales/pl_PL.json
@@ -368,7 +368,6 @@
     "app.settings.main.save.label.description": "Zapisuje zmiany i zamyka menu ustawień",
     "app.settings.dataSavingTab.label": "Ograniczenie wykorzystania połączenia internetowego",
     "app.settings.dataSavingTab.webcam": "Pozwalaj na włączanie kamer",
-    "app.settings.dataSavingTab.screenShare": "Pozwalaj udostępniać ekran",
     "app.settings.dataSavingTab.description": "Aby ograniczyć wykorzystanie połączenia internetowego włącz lub wyłącz poniższe opcje.",
     "app.settings.save-notification.label": "Ustawienia zostały zapisane",
     "app.statusNotifier.lowerHands": "Opuść ręce",
@@ -385,7 +384,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Zarządzaj prezentacjami",
     "app.actionsBar.actionsDropdown.initPollLabel": "Tworzy ankietę",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Udostępnij ekran",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Udostępnianie ekranu zablokowane",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Zakończ udostępnianie ekranu",
     "app.actionsBar.actionsDropdown.presentationDesc": "Prześlij swoją prezentację",
     "app.actionsBar.actionsDropdown.initPollDesc": "Tworzy ankietę",
diff --git a/bigbluebutton-html5/public/locales/pt.json b/bigbluebutton-html5/public/locales/pt.json
index 54f27b0ca1..afbfe4b7d4 100644
--- a/bigbluebutton-html5/public/locales/pt.json
+++ b/bigbluebutton-html5/public/locales/pt.json
@@ -385,7 +385,6 @@
     "app.settings.main.save.label.description": "Guardar as alterações e fechar o menu de configurações",
     "app.settings.dataSavingTab.label": "Economia de dados",
     "app.settings.dataSavingTab.webcam": "Permitir webcams",
-    "app.settings.dataSavingTab.screenShare": "Permitir partilha de ecrã",
     "app.settings.dataSavingTab.description": "Para otimizar o volume de transferência de dados, ajuste o que está a ser exibido atualmente.",
     "app.settings.save-notification.label": "As configurações foram guardadas",
     "app.statusNotifier.lowerHands": "Mãos baixadas",
@@ -404,7 +403,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Gerir apresentações",
     "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar uma sondagem",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Partilhar o seu ecrã",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Partilha de ecrã bloqueada",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Parar partilha de ecrã",
     "app.actionsBar.actionsDropdown.presentationDesc": "Carregar a sua apresentação",
     "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar uma sondagem",
diff --git a/bigbluebutton-html5/public/locales/pt_BR.json b/bigbluebutton-html5/public/locales/pt_BR.json
index 0b873ac639..18942366b3 100644
--- a/bigbluebutton-html5/public/locales/pt_BR.json
+++ b/bigbluebutton-html5/public/locales/pt_BR.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "Salvar as alterações e fechar o menu de configurações",
     "app.settings.dataSavingTab.label": "Economia de dados",
     "app.settings.dataSavingTab.webcam": "Ativar webcams",
-    "app.settings.dataSavingTab.screenShare": "Ativar o compartilhamento de tela",
     "app.settings.dataSavingTab.description": "Para economizar o volume de transferência de dados, ajuste o que está sendo exibido no momento.",
     "app.settings.save-notification.label": "As configurações foram salvas",
     "app.statusNotifier.lowerHands": "Mãos baixadas",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Gerenciar apresentações",
     "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar uma enquete",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartilhar sua tela",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Compartilhamento de tela bloqueado",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Parar compartilhamento de tela",
     "app.actionsBar.actionsDropdown.presentationDesc": "Carregar sua apresentação",
     "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar uma enquete",
diff --git a/bigbluebutton-html5/public/locales/ro_RO.json b/bigbluebutton-html5/public/locales/ro_RO.json
index 7a4f8c62ff..3e3f3bc3b8 100644
--- a/bigbluebutton-html5/public/locales/ro_RO.json
+++ b/bigbluebutton-html5/public/locales/ro_RO.json
@@ -265,7 +265,6 @@
     "app.settings.main.save.label.description": "Salveaza modificarile si inchide meniul de setari",
     "app.settings.dataSavingTab.label": "Salvari de date",
     "app.settings.dataSavingTab.webcam": "Activare camere web",
-    "app.settings.dataSavingTab.screenShare": "Activare partajare desktop",
     "app.settings.dataSavingTab.description": "Pentru a salva latimea de banda ajustati ce vreti sa fie afisat.",
     "app.settings.save-notification.label": "Setarile au fost salvate",
     "app.switch.onLabel": "Pornit",
@@ -276,7 +275,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Actiuni",
     "app.actionsBar.actionsDropdown.initPollLabel": "Porniti un sondaj",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Partajeaza ecranul",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Partajare ecram blocata",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Oprire partajare ecran",
     "app.actionsBar.actionsDropdown.presentationDesc": "Incarca prezentarea",
     "app.actionsBar.actionsDropdown.initPollDesc": "Porniti un sondaj",
diff --git a/bigbluebutton-html5/public/locales/ru.json b/bigbluebutton-html5/public/locales/ru.json
index 8e03e54076..e137e3d144 100644
--- a/bigbluebutton-html5/public/locales/ru.json
+++ b/bigbluebutton-html5/public/locales/ru.json
@@ -417,7 +417,6 @@
     "app.settings.main.save.label.description": "Сохраняет изменения и закрывает меню настроек",
     "app.settings.dataSavingTab.label": "Сохранение данных",
     "app.settings.dataSavingTab.webcam": "Отображать веб-камеры",
-    "app.settings.dataSavingTab.screenShare": "Отображать демонстрацию рабочего стола",
     "app.settings.dataSavingTab.description": "Чтобы сохранить устойчивую скорость соединения, выберите, что будет отображаться",
     "app.settings.save-notification.label": "Настройки сохранены",
     "app.statusNotifier.lowerHands": "Опустить руки",
@@ -437,7 +436,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Управление презентациями",
     "app.actionsBar.actionsDropdown.initPollLabel": "Начать голосование",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Демонстировать ваш экран",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Демонстрация экрана заблокирована",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Остановить демонстрацию экрана",
     "app.actionsBar.actionsDropdown.presentationDesc": "Загрузите вашу презентацию",
     "app.actionsBar.actionsDropdown.initPollDesc": "Начать голосование",
diff --git a/bigbluebutton-html5/public/locales/sk_SK.json b/bigbluebutton-html5/public/locales/sk_SK.json
index 6b44b3ca01..49ad3969c6 100644
--- a/bigbluebutton-html5/public/locales/sk_SK.json
+++ b/bigbluebutton-html5/public/locales/sk_SK.json
@@ -347,7 +347,6 @@
     "app.settings.main.save.label.description": "Uloží vykonané zmeny a zavrie menu nastavení",
     "app.settings.dataSavingTab.label": "Úspora dátového prenosu",
     "app.settings.dataSavingTab.webcam": "Povoliť webkameru",
-    "app.settings.dataSavingTab.screenShare": "Povoliť zdieľanie obrazovky",
     "app.settings.dataSavingTab.description": "Pre úsporu dátového prenosu upravte nižšie zobrazené položky.",
     "app.settings.save-notification.label": "Nastavenia boli uložené",
     "app.statusNotifier.lowerHands": "Zrušiť hlásenie sa",
@@ -364,7 +363,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Spravovať prezentáciu",
     "app.actionsBar.actionsDropdown.initPollLabel": "Začať anketu",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Zdieľať obrazovku",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Zdieľanie obrazovky je zamknuté",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ukončiť zdieľanie obrazovky",
     "app.actionsBar.actionsDropdown.presentationDesc": "Nahrať Vašu prezentáciu",
     "app.actionsBar.actionsDropdown.initPollDesc": "Začať anketu",
diff --git a/bigbluebutton-html5/public/locales/sl.json b/bigbluebutton-html5/public/locales/sl.json
index 9ac48f7cb2..8a3a7c0fda 100644
--- a/bigbluebutton-html5/public/locales/sl.json
+++ b/bigbluebutton-html5/public/locales/sl.json
@@ -302,7 +302,6 @@
     "app.settings.main.save.label.description": "Shrani spremembe in zapre nastavitveni meni",
     "app.settings.dataSavingTab.label": "Zmanjšanje količine podatkov",
     "app.settings.dataSavingTab.webcam": "Omogoči spletne kamere",
-    "app.settings.dataSavingTab.screenShare": "Omogoči deljenje namizja",
     "app.settings.dataSavingTab.description": "S prilagajanjem prikaza je mogoče zmanjšati količino prenesenih podatkov.",
     "app.settings.save-notification.label": "Nastavitve so shranjene",
     "app.statusNotifier.lowerHands": "Spusti roke",
@@ -316,7 +315,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Dejanja",
     "app.actionsBar.actionsDropdown.initPollLabel": "Začni anketo",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Souporaba zaslon",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Souporaba zaslona je zaklenjena",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Končaj souporabo zaslona",
     "app.actionsBar.actionsDropdown.presentationDesc": "Pošlji predstavitev",
     "app.actionsBar.actionsDropdown.initPollDesc": "Začni anketo",
diff --git a/bigbluebutton-html5/public/locales/sr.json b/bigbluebutton-html5/public/locales/sr.json
index 3f984ee2c1..727ec8c1cc 100644
--- a/bigbluebutton-html5/public/locales/sr.json
+++ b/bigbluebutton-html5/public/locales/sr.json
@@ -290,7 +290,6 @@
     "app.settings.main.save.label.description": "Sačuvajte izmene i zatvorite meni sa podešavanjima",
     "app.settings.dataSavingTab.label": "Čuvanje podataka",
     "app.settings.dataSavingTab.webcam": "Omogućite veb kamere",
-    "app.settings.dataSavingTab.screenShare": "Omogućite deljenje sadržaja sa ekrana",
     "app.settings.dataSavingTab.description": "Kako bi se ograničio protok podataka, uredite šta se trenutno prikazuje na ekranu.",
     "app.settings.save-notification.label": "Podešavanja su sačuvana",
     "app.statusNotifier.lowerHands": "Spustite ruke",
@@ -304,7 +303,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "Akcije",
     "app.actionsBar.actionsDropdown.initPollLabel": "Započnite anketu",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Podelite svoj ekran",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Deljenje ekrana je zaključano",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Zaustavite deljenje svog ekrana",
     "app.actionsBar.actionsDropdown.presentationDesc": "Uvezite svoju prezentaciju",
     "app.actionsBar.actionsDropdown.initPollDesc": "Započnite anketu",
diff --git a/bigbluebutton-html5/public/locales/sv_SE.json b/bigbluebutton-html5/public/locales/sv_SE.json
index dd964cce15..72a6086700 100644
--- a/bigbluebutton-html5/public/locales/sv_SE.json
+++ b/bigbluebutton-html5/public/locales/sv_SE.json
@@ -410,7 +410,6 @@
     "app.settings.main.save.label.description": "Sparar ändringarna och stänger inställningsmenyn",
     "app.settings.dataSavingTab.label": "Datasparande",
     "app.settings.dataSavingTab.webcam": "Aktivera webbkameror",
-    "app.settings.dataSavingTab.screenShare": "Aktivera skrivbordsdelning",
     "app.settings.dataSavingTab.description": "För att spara din bandbredd justera vad som visas för närvarande.",
     "app.settings.save-notification.label": "Inställningarna har blivit sparade",
     "app.statusNotifier.lowerHands": "Sänk händer",
@@ -430,7 +429,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Hantera presentationer",
     "app.actionsBar.actionsDropdown.initPollLabel": "Inled en omröstning",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Dela din skärm",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Skärmdelning låst",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Sluta dela din skärm",
     "app.actionsBar.actionsDropdown.presentationDesc": "Ladda upp din presentation",
     "app.actionsBar.actionsDropdown.initPollDesc": "Inled en omröstning",
diff --git a/bigbluebutton-html5/public/locales/ta.json b/bigbluebutton-html5/public/locales/ta.json
index a126f0b2a9..80f727ae26 100644
--- a/bigbluebutton-html5/public/locales/ta.json
+++ b/bigbluebutton-html5/public/locales/ta.json
@@ -356,7 +356,6 @@
     "app.settings.main.save.label.description": "மாற்றங்களைச் சேமிக்கிறது மற்றும் அமைப்புகள் மெனுவை மூடுகிறது",
     "app.settings.dataSavingTab.label": "தரவு சேமிப்பு",
     "app.settings.dataSavingTab.webcam": "வெப்கேம்களை இயக்கு",
-    "app.settings.dataSavingTab.screenShare": "டெஸ்க்டாப் பகிர்வை இயக்கு",
     "app.settings.dataSavingTab.description": "உங்கள் அலைவரிசையைச் சேமிக்க, தற்போது காண்பிக்கப்படுவதை சரிசெய்யவும்.",
     "app.settings.save-notification.label": "அமைப்புகள் சேமிக்கப்பட்டுள்ளன",
     "app.statusNotifier.lowerHands": "கீழ் கைகள்",
@@ -373,7 +372,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "விளக்கக்காட்சிகளை நிர்வகிக்கவும்",
     "app.actionsBar.actionsDropdown.initPollLabel": "வாக்கெடுப்பைத் தொடங்கவும்",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "உங்கள் திரையைப் பகிரவும்",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "ஸ்கிரீன்ஷேர் பூட்டப்பட்டுள்ளது",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "உங்கள் திரையைப் பகிர்வதை நிறுத்துங்கள்",
     "app.actionsBar.actionsDropdown.presentationDesc": "உங்கள் விளக்கக்காட்சியைப் பதிவேற்றவும்",
     "app.actionsBar.actionsDropdown.initPollDesc": "வாக்கெடுப்பைத் தொடங்கவும்",
diff --git a/bigbluebutton-html5/public/locales/te.json b/bigbluebutton-html5/public/locales/te.json
index b781c3f36e..80f8665778 100644
--- a/bigbluebutton-html5/public/locales/te.json
+++ b/bigbluebutton-html5/public/locales/te.json
@@ -379,7 +379,6 @@
     "app.settings.main.save.label.description": "మార్పులను సేవ్ చేస్తుంది మరియు సెట్టింగుల మెనుని మూసివేస్తుంది",
     "app.settings.dataSavingTab.label": "డేటా పొదుపు",
     "app.settings.dataSavingTab.webcam": "వెబ్‌క్యామ్‌లను ప్రారంభించండి",
-    "app.settings.dataSavingTab.screenShare": "డెస్క్టాప్ షేరింగ్ ను ప్రారంభించండి",
     "app.settings.dataSavingTab.description": "మీ బ్యాండ్‌విడ్త్‌ను సేవ్ చేయడానికి ప్రస్తుతం ప్రదర్శించబడుతున్న వాటిని సర్దుబాటు చేయండి.",
     "app.settings.save-notification.label": "సెట్టింగులు సేవ్ చేయబడ్డాయి",
     "app.statusNotifier.lowerHands": "చేతులను కిందకి దించారు",
@@ -398,7 +397,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "ప్రదర్శనలను నిర్వహించండి",
     "app.actionsBar.actionsDropdown.initPollLabel": "పోల్ ప్రారంభించండి",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "మీ స్క్రీన్‌ను షేర్ చేయండి",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "స్క్రీన్ షేర్ లాక్ చేయబడింది",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "మీ స్క్రీన్‌ను షేర్ చేయడం ఆపివేయండి",
     "app.actionsBar.actionsDropdown.presentationDesc": "మీ ప్రదర్శనను అప్‌లోడ్ చేయండి",
     "app.actionsBar.actionsDropdown.initPollDesc": "పోల్ ప్రారంభించండి",
diff --git a/bigbluebutton-html5/public/locales/th.json b/bigbluebutton-html5/public/locales/th.json
index fb1dbcbefb..545f2ae21c 100644
--- a/bigbluebutton-html5/public/locales/th.json
+++ b/bigbluebutton-html5/public/locales/th.json
@@ -268,7 +268,6 @@
     "app.settings.main.save.label.description": "บันทึกการเปลี่ยนแปลงและปิดเมนูการตั้งค่า",
     "app.settings.dataSavingTab.label": "กำลังบันทึกข้อมูล",
     "app.settings.dataSavingTab.webcam": "เปิดใช้งานเว็บแคม",
-    "app.settings.dataSavingTab.screenShare": "เปิดใช้งานการแชร์เดสก์ท็อป",
     "app.settings.dataSavingTab.description": "หากต้องการบันทึกแบนด์วิดท์ของคุณให้ปรับสิ่งที่กำลังแสดงอยู่",
     "app.settings.save-notification.label": "บันทึกการตั้งค่าแล้ว",
     "app.switch.onLabel": "เปิด",
@@ -279,7 +278,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "กระทำ",
     "app.actionsBar.actionsDropdown.initPollLabel": "เริ่มการสำรวจความคิดเห็น",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "แบ่งปันหน้าจอของคุณ",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "ล็อคหน้าจอแชร์",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "หยุดแชร์หน้าจอของคุณ",
     "app.actionsBar.actionsDropdown.presentationDesc": "อัพโหลดงานนำเสนอของคุณ",
     "app.actionsBar.actionsDropdown.initPollDesc": "เริ่มการสำรวจความคิดเห็น",
diff --git a/bigbluebutton-html5/public/locales/tr.json b/bigbluebutton-html5/public/locales/tr.json
index d03b426601..3e74c69aae 100644
--- a/bigbluebutton-html5/public/locales/tr.json
+++ b/bigbluebutton-html5/public/locales/tr.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "Değişiklikleri kaydeder ve ayarlar menüsünü kapatır",
     "app.settings.dataSavingTab.label": "Veri tasarrufu",
     "app.settings.dataSavingTab.webcam": "Kameraları aç",
-    "app.settings.dataSavingTab.screenShare": "Masaüstü paylaşılabilsin",
     "app.settings.dataSavingTab.description": "Bant genişliğinden tasarruf etmek için nelerin görüntüleneceğini ayarlayın.",
     "app.settings.save-notification.label": "Ayarlar kaydedildi",
     "app.statusNotifier.lowerHands": "Elleri indir",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Sunum yönetimi",
     "app.actionsBar.actionsDropdown.initPollLabel": "Oylama başlat",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Ekranını paylaş",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekran paylaşımı kilitli",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ekran paylaşımını bitir",
     "app.actionsBar.actionsDropdown.presentationDesc": "Sunumunuzu yükleyin",
     "app.actionsBar.actionsDropdown.initPollDesc": "Bir oylama başlatın",
diff --git a/bigbluebutton-html5/public/locales/tr_TR.json b/bigbluebutton-html5/public/locales/tr_TR.json
index fd7bda2481..9308a826f2 100644
--- a/bigbluebutton-html5/public/locales/tr_TR.json
+++ b/bigbluebutton-html5/public/locales/tr_TR.json
@@ -409,7 +409,6 @@
     "app.settings.main.save.label.description": "Değişiklikleri kaydeder ve ayarlar menüsünü kapatır",
     "app.settings.dataSavingTab.label": "Veri Tasarrufu",
     "app.settings.dataSavingTab.webcam": "Web kameralarını etkinleştir",
-    "app.settings.dataSavingTab.screenShare": "Masaüstü paylaşımını etkinleştir",
     "app.settings.dataSavingTab.description": "Bant genişliğinden tasarruf etmek için mevcut gösterimi ayarlayın.",
     "app.settings.save-notification.label": "Ayarlar kaydedildi",
     "app.statusNotifier.lowerHands": "Elleri indir",
@@ -429,7 +428,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Sunumları Yönet",
     "app.actionsBar.actionsDropdown.initPollLabel": "Oylama başlat",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Ekranını paylaş",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Ekran paylaşımı kilitli",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ekran paylaşımını sonlandır",
     "app.actionsBar.actionsDropdown.presentationDesc": "Sunumunuzu yükleyin",
     "app.actionsBar.actionsDropdown.initPollDesc": "Oylama başlat",
diff --git a/bigbluebutton-html5/public/locales/uk_UA.json b/bigbluebutton-html5/public/locales/uk_UA.json
index 6ac47c7341..211c887f22 100644
--- a/bigbluebutton-html5/public/locales/uk_UA.json
+++ b/bigbluebutton-html5/public/locales/uk_UA.json
@@ -388,7 +388,6 @@
     "app.settings.main.save.label.description": "Зберігає зміни та закриває меню налаштувань",
     "app.settings.dataSavingTab.label": "Заощадження трафіку",
     "app.settings.dataSavingTab.webcam": "Дозволити вебкамери",
-    "app.settings.dataSavingTab.screenShare": "Демонстрація екрану",
     "app.settings.dataSavingTab.description": "Для заощадження передачі даних, будь ласка, вимкніть функції, які пов'язані з демонстрацією відео:",
     "app.settings.save-notification.label": "Налаштування збережено",
     "app.statusNotifier.lowerHands": "Опустити руки",
@@ -407,7 +406,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Керування презентаціями",
     "app.actionsBar.actionsDropdown.initPollLabel": "Опитування",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Демонструвати ваш екран",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Демонстрація екрану заблокована",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Зупинити демонстрацію екрану",
     "app.actionsBar.actionsDropdown.presentationDesc": "Завантажити вашу презентацію",
     "app.actionsBar.actionsDropdown.initPollDesc": "Опитування",
diff --git a/bigbluebutton-html5/public/locales/vi_VN.json b/bigbluebutton-html5/public/locales/vi_VN.json
index d6276da369..7ac8c4f3e0 100644
--- a/bigbluebutton-html5/public/locales/vi_VN.json
+++ b/bigbluebutton-html5/public/locales/vi_VN.json
@@ -384,7 +384,6 @@
     "app.settings.main.save.label.description": "Lưu các thay đổi và đóng menu cài đặt",
     "app.settings.dataSavingTab.label": "Tiết kiệm dữ liệu",
     "app.settings.dataSavingTab.webcam": "Bật webcam",
-    "app.settings.dataSavingTab.screenShare": "Bật chia sẻ màn hình",
     "app.settings.dataSavingTab.description": "Để tiết kiệm băng thông của bạn, hãy điều chỉnh những gì hiện đang được hiển thị.",
     "app.settings.save-notification.label": "Cài đặt đã được lưu",
     "app.statusNotifier.lowerHands": "Hạ tay",
@@ -402,7 +401,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "Tải lên bản trình bày",
     "app.actionsBar.actionsDropdown.initPollLabel": "Tạo Khảo sát",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "Chia sẻ màn hình",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Chia sẻ màn hình bị khóa",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Dừng chia sẻ màn hình",
     "app.actionsBar.actionsDropdown.presentationDesc": "Tải lên bản trình bày của bạn",
     "app.actionsBar.actionsDropdown.initPollDesc": "Tạo Khảo sát",
diff --git a/bigbluebutton-html5/public/locales/zh_CN.json b/bigbluebutton-html5/public/locales/zh_CN.json
index 283ffc7b09..9cc5c0a4db 100644
--- a/bigbluebutton-html5/public/locales/zh_CN.json
+++ b/bigbluebutton-html5/public/locales/zh_CN.json
@@ -333,7 +333,6 @@
     "app.settings.main.save.label.description": "保存更改并关闭设置菜单",
     "app.settings.dataSavingTab.label": "节省流量",
     "app.settings.dataSavingTab.webcam": "启用摄像头",
-    "app.settings.dataSavingTab.screenShare": "启用桌面分享",
     "app.settings.dataSavingTab.description": "调整当前显示以节省带宽",
     "app.settings.save-notification.label": "设置已保存",
     "app.statusNotifier.lowerHands": "没举手",
@@ -347,7 +346,6 @@
     "app.actionsBar.actionsDropdown.actionsLabel": "操作",
     "app.actionsBar.actionsDropdown.initPollLabel": "发起投票",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "分享您的桌面",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "屏幕分享已锁定",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "停止分享您的桌面",
     "app.actionsBar.actionsDropdown.presentationDesc": "上传您的演示文件",
     "app.actionsBar.actionsDropdown.initPollDesc": "发起投票",
diff --git a/bigbluebutton-html5/public/locales/zh_TW.json b/bigbluebutton-html5/public/locales/zh_TW.json
index b400908de4..382838be10 100644
--- a/bigbluebutton-html5/public/locales/zh_TW.json
+++ b/bigbluebutton-html5/public/locales/zh_TW.json
@@ -420,7 +420,6 @@
     "app.settings.main.save.label.description": "儲存變更並關閉設定選單",
     "app.settings.dataSavingTab.label": "節省流量",
     "app.settings.dataSavingTab.webcam": "啟用其他與會者視訊",
-    "app.settings.dataSavingTab.screenShare": "啟用桌面分享",
     "app.settings.dataSavingTab.description": "調整當前顯示去節省您的頻寬",
     "app.settings.save-notification.label": "已儲存設定",
     "app.statusNotifier.lowerHands": "放下",
@@ -440,7 +439,6 @@
     "app.actionsBar.actionsDropdown.presentationLabel": "管理簡報",
     "app.actionsBar.actionsDropdown.initPollLabel": "發起投票",
     "app.actionsBar.actionsDropdown.desktopShareLabel": "分享您的畫面",
-    "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "螢幕分享已鎖定",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "停止分享您的畫面",
     "app.actionsBar.actionsDropdown.presentationDesc": "上傳您的簡報",
     "app.actionsBar.actionsDropdown.initPollDesc": "發起投票",

From 46aa2ccfe6a994f4107a74d2fed1a95b3977e28a Mon Sep 17 00:00:00 2001
From: Maxim Khlobystov <maxim.khlobystov@gmail.com>
Date: Wed, 20 Jul 2022 15:44:09 -0400
Subject: [PATCH 19/50] Add new 2.5 shared notes tests

---
 .../connectionStatus/connectionStatus.js      |   1 -
 .../playwright/core/elements.js               |   5 +
 bigbluebutton-tests/playwright/core/page.js   |  12 ++
 .../playwright/sharednotes/sharednotes.js     | 106 +++++++++++++++++-
 .../sharednotes/sharednotes.spec.js           |  18 +++
 .../playwright/sharednotes/util.js            |  16 +++
 6 files changed, 156 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-tests/playwright/connectionStatus/connectionStatus.js b/bigbluebutton-tests/playwright/connectionStatus/connectionStatus.js
index 8f0c929f3f..0e25947bad 100644
--- a/bigbluebutton-tests/playwright/connectionStatus/connectionStatus.js
+++ b/bigbluebutton-tests/playwright/connectionStatus/connectionStatus.js
@@ -3,7 +3,6 @@ const { MultiUsers } = require('../user/multiusers');
 const e = require('../core/elements');
 const { ELEMENT_WAIT_TIME } = require('../core/constants');
 const { openConnectionStatus, checkNetworkStatus } = require('./util');
-const { sleep } = require('../core/helpers');
 
 class ConnectionStatus extends MultiUsers {
   constructor(browser, context) {
diff --git a/bigbluebutton-tests/playwright/core/elements.js b/bigbluebutton-tests/playwright/core/elements.js
index 741998b5dc..ba0bbe4b27 100644
--- a/bigbluebutton-tests/playwright/core/elements.js
+++ b/bigbluebutton-tests/playwright/core/elements.js
@@ -282,3 +282,8 @@ exports.drawnRectangle = 'svg g[clip-path] > g:nth-child(2) rect[data-test="draw
 exports.whiteboardViewBox = 'svg g[clip-path="url(#viewBox)"]';
 exports.changeWhiteboardAccess = 'li[data-test="changeWhiteboardAccess"]';
 exports.pencil = 'button[data-test="pencilTool"]';
+
+// Shared notes
+exports.showMoreSharedNotesButton = 'span[class="show-more-icon-btn"]'
+exports.exportSharedNotesButton = 'button[aria-label="Import/Export from/to different file formats"]';
+exports.exportPlainButton = 'span[id="exportplain"]';
diff --git a/bigbluebutton-tests/playwright/core/page.js b/bigbluebutton-tests/playwright/core/page.js
index d06ffa1cf9..3343555bfb 100644
--- a/bigbluebutton-tests/playwright/core/page.js
+++ b/bigbluebutton-tests/playwright/core/page.js
@@ -173,6 +173,18 @@ class Page {
     const locator = this.getLocator(selector);
     await expect(locator).toContainText(text, { timeout });
   }
+
+  async press(key) {
+    await this.page.keyboard.press(key);
+  }
+
+  async down(key) {
+    await this.page.keyboard.down(key);
+  }
+
+  async up(key) {
+    await this.page.keyboard.up(key);
+  }
 }
 
 module.exports = exports = Page;
diff --git a/bigbluebutton-tests/playwright/sharednotes/sharednotes.js b/bigbluebutton-tests/playwright/sharednotes/sharednotes.js
index 4da29c242b..7df2cdb76a 100644
--- a/bigbluebutton-tests/playwright/sharednotes/sharednotes.js
+++ b/bigbluebutton-tests/playwright/sharednotes/sharednotes.js
@@ -1,7 +1,11 @@
 const { default: test } = require('@playwright/test');
 const Page = require('../core/page');
 const { getSettings } = require('../core/settings');
-const { startSharedNotes } = require('./util');
+const e = require('../core/elements');
+const { startSharedNotes, getNotesLocator, getShowMoreButtonLocator, getExportButtonLocator, getExportPlainTextLocator } = require('./util');
+const { expect } = require('@playwright/test');
+const { ELEMENT_WAIT_TIME } = require('../core/constants');
+const { sleep } = require('../core/helpers');
 
 class SharedNotes extends Page {
   constructor(browser, page) {
@@ -13,6 +17,106 @@ class SharedNotes extends Page {
     test.fail(!sharedNotesEnabled, 'Shared notes is disabled');
     await startSharedNotes(this);
   }
+
+  async editMessage(notesLocator) {
+    await this.down('Shift');
+    let i = 7;
+    while(i > 0) {
+      await this.press('ArrowLeft');
+      i--;
+    }
+    await this.up('Shift');
+    await this.press('Backspace');
+    i = 5;
+    while(i > 0) {
+      await this.press('ArrowLeft');
+      i--;
+    }
+    await this.press('!');
+  }
+
+  async typeInSharedNotes() {
+    const { sharedNotesEnabled } = getSettings();
+    test.fail(!sharedNotesEnabled, 'Shared notes is disabled');
+    await startSharedNotes(this);
+    const notesLocator = getNotesLocator(this);
+    await notesLocator.type(e.message);
+    this.editMessage(notesLocator);
+    const editedMessage = '!Hello';
+    await expect(notesLocator).toContainText(editedMessage, { timeout : ELEMENT_WAIT_TIME });
+  }
+
+  async formatMessage(notesLocator) {
+
+    // U for '!'
+    await this.down('Shift');
+    await this.press('ArrowLeft');
+    await this.up('Shift');
+    await this.press('Control+U');
+    await this.press('ArrowLeft');
+
+    // B for 'World'
+    await this.down('Shift');
+    let i = 5;
+    while(i > 0) {
+      await this.press('ArrowLeft');
+      i--;
+    }
+    await this.up('Shift');
+    await this.press('Control+B');
+    await this.press('ArrowLeft');
+
+    await this.press('ArrowLeft');
+
+    // I for 'Hello'
+    await this.down('Shift');
+    i = 5;
+    while(i > 0) {
+      await this.press('ArrowLeft');
+      i--;
+    }
+    await this.up('Shift');
+    await this.press('Control+I');
+    await this.press('ArrowLeft');
+  }
+
+  async formatTextInSharedNotes() {
+    const { sharedNotesEnabled } = getSettings();
+    test.fail(!sharedNotesEnabled, 'Shared notes is disabled');
+    await startSharedNotes(this);
+    const notesLocator = getNotesLocator(this);
+    await notesLocator.type(e.message);
+    this.formatMessage(notesLocator);
+    const html = await notesLocator.innerHTML();
+
+    const uText = '<u>!</u>';
+    await expect(html.includes(uText)).toBeTruthy();
+
+    const bText = '<b>World</b>';
+    await expect(html.includes(bText)).toBeTruthy();
+
+    const iText = '<i>Hello</i>'
+    await expect(html.includes(bText)).toBeTruthy();
+  }
+
+  async exportSharedNotes(testInfo) {
+    const { sharedNotesEnabled } = getSettings();
+    test.fail(!sharedNotesEnabled, 'Shared notes is disabled');
+    await startSharedNotes(this);
+    const notesLocator = getNotesLocator(this);
+    await notesLocator.type(e.message);
+
+    const showMoreButtonLocator = getShowMoreButtonLocator(this);
+    await showMoreButtonLocator.click();
+
+    const exportButtonLocator = getExportButtonLocator(this);
+    await exportButtonLocator.click();
+
+    const exportPlainTextLocator = getExportPlainTextLocator(this);
+    this.page.waitForEvent('download');
+    await exportPlainTextLocator.click();
+    await sleep(500);
+  }
 }
 
 exports.SharedNotes = SharedNotes;
diff --git a/bigbluebutton-tests/playwright/sharednotes/sharednotes.spec.js b/bigbluebutton-tests/playwright/sharednotes/sharednotes.spec.js
index 531e0bcbc9..5fb7eff51f 100644
--- a/bigbluebutton-tests/playwright/sharednotes/sharednotes.spec.js
+++ b/bigbluebutton-tests/playwright/sharednotes/sharednotes.spec.js
@@ -7,4 +7,22 @@ test.describe.parallel('Shared Notes', () => {
     await sharedNotes.init(true, true);
     await sharedNotes.openSharedNotes();
   });
+  test('Type in shared notes', async ({ browser, page }) => {
+    // https://docs.bigbluebutton.org/2.5/release-tests.html#using-shared-notes-panel
+    const sharedNotes = new SharedNotes(browser, page);
+    await sharedNotes.init(true, true);
+    await sharedNotes.typeInSharedNotes();
+  });
+  test('Formate text in shared notes', async ({ browser, page }) => {
+    // https://docs.bigbluebutton.org/2.5/release-tests.html#using-shared-notes-formatting-tools
+    const sharedNotes = new SharedNotes(browser, page);
+    await sharedNotes.init(true, true);
+    await sharedNotes.formatTextInSharedNotes();
+  });
+  test('Export shared notes', async ({ browser, page }, testInfo) => {
+    // https://docs.bigbluebutton.org/2.5/release-tests.html#exporting-shared-notes
+    const sharedNotes = new SharedNotes(browser, page);
+    await sharedNotes.init(true, true);
+    await sharedNotes.exportSharedNotes(testInfo);
+  });
 });
diff --git a/bigbluebutton-tests/playwright/sharednotes/util.js b/bigbluebutton-tests/playwright/sharednotes/util.js
index da1155403b..d80a2e5a44 100644
--- a/bigbluebutton-tests/playwright/sharednotes/util.js
+++ b/bigbluebutton-tests/playwright/sharednotes/util.js
@@ -1,5 +1,6 @@
 const { ELEMENT_WAIT_LONGER_TIME } = require('../core/constants');
 const e = require('../core/elements');
+const { expect } = require('@playwright/test');
 
 async function startSharedNotes(test) {
   await test.waitAndClick(e.sharedNotes);
@@ -14,5 +15,20 @@ function getNotesLocator(test) {
     .locator(e.etherpadEditable);
 }
 
+function getShowMoreButtonLocator(test) {
+  return test.page.frameLocator(e.etherpadFrame).locator(e.showMoreSharedNotesButton);
+}
+
+function getExportButtonLocator(test) {
+  return test.page.frameLocator(e.etherpadFrame).locator(e.exportSharedNotesButton);
+}
+
+function getExportPlainTextLocator(test) {
+  return test.page.frameLocator(e.etherpadFrame).locator(e.exportPlainButton);
+}
+
 exports.startSharedNotes = startSharedNotes;
 exports.getNotesLocator = getNotesLocator;
+exports.getShowMoreButtonLocator = getShowMoreButtonLocator;
+exports.getExportButtonLocator = getExportButtonLocator;
+exports.getExportPlainTextLocator = getExportPlainTextLocator;

From 94cfa3c084ce50205c8ab5493db1cc6afbbb4f3a Mon Sep 17 00:00:00 2001
From: Gabriel Porfirio <gabrielporfirio1994@gmail.com>
Date: Thu, 21 Jul 2022 14:07:19 -0300
Subject: [PATCH 20/50] WIP: Adding notification to waiting users list

---
 .../ui/components/waiting-users/component.jsx        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx b/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
index 57d008f3db..49e1fa99d9 100755
--- a/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
@@ -9,6 +9,7 @@ import { PANELS, ACTIONS } from '../layout/enums';
 import Settings from '/imports/ui/services/settings';
 import browserInfo from '/imports/utils/browserInfo';
 import Header from '/imports/ui/components/common/control-header/component';
+import { notify } from '/imports/ui/services/notification';
 
 const intlMessages = defineMessages({
   waitingUsersTitle: {
@@ -252,10 +253,19 @@ const WaitingUsers = (props) => {
     setRememberChoice(checked);
   };
 
-  const changePolicy = (shouldExecutePolicy, policyRule, cb) => () => {
+  const changePolicy = (shouldExecutePolicy, policyRule, cb) => () => {   
     if (shouldExecutePolicy) {
       changeGuestPolicy(policyRule);
     }
+
+    if (policyRule === 'ALWAYS_ACCEPT_AUTH') {
+      notify("Action applied to waiting users: " + intl.formatMessage(intlMessages.allowAllAuthenticated).toUpperCase(), 'success');
+    }else if (policyRule === 'ALWAYS_ACCEPT') {
+      notify("Action applied to waiting users: " + intl.formatMessage(intlMessages.allowEveryone).toUpperCase(), 'success');
+    }else if(policyRule === 'ALWAYS_DENY') {
+      notify("Action applied to waiting users: " + intl.formatMessage(intlMessages.denyEveryone).toUpperCase(), 'success');
+    }
+
     closePanel();
     return cb();
   };

From 07ccaa88fa076b6150bd64302794249d46184069 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Thu, 21 Jul 2022 15:50:18 -0400
Subject: [PATCH 21/50] test: set permissions: content: read

Suggested by @naveensrinivasan
---
 .github/workflows/automated-tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
index c0c5ea585e..f06fd6e729 100644
--- a/.github/workflows/automated-tests.yml
+++ b/.github/workflows/automated-tests.yml
@@ -7,6 +7,8 @@ on:
       - 'v[3-9].*.x-release'
   pull_request:
     types: [opened, synchronize, reopened]
+permissions:
+  contents: read
 jobs:
   build-install-and-test:
     runs-on: ubuntu-20.04
@@ -137,4 +139,4 @@ jobs:
           name: tests-report
           path: |
             bigbluebutton-tests/playwright/playwright-report
-            bigbluebutton-tests/playwright/test-results
\ No newline at end of file
+            bigbluebutton-tests/playwright/test-results

From dbafb610d5ac4372c9c1b825a0120ee4fc0a2894 Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Fri, 22 Jul 2022 10:16:57 -0300
Subject: [PATCH 22/50] fix: whiteboard access avatar icon in RTL mode

---
 .../imports/ui/components/user-avatar/styles.js                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-avatar/styles.js b/bigbluebutton-html5/imports/ui/components/user-avatar/styles.js
index 456260e8b8..c72b64dbfb 100644
--- a/bigbluebutton-html5/imports/ui/components/user-avatar/styles.js
+++ b/bigbluebutton-html5/imports/ui/components/user-avatar/styles.js
@@ -179,7 +179,7 @@ const Avatar = styled.div`
   ${({ whiteboardAccess }) => whiteboardAccess && `
     &:before {
       content: "\\00a0\\e925\\00a0";
-      padding: ${mdPaddingY};
+      padding: ${mdPaddingY} !important;
       border-radius: 50% !important;
       opacity: 1;
       top: ${userIndicatorsOffset};
@@ -193,6 +193,7 @@ const Avatar = styled.div`
         left: auto;
         right: ${userIndicatorsOffset};
         letter-spacing: -.33rem;
+        transform: scale(-1, 1);
       }
     }
   `}

From 15b28d52fe0787c41138cc14aef9413a755b9a47 Mon Sep 17 00:00:00 2001
From: Gabriel Porfirio <gabrielporfirio1994@gmail.com>
Date: Fri, 22 Jul 2022 13:27:39 -0300
Subject: [PATCH 23/50] updating feedback message

---
 .../ui/components/waiting-users/component.jsx | 19 +++++++++----------
 bigbluebutton-html5/public/locales/en.json    |  1 +
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx b/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
index 49e1fa99d9..16b3c144e1 100755
--- a/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
@@ -80,6 +80,10 @@ const intlMessages = defineMessages({
     id: 'app.userList.guest.denyLabel',
     description: 'Deny guest button label',
   },
+  feedbackMessage: {
+    id: 'app.userList.guest.feedbackMessage',
+    description: 'Feedback message moderator action',
+  },
 });
 
 const ALLOW_STATUS = 'ALLOW';
@@ -253,20 +257,15 @@ const WaitingUsers = (props) => {
     setRememberChoice(checked);
   };
 
-  const changePolicy = (shouldExecutePolicy, policyRule, cb) => () => {   
+  const changePolicy = (shouldExecutePolicy, policyRule, cb, message) => () => {   
     if (shouldExecutePolicy) {
       changeGuestPolicy(policyRule);
     }
 
-    if (policyRule === 'ALWAYS_ACCEPT_AUTH') {
-      notify("Action applied to waiting users: " + intl.formatMessage(intlMessages.allowAllAuthenticated).toUpperCase(), 'success');
-    }else if (policyRule === 'ALWAYS_ACCEPT') {
-      notify("Action applied to waiting users: " + intl.formatMessage(intlMessages.allowEveryone).toUpperCase(), 'success');
-    }else if(policyRule === 'ALWAYS_DENY') {
-      notify("Action applied to waiting users: " + intl.formatMessage(intlMessages.denyEveryone).toUpperCase(), 'success');
-    }
-
     closePanel();
+    
+    notify(intl.formatMessage(intlMessages.feedbackMessage) + message.toUpperCase(), 'success');
+    
     return cb();
   };
 
@@ -276,7 +275,7 @@ const WaitingUsers = (props) => {
       color={color}
       label={message}
       size="lg"
-      onClick={changePolicy(rememberChoice, policy, action)}
+      onClick={changePolicy(rememberChoice, policy, action, message)}
     />
   );
 
diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index 082a2d45c4..904897a2a0 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -643,6 +643,7 @@
     "app.userList.guest.privateMessageLabel": "Message",
     "app.userList.guest.acceptLabel": "Accept",
     "app.userList.guest.denyLabel": "Deny",
+    "app.userList.guest.feedbackMessage": "Action applied: ",
     "app.user-info.title": "Directory Lookup",
     "app.toast.breakoutRoomEnded": "The breakout room ended.  Please rejoin in the audio.",
     "app.toast.chat.public": "New Public Chat message",

From 72a0deb16ccd8ee7b5fa489bdbd177b9c357a873 Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Fri, 22 Jul 2022 17:38:34 -0400
Subject: [PATCH 24/50] update test usersJoinKeepingConnected

This is the stress test that connects twenty clients to the server.

Two changes in this PR:
    - actually await a Promise.all() that waits for nothing otherwise
    - close the twenty pages at the end of the test
---
 bigbluebutton-tests/playwright/stress/stress.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-tests/playwright/stress/stress.js b/bigbluebutton-tests/playwright/stress/stress.js
index ee2b10b47b..74549e6ebc 100644
--- a/bigbluebutton-tests/playwright/stress/stress.js
+++ b/bigbluebutton-tests/playwright/stress/stress.js
@@ -100,18 +100,25 @@ class Stress {
 
   async usersJoinKeepingConnected() {
     const meetingId = await createMeeting(parameters);
+    const pages = [];
 
     for (let i = 1; i <= c.JOIN_TWO_USERS_KEEPING_CONNECTED_ROUNDS / 2; i++) {
       console.log(`joining ${i * 2} users of ${c.JOIN_TWO_USERS_KEEPING_CONNECTED_ROUNDS}`);
       const modPage = new Page(this.browser, await this.getNewPageTab());
       const userPage = new Page(this.browser, await this.getNewPageTab());
-      Promise.all([
+      pages.push(modPage);
+      pages.push(userPage);
+      await Promise.all([
         modPage.init(true, false, { meetingId, fullName: `Mod-${i}` }),
         userPage.init(false, false, { meetingId, fullName: `User-${i}` }),
       ]);
       await modPage.waitForSelector(e.audioModal, c.ELEMENT_WAIT_LONGER_TIME);
       await userPage.waitForSelector(e.audioModal, c.ELEMENT_WAIT_LONGER_TIME);
     }
+
+    pages.forEach(async (currentPage) => {
+      await currentPage.page.close();
+    })
   }
 
   async usersJoinExceddingParticipantsLimit() {

From 8faebab7c4df8d5b70289c4d63796dcc18450cdf Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Fri, 22 Jul 2022 18:12:55 -0400
Subject: [PATCH 25/50] flag 'Test locales' as slow test so it doesn't timeout

---
 bigbluebutton-tests/playwright/settings/settings.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-tests/playwright/settings/settings.spec.js b/bigbluebutton-tests/playwright/settings/settings.spec.js
index ffea141689..30011f9536 100644
--- a/bigbluebutton-tests/playwright/settings/settings.spec.js
+++ b/bigbluebutton-tests/playwright/settings/settings.spec.js
@@ -3,6 +3,7 @@ const { Language } = require('./language');
 
 test.describe.parallel('Settings test suite', () => {
     test(`Test locales`, async ({ browser, page }) => {
+      test.slow();
       const language = new Language(browser, page);
       await language.init(true, true);
       await language.test();

From 7280ac0177fb5c5973f58de0784ce04e4771593a Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Fri, 22 Jul 2022 18:19:17 -0400
Subject: [PATCH 26/50] Don't wait for screenshareConnecting

Waiting for e.screenshareConnecting creates a race condition if the
screen share connects quickly, before the test waits for the
screenshareConnecting message.
---
 bigbluebutton-tests/playwright/screenshare/util.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bigbluebutton-tests/playwright/screenshare/util.js b/bigbluebutton-tests/playwright/screenshare/util.js
index f1fbe5cd95..6fb7cbf5f7 100644
--- a/bigbluebutton-tests/playwright/screenshare/util.js
+++ b/bigbluebutton-tests/playwright/screenshare/util.js
@@ -3,12 +3,10 @@ const { VIDEO_LOADING_WAIT_TIME } = require('../core/constants');
 
 async function startScreenshare(test) {
   await test.waitAndClick(e.startScreenSharing);
-  await test.waitForSelector(e.screenshareConnecting);
   await test.waitForSelector(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
 }
 
 async function getScreenShareBreakoutContainer(test) {
-  await test.waitForSelector(e.screenshareConnecting, VIDEO_LOADING_WAIT_TIME);
   await test.hasElement(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
 }
 

From a2aed9f956cf9bbf52d8a24822172c18d83cc06f Mon Sep 17 00:00:00 2001
From: Anton B <antonbsa.bck@gmail.com>
Date: Mon, 25 Jul 2022 16:42:48 -0300
Subject: [PATCH 27/50] test: fix and update test plan links

---
 .../playwright/audio/audio.spec.js                |  4 ++--
 .../playwright/breakout/breakout.spec.js          |  2 +-
 bigbluebutton-tests/playwright/chat/chat.spec.js  |  8 ++++----
 .../playwright/polling/polling.spec.js            |  4 ++--
 .../playwright/presentation/presentation.spec.js  |  9 +++++++--
 .../playwright/screenshare/screenshare.spec.js    |  1 +
 .../playwright/settings/settings.spec.js          |  1 +
 bigbluebutton-tests/playwright/user/user.spec.js  | 15 +++++++++++++--
 .../playwright/webcam/webcam.spec.js              |  2 +-
 9 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/bigbluebutton-tests/playwright/audio/audio.spec.js b/bigbluebutton-tests/playwright/audio/audio.spec.js
index 16221cbf4c..efeba1529a 100644
--- a/bigbluebutton-tests/playwright/audio/audio.spec.js
+++ b/bigbluebutton-tests/playwright/audio/audio.spec.js
@@ -2,14 +2,14 @@ const { test } = require('@playwright/test');
 const { Audio } = require('./audio');
 
 test.describe.parallel('Audio', () => {
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#listen-only-mode-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#listen-only-mode-automated
   test('Join audio with Listen Only @ci', async ({ browser, page }) => {
     const audio = new Audio(browser, page);
     await audio.init(true, false);
     await audio.joinAudio();
   });
 
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#join-audio-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#join-audio-automated
   test('Join audio with Microphone @ci', async ({ browser, page }) => {
     const audio = new Audio(browser, page);
     await audio.init(true, false);
diff --git a/bigbluebutton-tests/playwright/breakout/breakout.spec.js b/bigbluebutton-tests/playwright/breakout/breakout.spec.js
index 7fa1ac037a..86a9787db8 100644
--- a/bigbluebutton-tests/playwright/breakout/breakout.spec.js
+++ b/bigbluebutton-tests/playwright/breakout/breakout.spec.js
@@ -9,7 +9,7 @@ test.describe.parallel('Breakout', () => {
     await create.create();
   });
 
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#moderators-creating-breakout-rooms-and-assiging-users-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#moderators-creating-breakout-rooms-and-assiging-users-automated
   test('Join Breakout room @ci', async ({ browser, context, page }) => {
     const join = new Join(browser, context);
     await join.initPages(page);
diff --git a/bigbluebutton-tests/playwright/chat/chat.spec.js b/bigbluebutton-tests/playwright/chat/chat.spec.js
index 3ee8da93ed..4081ab0958 100644
--- a/bigbluebutton-tests/playwright/chat/chat.spec.js
+++ b/bigbluebutton-tests/playwright/chat/chat.spec.js
@@ -3,14 +3,14 @@ const { Chat } = require('./chat');
 const { PrivateChat } = require('./privateChat');
 
 test.describe.parallel('Chat', () => {
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#public-message-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#public-message-automated
   test('Send public message @ci', async ({ browser, page }) => {
     const chat = new Chat(browser, page);
     await chat.init(true, true);
     await chat.sendPublicMessage();
   });
 
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#private-message-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#private-message-automated
   test('Send private message @ci', async ({ browser, context, page }) => {
     const privateChat = new PrivateChat(browser, context);
     await privateChat.initPages(page);
@@ -36,14 +36,14 @@ test.describe.parallel('Chat', () => {
     await chat.saveChat(testInfo);
   });
 
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#chat-character-limit-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#chat-character-limit-automated
   test('Verify character limit', async ({ browser, page }) => {
     const chat = new Chat(browser, page);
     await chat.init(true, true);
     await chat.characterLimit();
   });
 
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#sending-empty-chat-message-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#sending-empty-chat-message-automated
   test('Not able to send an empty message', async ({ browser, page }) => {
     const chat = new Chat(browser, page);
     await chat.init(true, true);
diff --git a/bigbluebutton-tests/playwright/polling/polling.spec.js b/bigbluebutton-tests/playwright/polling/polling.spec.js
index dbea4c16d7..16433b25d5 100644
--- a/bigbluebutton-tests/playwright/polling/polling.spec.js
+++ b/bigbluebutton-tests/playwright/polling/polling.spec.js
@@ -9,14 +9,14 @@ test.describe.parallel('Polling', () => {
       await polling.createPoll();
     });
 
-    // https://docs.bigbluebutton.org/2.5/release-tests.html#start-an-anonymous-poll-automated
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#start-an-anonymous-poll-automated
     test('Create anonymous poll @ci', async ({ browser, context, page }) => {
       const polling = new Polling(browser, context);
       await polling.initPages(page);
       await polling.pollAnonymous();
     });
 
-    // https://docs.bigbluebutton.org/2.5/release-tests.html#quick-poll-option-automated
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#quick-poll-option-automated
     test('Create quick poll - from the slide', async ({ browser, context, page }) => {
       const polling = new Polling(browser, context);
       await polling.initPages(page);
diff --git a/bigbluebutton-tests/playwright/presentation/presentation.spec.js b/bigbluebutton-tests/playwright/presentation/presentation.spec.js
index 3889d57960..3c230c74b5 100644
--- a/bigbluebutton-tests/playwright/presentation/presentation.spec.js
+++ b/bigbluebutton-tests/playwright/presentation/presentation.spec.js
@@ -2,24 +2,28 @@ const { test } = require('@playwright/test');
 const { Presentation } = require('./presentation');
 
 test.describe.parallel('Presentation', () => {
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#navigation-automated
   test('Skip slide @ci', async ({ browser, context, page }) => {
     const presentation = new Presentation(browser, context);
     await presentation.initPages(page);
     await presentation.skipSlide();
   });
 
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#minimizerestore-presentation-automated
   test('Hide/Restore presentation @ci', async ({ browser, context, page }) => {
     const presentation = new Presentation(browser, context);
     await presentation.initPages(page);
     await presentation.hideAndRestorePresentation();
   });
 
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#start-youtube-video-sharing
   test('Start external video', async ({ browser, context, page }) => {
     const presentation = new Presentation(browser, context);
     await presentation.initPages(page);
     await presentation.startExternalVideo();
   });
 
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#fit-to-width-option
   test('Presentation fit to width', async ({ browser, context, page }) => {
     const presentation = new Presentation(browser, context);
     await presentation.initPages(page);
@@ -27,7 +31,7 @@ test.describe.parallel('Presentation', () => {
   });
 
   test.describe.parallel('Manage', () => {
-    // https://docs.bigbluebutton.org/2.5/release-tests.html#uploading-a-presentation-automated
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#uploading-a-presentation-automated
     test('Upload single presentation @ci', async ({ browser, context, page }) => {
       test.fixme(true, 'Different behaviors in the development and production environment');
       const presentation = new Presentation(browser, context);
@@ -35,13 +39,14 @@ test.describe.parallel('Presentation', () => {
       await presentation.uploadSinglePresentationTest();
     });
 
-    // https://docs.bigbluebutton.org/2.5/release-tests.html#uploading-multiple-presentations-automated
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#uploading-multiple-presentations-automated
     test('Upload multiple presentations', async ({ browser, context, page }) => {
       const presentation = new Presentation(browser, context);
       await presentation.initPages(page, true);
       await presentation.uploadMultiplePresentationsTest();
     });
 
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#enabling-and-disabling-presentation-download-automated
     test.skip('Allow and disallow presentation download @ci', async ({ browser, context, page }, testInfo) => {
       const presentation = new Presentation(browser, context);
       await presentation.initPages(page);
diff --git a/bigbluebutton-tests/playwright/screenshare/screenshare.spec.js b/bigbluebutton-tests/playwright/screenshare/screenshare.spec.js
index 1ca9489ab9..e1771f3941 100644
--- a/bigbluebutton-tests/playwright/screenshare/screenshare.spec.js
+++ b/bigbluebutton-tests/playwright/screenshare/screenshare.spec.js
@@ -2,6 +2,7 @@ const { test, devices } = require('@playwright/test');
 const { ScreenShare } = require('./screenshare');
 
 test.describe.parallel('Screenshare', () => {
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#sharing-screen-in-full-screen-mode-automated
   test('Share screen @ci', async ({ browser, page }) => {
     const screenshare = new ScreenShare(browser, page);
     await screenshare.init(true, true);
diff --git a/bigbluebutton-tests/playwright/settings/settings.spec.js b/bigbluebutton-tests/playwright/settings/settings.spec.js
index 51c7045a2b..20ef8dd924 100644
--- a/bigbluebutton-tests/playwright/settings/settings.spec.js
+++ b/bigbluebutton-tests/playwright/settings/settings.spec.js
@@ -2,6 +2,7 @@ const { test } = require('@playwright/test');
 const { Language } = require('./language');
 
 test.describe.parallel('Settings', () => {
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#sharing-screen-in-full-screen-mode-automated
   test(`Locales`, async ({ browser, page }) => {
     const language = new Language(browser, page);
     await language.init(true, true);
diff --git a/bigbluebutton-tests/playwright/user/user.spec.js b/bigbluebutton-tests/playwright/user/user.spec.js
index 06bb710242..e223e6f230 100644
--- a/bigbluebutton-tests/playwright/user/user.spec.js
+++ b/bigbluebutton-tests/playwright/user/user.spec.js
@@ -9,7 +9,7 @@ const iPhone11 = devices['iPhone 11'];
 
 test.describe.parallel('User', () => {
   test.describe.parallel('Actions', () => {
-    // https://docs.bigbluebutton.org/2.5/release-tests.html#set-status--raise-hand-automated
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#set-status--raise-hand-automated
     test('Raise and lower Hand Toast', async ({ browser, context, page }) => {
       const multiusers = new MultiUsers(browser, context);
       await multiusers.initModPage(page, true);
@@ -24,7 +24,7 @@ test.describe.parallel('User', () => {
   });
 
   test.describe.parallel('List', () => {
-    // https://docs.bigbluebutton.org/2.5/release-tests.html#set-status--raise-hand-automated
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#set-status--raise-hand-automated
     test('Change user status @ci', async ({ browser, page }) => {
       const status = new Status(browser, page);
       await status.init(true, true);
@@ -37,12 +37,14 @@ test.describe.parallel('User', () => {
       await multiusers.userPresence();
     });
 
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#make-viewer-a-presenter-automated
     test('Make presenter @ci', async ({ browser, context, page }) => {
       const multiusers = new MultiUsers(browser, context);
       await multiusers.initPages(page);
       await multiusers.makePresenter();
     });
 
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#taking-presenter-status-back-automated
     test('Take presenter @ci', async ({ browser, context, page }) => {
       const multiusers = new MultiUsers(browser, context);
       await multiusers.initModPage(page);
@@ -86,6 +88,7 @@ test.describe.parallel('User', () => {
     });
 
     test.describe.parallel('Lock viewers @ci', () => {
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#webcam
       test('Lock Share webcam', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -93,6 +96,7 @@ test.describe.parallel('User', () => {
         await lockViewers.lockShareWebcam();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#see-other-viewers-webcams
       test('Lock See other viewers webcams', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -100,6 +104,7 @@ test.describe.parallel('User', () => {
         await lockViewers.lockSeeOtherViewersWebcams();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#microphone
       test('Lock Share microphone', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -107,6 +112,7 @@ test.describe.parallel('User', () => {
         await lockViewers.lockShareMicrophone();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#public-chat
       test('Lock Send public chat messages', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -114,6 +120,7 @@ test.describe.parallel('User', () => {
         await lockViewers.lockSendPublicChatMessages();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#private-chat
       test('Lock Send private chat messages', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -121,12 +128,14 @@ test.describe.parallel('User', () => {
         await lockViewers.lockSendPrivateChatMessages();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#shared-notes-1
       test('Lock Edit Shared Notes', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
         await lockViewers.lockEditSharedNotes();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#see-other-viewers-in-the-users-list
       test('Lock See other viewers in the Users list', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -134,6 +143,7 @@ test.describe.parallel('User', () => {
         await lockViewers.lockSeeOtherViewersUserList();
       });
 
+      // https://docs.bigbluebutton.org/2.6/release-tests.html#unlock-a-specific-user
       test('Unlock a user', async ({ browser, context, page }) => {
         const lockViewers = new LockViewers(browser, context);
         await lockViewers.initPages(page);
@@ -142,6 +152,7 @@ test.describe.parallel('User', () => {
       });
     });
 
+    // https://docs.bigbluebutton.org/2.6/release-tests.html#saving-usernames
     test('Save user names', async ({ browser, context, page }, testInfo) => {
       const multiusers = new MultiUsers(browser, context);
       await multiusers.initPages(page);
diff --git a/bigbluebutton-tests/playwright/webcam/webcam.spec.js b/bigbluebutton-tests/playwright/webcam/webcam.spec.js
index 739e0c471b..80a147919b 100644
--- a/bigbluebutton-tests/playwright/webcam/webcam.spec.js
+++ b/bigbluebutton-tests/playwright/webcam/webcam.spec.js
@@ -2,7 +2,7 @@ const { test } = require('@playwright/test');
 const { Webcam } = require('./webcam');
 
 test.describe.parallel('Webcam @ci', () => {
-  // https://docs.bigbluebutton.org/2.5/release-tests.html#joining-webcam-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#joining-webcam-automated
   test('Shares webcam', async ({ browser, page }) => {
     const webcam = new Webcam(browser, page);
     await webcam.init(true, true);

From c6f405667744ac555e68aae1384147ac6ee26e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Souza?= <contato@ramonsouza.com>
Date: Mon, 25 Jul 2022 16:53:19 -0300
Subject: [PATCH 28/50] fix chat resizing in RTL

---
 .../imports/ui/components/chat/component.jsx           |  2 ++
 .../ui/components/chat/time-window-list/component.jsx  | 10 +++++++---
 .../ui/components/sidebar-content/component.jsx        |  2 +-
 bigbluebutton-html5/imports/utils/dom-utils.js         |  5 +++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/component.jsx
index 2641232cd6..3d978365e5 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/component.jsx
@@ -53,6 +53,7 @@ const Chat = (props) => {
     syncing,
     syncedPercent,
     lastTimeWindowValuesBuild,
+    width,
   } = props;
 
   const userSentMessage = UserSentMessageCollection.findOne({ userId: Auth.userID, sent: true });
@@ -136,6 +137,7 @@ const Chat = (props) => {
           syncedPercent,
           lastTimeWindowValuesBuild,
           userSentMessage,
+          width,
         }}
       />
       <MessageFormContainer
diff --git a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/component.jsx
index 9f25673a92..30104892f8 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/component.jsx
@@ -7,6 +7,7 @@ import { AutoSizer,CellMeasurer, CellMeasurerCache } from 'react-virtualized';
 import Styled from './styles';
 import ChatLogger from '/imports/ui/components/chat/chat-logger/ChatLogger';
 import TimeWindowChatItem from './time-window-chat-item/container';
+import { convertRemToPixels } from '/imports/utils/dom-utils';
 
 const CHAT_CONFIG = Meteor.settings.public.chat;
 const SYSTEM_CHAT_TYPE = CHAT_CONFIG.type_system;
@@ -271,6 +272,7 @@ class TimeWindowList extends PureComponent {
   render() {
     const {
       timeWindowsValues,
+      width,
     } = this.props;
     const {
       scrollArea,
@@ -285,6 +287,8 @@ class TimeWindowList extends PureComponent {
       && !userScrolledBack
     );
 
+    const paddingValue = convertRemToPixels(2);
+
     return (
       [
         <Styled.MessageListWrapper
@@ -306,8 +310,8 @@ class TimeWindowList extends PureComponent {
           aria-live="polite"
           ref={node => this.messageListWrapper = node}
         >
-          <AutoSizer>
-            {({ height, width }) => {
+          <AutoSizer disableWidth>
+            {({ height }) => {
               if (width !== this.lastWidth) {
                 this.lastWidth = width;
                 this.cache.clearAll();
@@ -328,7 +332,7 @@ class TimeWindowList extends PureComponent {
                   rowRenderer={this.rowRender}
                   rowCount={timeWindowsValues.length}
                   height={height}
-                  width={width}
+                  width={width - paddingValue}
                   overscanRowCount={0}
                   deferredMeasurementCache={this.cache}
                   scrollToIndex={shouldAutoScroll ? scrollPosition : undefined}
diff --git a/bigbluebutton-html5/imports/ui/components/sidebar-content/component.jsx b/bigbluebutton-html5/imports/ui/components/sidebar-content/component.jsx
index 91665aabbc..b6795ceee0 100644
--- a/bigbluebutton-html5/imports/ui/components/sidebar-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/sidebar-content/component.jsx
@@ -134,7 +134,7 @@ const SidebarContent = (props) => {
       <ErrorBoundary
         Fallback={FallbackView}
       >
-        <ChatContainer />
+        <ChatContainer width={width}/>
       </ErrorBoundary>
       )}
       {sidebarContentPanel === PANELS.SHARED_NOTES && <NotesContainer />}
diff --git a/bigbluebutton-html5/imports/utils/dom-utils.js b/bigbluebutton-html5/imports/utils/dom-utils.js
index c110487cda..c332c9da69 100644
--- a/bigbluebutton-html5/imports/utils/dom-utils.js
+++ b/bigbluebutton-html5/imports/utils/dom-utils.js
@@ -21,7 +21,12 @@ export const unregisterTitleView = () => {
     title.text = data.join(' - ');
 };
 
+export const convertRemToPixels = (rem) => {
+    return rem * parseFloat(getComputedStyle(document.documentElement).fontSize);
+}
+
 export default {
   registerTitleView,
   unregisterTitleView,
+  convertRemToPixels,
 };

From 279c3e71e24dfc01c629669c7da1f2d0d7254f72 Mon Sep 17 00:00:00 2001
From: Brent Baccala <cosine@freesoft.org>
Date: Tue, 26 Jul 2022 15:51:56 -0400
Subject: [PATCH 29/50] webcamContentCheck: use browser's SHA-1 hash from Web
 Crypto API instead of a custom hash function

---
 bigbluebutton-tests/playwright/webcam/util.js | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/bigbluebutton-tests/playwright/webcam/util.js b/bigbluebutton-tests/playwright/webcam/util.js
index 9f4e7272a9..03eca44ae3 100644
--- a/bigbluebutton-tests/playwright/webcam/util.js
+++ b/bigbluebutton-tests/playwright/webcam/util.js
@@ -13,39 +13,18 @@ async function webcamContentCheck(test) {
   let check;
   for (let i = repeats; i >= 1; i--) {
     console.log(`loop ${i}`);
-    const checkCameras = () => {
+    const checkCameras = async () => {
       const videos = document.querySelectorAll('video');
       const lastVideoHash = document.lastVideoHash || {};
       document.lastVideoHash = lastVideoHash;
 
-      // If this code was running in the playwright test harness, we
-      // could just require('sha1'), but it's running in the test
-      // browser via test.page.evaluate, and I'm not sure how to get a
-      // node module (like sha1) into the test browser.  So I just
-      // found a nice hash function on the Internet.  -bwb
-
-      // public domain code from https://stackoverflow.com/a/52171480/1493790
-      // and/or https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
-
-      const cyrb53 = function(array, seed = 0) {
-          let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
-          for (let i = 0, ch; i < array.length; i++) {
-              ch = array[i];
-              h1 = Math.imul(h1 ^ ch, 2654435761);
-              h2 = Math.imul(h2 ^ ch, 1597334677);
-          }
-          h1 = Math.imul(h1 ^ (h1>>>16), 2246822507) ^ Math.imul(h2 ^ (h2>>>13), 3266489909);
-          h2 = Math.imul(h2 ^ (h2>>>16), 2246822507) ^ Math.imul(h1 ^ (h1>>>13), 3266489909);
-          return 4294967296 * (2097151 & h2) + (h1>>>0);
-      };
-
       for (let v = 0; v < videos.length; v++) {
         const video = videos[v];
         const canvas = document.createElement('canvas');
         const context = canvas.getContext('2d');
         context.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
         const pixel = context.getImageData(0, 0, video.videoWidth, video.videoHeight).data;
-        const pixelHash = cyrb53(pixel);
+        const pixelHash = await window.crypto.subtle.digest('SHA-1', pixel);
 
         if (lastVideoHash[v]) {
           if (lastVideoHash[v] == pixelHash) {
@@ -57,7 +36,7 @@ async function webcamContentCheck(test) {
       return true;
     };
 
-    check = await test.page.evaluate(checkCameras, i);
+    check = await test.page.evaluate(checkCameras);
     if (!check) return false;
     await sleep(LOOP_INTERVAL);
   }

From 6f33111ea49f31752de3033107ee9cb71fb8abd8 Mon Sep 17 00:00:00 2001
From: GuiLeme <leme.guilherme.p@gmail.com>
Date: Wed, 27 Jul 2022 10:24:07 -0300
Subject: [PATCH 30/50] [issue-15439] - fix typo in presentation scripts

---
 .../presentation/scripts/publish/presentation.rb                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/record-and-playback/presentation/scripts/publish/presentation.rb b/record-and-playback/presentation/scripts/publish/presentation.rb
index 38ad1049e5..86b7dfc8ee 100755
--- a/record-and-playback/presentation/scripts/publish/presentation.rb
+++ b/record-and-playback/presentation/scripts/publish/presentation.rb
@@ -39,7 +39,7 @@ filepathPresOverride = "/etc/bigbluebutton/recording/presentation.yml"
 hasOverride = File.file?(filepathPresOverride)
 if (hasOverride)
   presOverrideProps = YAML::load(File.open(filepathPresOverride))
-  $presentation_props = $presentation_props.merge(presOverrideProps)
+  @presentation_props = @presentation_props.merge(presOverrideProps)
 end
 
 # There's a couple of places where stuff is mysteriously divided or multiplied

From ecc8c2dd1b4d8ce25d2f455c2dd68f8bcbb65719 Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Wed, 27 Jul 2022 16:49:25 +0200
Subject: [PATCH 31/50] feat(lint): add eslint to bbb-export-annotations

---
 bbb-export-annotations/.eslintrc.js         |   18 +
 bbb-export-annotations/master.js            |   96 +-
 bbb-export-annotations/package-lock.json    | 1660 +++++++++++++++++++
 bbb-export-annotations/package.json         |    7 +-
 bbb-export-annotations/workers/collector.js |  148 +-
 bbb-export-annotations/workers/notifier.js  |  114 +-
 bbb-export-annotations/workers/process.js   | 1223 +++++++-------
 7 files changed, 2497 insertions(+), 769 deletions(-)
 create mode 100644 bbb-export-annotations/.eslintrc.js

diff --git a/bbb-export-annotations/.eslintrc.js b/bbb-export-annotations/.eslintrc.js
new file mode 100644
index 0000000000..f8e1965746
--- /dev/null
+++ b/bbb-export-annotations/.eslintrc.js
@@ -0,0 +1,18 @@
+module.exports = {
+  'env': {
+    'commonjs': true,
+    'es2021': true,
+    'node': true,
+  },
+  'extends': [
+    'eslint:recommended',
+  ],
+  'parserOptions': {
+    'ecmaVersion': 'latest',
+  },
+  'rules': {
+    'require-jsdoc': 0,
+    'camelcase': 0,
+    'max-len': 0,
+  },
+};
diff --git a/bbb-export-annotations/master.js b/bbb-export-annotations/master.js
index e1437f37e8..21d7a76c62 100644
--- a/bbb-export-annotations/master.js
+++ b/bbb-export-annotations/master.js
@@ -2,61 +2,69 @@ const Logger = require('./lib/utils/logger');
 const config = require('./config');
 const fs = require('fs');
 const redis = require('redis');
-const { commandOptions } = require('redis');
-const { Worker } = require('worker_threads');
+const {commandOptions} = require('redis');
+const {Worker} = require('worker_threads');
 const path = require('path');
 
 const logger = new Logger('presAnn Master');
-logger.info("Running bbb-export-annotations");
+logger.info('Running bbb-export-annotations');
 
 const kickOffCollectorWorker = (jobId) => {
-    return new Promise((resolve, reject) => {
-        const worker = new Worker(path.join(__dirname, 'workers', 'collector.js'), { workerData: jobId });
-        worker.on('message', resolve);
-        worker.on('error', reject);
-        worker.on('exit', (code) => {
-            if (code !== 0)
-                reject(new Error(`PresAnn Collector Worker stopped with exit code ${code}`));
-        })
-    })
-}
+  return new Promise((resolve, reject) => {
+    const collectorPath = path.join(__dirname, 'workers', 'collector.js');
+    const worker = new Worker(collectorPath, {workerData: jobId});
+    worker.on('message', resolve);
+    worker.on('error', reject);
+    worker.on('exit', (code) => {
+      if (code !== 0) {
+        reject(new Error(`Collector Worker stopped with exit code ${code}`));
+      }
+    });
+  });
+};
 
 (async () => {
-    const client = redis.createClient({
-        host: config.redis.host,
-        port: config.redis.port,
-        password: config.redis.password
-      });
-    
-    await client.connect();
-    
-    client.on('error', (err) => logger.info('Redis Client Error', err));
+  const client = redis.createClient({
+    host: config.redis.host,
+    port: config.redis.port,
+    password: config.redis.password,
+  });
 
-    async function waitForJobs () {
-        const queue = client.blPop(
-            commandOptions({ isolated: true }),
-            config.redis.channels.queue,
-            0
-        );
+  await client.connect();
 
-        let job = await queue;
-        
-        logger.info('Received job', job.element);
-        const exportJob = JSON.parse(job.element);
-        
-        // Create folder in dropbox
-        let dropbox = path.join(config.shared.presAnnDropboxDir, exportJob.jobId);
-        fs.mkdirSync(dropbox, { recursive: true })
-    
-        // Drop job into dropbox as JSON
-        fs.writeFile(path.join(dropbox, 'job'), job.element, function(err) {
-            if(err) { return logger.error(err); }
-        });
+  client.on('error', (err) => logger.info('Redis Client Error', err));
 
-        kickOffCollectorWorker(exportJob.jobId)
+  /**
+   * Pops new export requests from a Redis queue, blocking the
+   * connection otherwise.
+   */
+  async function waitForJobs() {
+    const queue = client.blPop(
+        commandOptions({isolated: true}),
+        config.redis.channels.queue,
+        0,
+    );
 
-        waitForJobs();
-    }
+    const job = await queue;
+
+    logger.info('Received job', job.element);
+    const exportJob = JSON.parse(job.element);
+
+    // Create folder in dropbox
+    const dropbox = path.join(config.shared.presAnnDropboxDir, exportJob.jobId);
+    fs.mkdirSync(dropbox, {recursive: true});
+
+    // Drop job into dropbox as JSON
+    fs.writeFile(path.join(dropbox, 'job'), job.element, function(err) {
+      if (err) {
+        return logger.error(err);
+      }
+    });
+
+    kickOffCollectorWorker(exportJob.jobId);
 
     waitForJobs();
+  }
+
+  waitForJobs();
 })();
diff --git a/bbb-export-annotations/package-lock.json b/bbb-export-annotations/package-lock.json
index c4d12807d4..4f7a91ce6b 100644
--- a/bbb-export-annotations/package-lock.json
+++ b/bbb-export-annotations/package-lock.json
@@ -15,8 +15,98 @@
         "redis": "^4.0.3",
         "sanitize-filename": "^1.6.3",
         "xmlbuilder2": "^3.0.2"
+      },
+      "devDependencies": {
+        "eslint": "^8.20.0",
+        "eslint-config-google": "^0.14.0"
       }
     },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
     "node_modules/@node-redis/bloom": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@node-redis/bloom/-/bloom-1.0.1.tgz",
@@ -120,6 +210,73 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.16.tgz",
       "integrity": "sha512-ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA=="
     },
+    "node_modules/acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -133,6 +290,47 @@
         "follow-redirects": "^1.14.8"
       }
     },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/cluster-key-slot": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
@@ -141,6 +339,24 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -152,6 +368,26 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -160,6 +396,12 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -168,6 +410,180 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
+      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.2",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-google": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
+      "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/espree": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.7.1",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -180,6 +596,97 @@
         "node": ">=4"
       }
     },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
+      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
+      "dev": true
+    },
     "node_modules/follow-redirects": {
       "version": "1.14.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -212,6 +719,18 @@
         "node": ">= 6"
       }
     },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
     "node_modules/generic-pool": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
@@ -220,6 +739,62 @@
         "node": ">= 4"
       }
     },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -231,6 +806,120 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -255,11 +944,29 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
     "node_modules/needle": {
       "version": "2.9.1",
       "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
@@ -276,11 +983,76 @@
         "node": ">= 4.4.x"
       }
     },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/perfect-freehand": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/perfect-freehand/-/perfect-freehand-1.0.16.tgz",
       "integrity": "sha512-D4+avUeR8CHSl2vaPbPYX/dNpSMRYO3VOFp7qSSc+LRkSgzQbLATVnXosy7VxtsSHEh1C5t8K8sfmo0zCVnfWQ=="
     },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/probe-image-size": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.2.3.tgz",
@@ -291,6 +1063,15 @@
         "stream-parser": "~0.3.1"
       }
     },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/redis": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/redis/-/redis-4.0.3.tgz",
@@ -323,6 +1104,42 @@
         "node": ">=4"
       }
     },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -341,6 +1158,27 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -367,6 +1205,48 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
     "node_modules/truncate-utf8-bytes": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -375,11 +1255,80 @@
         "utf8-byte-length": "^1.0.1"
       }
     },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
     "node_modules/utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
       "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
     },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
     "node_modules/xmlbuilder2": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-3.0.2.tgz",
@@ -422,6 +1371,74 @@
     }
   },
   "dependencies": {
+    "@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
     "@node-redis/bloom": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@node-redis/bloom/-/bloom-1.0.1.tgz",
@@ -500,6 +1517,52 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.16.tgz",
       "integrity": "sha512-ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA=="
     },
+    "acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -513,11 +1576,58 @@
         "follow-redirects": "^1.14.8"
       }
     },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
     "cluster-key-slot": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
       "integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
     },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -526,6 +1636,23 @@
         "delayed-stream": "~1.0.0"
       }
     },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
     "debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -534,16 +1661,221 @@
         "ms": "^2.1.1"
       }
     },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz",
+      "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==",
+      "dev": true,
+      "requires": {
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.2",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-config-google": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
+      "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.7.1",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
+      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
+      "dev": true
+    },
     "follow-redirects": {
       "version": "1.14.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -559,11 +1891,61 @@
         "mime-types": "^2.1.12"
       }
     },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
     "generic-pool": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
       "integrity": "sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="
     },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -572,6 +1954,96 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -590,11 +2062,26 @@
         "mime-db": "1.51.0"
       }
     },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
     "needle": {
       "version": "2.9.1",
       "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
@@ -605,11 +2092,61 @@
         "sax": "^1.2.4"
       }
     },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
     "perfect-freehand": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/perfect-freehand/-/perfect-freehand-1.0.16.tgz",
       "integrity": "sha512-D4+avUeR8CHSl2vaPbPYX/dNpSMRYO3VOFp7qSSc+LRkSgzQbLATVnXosy7VxtsSHEh1C5t8K8sfmo0zCVnfWQ=="
     },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
     "probe-image-size": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.2.3.tgz",
@@ -620,6 +2157,12 @@
         "stream-parser": "~0.3.1"
       }
     },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
     "redis": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/redis/-/redis-4.0.3.tgz",
@@ -646,6 +2189,27 @@
         "redis-errors": "^1.0.0"
       }
     },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -664,6 +2228,21 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -692,6 +2271,36 @@
         }
       }
     },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
     "truncate-utf8-bytes": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -700,11 +2309,62 @@
         "utf8-byte-length": "^1.0.1"
       }
     },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
       "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
     },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
     "xmlbuilder2": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-3.0.2.tgz",
diff --git a/bbb-export-annotations/package.json b/bbb-export-annotations/package.json
index dc2756cbfa..c1642e3914 100644
--- a/bbb-export-annotations/package.json
+++ b/bbb-export-annotations/package.json
@@ -3,7 +3,8 @@
   "version": "0.0.1",
   "description": "BigBlueButton's Presentation Annotation Exporter",
   "scripts": {
-    "start": "node master.js"
+    "start": "node master.js",
+    "lint:fix": "eslint --fix **/*.js"
   },
   "dependencies": {
     "axios": "^0.26.0",
@@ -13,5 +14,9 @@
     "redis": "^4.0.3",
     "sanitize-filename": "^1.6.3",
     "xmlbuilder2": "^3.0.2"
+  },
+  "devDependencies": {
+    "eslint": "^8.20.0",
+    "eslint-config-google": "^0.14.0"
   }
 }
diff --git a/bbb-export-annotations/workers/collector.js b/bbb-export-annotations/workers/collector.js
index 5bfc15c7c2..9618561306 100644
--- a/bbb-export-annotations/workers/collector.js
+++ b/bbb-export-annotations/workers/collector.js
@@ -2,106 +2,104 @@ const Logger = require('../lib/utils/logger');
 const config = require('../config');
 const fs = require('fs');
 const redis = require('redis');
-const { Worker, workerData, parentPort } = require('worker_threads');
+const {Worker, workerData, parentPort} = require('worker_threads');
 const path = require('path');
-const { execSync } = require("child_process");
+const {execSync} = require('child_process');
 
 const jobId = workerData;
 
 const logger = new Logger('presAnn Collector');
-logger.info("Collecting job " + jobId);
+logger.info('Collecting job ' + jobId);
 
 const kickOffProcessWorker = (jobId) => {
   return new Promise((resolve, reject) => {
-      const worker = new Worker('./workers/process.js', { workerData: jobId });
-      worker.on('message', resolve);
-      worker.on('error', reject);
-      worker.on('exit', (code) => {
-          if (code !== 0)
-              reject(new Error(`PresAnn Process Worker stopped with exit code ${code}`));
-      })
-  })
-}
+    const worker = new Worker('./workers/process.js', {workerData: jobId});
+    worker.on('message', resolve);
+    worker.on('error', reject);
+    worker.on('exit', (code) => {
+      if (code !== 0) {
+        reject(new Error(`Process Worker stopped with exit code ${code}`));
+      }
+    });
+  });
+};
 
 const dropbox = path.join(config.shared.presAnnDropboxDir, jobId);
 
 // Takes the Job from the dropbox
-let job = fs.readFileSync(path.join(dropbox, 'job'));
-let exportJob = JSON.parse(job);
+const job = fs.readFileSync(path.join(dropbox, 'job'));
+const exportJob = JSON.parse(job);
 
 // Collect the annotations from Redis
 (async () => {
-    const client = redis.createClient({
-        host: config.redis.host,
-        port: config.redis.port,
-        password: config.redis.password
-      });
-  
-    client.on('error', (err) => logger.info('Redis Client Error', err));
+  const client = redis.createClient({
+    host: config.redis.host,
+    port: config.redis.port,
+    password: config.redis.password,
+  });
 
-    await client.connect();
-    
-    let presAnn = await client.hGetAll(exportJob.jobId);
-    
-    // Remove annotations from Redis
-    await client.DEL(jobId);
+  client.on('error', (err) => logger.info('Redis Client Error', err));
 
-    client.disconnect();
+  await client.connect();
 
-    let annotations = JSON.stringify(presAnn);
+  const presAnn = await client.hGetAll(exportJob.jobId);
 
-    let whiteboard = JSON.parse(annotations);
-    let pages = JSON.parse(whiteboard.pages);
-    
-    fs.writeFile(path.join(dropbox, 'whiteboard'), annotations, function(err) {
-      if(err) { return logger.error(err); }
-    });
+  // Remove annotations from Redis
+  await client.del(jobId);
 
-    // Collect the Presentation Page files (PDF / PNG / JPEG) from the presentation directory
-    let presentationFile = path.join(exportJob.presLocation, exportJob.presId);
-    let pdfFile = `${presentationFile}.pdf`
+  client.disconnect();
 
-    if (fs.existsSync(pdfFile)) {
+  const annotations = JSON.stringify(presAnn);
 
-      for (let p of pages) {
-        let pageNumber = p.page;
-        let outputFile = path.join(dropbox, `slide${pageNumber}`);
-        
-        // CairoSVG doesn't handle transparent SVG and PNG embeds properly, e.g., in rasterized text.
-        // So textboxes may get a black background when downloading/exporting repeatedly.
-        // To avoid that, we take slides from the uploaded file, but later probe the dimensions from the SVG
-        // so it matches what was shown in the browser.
+  const whiteboard = JSON.parse(annotations);
+  const pages = JSON.parse(whiteboard.pages);
 
-        let extract_png_from_pdf = [
-          'pdftocairo',
-          '-png',
-          '-f', pageNumber, 
-          '-l', pageNumber,
-          '-scale-to', config.collector.pngWidthRasterizedSlides,
-          '-singlefile',
-          '-cropbox',
-          pdfFile, outputFile,
-        ].join(' ')
-
-        execSync(extract_png_from_pdf);
-      }
+  fs.writeFile(path.join(dropbox, 'whiteboard'), annotations, function(err) {
+    if (err) {
+      return logger.error(err);
     }
+  });
 
-    // If PNG file already available
-    else if (fs.existsSync(`${presentationFile}.png`)) {
-      fs.copyFileSync(`${presentationFile}.png`, path.join(dropbox, 'slide1.png'));
-    }
-  
-    // If JPEG file available
-    else if (fs.existsSync(`${presentationFile}.jpeg`)) {
-      fs.copyFileSync(`${presentationFile}.jpeg`, path.join(dropbox, 'slide1.jpeg'));
+  // Collect the presentation page files (PDF / PNG / JPEG)
+  // from the presentation directory
+  const presFile = path.join(exportJob.presLocation, exportJob.presId);
+  const pdfFile = `${presFile}.pdf`;
+
+  if (fs.existsSync(pdfFile)) {
+    for (const p of pages) {
+      const pageNumber = p.page;
+      const outputFile = path.join(dropbox, `slide${pageNumber}`);
+
+      // CairoSVG doesn't handle transparent SVG and PNG embeds properly,
+      // e.g., in rasterized text. So textboxes may get a black background
+      // when downloading/exporting repeatedly. To avoid that, we take slides
+      // from the uploaded file, but later probe the dimensions from the SVG
+      // so it matches what was shown in the browser.
+
+      const extract_png_from_pdf = [
+        'pdftocairo',
+        '-png',
+        '-f', pageNumber,
+        '-l', pageNumber,
+        '-scale-to', config.collector.pngWidthRasterizedSlides,
+        '-singlefile',
+        '-cropbox',
+        pdfFile, outputFile,
+      ].join(' ');
+
+      execSync(extract_png_from_pdf);
     }
+  // If PNG file already available
+  } else if (fs.existsSync(`${presFile}.png`)) {
+    fs.copyFileSync(`${presFile}.png`, path.join(dropbox, 'slide1.png'));
+  // If JPEG file available
+  } else if (fs.existsSync(`${presFile}.jpeg`)) {
+    fs.copyFileSync(`${presFile}.jpeg`, path.join(dropbox, 'slide1.jpeg'));
+  } else {
+    return logger.error(`Could not find presentation file ${exportJob.jobId}`);
+  }
 
-    else {
-      return logger.error(`Could not find whiteboard presentation file for job ${exportJob.jobId}`);
-    }
+  kickOffProcessWorker(exportJob.jobId);
+})();
 
-    kickOffProcessWorker(exportJob.jobId);
-})()
-
-parentPort.postMessage({ message: workerData })
+parentPort.postMessage({message: workerData});
diff --git a/bbb-export-annotations/workers/notifier.js b/bbb-export-annotations/workers/notifier.js
index 8f83554dd1..de143ba495 100644
--- a/bbb-export-annotations/workers/notifier.js
+++ b/bbb-export-annotations/workers/notifier.js
@@ -6,79 +6,85 @@ const redis = require('redis');
 const axios = require('axios').default;
 const path = require('path');
 
-const { workerData, parentPort } = require('worker_threads')
+const {workerData, parentPort} = require('worker_threads');
 
 const [jobType, jobId, filename] = workerData;
 
 const logger = new Logger('presAnn Notifier Worker');
 
-const dropbox = `${config.shared.presAnnDropboxDir}/${jobId}`
-let job = fs.readFileSync(path.join(dropbox, 'job'));
-let exportJob = JSON.parse(job);
+const dropbox = `${config.shared.presAnnDropboxDir}/${jobId}`;
+const job = fs.readFileSync(path.join(dropbox, 'job'));
+const exportJob = JSON.parse(job);
 
+/** Notify Meeting Actor of file availability by
+ * sending a message through Redis PubSub */
 async function notifyMeetingActor() {
-    const client = redis.createClient({
-        host: config.redis.host,
-        port: config.redis.port,
-        password: config.redis.password
-    });
+  const client = redis.createClient({
+    host: config.redis.host,
+    port: config.redis.port,
+    password: config.redis.password,
+  });
 
-    await client.connect();
-    client.on('error', (err) => logger.info('Redis Client Error', err));
+  await client.connect();
+  client.on('error', (err) => logger.info('Redis Client Error', err));
+  const link = `${config.notifier.protocol}://${config.notifier.host}/bigbluebutton/presentation/${exportJob.parentMeetingId}/${exportJob.parentMeetingId}/${exportJob.presId}/pdf/${jobId}/${filename}.pdf`;
+  const notification = {
+    envelope: {
+      name: config.notifier.msgName,
+      routing: {
+        sender: exportJob.module,
+      },
+      timestamp: (new Date()).getTime(),
+    },
+    core: {
+      header: {
+        name: config.notifier.msgName,
+        meetingId: exportJob.parentMeetingId,
+        userId: '',
+      },
+      body: {
+        fileURI: link,
+        presId: exportJob.presId,
+      },
+    },
+  };
 
-    let link = `${config.notifier.protocol}://${config.notifier.host}/bigbluebutton/presentation/${exportJob.parentMeetingId}/${exportJob.parentMeetingId}/${exportJob.presId}/pdf/${jobId}/${filename}.pdf`;
-    // Notify Meeting Actor of file availability by sending a message through Redis PubSub
-    const notification = {
-        envelope: {
-            name: config.notifier.msgName,
-            routing: {
-                sender: exportJob.module
-            },
-            timestamp: (new Date()).getTime(),
-        },
-        core: {
-            header: {
-                name: config.notifier.msgName,
-                meetingId: exportJob.parentMeetingId,
-                userId: ""
-            },
-            body: {
-                fileURI: link,
-                presId: exportJob.presId
-            },
-          }
-    }
-
-    logger.info(`Annotated PDF available at ${link}`);
-    await client.publish(config.redis.channels.publish, JSON.stringify(notification));
-    client.disconnect();
+  logger.info(`Annotated PDF available at ${link}`);
+  await client.publish(config.redis.channels.publish,
+      JSON.stringify(notification));
+  client.disconnect();
 }
 
-async function upload(exportJob) {
-    let callbackUrl = `http://${config.bbbWeb.host}:${config.bbbWeb.port}/bigbluebutton/presentation/${exportJob.presentationUploadToken}/upload`
-    let formData = new FormData();
+/** Upload PDF to a BBB room */
+async function upload() {
+  const callbackUrl = `http://${config.bbbWeb.host}:${config.bbbWeb.port}/bigbluebutton/presentation/${exportJob.presentationUploadToken}/upload`;
+  const formData = new FormData();
+  const file = `${exportJob.presLocation}/pdfs/${jobId}/${filename}.pdf`;
 
-    formData.append('conference', exportJob.parentMeetingId);
-    formData.append('pod_id', config.notifier.pod_id);
-    formData.append('is_downloadable', config.notifier.is_downloadable);
-    formData.append('temporaryPresentationId', jobId);
-    formData.append('fileUpload', fs.createReadStream(`${exportJob.presLocation}/pdfs/${jobId}/${filename}.pdf`));
+  formData.append('conference', exportJob.parentMeetingId);
+  formData.append('pod_id', config.notifier.pod_id);
+  formData.append('is_downloadable', config.notifier.is_downloadable);
+  formData.append('temporaryPresentationId', jobId);
+  formData.append('fileUpload', fs.createReadStream(file));
 
-    let res = await axios.post(callbackUrl, formData, { headers: formData.getHeaders() });
-    logger.info(`Upload of job ${exportJob.jobId} returned ${res.data}`);
+  const res = await axios.post(callbackUrl, formData,
+      {headers: formData.getHeaders()});
+  logger.info(`Upload of job ${exportJob.jobId} returned ${res.data}`);
 }
 
 if (jobType == 'PresentationWithAnnotationDownloadJob') {
-    notifyMeetingActor();
-
+  notifyMeetingActor();
 } else if (jobType == 'PresentationWithAnnotationExportJob') {
-    upload(exportJob);
-
+  upload();
 } else {
-    logger.error(`Notifier received unknown job type ${jobType}`);
+  logger.error(`Notifier received unknown job type ${jobType}`);
 }
 
 // Delete temporary files
-fs.rm(dropbox, { recursive: true }, (err) => { if (err) { throw err; } });
+fs.rm(dropbox, {recursive: true}, (err) => {
+  if (err) {
+    throw err;
+  }
+});
 
-parentPort.postMessage({ message: workerData })
+parentPort.postMessage({message: workerData});
diff --git a/bbb-export-annotations/workers/process.js b/bbb-export-annotations/workers/process.js
index e44b00f942..a099c2b7c9 100644
--- a/bbb-export-annotations/workers/process.js
+++ b/bbb-export-annotations/workers/process.js
@@ -1,856 +1,889 @@
 const Logger = require('../lib/utils/logger');
 const config = require('../config');
 const fs = require('fs');
-const { create } = require('xmlbuilder2', { encoding: 'utf-8' });
-const { execSync } = require("child_process");
-const { Worker, workerData, parentPort } = require('worker_threads');
+const {create} = require('xmlbuilder2', {encoding: 'utf-8'});
+const {execSync} = require('child_process');
+const {Worker, workerData, parentPort} = require('worker_threads');
 const path = require('path');
 const sanitize = require('sanitize-filename');
-const { getStroke, getStrokePoints } = require('perfect-freehand');
+const {getStroke, getStrokePoints} = require('perfect-freehand');
 const probe = require('probe-image-size');
 
 const jobId = workerData;
 
 const logger = new Logger('presAnn Process Worker');
-logger.info("Processing PDF for job " + jobId);
+logger.info('Processing PDF for job ' + jobId);
 
 const kickOffNotifierWorker = (jobType, filename) => {
-    return new Promise((resolve, reject) => {
-        const worker = new Worker('./workers/notifier.js', { workerData: [jobType, jobId, filename] });
-        worker.on('message', resolve);
-        worker.on('error', reject);
-        worker.on('exit', (code) => {
-            if (code !== 0)
-                reject(new Error(`PresAnn Notifier Worker stopped with exit code ${code}`));
-        })
-    })
-}
+  return new Promise((resolve, reject) => {
+    const notifierPath = './workers/notifier.js';
+    const worker = new Worker(notifierPath,
+        {workerData: [jobType, jobId, filename]});
+    worker.on('message', resolve);
+    worker.on('error', reject);
+    worker.on('exit', (code) => {
+      if (code !== 0) {
+        reject(new Error(`Notifier Worker stopped with exit code ${code}`));
+      }
+    });
+  });
+};
 
 // General utilities for rendering SVGs resembling Tldraw as much as possible
 function align_to_pango(alignment) {
-    switch (alignment) {
-        case 'start': return 'left'
-        case 'middle': return 'center'
-        case 'end': return 'right'
-        case 'justify': return 'justify'
-        default: return 'left'
-    }
+  switch (alignment) {
+    case 'start': return 'left';
+    case 'middle': return 'center';
+    case 'end': return 'right';
+    case 'justify': return 'justify';
+    default: return 'left';
+  }
 }
 
 function color_to_hex(color, isStickyNote = false, isFilled = false) {
-    if (isStickyNote) { color = `sticky-${color}` }
-    if (isFilled) { color = `fill-${color}` }
+  if (isStickyNote) {
+    color = `sticky-${color}`;
+  }
+  if (isFilled) {
+    color = `fill-${color}`;
+  }
 
-    switch (color) {
-        case 'white': return '#1d1d1d'
-        case 'fill-white': return '#fefefe'
-        case 'sticky-white': return '#fddf8e'
-        case 'lightGray': return '#c6cbd1'
-        case 'fill-lightGray': return '#f1f2f3'
-        case 'sticky-lightGray': return '#dde0e3'
-        case 'gray': return '#788492'
-        case 'fill-gray': return '#e3e5e7'
-        case 'sticky-gray': return '#b3b9c1'
-        case 'black': return '#1d1d1d'
-        case 'fill-black': return '#d2d2d2'
-        case 'sticky-black': return '#fddf8e'
-        case 'green': return '#36b24d'
-        case 'fill-green': return '#d7eddb'
-        case 'sticky-green': return '#8ed29b'
-        case 'cyan': return '#0e98ad'
-        case 'fill-cyan': return '#d0e8ec'
-        case 'sticky-cyan': return '#78c4d0'
-        case 'blue': return '#1c7ed6'
-        case 'fill-blue': return '#d2e4f4'
-        case 'sticky-blue': return '#80b6e6'
-        case 'indigo': return '#4263eb'
-        case 'fill-indigo': return '#d9dff7'
-        case 'sticky-indigo': return '#95a7f2'
-        case 'violet': return '#7746f1'
-        case 'fill-violet': return '#e2daf8'
-        case 'sticky-violet': return '#b297f5'
-        case 'red': return '#ff2133'
-        case 'fill-red': return '#fbd3d6'
-        case 'sticky-red': return '#fd838d'
-        case 'orange': return '#ff9433'
-        case 'fill-orange': return '#fbe8d6'
-        case 'sticky-orange': return '#fdc28d'
-        case 'yellow': return '#ffc936'
-        case 'fill-yellow': return '#fbf1d7'
-        case 'sticky-yellow': return '#fddf8e'
+  switch (color) {
+    case 'white': return '#1d1d1d';
+    case 'fill-white': return '#fefefe';
+    case 'sticky-white': return '#fddf8e';
+    case 'lightGray': return '#c6cbd1';
+    case 'fill-lightGray': return '#f1f2f3';
+    case 'sticky-lightGray': return '#dde0e3';
+    case 'gray': return '#788492';
+    case 'fill-gray': return '#e3e5e7';
+    case 'sticky-gray': return '#b3b9c1';
+    case 'black': return '#1d1d1d';
+    case 'fill-black': return '#d2d2d2';
+    case 'sticky-black': return '#fddf8e';
+    case 'green': return '#36b24d';
+    case 'fill-green': return '#d7eddb';
+    case 'sticky-green': return '#8ed29b';
+    case 'cyan': return '#0e98ad';
+    case 'fill-cyan': return '#d0e8ec';
+    case 'sticky-cyan': return '#78c4d0';
+    case 'blue': return '#1c7ed6';
+    case 'fill-blue': return '#d2e4f4';
+    case 'sticky-blue': return '#80b6e6';
+    case 'indigo': return '#4263eb';
+    case 'fill-indigo': return '#d9dff7';
+    case 'sticky-indigo': return '#95a7f2';
+    case 'violet': return '#7746f1';
+    case 'fill-violet': return '#e2daf8';
+    case 'sticky-violet': return '#b297f5';
+    case 'red': return '#ff2133';
+    case 'fill-red': return '#fbd3d6';
+    case 'sticky-red': return '#fd838d';
+    case 'orange': return '#ff9433';
+    case 'fill-orange': return '#fbe8d6';
+    case 'sticky-orange': return '#fdc28d';
+    case 'yellow': return '#ffc936';
+    case 'fill-yellow': return '#fbf1d7';
+    case 'sticky-yellow': return '#fddf8e';
 
-        default: return '#0d0d0d'
-    }
+    default: return '#0d0d0d';
+  }
 }
 
 function determine_dasharray(dash, gap = 0) {
+  switch (dash) {
+    case 'dashed': return `stroke-linecap:butt;stroke-dasharray:${gap};`;
+    case 'dotted': return `stroke-linecap:round;stroke-dasharray:${gap};`;
 
-    switch (dash) {
-        case 'dashed': return `stroke-linecap:butt;stroke-dasharray:${gap};`
-        case 'dotted': return `stroke-linecap:round;stroke-dasharray:${gap};`
-
-        default: return 'stroke-linejoin:round;stroke-linecap:round;'
-    }
+    default: return 'stroke-linejoin:round;stroke-linecap:round;';
+  }
 }
 
 function determine_font_from_family(family) {
-    switch (family) {
-        case 'script': return 'Caveat Brush'
-        case 'sans': return 'Source Sans Pro'
-        case 'serif': return 'Crimson Pro'
-        // Temporary workaround due to typo in messages
-        case 'erif': return 'Crimson Pro'
-        case 'mono': return 'Source Code Pro'
+  switch (family) {
+    case 'script': return 'Caveat Brush';
+    case 'sans': return 'Source Sans Pro';
+    case 'serif': return 'Crimson Pro';
+      // Temporary workaround due to typo in messages
+    case 'erif': return 'Crimson Pro';
+    case 'mono': return 'Source Code Pro';
 
-        default: return 'Caveat Brush'
-    }
+    default: return 'Caveat Brush';
+  }
 }
 
 function rad_to_degree(angle) {
-    return angle * (180 / Math.PI);
+  return angle * (180 / Math.PI);
 }
 
 // Convert pixels to points
 function to_pt(px) {
-    return (px / config.process.pixelsPerInch) * config.process.pointsPerInch
+  return (px / config.process.pixelsPerInch) * config.process.pointsPerInch;
 }
 
 // Convert points to pixels
 function to_px(pt) {
-    return (pt / config.process.pointsPerInch) * config.process.pixelsPerInch
+  return (pt / config.process.pointsPerInch) * config.process.pixelsPerInch;
 }
 
-// Escape shell metacharacters based on MDN's page on regular expressions, 
+// Escape shell metacharacters based on MDN's page on regular expressions,
 // the escape-string-regexp npm package, and Pango markup.
 function escapeText(string) {
-    return  string
-            .replace(/&/g, '\\&amp;')
-            .replace(/'/g, '\\&#39;')
-            .replace(/>/g, '\\&gt;')
-            .replace(/</g, '\\&lt;')
-            .replace(/[~`!".*+?%^${}()|[\]\\\/]/g, '\\$&')
-            .replace(/-/g, '\\&#x2D;');
+  return string
+      .replace(/&/g, '\\&amp;')
+      .replace(/'/g, '\\&#39;')
+      .replace(/>/g, '\\&gt;')
+      .replace(/</g, '\\&lt;')
+      .replace(/[~`!".*+?%^${}()|[\]\\/]/g, '\\$&')
+      .replace(/-/g, '\\&#x2D;');
 }
 
 function render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxWidth = null) {
-    
-    fontSize = to_pt(fontSize) * config.process.textScaleFactor
-    text = escapeText(text);
+  fontSize = to_pt(fontSize) * config.process.textScaleFactor;
+  text = escapeText(text);
 
-    // Sticky notes need automatic line wrapping: take width into account
-    // Texbox scaled by a constant factor to improve resolution at small scales
-    let size = textBoxWidth ? `-size ${textBoxWidth * config.process.textScaleFactor}x` : ''
+  // Sticky notes need automatic line wrapping: take width into account
+  // Texbox scaled by a constant factor to improve resolution at small scales
+  const size = textBoxWidth ? `-size ${textBoxWidth * config.process.textScaleFactor}x` : '';
 
-    let pangoText = `pango:"<span font_family='${font}' font='${fontSize}' color='${textColor}'>${text}</span>"`
+  const pangoText = `pango:"<span font_family='${font}' font='${fontSize}' color='${textColor}'>${text}</span>"`;
 
-    let justify = textAlign === 'justify'
-    textAlign = justify ? 'left' : textAlign
+  const justify = textAlign === 'justify';
+  textAlign = justify ? 'left' : textAlign;
 
-    let commands = [
-        'convert',
-        '-encoding', `${config.process.whiteboardTextEncoding}`,
-        '-density', config.process.pixelsPerInch,
-        '-background', 'transparent',
-        size,
-        '-define', `pango:align=${textAlign}`,
-        '-define', `pango:justify=${justify}`,
-        '-define', 'pango:wrap=word-char',
-        pangoText,
-        path.join(dropbox, `text${id}.png`)
-    ].join(' ')
+  const commands = [
+    'convert',
+    '-encoding', `${config.process.whiteboardTextEncoding}`,
+    '-density', config.process.pixelsPerInch,
+    '-background', 'transparent',
+    size,
+    '-define', `pango:align=${textAlign}`,
+    '-define', `pango:justify=${justify}`,
+    '-define', 'pango:wrap=word-char',
+    pangoText,
+    path.join(dropbox, `text${id}.png`),
+  ].join(' ');
 
-    execSync(commands);
+  execSync(commands);
 }
 
 function get_gap(dash, size) {
-    switch (dash) {
-        case 'dashed':
-            if (size == 'small') { return '8 8' }
-            else if (size == 'medium') { return '14 14' }
-            else { return '20 20' }
-        case 'dotted':
-            if (size == 'small') { return '0.1 8' }
-            else if (size == 'medium') { return '0.1 14' }
-            else { return '0.1 20' }
+  switch (dash) {
+    case 'dashed':
+      if (size == 'small') {
+        return '8 8';
+      } else if (size == 'medium') {
+        return '14 14';
+      } else {
+        return '20 20';
+      }
+    case 'dotted':
+      if (size == 'small') {
+        return '0.1 8';
+      } else if (size == 'medium') {
+        return '0.1 14';
+      } else {
+        return '0.1 20';
+      }
 
-        default: return '0'
-    }
+    default: return '0';
+  }
 }
 
 function get_stroke_width(dash, size) {
-    switch (size) {
-        case 'small': if (dash === 'draw') { return 1 } else { return 4 };
-        case 'medium': if (dash === 'draw') { return 1.75 } else { return 6.25 };
-        case 'large': if (dash === 'draw') { return 2.5 } else { return 8.5 }
-
-        default: return 1;
+  switch (size) {
+    case 'small': if (dash === 'draw') {
+      return 1;
+    } else {
+      return 4;
     }
+    case 'medium': if (dash === 'draw') {
+      return 1.75;
+    } else {
+      return 6.25;
+    }
+    case 'large': if (dash === 'draw') {
+      return 2.5;
+    } else {
+      return 8.5;
+    }
+
+    default: return 1;
+  }
 }
 
 function sortByKey(array, key, value) {
-    return array.sort(function (a, b) {
-        let [x, y] = [a[key][value], b[key][value]];
-        return x - y;
-    });
+  return array.sort(function(a, b) {
+    const [x, y] = [a[key][value], b[key][value]];
+    return x - y;
+  });
 }
 
 function text_size_to_px(size, scale = 1, isStickyNote = false) {
-    if (isStickyNote) { size = `sticky-${size}` }
+  if (isStickyNote) {
+    size = `sticky-${size}`;
+  }
 
-    switch (size) {
-        case 'sticky-small': return 24
-        case 'small': return 28 * scale
-        case 'sticky-medium': return 36
-        case 'medium': return 48 * scale
-        case 'sticky-large': return 48
-        case 'large': return 96 * scale
+  switch (size) {
+    case 'sticky-small': return 24;
+    case 'small': return 28 * scale;
+    case 'sticky-medium': return 36;
+    case 'medium': return 48 * scale;
+    case 'sticky-large': return 48;
+    case 'large': return 96 * scale;
 
-        default: return 28 * scale
-    }
+    default: return 28 * scale;
+  }
 }
 
 // Methods based on tldraw's utilities
 function getPath(annotationPoints) {
-    // Gets inner path of a stroke outline
-    // For solid, dashed, and dotted types
-    let stroke = getStrokePoints(annotationPoints).map((strokePoint) => strokePoint.point);
+  // Gets inner path of a stroke outline
+  // For solid, dashed, and dotted types
+  const stroke = getStrokePoints(annotationPoints)
+      .map((strokePoint) => strokePoint.point);
 
-    let [max_x, max_y] = [0, 0];
-    let path = stroke.reduce(
-        (acc, [x0, y0], i, arr) => {
-            if (!arr[i + 1]) return acc
-            let [x1, y1] = arr[i + 1]
-            if (x1 >= max_x) { max_x = x1 }
-            if (y1 >= max_y) { max_y = y1 }
-            acc.push(x0, y0, (x0 + x1) / 2, (y0 + y1) / 2)
-            return acc
-        },
+  let [max_x, max_y] = [0, 0];
+  const path = stroke.reduce(
+      (acc, [x0, y0], i, arr) => {
+        if (!arr[i + 1]) return acc;
+        const [x1, y1] = arr[i + 1];
+        if (x1 >= max_x) {
+          max_x = x1;
+        }
+        if (y1 >= max_y) {
+          max_y = y1;
+        }
+        acc.push(x0, y0, (x0 + x1) / 2, (y0 + y1) / 2);
+        return acc;
+      },
 
-        ['M', ...stroke[0], 'Q']
-    )
+      ['M', ...stroke[0], 'Q'],
+  );
 
-    path.join(' ');
-    return [path, max_x, max_y];
+  path.join(' ');
+  return [path, max_x, max_y];
 }
 
 function getOutlinePath(annotationPoints) {
-    // Gets outline of a hand-drawn input, with pressure
-    let stroke = getStroke(annotationPoints, {
-        simulatePressure: true,
-        size: 8,
-    });
+  // Gets outline of a hand-drawn input, with pressure
+  const stroke = getStroke(annotationPoints, {
+    simulatePressure: true,
+    size: 8,
+  });
 
-    let [max_x, max_y] = [0, 0];
-    let path = stroke.reduce(
-        (acc, [x0, y0], i, arr) => {
-            let [x1, y1] = arr[(i + 1) % arr.length]
-            if (x1 >= max_x) { max_x = x1 }
-            if (y1 >= max_y) { max_y = y1 }
-            acc.push(x0, y0, (x0 + x1) / 2, (y0 + y1) / 2)
-            return acc;
-        },
+  let [max_x, max_y] = [0, 0];
+  const path = stroke.reduce(
+      (acc, [x0, y0], i, arr) => {
+        const [x1, y1] = arr[(i + 1) % arr.length];
+        if (x1 >= max_x) {
+          max_x = x1;
+        }
+        if (y1 >= max_y) {
+          max_y = y1;
+        }
+        acc.push(x0, y0, (x0 + x1) / 2, (y0 + y1) / 2);
+        return acc;
+      },
 
-        ['M', ...stroke[0], 'Q']
-    );
+      ['M', ...stroke[0], 'Q'],
+  );
 
-    path.push('Z');
-    path.join(' ');
+  path.push('Z');
+  path.join(' ');
 
-    return [path, max_x, max_y];
+  return [path, max_x, max_y];
 }
 
 function circleFromThreePoints(A, B, C) {
-    let [x1, y1] = A
-    let [x2, y2] = B
-    let [x3, y3] = C
+  const [x1, y1] = A;
+  const [x2, y2] = B;
+  const [x3, y3] = C;
 
-    let a = x1 * (y2 - y3) - y1 * (x2 - x3) + x2 * y3 - x3 * y2
+  const a = x1 * (y2 - y3) - y1 * (x2 - x3) + x2 * y3 - x3 * y2;
 
-    let b =
+  const b =
         (x1 * x1 + y1 * y1) * (y3 - y2) +
         (x2 * x2 + y2 * y2) * (y1 - y3) +
-        (x3 * x3 + y3 * y3) * (y2 - y1)
+        (x3 * x3 + y3 * y3) * (y2 - y1);
 
-    let c =
+  const c =
         (x1 * x1 + y1 * y1) * (x2 - x3) +
         (x2 * x2 + y2 * y2) * (x3 - x1) +
-        (x3 * x3 + y3 * y3) * (x1 - x2)
+        (x3 * x3 + y3 * y3) * (x1 - x2);
 
-    let x = -b / (2 * a)
-    let y = -c / (2 * a)
+  const x = -b / (2 * a);
+  const y = -c / (2 * a);
 
-    return [x, y, Math.hypot(x - x1, y - y1)]
+  return [x, y, Math.hypot(x - x1, y - y1)];
 }
 
 function distance(x1, y1, x2, y2) {
-    return Math.sqrt(Math.pow((x2 - x1), 2) + Math.pow((y2 - y1), 2));
+  return Math.sqrt(Math.pow((x2 - x1), 2) + Math.pow((y2 - y1), 2));
 }
 
 function getArcLength(C, r, A, B) {
-    let sweep = getSweep(C, A, B);
-    return r * (2 * Math.PI) * (sweep / (2 * Math.PI));
+  const sweep = getSweep(C, A, B);
+  return r * (2 * Math.PI) * (sweep / (2 * Math.PI));
 }
 
 function getSweep(C, A, B) {
+  // Get angle between two vectors in radians
+  const a0 = Math.atan2(A[1] - C[1], A[0] - C[0]);
+  const a1 = Math.atan2(B[1] - C[1], B[0] - C[0]);
 
-    // Get angle between two vectors in radians
-    let a0 = Math.atan2(A[1] - C[1], A[0] - C[0]);
-    let a1 = Math.atan2(B[1] - C[1], B[0] - C[0]);
+  // Short distance between two angles
+  const max = Math.PI * 2;
+  const da = (a1 - a0) % max;
 
-    // Short distance between two angles
-    let max = Math.PI * 2
-    let da = (a1 - a0) % max
-
-    return ((2 * da) % max) - da
+  return ((2 * da) % max) - da;
 }
 
 function intersectCircleCircle(c1, r1, c2, r2) {
+  let dx = c2[0] - c1[0];
+  let dy = c2[1] - c1[1];
 
-    let dx = c2[0] - c1[0];
-    let dy = c2[1] - c1[1];
+  const d = Math.sqrt(dx * dx + dy * dy);
+  const x = (d * d - r2 * r2 + r1 * r1) / (2 * d);
+  const y = Math.sqrt(r1 * r1 - x * x);
 
-    let d = Math.sqrt(dx * dx + dy * dy);
-    let x = (d * d - r2 * r2 + r1 * r1) / (2 * d);
-    let y = Math.sqrt(r1 * r1 - x * x);
+  dx /= d;
+  dy /= d;
 
-    dx /= d
-    dy /= d
-
-    return [[c1[0] + dx * x - dy * y, c1[1] + dy * x + dx * y],
-    [c1[0] + dx * x + dy * y, c1[1] + dy * x - dx * y]]
+  return [[c1[0] + dx * x - dy * y, c1[1] + dy * x + dx * y],
+    [c1[0] + dx * x + dy * y, c1[1] + dy * x - dx * y]];
 }
 
 function rotWith(A, C, r = 0) {
-    // Rotate a vector A around another vector C by r radians
-    if (r === 0) return A
+  // Rotate a vector A around another vector C by r radians
+  if (r === 0) return A;
 
-    let s = Math.sin(r)
-    let c = Math.cos(r)
+  const s = Math.sin(r);
+  const c = Math.cos(r);
 
-    let px = A[0] - C[0]
-    let py = A[1] - C[1]
+  const px = A[0] - C[0];
+  const py = A[1] - C[1];
 
-    let nx = px * c - py * s
-    let ny = px * s + py * c
+  const nx = px * c - py * s;
+  const ny = px * s + py * c;
 
-    return [nx + C[0], ny + C[1]]
+  return [nx + C[0], ny + C[1]];
 }
 
 function nudge(A, B, d) {
-    // Pushes a point A towards a point B by a given distance
-    if (A[0] === B[0] && A[1] === B[1]) return A
+  // Pushes a point A towards a point B by a given distance
+  if (A[0] === B[0] && A[1] === B[1]) return A;
 
-    // B - A
-    let sub = [B[0] - A[0], B[1] - A[1]];
+  // B - A
+  const sub = [B[0] - A[0], B[1] - A[1]];
 
-    // Vector length
-    let len = Math.hypot(sub[0], sub[1]);
+  // Vector length
+  const len = Math.hypot(sub[0], sub[1]);
 
-    // Get unit vector
-    let unit = [sub[0] / len, sub[1] / len];
+  // Get unit vector
+  const unit = [sub[0] / len, sub[1] / len];
 
-    // Multiply by distance
-    let mul = [unit[0] * d, unit[1] * d];
+  // Multiply by distance
+  const mul = [unit[0] * d, unit[1] * d];
 
-    return [A[0] + mul[0], A[1] + mul[1]]
+  return [A[0] + mul[0], A[1] + mul[1]];
 }
 
 function getCurvedArrowHeadPath(A, r1, C, r2, sweep) {
-    const phi = (1 + Math.sqrt(5)) / 2;
+  const phi = (1 + Math.sqrt(5)) / 2;
 
-    // Determine intersections between two circles
-    let ints = intersectCircleCircle(A, r1 * (phi - 1), C, r2)
+  // Determine intersections between two circles
+  const ints = intersectCircleCircle(A, r1 * (phi - 1), C, r2);
 
-    if (!ints) {
-        logger.info('Could not find an intersection for the arrow head.')
-        return { left: A, right: A }
-    }
+  if (!ints) {
+    logger.info('Could not find an intersection for the arrow head.');
+    return {left: A, right: A};
+  }
 
-    let int = sweep ? ints[0] : ints[1]
-    let left = int ? nudge(rotWith(int, A, Math.PI / 6), A, r1 * -0.382) : A
-    let right = int ? nudge(rotWith(int, A, -Math.PI / 6), A, r1 * -0.382) : A
+  const int = sweep ? ints[0] : ints[1];
+  const left = int ? nudge(rotWith(int, A, Math.PI / 6), A, r1 * -0.382) : A;
+  const right = int ? nudge(rotWith(int, A, -Math.PI / 6), A, r1 * -0.382) : A;
 
-    return `M ${left} L ${A} ${right}`
+  return `M ${left} L ${A} ${right}`;
 }
 
 // Methods to convert Akka message contents into SVG
 function overlay_arrow(svg, annotation) {
+  const [x, y] = annotation.point;
+  const bend = annotation.bend;
+  const decorations = annotation.decorations;
 
-    let [x, y] = annotation.point;
-    let bend = annotation.bend;
-    let decorations = annotation.decorations;
+  let dash = annotation.style.dash;
+  dash = (dash == 'draw') ? 'solid' : dash; // Use 'solid' thickness
 
-    let dash = annotation.style.dash;
-    dash = (dash == 'draw') ? 'solid' : dash // Use 'solid' thickness
+  const shapeColor = color_to_hex(annotation.style.color);
+  const sw = get_stroke_width(dash, annotation.style.size);
+  const gap = get_gap(dash, annotation.style.size);
+  const stroke_dasharray = determine_dasharray(dash, gap);
 
-    let shapeColor = color_to_hex(annotation.style.color);
-    let sw = get_stroke_width(dash, annotation.style.size);
-    let gap = get_gap(dash, annotation.style.size);
-    let stroke_dasharray = determine_dasharray(dash, gap);
+  const [start_x, start_y] = annotation.handles.start.point;
+  const [end_x, end_y] = annotation.handles.end.point;
+  const [bend_x, bend_y] = annotation.handles.bend.point;
 
-    let [start_x, start_y] = annotation.handles.start.point;
-    let [end_x, end_y] = annotation.handles.end.point;
-    let [bend_x, bend_y] = annotation.handles.bend.point;
+  const line = [];
+  const arrowHead = [];
+  const arrowDistance = distance(start_x, start_y, end_x, end_y);
+  const arrowHeadLength = Math.min(arrowDistance / 3, 8 * sw);
+  const isStraightLine = parseFloat(bend).toFixed(3) == 0;
 
-    let line = [];
-    let arrowHead = [];
-    let arrowDistance = distance(start_x, start_y, end_x, end_y);
-    let arrowHeadLength = Math.min(arrowDistance / 3, 8 * sw);
-    let isStraightLine = parseFloat(bend).toFixed(3) == 0;
+  const angle = Math.atan2(end_y - start_y, end_x - start_x);
 
-    let angle = Math.atan2(end_y - start_y, end_x - start_x)
+  if (isStraightLine) {
+    // Draws a straight line / arrow
+    line.push(`M ${start_x} ${start_y} L ${end_x} ${end_y}`);
 
-    if (isStraightLine) {
-        // Draws a straight line / arrow
-        line.push(`M ${start_x} ${start_y} L ${end_x} ${end_y}`);
-
-        if (decorations.start || decorations.end) {
-            arrowHead.push(`M ${end_x} ${end_y}`);
-            arrowHead.push(`L ${end_x + arrowHeadLength * Math.cos(angle + (7 / 6) * Math.PI)} ${end_y + arrowHeadLength * Math.sin(angle + (7 / 6) * Math.PI)}`);
-            arrowHead.push(`M ${end_x} ${end_y}`);
-            arrowHead.push(`L ${end_x + arrowHeadLength * Math.cos(angle + (5 / 6) * Math.PI)} ${end_y + arrowHeadLength * Math.sin(angle + (5 / 6) * Math.PI)}`);
-        }
-
-    } else {
-
-        // Curved lines and arrows
-        let circle = circleFromThreePoints([start_x, start_y], [bend_x, bend_y], [end_x, end_y]);
-        let center = [circle[0], circle[1]]
-        let radius = circle[2]
-        let length = getArcLength(center, radius, [start_x, start_y], [end_x, end_y]);
-
-        line.push(`M ${start_x} ${start_y} A ${radius} ${radius} 0 0 ${length > 0 ? '1' : '0'} ${end_x} ${end_y}`);
-
-        if (decorations.start)
-            arrowHead.push(getCurvedArrowHeadPath([start_x, start_y], arrowHeadLength, center, radius, length < 0));
-        else if (decorations.end) {
-            arrowHead.push(getCurvedArrowHeadPath([end_x, end_y], arrowHeadLength, center, radius, length >= 0));
-        }
+    if (decorations.start || decorations.end) {
+      arrowHead.push(`M ${end_x} ${end_y}`);
+      arrowHead.push(`L ${end_x + arrowHeadLength * Math.cos(angle + (7 / 6) * Math.PI)} ${end_y + arrowHeadLength * Math.sin(angle + (7 / 6) * Math.PI)}`);
+      arrowHead.push(`M ${end_x} ${end_y}`);
+      arrowHead.push(`L ${end_x + arrowHeadLength * Math.cos(angle + (5 / 6) * Math.PI)} ${end_y + arrowHeadLength * Math.sin(angle + (5 / 6) * Math.PI)}`);
     }
+  } else {
+    // Curved lines and arrows
+    const circle = circleFromThreePoints([start_x, start_y], [bend_x, bend_y], [end_x, end_y]);
+    const center = [circle[0], circle[1]];
+    const radius = circle[2];
+    const length = getArcLength(center, radius, [start_x, start_y], [end_x, end_y]);
 
-    // The arrowhead is purposely not styled (e.g., dashed / dotted)
-    svg.ele('g', {
-        style: `stroke:${shapeColor};stroke-width:${sw};fill:none;`,
-        transform: `translate(${x} ${y})`
-    }).ele('path', {
-        'style': stroke_dasharray,
-        d: line.join(' '),
-    }).up()
-        .ele('path', {
-            d: arrowHead.join(' '),
-        }).up();
+    line.push(`M ${start_x} ${start_y} A ${radius} ${radius} 0 0 ${length > 0 ? '1' : '0'} ${end_x} ${end_y}`);
+
+    if (decorations.start) {
+      arrowHead.push(getCurvedArrowHeadPath([start_x, start_y], arrowHeadLength, center, radius, length < 0));
+    } else if (decorations.end) {
+      arrowHead.push(getCurvedArrowHeadPath([end_x, end_y], arrowHeadLength, center, radius, length >= 0));
+    }
+  }
+
+  // The arrowhead is purposely not styled (e.g., dashed / dotted)
+  svg.ele('g', {
+    style: `stroke:${shapeColor};stroke-width:${sw};fill:none;`,
+    transform: `translate(${x} ${y})`,
+  }).ele('path', {
+    'style': stroke_dasharray,
+    'd': line.join(' '),
+  }).up()
+      .ele('path', {
+        d: arrowHead.join(' '),
+      }).up();
 }
 
 function overlay_draw(svg, annotation) {
-    let dash = annotation.style.dash;
+  const dash = annotation.style.dash;
 
-    let [path, max_x, max_y] = (dash == 'draw') ? getOutlinePath(annotation.points) : getPath(annotation.points);
+  const [path, max_x, max_y] = (dash == 'draw') ? getOutlinePath(annotation.points) : getPath(annotation.points);
 
-    if (!path.length) return;
+  if (!path.length) return;
 
-    let shapeColor = color_to_hex(annotation.style.color);
-    let rotation = rad_to_degree(annotation.rotation);
-    let thickness = get_stroke_width(dash, annotation.style.size);
-    let gap = get_gap(dash, annotation.style.size);
+  const shapeColor = color_to_hex(annotation.style.color);
+  const rotation = rad_to_degree(annotation.rotation);
+  const thickness = get_stroke_width(dash, annotation.style.size);
+  const gap = get_gap(dash, annotation.style.size);
 
-    let [x, y] = annotation.point;
+  const [x, y] = annotation.point;
 
-    let stroke_dasharray = determine_dasharray(dash, gap);
-    let fill = (dash === 'draw') ? shapeColor : 'none';
+  const stroke_dasharray = determine_dasharray(dash, gap);
+  const fill = (dash === 'draw') ? shapeColor : 'none';
 
-    let shapeFillColor = color_to_hex(`fill-${annotation.style.color}`)
-    let shapeTransform = `translate(${x} ${y}), rotate(${rotation} ${max_x / 2} ${max_y / 2})`
+  const shapeFillColor = color_to_hex(`fill-${annotation.style.color}`);
+  const shapeTransform = `translate(${x} ${y}), rotate(${rotation} ${max_x / 2} ${max_y / 2})`;
 
-    // Fill assuming solid, small pencil used when path start- and end points overlap
-    let shapeIsFilled =
+  // Fill assuming solid, small pencil used
+  // when path start- and end points overlap
+  const shapeIsFilled =
         annotation.style.isFilled &&
-        annotation.points.length > 3
-        && Math.round(distance(
+        annotation.points.length > 3 &&
+        Math.round(distance(
             annotation.points[0][0],
             annotation.points[0][1],
             annotation.points[annotation.points.length - 1][0],
-            annotation.points[annotation.points.length - 1][1]
+            annotation.points[annotation.points.length - 1][1],
         )) <= 2 * get_stroke_width('solid', 'small');
 
-    if (shapeIsFilled) {
-        svg.ele('path', {
-            style: `fill:${shapeFillColor};`,
-            d: getPath(annotation.points)[0] + 'Z',
-            transform: shapeTransform
-        }).up()
-    }
-
+  if (shapeIsFilled) {
     svg.ele('path', {
-        style: `stroke:${shapeColor};stroke-width:${thickness};fill:${fill};${stroke_dasharray}`,
-        d: path,
-        transform: shapeTransform
-    })
+      style: `fill:${shapeFillColor};`,
+      d: getPath(annotation.points)[0] + 'Z',
+      transform: shapeTransform,
+    }).up();
+  }
+
+  svg.ele('path', {
+    style: `stroke:${shapeColor};stroke-width:${thickness};fill:${fill};${stroke_dasharray}`,
+    d: path,
+    transform: shapeTransform,
+  });
 }
 
 function overlay_ellipse(svg, annotation) {
+  let dash = annotation.style.dash;
+  dash = (dash == 'draw') ? 'solid' : dash; // Use 'solid' thickness for draw type
 
-    let dash = annotation.style.dash;
-    dash = (dash == 'draw') ? 'solid' : dash // Use 'solid' thickness for draw type
+  const [x, y] = annotation.point; // Ellipse center coordinates
+  const [rx, ry] = annotation.radius;
+  const isFilled = annotation.style.isFilled;
 
-    let [x, y] = annotation.point; // Ellipse center coordinates
-    let [rx, ry] = annotation.radius;
-    let isFilled = annotation.style.isFilled;
+  const shapeColor = color_to_hex(annotation.style.color);
+  const fillColor = isFilled ? color_to_hex(annotation.style.color, false, isFilled) : 'none';
 
-    let shapeColor = color_to_hex(annotation.style.color);
-    let fillColor = isFilled ? color_to_hex(annotation.style.color, false, isFilled) : 'none';
+  const rotation = rad_to_degree(annotation.rotation);
+  const sw = get_stroke_width(dash, annotation.style.size);
+  const gap = get_gap(dash, annotation.style.size);
 
-    let rotation = rad_to_degree(annotation.rotation);
-    let sw = get_stroke_width(dash, annotation.style.size);
-    let gap = get_gap(dash, annotation.style.size);
+  const stroke_dasharray = determine_dasharray(dash, gap);
 
-    let stroke_dasharray = determine_dasharray(dash, gap);
+  svg.ele('g', {
+    style: `stroke:${shapeColor};stroke-width:${sw};fill:${fillColor};${stroke_dasharray}`,
+  }).ele('ellipse', {
+    'cx': x + rx,
+    'cy': y + ry,
+    'rx': rx,
+    'ry': ry,
+    'transform': `rotate(${rotation} ${x + rx} ${y + ry})`,
+  }).up();
 
-    svg.ele('g', {
-        style: `stroke:${shapeColor};stroke-width:${sw};fill:${fillColor};${stroke_dasharray}`,
-    }).ele('ellipse', {
-        'cx': x + rx,
-        'cy': y + ry,
-        'rx': rx,
-        'ry': ry,
-        transform: `rotate(${rotation} ${x + rx} ${y + ry})`
-    }).up()
-
-    if (annotation.label) { overlay_shape_label(svg, annotation) }
+  if (annotation.label) {
+    overlay_shape_label(svg, annotation);
+  }
 }
 
 function overlay_rectangle(svg, annotation) {
+  const dash = annotation.style.dash;
+  const rect_dash = (dash == 'draw') ? 'solid' : dash; // Use 'solid' thickness for draw type
 
-    let dash = annotation.style.dash;
-    let rect_dash = (dash == 'draw') ? 'solid' : dash // Use 'solid' thickness for draw type
+  const [x, y] = annotation.point;
+  const [w, h] = annotation.size;
+  const isFilled = annotation.style.isFilled;
 
-    let [x, y] = annotation.point;
-    let [w, h] = annotation.size;
-    let isFilled = annotation.style.isFilled;
+  const shapeColor = color_to_hex(annotation.style.color);
+  const fillColor = isFilled ? color_to_hex(annotation.style.color, false, isFilled) : 'none';
 
-    let shapeColor = color_to_hex(annotation.style.color);
-    let fillColor = isFilled ? color_to_hex(annotation.style.color, false, isFilled) : 'none';
+  const rotation = rad_to_degree(annotation.rotation);
+  const sw = get_stroke_width(rect_dash, annotation.style.size);
+  const gap = get_gap(dash, annotation.style.size);
 
-    let rotation = rad_to_degree(annotation.rotation);
-    let sw = get_stroke_width(rect_dash, annotation.style.size);
-    let gap = get_gap(dash, annotation.style.size);
+  const stroke_dasharray = determine_dasharray(dash, gap);
 
-    let stroke_dasharray = determine_dasharray(dash, gap);
+  const rx = (dash == 'draw') ? Math.min(w / 4, sw * 2) : 0;
+  const ry = (dash == 'draw') ? Math.min(h / 4, sw * 2) : 0;
 
-    let rx = (dash == 'draw') ? Math.min(w / 4, sw * 2) : 0;
-    let ry = (dash == 'draw') ? Math.min(h / 4, sw * 2) : 0;
+  svg.ele('g', {
+    style: `stroke:${shapeColor};stroke-width:${sw};fill:${fillColor};${stroke_dasharray}`,
+  }).ele('rect', {
+    'width': w,
+    'height': h,
+    'rx': rx,
+    'ry': ry,
+    'transform': `translate(${x} ${y}), rotate(${rotation} ${w / 2} ${h / 2})`,
+  }).up();
 
-    svg.ele('g', {
-        style: `stroke:${shapeColor};stroke-width:${sw};fill:${fillColor};${stroke_dasharray}`,
-    }).ele('rect', {
-        width: w,
-        height: h,
-        'rx': rx,
-        'ry': ry,
-        transform: `translate(${x} ${y}), rotate(${rotation} ${w / 2} ${h / 2})`
-    }).up()
-
-    if (annotation.label) { overlay_shape_label(svg, annotation) }
+  if (annotation.label) {
+    overlay_shape_label(svg, annotation);
+  }
 }
 
 function overlay_shape_label(svg, annotation) {
+  const fontColor = color_to_hex(annotation.style.color);
+  const font = determine_font_from_family(annotation.style.font);
+  const fontSize = text_size_to_px(annotation.style.size, annotation.style.scale);
+  const textAlign = 'center';
+  const text = annotation.label;
+  const id = annotation.id;
+  const rotation = rad_to_degree(annotation.rotation);
 
-    let fontColor = color_to_hex(annotation.style.color);
-    let font = determine_font_from_family(annotation.style.font);
-    let fontSize = text_size_to_px(annotation.style.size, annotation.style.scale);
-    let textAlign = 'center';
-    let text = annotation.label;
-    let id = annotation.id;
-    let rotation = rad_to_degree(annotation.rotation);
+  const [shape_width, shape_height] = annotation.size;
+  const [shape_x, shape_y] = annotation.point;
 
-    let [shape_width, shape_height] = annotation.size
-    let [shape_x, shape_y] = annotation.point;
+  const x_offset = annotation.labelPoint[0];
+  const y_offset = annotation.labelPoint[1];
 
-    let x_offset = annotation.labelPoint[0]
-    let y_offset = annotation.labelPoint[1]
+  const label_center_x = shape_x + shape_width * x_offset;
+  const label_center_y = shape_y + shape_height * y_offset;
 
-    let label_center_x = shape_x + shape_width * x_offset
-    let label_center_y = shape_y + shape_height * y_offset
-    
-    render_textbox(fontColor, font, fontSize, textAlign, text, id);
+  render_textbox(fontColor, font, fontSize, textAlign, text, id);
 
-    let dimensions = probe.sync(fs.readFileSync(path.join(dropbox, `text${id}.png`)));
-    let labelWidth = dimensions.width / config.process.textScaleFactor;
-    let labelHeight = dimensions.height / config.process.textScaleFactor;
-    
-    svg.ele('g', {
-        transform: `rotate(${rotation} ${label_center_x} ${label_center_y})`
-    }).ele('image', {
-        x: label_center_x - (labelWidth * x_offset),
-        y: label_center_y - (labelHeight * y_offset),
-        width: labelWidth,
-        height: labelHeight,
-        'xlink:href': `file://${dropbox}/text${id}.png`,
-    }).up();
+  const dimensions = probe.sync(fs.readFileSync(path.join(dropbox, `text${id}.png`)));
+  const labelWidth = dimensions.width / config.process.textScaleFactor;
+  const labelHeight = dimensions.height / config.process.textScaleFactor;
+
+  svg.ele('g', {
+    transform: `rotate(${rotation} ${label_center_x} ${label_center_y})`,
+  }).ele('image', {
+    'x': label_center_x - (labelWidth * x_offset),
+    'y': label_center_y - (labelHeight * y_offset),
+    'width': labelWidth,
+    'height': labelHeight,
+    'xlink:href': `file://${dropbox}/text${id}.png`,
+  }).up();
 }
 
 function overlay_sticky(svg, annotation) {
+  const backgroundColor = color_to_hex(annotation.style.color, true);
+  const fontSize = text_size_to_px(annotation.style.size, annotation.style.scale, true);
+  const rotation = rad_to_degree(annotation.rotation);
+  const font = determine_font_from_family(annotation.style.font);
+  const textAlign = align_to_pango(annotation.style.textAlign);
 
-    let backgroundColor = color_to_hex(annotation.style.color, true);
-    let fontSize = text_size_to_px(annotation.style.size, annotation.style.scale, true);
-    let rotation = rad_to_degree(annotation.rotation);
-    let font = determine_font_from_family(annotation.style.font);
-    let textAlign = align_to_pango(annotation.style.textAlign);
+  const [textBoxWidth, textBoxHeight] = annotation.size;
+  const [textBox_x, textBox_y] = annotation.point;
 
-    let [textBoxWidth, textBoxHeight] = annotation.size;
-    let [textBox_x, textBox_y] = annotation.point;
+  const textColor = '#0d0d0d'; // For sticky notes
+  const text = annotation.text;
+  const id = annotation.id;
 
-    let textColor = "#0d0d0d" // For sticky notes
-    let text = annotation.text
-    let id = annotation.id;
+  render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxWidth);
 
-    render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxWidth);
-
-    // Overlay transparent text image over empty sticky note
-    svg.ele('g', {
-        transform: `rotate(${rotation}, ${textBox_x + (textBoxWidth / 2)}, ${textBox_y + (textBoxHeight / 2)})`
-    }).ele('rect', {
-        x: textBox_x,
-        y: textBox_y,
-        width: textBoxWidth,
-        height: textBoxHeight,
-        fill: backgroundColor,
-    }).up()
-    .ele('image', {
-        x: textBox_x,
-        y: textBox_y,
-        width: textBoxWidth,
-        height: textBoxHeight,
+  // Overlay transparent text image over empty sticky note
+  svg.ele('g', {
+    transform: `rotate(${rotation}, ${textBox_x + (textBoxWidth / 2)}, ${textBox_y + (textBoxHeight / 2)})`,
+  }).ele('rect', {
+    x: textBox_x,
+    y: textBox_y,
+    width: textBoxWidth,
+    height: textBoxHeight,
+    fill: backgroundColor,
+  }).up()
+      .ele('image', {
+        'x': textBox_x,
+        'y': textBox_y,
+        'width': textBoxWidth,
+        'height': textBoxHeight,
         'xlink:href': `file://${dropbox}/text${id}.png`,
-    }).up();
+      }).up();
 }
 
 function overlay_triangle(svg, annotation) {
+  let dash = annotation.style.dash;
+  dash = (dash == 'draw') ? 'solid' : dash;
 
-    let dash = annotation.style.dash;
-    dash = (dash == 'draw') ? 'solid' : dash
+  const [x, y] = annotation.point;
+  const [w, h] = annotation.size;
+  const isFilled = annotation.style.isFilled;
 
-    let [x, y] = annotation.point;
-    let [w, h] = annotation.size;
-    let isFilled = annotation.style.isFilled;
+  const shapeColor = color_to_hex(annotation.style.color);
+  const fillColor = isFilled ? color_to_hex(annotation.style.color, false, isFilled) : 'none';
 
-    let shapeColor = color_to_hex(annotation.style.color);
-    let fillColor = isFilled ? color_to_hex(annotation.style.color, false, isFilled) : 'none';
+  const rotation = rad_to_degree(annotation.rotation);
+  const sw = get_stroke_width(dash, annotation.style.size);
+  const gap = get_gap(dash, annotation.style.size);
 
-    let rotation = rad_to_degree(annotation.rotation);
-    let sw = get_stroke_width(dash, annotation.style.size);
-    let gap = get_gap(dash, annotation.style.size);
+  const stroke_dasharray = determine_dasharray(dash, gap);
+  const points = `${w / 2} 0, ${w} ${h}, 0 ${h}, ${w / 2} 0`;
 
-    let stroke_dasharray = determine_dasharray(dash, gap);
-    let points = `${w / 2} 0, ${w} ${h}, 0 ${h}, ${w / 2} 0`
+  svg.ele('g', {
+    style: `stroke:${shapeColor};stroke-width:${sw};fill:${fillColor};${stroke_dasharray}`,
+  }).ele('polygon', {
+    'points': points,
+    'transform': `translate(${x}, ${y}), rotate(${rotation} ${w / 2} ${h / 2})`,
+  }).up();
 
-    svg.ele('g', {
-        style: `stroke:${shapeColor};stroke-width:${sw};fill:${fillColor};${stroke_dasharray}`,
-    }).ele('polygon', {
-        'points': points,
-        transform: `translate(${x}, ${y}), rotate(${rotation} ${w / 2} ${h / 2})`
-    }).up()
-
-    if (annotation.label) { overlay_shape_label(svg, annotation) }
+  if (annotation.label) {
+    overlay_shape_label(svg, annotation);
+  }
 }
 
 function overlay_text(svg, annotation) {
+  const [textBoxWidth, textBoxHeight] = annotation.size;
+  const fontColor = color_to_hex(annotation.style.color);
+  const font = determine_font_from_family(annotation.style.font);
+  const fontSize = text_size_to_px(annotation.style.size, annotation.style.scale);
+  const textAlign = align_to_pango(annotation.style.textAlign);
+  const text = annotation.text;
+  const id = annotation.id;
 
-    let [textBoxWidth, textBoxHeight] = annotation.size;
-    let fontColor = color_to_hex(annotation.style.color);
-    let font = determine_font_from_family(annotation.style.font);
-    let fontSize = text_size_to_px(annotation.style.size, annotation.style.scale);
-    let textAlign = align_to_pango(annotation.style.textAlign);
-    let text = annotation.text
-    let id = annotation.id;
+  const rotation = rad_to_degree(annotation.rotation);
+  const [textBox_x, textBox_y] = annotation.point;
 
-    let rotation = rad_to_degree(annotation.rotation);
-    let [textBox_x, textBox_y] = annotation.point;
+  render_textbox(fontColor, font, fontSize, textAlign, text, id);
 
-    render_textbox(fontColor, font, fontSize, textAlign, text, id);
+  const rotation_x = textBox_x + (textBoxWidth / 2);
+  const rotation_y = textBox_y + (textBoxHeight / 2);
 
-    let rotation_x = textBox_x + (textBoxWidth / 2)
-    let rotation_y = textBox_y + (textBoxHeight / 2)
-
-    svg.ele('g', {
-        transform: `rotate(${rotation} ${rotation_x} ${rotation_y})`
-    }).ele('image', {
-        x: textBox_x,
-        y: textBox_y,
-        width: textBoxWidth,
-        height: textBoxHeight,
-        'xlink:href': `file://${dropbox}/text${id}.png`,
-    }).up();
+  svg.ele('g', {
+    transform: `rotate(${rotation} ${rotation_x} ${rotation_y})`,
+  }).ele('image', {
+    'x': textBox_x,
+    'y': textBox_y,
+    'width': textBoxWidth,
+    'height': textBoxHeight,
+    'xlink:href': `file://${dropbox}/text${id}.png`,
+  }).up();
 }
 
 function overlay_annotation(svg, currentAnnotation) {
-
-    if (currentAnnotation.childIndex >= 1) {
-        switch (currentAnnotation.type) {
-            case 'arrow':
-                overlay_arrow(svg, currentAnnotation);
-                break;
-            case 'draw':
-                overlay_draw(svg, currentAnnotation);
-                break;
-            case 'ellipse':
-                overlay_ellipse(svg, currentAnnotation);
-                break;
-            case 'rectangle':
-                overlay_rectangle(svg, currentAnnotation);
-                break;
-            case 'sticky':
-                overlay_sticky(svg, currentAnnotation);
-                break;
-            case 'triangle':
-                overlay_triangle(svg, currentAnnotation);
-                break;
-            case 'text':
-                overlay_text(svg, currentAnnotation);
-                break;
-            default:
-                logger.info(`Unknown annotation type ${currentAnnotation.type}.`);
-        }
+  if (currentAnnotation.childIndex >= 1) {
+    switch (currentAnnotation.type) {
+      case 'arrow':
+        overlay_arrow(svg, currentAnnotation);
+        break;
+      case 'draw':
+        overlay_draw(svg, currentAnnotation);
+        break;
+      case 'ellipse':
+        overlay_ellipse(svg, currentAnnotation);
+        break;
+      case 'rectangle':
+        overlay_rectangle(svg, currentAnnotation);
+        break;
+      case 'sticky':
+        overlay_sticky(svg, currentAnnotation);
+        break;
+      case 'triangle':
+        overlay_triangle(svg, currentAnnotation);
+        break;
+      case 'text':
+        overlay_text(svg, currentAnnotation);
+        break;
+      default:
+        logger.info(`Unknown annotation type ${currentAnnotation.type}.`);
     }
+  }
 }
 
 function overlay_annotations(svg, currentSlideAnnotations) {
+  // Sort annotations by lowest child index
+  currentSlideAnnotations = sortByKey(currentSlideAnnotations, 'annotationInfo', 'childIndex');
 
-    // Sort annotations by lowest child index
-    currentSlideAnnotations = sortByKey(currentSlideAnnotations, 'annotationInfo', 'childIndex');
+  for (const annotation of currentSlideAnnotations) {
+    switch (annotation.annotationInfo.type) {
+      case 'group':
+        // Get annotations that have this group as parent
+        for (const childId of annotation.annotationInfo.children) {
+          const childAnnotation =
+            currentSlideAnnotations.find((ann) => ann.id == childId);
+          overlay_annotation(svg, childAnnotation.annotationInfo);
+        }
 
-    for (let annotation of currentSlideAnnotations) {
+        break;
 
-        switch (annotation.annotationInfo.type) {
-            case 'group':
-                // Get annotations that have this group as parent
-                let children = annotation.annotationInfo.children;
-
-                for (let childId of children) {
-                    let childAnnotation = currentSlideAnnotations.find(ann => ann.id == childId);
-                    overlay_annotation(svg, childAnnotation.annotationInfo);
-                }
-
-                break;
-
-            default:
-                // Add individual annotations if they don't belong to a group
-                if (annotation.annotationInfo.parentId % 1 === 0) {
-                    overlay_annotation(svg, annotation.annotationInfo);
-                }
+      default:
+        // Add individual annotations if they don't belong to a group
+        if (annotation.annotationInfo.parentId % 1 === 0) {
+          overlay_annotation(svg, annotation.annotationInfo);
         }
     }
+  }
 }
 
 // Process the presentation pages and annotations into a PDF file
 
 // 1. Get the job
 const dropbox = path.join(config.shared.presAnnDropboxDir, jobId);
-let job = fs.readFileSync(path.join(dropbox, 'job'));
-let exportJob = JSON.parse(job);
+const job = fs.readFileSync(path.join(dropbox, 'job'));
+const exportJob = JSON.parse(job);
 
-// 2. Get the annotations
-let annotations = fs.readFileSync(path.join(dropbox, 'whiteboard'));
-let whiteboard = JSON.parse(annotations);
-let pages = JSON.parse(whiteboard.pages);
-let ghostScriptInput = ""
+// 2. Get the annotations
+const annotations = fs.readFileSync(path.join(dropbox, 'whiteboard'));
+const whiteboard = JSON.parse(annotations);
+const pages = JSON.parse(whiteboard.pages);
+let ghostScriptInput = '';
 
 // 3. Convert annotations to SVG
-for (let currentSlide of pages) {
+for (const currentSlide of pages) {
+  const bgImagePath = path.join(dropbox, `slide${currentSlide.page}`);
+  const svgBackgroundSlide = path.join(exportJob.presLocation,
+      'svgs', `slide${currentSlide.page}.svg`);
+  const svgBackgroundExists = fs.existsSync(svgBackgroundSlide);
+  const backgroundFormat = fs.existsSync(`${bgImagePath}.png`) ? 'png' : 'jpeg';
 
-    let backgroundImagePath = path.join(dropbox, `slide${currentSlide.page}`);
-    let svgBackgroundSlide = path.join(exportJob.presLocation, 'svgs',  `slide${currentSlide.page}.svg`);
-    let svgBackgroundExists = fs.existsSync(svgBackgroundSlide);
-    let backgroundFormat = fs.existsSync(`${backgroundImagePath}.png`) ? 'png' : 'jpeg'
-
-    // Output dimensions in pixels even if stated otherwise (pt)
-    // CairoSVG didn't like attempts to read the dimensions from a stream
-    // that would prevent loading file in memory
-    // Ideally, use dimensions provided by tldraw's background image asset
-    // (this is not yet always provided)
-    let dimensions = svgBackgroundExists ? 
+  // Output dimensions in pixels even if stated otherwise (pt)
+  // CairoSVG didn't like attempts to read the dimensions from a stream
+  // that would prevent loading file in memory
+  // Ideally, use dimensions provided by tldraw's background image asset
+  // (this is not yet always provided)
+  const dimensions = svgBackgroundExists ?
         probe.sync(fs.readFileSync(svgBackgroundSlide)) :
-        probe.sync(fs.readFileSync(`${backgroundImagePath}.${backgroundFormat}`));
+        probe.sync(fs.readFileSync(`${bgImagePath}.${backgroundFormat}`));
 
-    let slideWidth = parseInt(dimensions.width, 10);
-    let slideHeight = parseInt(dimensions.height, 10);
+  const slideWidth = parseInt(dimensions.width, 10);
+  const slideHeight = parseInt(dimensions.height, 10);
 
-    // Create the SVG slide with the background image
-    let svg = create({ version: '1.0', encoding: 'UTF-8' })
-        .ele('svg', {
-            xmlns: 'http://www.w3.org/2000/svg',
-            'xmlns:xlink': 'http://www.w3.org/1999/xlink',
-            width: `${slideWidth}px`,
-            height: `${slideHeight}px`,
-        })
-        .dtd({
-            pubID: '-//W3C//DTD SVG 1.1//EN',
-            sysID: 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'
-        })
-        .ele('image', {
-            'xlink:href': `file://${dropbox}/slide${currentSlide.page}.${backgroundFormat}`,
-            width: `${slideWidth}px`,
-            height: `${slideHeight}px`,
-        })
-        .up()
-        .ele('g', {
-            class: 'canvas'
-        });
+  // Create the SVG slide with the background image
+  let svg = create({version: '1.0', encoding: 'UTF-8'})
+      .ele('svg', {
+        'xmlns': 'http://www.w3.org/2000/svg',
+        'xmlns:xlink': 'http://www.w3.org/1999/xlink',
+        'width': `${slideWidth}px`,
+        'height': `${slideHeight}px`,
+      })
+      .dtd({
+        pubID: '-//W3C//DTD SVG 1.1//EN',
+        sysID: 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd',
+      })
+      .ele('image', {
+        'xlink:href': `file://${dropbox}/slide${currentSlide.page}.${backgroundFormat}`,
+        'width': `${slideWidth}px`,
+        'height': `${slideHeight}px`,
+      })
+      .up()
+      .ele('g', {
+        class: 'canvas',
+      });
 
-    // 4. Overlay annotations onto slides
-    overlay_annotations(svg, currentSlide.annotations)
+  // 4. Overlay annotations onto slides
+  overlay_annotations(svg, currentSlide.annotations);
 
-    svg = svg.end({ prettyPrint: true });
-    
-    // Write annotated SVG file
-    let SVGfile = path.join(dropbox, `annotated-slide${currentSlide.page}.svg`)
-    let PDFfile = path.join(dropbox, `annotated-slide${currentSlide.page}.pdf`)
+  svg = svg.end({prettyPrint: true});
 
-    fs.writeFileSync(SVGfile, svg, function (err) {
-        if (err) { return logger.error(err); }
-    });
+  // Write annotated SVG file
+  const SVGfile = path.join(dropbox, `annotated-slide${currentSlide.page}.svg`);
+  const PDFfile = path.join(dropbox, `annotated-slide${currentSlide.page}.pdf`);
 
-    // Dimensions converted to a pixel size which,
-    // when converted to points, will yield the desired
-    // dimension in pixels when read without conversion
+  fs.writeFileSync(SVGfile, svg, function(err) {
+    if (err) {
+      return logger.error(err);
+    }
+  });
 
-    // e.g. say the background SVG dimensions are set to 1920x1080 pt
-    // Resize output to 2560x1440 px so that the SVG generates with the original size in pt.
+  // Dimensions converted to a pixel size which,
+  // when converted to points, will yield the desired
+  // dimension in pixels when read without conversion
 
-    let convertAnnotatedSlide = [
-        'cairosvg',
-        SVGfile,
-        '--output-width', to_px(slideWidth),
-        '--output-height', to_px(slideHeight),
-        '-o', PDFfile
-    ].join(' ');
+  // e.g. say the background SVG dimensions are set to 1920x1080 pt
+  // Resize output to 2560x1440 px so that the SVG
+  // generates with the original size in pt.
 
-    execSync(convertAnnotatedSlide);
+  const convertAnnotatedSlide = [
+    'cairosvg',
+    SVGfile,
+    '--output-width', to_px(slideWidth),
+    '--output-height', to_px(slideHeight),
+    '-o', PDFfile,
+  ].join(' ');
 
-    ghostScriptInput += `${PDFfile} `
+  execSync(convertAnnotatedSlide);
+
+  ghostScriptInput += `${PDFfile} `;
 }
 
 // Create PDF output directory if it doesn't exist
-let output_dir = path.join(exportJob.presLocation, 'pdfs', jobId);
+const outputDir = path.join(exportJob.presLocation, 'pdfs', jobId);
 
-if (!fs.existsSync(output_dir)) { fs.mkdirSync(output_dir, { recursive: true }); }
+if (!fs.existsSync(outputDir)) {
+  fs.mkdirSync(outputDir, {recursive: true});
+}
 
-let filename = sanitize(exportJob.filename.replace(/\s/g, '_'));
+const filename = sanitize(exportJob.filename.replace(/\s/g, '_'));
 
-let mergePDFs = [
-    'gs',
-    '-dNOPAUSE',
-    '-sDEVICE=pdfwrite',
-    `-sOUTPUTFILE="${path.join(output_dir, `${filename}.pdf`)}"`,
-    `-dBATCH`,
-    ghostScriptInput,
+const mergePDFs = [
+  'gs',
+  '-dNOPAUSE',
+  '-sDEVICE=pdfwrite',
+  `-sOUTPUTFILE="${path.join(outputDir, `${filename}.pdf`)}"`,
+  `-dBATCH`,
+  ghostScriptInput,
 ].join(' ');
 
 // Resulting PDF file is stored in the presentation dir
 execSync(mergePDFs);
 
 // Launch Notifier Worker depending on job type
-logger.info(`Saved PDF at ${output_dir}/${jobId}/${filename}.pdf`);
+logger.info(`Saved PDF at ${outputDir}/${jobId}/${filename}.pdf`);
 
 kickOffNotifierWorker(exportJob.jobType, filename);
 
-parentPort.postMessage({ message: workerData });
+parentPort.postMessage({message: workerData});

From a3935bb90ad885a0c819d6760953de6066a2e6cf Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Wed, 27 Jul 2022 20:54:16 +0200
Subject: [PATCH 32/50] Implement SonarCloud generic fix

---
 bbb-export-annotations/.eslintrc.js         |  2 +-
 bbb-export-annotations/config/settings.json |  6 +-
 bbb-export-annotations/workers/collector.js |  7 +-
 bbb-export-annotations/workers/notifier.js  |  6 +-
 bbb-export-annotations/workers/process.js   | 73 ++++++++++-----------
 5 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/bbb-export-annotations/.eslintrc.js b/bbb-export-annotations/.eslintrc.js
index f8e1965746..f0220a73e5 100644
--- a/bbb-export-annotations/.eslintrc.js
+++ b/bbb-export-annotations/.eslintrc.js
@@ -5,7 +5,7 @@ module.exports = {
     'node': true,
   },
   'extends': [
-    'eslint:recommended',
+    'google',
   ],
   'parserOptions': {
     'ecmaVersion': 'latest',
diff --git a/bbb-export-annotations/config/settings.json b/bbb-export-annotations/config/settings.json
index 2eb6f24c35..138961c510 100644
--- a/bbb-export-annotations/config/settings.json
+++ b/bbb-export-annotations/config/settings.json
@@ -4,7 +4,11 @@
     },
     "shared": {
       "presDir": "/var/bigbluebutton",
-      "presAnnDropboxDir": "/tmp/pres-ann-dropbox"
+      "presAnnDropboxDir": "/tmp/pres-ann-dropbox",
+      "cairosvg": "/usr/bin/cairosvg",
+      "ghostscript": "/usr/bin/gs",
+      "imagemagick": "/usr/bin/convert",
+      "pdftocairo": "/usr/bin/pdftocairo"
     },
     "collector": {
       "pngWidthRasterizedSlides": 2560
diff --git a/bbb-export-annotations/workers/collector.js b/bbb-export-annotations/workers/collector.js
index 9618561306..02e42d3f13 100644
--- a/bbb-export-annotations/workers/collector.js
+++ b/bbb-export-annotations/workers/collector.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const redis = require('redis');
 const {Worker, workerData, parentPort} = require('worker_threads');
 const path = require('path');
-const {execSync} = require('child_process');
+const cp = require('child_process');
 
 const jobId = workerData;
 
@@ -77,7 +77,6 @@ const exportJob = JSON.parse(job);
       // so it matches what was shown in the browser.
 
       const extract_png_from_pdf = [
-        'pdftocairo',
         '-png',
         '-f', pageNumber,
         '-l', pageNumber,
@@ -85,9 +84,9 @@ const exportJob = JSON.parse(job);
         '-singlefile',
         '-cropbox',
         pdfFile, outputFile,
-      ].join(' ');
+      ];
 
-      execSync(extract_png_from_pdf);
+      cp.spawnSync(config.shared.pdftocairo, extract_png_from_pdf, {shell: false});
     }
   // If PNG file already available
   } else if (fs.existsSync(`${presFile}.png`)) {
diff --git a/bbb-export-annotations/workers/notifier.js b/bbb-export-annotations/workers/notifier.js
index de143ba495..5c77ae9369 100644
--- a/bbb-export-annotations/workers/notifier.js
+++ b/bbb-export-annotations/workers/notifier.js
@@ -8,7 +8,7 @@ const path = require('path');
 
 const {workerData, parentPort} = require('worker_threads');
 
-const [jobType, jobId, filename] = workerData;
+const [jobType, jobId, filename_with_extension] = workerData;
 
 const logger = new Logger('presAnn Notifier Worker');
 
@@ -27,7 +27,7 @@ async function notifyMeetingActor() {
 
   await client.connect();
   client.on('error', (err) => logger.info('Redis Client Error', err));
-  const link = `${config.notifier.protocol}://${config.notifier.host}/bigbluebutton/presentation/${exportJob.parentMeetingId}/${exportJob.parentMeetingId}/${exportJob.presId}/pdf/${jobId}/${filename}.pdf`;
+  const link = `${config.notifier.protocol}://${config.notifier.host}/bigbluebutton/presentation/${exportJob.parentMeetingId}/${exportJob.parentMeetingId}/${exportJob.presId}/pdf/${jobId}/${filename_with_extension}`;
   const notification = {
     envelope: {
       name: config.notifier.msgName,
@@ -59,7 +59,7 @@ async function notifyMeetingActor() {
 async function upload() {
   const callbackUrl = `http://${config.bbbWeb.host}:${config.bbbWeb.port}/bigbluebutton/presentation/${exportJob.presentationUploadToken}/upload`;
   const formData = new FormData();
-  const file = `${exportJob.presLocation}/pdfs/${jobId}/${filename}.pdf`;
+  const file = `${exportJob.presLocation}/pdfs/${jobId}/${filename_with_extension}`;
 
   formData.append('conference', exportJob.parentMeetingId);
   formData.append('pod_id', config.notifier.pod_id);
diff --git a/bbb-export-annotations/workers/process.js b/bbb-export-annotations/workers/process.js
index a099c2b7c9..cdd7b06cf2 100644
--- a/bbb-export-annotations/workers/process.js
+++ b/bbb-export-annotations/workers/process.js
@@ -2,7 +2,7 @@ const Logger = require('../lib/utils/logger');
 const config = require('../config');
 const fs = require('fs');
 const {create} = require('xmlbuilder2', {encoding: 'utf-8'});
-const {execSync} = require('child_process');
+const cp = require('child_process');
 const {Worker, workerData, parentPort} = require('worker_threads');
 const path = require('path');
 const sanitize = require('sanitize-filename');
@@ -130,12 +130,13 @@ function to_px(pt) {
 // the escape-string-regexp npm package, and Pango markup.
 function escapeText(string) {
   return string
+      .replace(/[~`!.*+?%^${}()|[\]\\/]/g, '\\$&')
+      .replace(/-/g, '\\&#x2D;')
       .replace(/&/g, '\\&amp;')
       .replace(/'/g, '\\&#39;')
+      .replace(/"/g, '\\&quot;')
       .replace(/>/g, '\\&gt;')
-      .replace(/</g, '\\&lt;')
-      .replace(/[~`!".*+?%^${}()|[\]\\/]/g, '\\$&')
-      .replace(/-/g, '\\&#x2D;');
+      .replace(/</g, '\\&lt;');
 }
 
 function render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxWidth = null) {
@@ -144,7 +145,7 @@ function render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxW
 
   // Sticky notes need automatic line wrapping: take width into account
   // Texbox scaled by a constant factor to improve resolution at small scales
-  const size = textBoxWidth ? `-size ${textBoxWidth * config.process.textScaleFactor}x` : '';
+  const size = textBoxWidth ? ['-size', `${textBoxWidth * config.process.textScaleFactor}x`] : [];
 
   const pangoText = `pango:"<span font_family='${font}' font='${fontSize}' color='${textColor}'>${text}</span>"`;
 
@@ -152,19 +153,18 @@ function render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxW
   textAlign = justify ? 'left' : textAlign;
 
   const commands = [
-    'convert',
     '-encoding', `${config.process.whiteboardTextEncoding}`,
     '-density', config.process.pixelsPerInch,
-    '-background', 'transparent',
-    size,
-    '-define', `pango:align=${textAlign}`,
-    '-define', `pango:justify=${justify}`,
-    '-define', 'pango:wrap=word-char',
-    pangoText,
-    path.join(dropbox, `text${id}.png`),
-  ].join(' ');
+    '-background', 'transparent'].concat(size,
+      [
+        '-define', `pango:align=${textAlign}`,
+        '-define', `pango:justify=${justify}`,
+        '-define', 'pango:wrap=word-char',
+        pangoText,
+        path.join(dropbox, `text${id}.png`),
+      ]);
 
-  execSync(commands);
+  cp.spawnSync(config.shared.imagemagick, commands, {shell: false});
 }
 
 function get_gap(dash, size) {
@@ -244,7 +244,7 @@ function getPath(annotationPoints) {
       .map((strokePoint) => strokePoint.point);
 
   let [max_x, max_y] = [0, 0];
-  const path = stroke.reduce(
+  const inner_path = stroke.reduce(
       (acc, [x0, y0], i, arr) => {
         if (!arr[i + 1]) return acc;
         const [x1, y1] = arr[i + 1];
@@ -261,8 +261,7 @@ function getPath(annotationPoints) {
       ['M', ...stroke[0], 'Q'],
   );
 
-  path.join(' ');
-  return [path, max_x, max_y];
+  return [inner_path, max_x, max_y];
 }
 
 function getOutlinePath(annotationPoints) {
@@ -273,7 +272,7 @@ function getOutlinePath(annotationPoints) {
   });
 
   let [max_x, max_y] = [0, 0];
-  const path = stroke.reduce(
+  const outline_path = stroke.reduce(
       (acc, [x0, y0], i, arr) => {
         const [x1, y1] = arr[(i + 1) % arr.length];
         if (x1 >= max_x) {
@@ -289,10 +288,9 @@ function getOutlinePath(annotationPoints) {
       ['M', ...stroke[0], 'Q'],
   );
 
-  path.push('Z');
-  path.join(' ');
+  outline_path.push('Z');
 
-  return [path, max_x, max_y];
+  return [outline_path, max_x, max_y];
 }
 
 function circleFromThreePoints(A, B, C) {
@@ -474,10 +472,9 @@ function overlay_arrow(svg, annotation) {
 
 function overlay_draw(svg, annotation) {
   const dash = annotation.style.dash;
+  const [calculated_path, max_x, max_y] = (dash == 'draw') ? getOutlinePath(annotation.points) : getPath(annotation.points);
 
-  const [path, max_x, max_y] = (dash == 'draw') ? getOutlinePath(annotation.points) : getPath(annotation.points);
-
-  if (!path.length) return;
+  if (!calculated_path.length) return;
 
   const shapeColor = color_to_hex(annotation.style.color);
   const rotation = rad_to_degree(annotation.rotation);
@@ -514,7 +511,7 @@ function overlay_draw(svg, annotation) {
 
   svg.ele('path', {
     style: `stroke:${shapeColor};stroke-width:${thickness};fill:${fill};${stroke_dasharray}`,
-    d: path,
+    d: calculated_path,
     transform: shapeTransform,
   });
 }
@@ -780,7 +777,7 @@ const exportJob = JSON.parse(job);
 const annotations = fs.readFileSync(path.join(dropbox, 'whiteboard'));
 const whiteboard = JSON.parse(annotations);
 const pages = JSON.parse(whiteboard.pages);
-let ghostScriptInput = '';
+const ghostScriptInput = [];
 
 // 3. Convert annotations to SVG
 for (const currentSlide of pages) {
@@ -848,16 +845,15 @@ for (const currentSlide of pages) {
   // generates with the original size in pt.
 
   const convertAnnotatedSlide = [
-    'cairosvg',
     SVGfile,
     '--output-width', to_px(slideWidth),
     '--output-height', to_px(slideHeight),
     '-o', PDFfile,
-  ].join(' ');
+  ];
 
-  execSync(convertAnnotatedSlide);
+  cp.spawnSync(config.shared.cairosvg, convertAnnotatedSlide, {shell: false});
 
-  ghostScriptInput += `${PDFfile} `;
+  ghostScriptInput.push(PDFfile);
 }
 
 // Create PDF output directory if it doesn't exist
@@ -867,23 +863,20 @@ if (!fs.existsSync(outputDir)) {
   fs.mkdirSync(outputDir, {recursive: true});
 }
 
-const filename = sanitize(exportJob.filename.replace(/\s/g, '_'));
+const filename_with_extension = `${sanitize(exportJob.filename.replace(/\s/g, '_'))}.pdf`;
 
 const mergePDFs = [
-  'gs',
   '-dNOPAUSE',
   '-sDEVICE=pdfwrite',
-  `-sOUTPUTFILE="${path.join(outputDir, `${filename}.pdf`)}"`,
-  `-dBATCH`,
-  ghostScriptInput,
-].join(' ');
+  `-sOUTPUTFILE="${path.join(outputDir, filename_with_extension)}"`,
+  `-dBATCH`].concat(ghostScriptInput);
 
 // Resulting PDF file is stored in the presentation dir
-execSync(mergePDFs);
+cp.spawnSync(config.shared.ghostscript, mergePDFs, {shell: false});
 
 // Launch Notifier Worker depending on job type
-logger.info(`Saved PDF at ${outputDir}/${jobId}/${filename}.pdf`);
+logger.info(`Saved PDF at ${outputDir}/${jobId}/${filename_with_extension}`);
 
-kickOffNotifierWorker(exportJob.jobType, filename);
+kickOffNotifierWorker(exportJob.jobType, filename_with_extension);
 
 parentPort.postMessage({message: workerData});

From ad8fcbf03ee9a787cd931839b7772294489b4459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Souza?= <contato@ramonsouza.com>
Date: Fri, 29 Jul 2022 14:47:24 -0300
Subject: [PATCH 33/50] fix text input losing focus on webcam start/stop

---
 bigbluebutton-html5/package-lock.json | 10 +++++-----
 bigbluebutton-html5/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index 97d7145b31..78ba705694 100644
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -5187,12 +5187,12 @@
       }
     },
     "react-draggable": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-3.3.2.tgz",
-      "integrity": "sha512-oaz8a6enjbPtx5qb0oDWxtDNuybOylvto1QLydsXgKmwT7e3GXC2eMVDwEMIUYJIFqVG72XpOv673UuuAq6LhA==",
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz",
+      "integrity": "sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==",
       "requires": {
-        "classnames": "^2.2.5",
-        "prop-types": "^15.6.0"
+        "clsx": "^1.1.1",
+        "prop-types": "^15.8.1"
       }
     },
     "react-dropzone": {
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index cf1637a6de..618c9e214f 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -60,7 +60,7 @@
     "react-autosize-textarea": "^5.0.1",
     "react-color": "^2.19.3",
     "react-dom": "^16.14.0",
-    "react-draggable": "^3.3.2",
+    "react-draggable": "^4.4.5",
     "react-dropzone": "^7.0.1",
     "react-intl": "^3.12.1",
     "react-loading-skeleton": "^3.0.3",

From efb40e00bbce99977ed22ce15d87860d1c496376 Mon Sep 17 00:00:00 2001
From: Joao Victor <joaov@imdt.com.br>
Date: Fri, 29 Jul 2022 16:02:31 -0300
Subject: [PATCH 34/50] fix(layout): don't show navbar/action-bar before layout
 has been calculated

---
 .../imports/ui/components/actions-bar/container.jsx           | 2 ++
 bigbluebutton-html5/imports/ui/components/layout/initState.js | 4 ++--
 .../imports/ui/components/nav-bar/container.jsx               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index d35f8c2646..4b429a1de7 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -29,6 +29,8 @@ const ActionsBarContainer = (props) => {
 
   const amIPresenter = users[Auth.meetingID][Auth.userID].presenter;
 
+  if (actionsBarStyle.display === false) return null;
+
   return (
     <ActionsBar {
       ...{
diff --git a/bigbluebutton-html5/imports/ui/components/layout/initState.js b/bigbluebutton-html5/imports/ui/components/layout/initState.js
index 39593692f4..8ef773a9f9 100644
--- a/bigbluebutton-html5/imports/ui/components/layout/initState.js
+++ b/bigbluebutton-html5/imports/ui/components/layout/initState.js
@@ -99,7 +99,7 @@ export const INITIAL_INPUT_STATE = {
 
 export const INITIAL_OUTPUT_STATE = {
   navBar: {
-    display: true,
+    display: false,
     width: 0,
     height: 0,
     top: 0,
@@ -108,7 +108,7 @@ export const INITIAL_OUTPUT_STATE = {
     zIndex: 1,
   },
   actionBar: {
-    display: true,
+    display: false,
     width: 0,
     height: 0,
     top: 0,
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
index 8708f754e7..e3d6e99947 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
@@ -57,7 +57,7 @@ const NavBarContainer = ({ children, ...props }) => {
 
   const hideNavBar = getFromUserSettings('bbb_hide_nav_bar', false);
 
-  if (hideNavBar) return null;
+  if (hideNavBar || navBar.display === false) return null;
 
   return (
     <NavBar

From aabfdbb991243a57886d8cd9b880b37bc0ec1fa4 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Mon, 1 Aug 2022 22:41:48 +0000
Subject: [PATCH 35/50] update shortcut modal style | add new shortcuts for WB

---
 .../ui/components/shortcut-help/component.jsx | 167 +++++++++++++-----
 .../ui/components/shortcut-help/styles.js     |  21 ++-
 bigbluebutton-html5/public/locales/en.json    |  11 ++
 3 files changed, 158 insertions(+), 41 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
index 9cdb9c5299..b03932d9bd 100644
--- a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
@@ -6,6 +6,7 @@ import deviceInfo from '/imports/utils/deviceInfo';
 import Modal from '/imports/ui/components/common/modal/simple/component';
 import _ from 'lodash';
 import Styled from './styles';
+import StyledSettings from '../settings/styles';
 import withShortcutHelper from './service';
 import { isChatEnabled } from '/imports/ui/services/features';
 
@@ -114,12 +115,62 @@ const intlMessages = defineMessages({
     id: 'app.shortcut-help.previousSlideKey',
     description: 'describes the previous slide shortcut key',
   },
+  select: {
+    id: 'app.shortcut-help.select',
+    description: 'describes the selection tool shortcut key',
+  },
+  pencil: {
+    id: 'app.shortcut-help.pencil',
+    description: 'describes the pencil tool shortcut key',
+  },
+  eraser: {
+    id: 'app.shortcut-help.eraser',
+    description: 'describes the eraser tool shortcut key',
+  },
+  rectangle: {
+    id: 'app.shortcut-help.rectangle',
+    description: 'describes the rectangle shape tool shortcut key',
+  },
+  elipse: {
+    id: 'app.shortcut-help.elipse',
+    description: 'describes the elipse shape tool shortcut key',
+  },
+  triangle: {
+    id: 'app.shortcut-help.triangle',
+    description: 'describes the triangle shape tool shortcut key',
+  },
+  line: {
+    id: 'app.shortcut-help.line',
+    description: 'describes the line shape tool shortcut key',
+  },
+  arrow: {
+    id: 'app.shortcut-help.arrow',
+    description: 'describes the arrow shape tool shortcut key',
+  },
+  text: {
+    id: 'app.shortcut-help.text',
+    description: 'describes the text tool shortcut key',
+  },
+  note: {
+    id: 'app.shortcut-help.note',
+    description: 'describes the sticky note shortcut key',
+  },
 });
 
+const renderItem = (func, key) => {
+  return (
+    <tr key={_.uniqueId('hotkey-item-')}>
+      <Styled.DescCell>{func}</Styled.DescCell>
+      <Styled.KeyCell>{key}</Styled.KeyCell>
+    </tr>
+  );
+}
+
 const ShortcutHelpComponent = (props) => {
   const { intl, shortcuts } = props;
   const { browserName } = browserInfo;
   const { isIos, isMacos } = deviceInfo;
+  const [ selectedTab, setSelectedTab] = React.useState(0);
 
   let accessMod = null;
 
@@ -147,43 +198,31 @@ const ShortcutHelpComponent = (props) => {
     accessMod = 'Control + Option';
   }
 
-  const shortcutItems = shortcuts.map((shortcut) => {
+  const generalShortcutItems = shortcuts.map((shortcut) => {
     if (!isChatEnabled() && shortcut.descId.indexOf('Chat') !== -1) return null;
-    return (
-      <tr key={_.uniqueId('hotkey-item-')}>
-        <Styled.KeyCell>{`${accessMod} + ${shortcut.accesskey}`}</Styled.KeyCell>
-        <Styled.DescCell>{`${intl.formatMessage(intlMessages[`${shortcut.descId.toLowerCase()}`])}`}</Styled.DescCell>
-      </tr>
+    return renderItem(
+      `${intl.formatMessage(intlMessages[`${shortcut.descId.toLowerCase()}`])}`,
+      `${accessMod} + ${shortcut.accesskey}`
     );
   });
 
-  shortcutItems.push((
-    <tr key={_.uniqueId('hotkey-item-')}>
-      <Styled.KeyCell>{intl.formatMessage(intlMessages.togglePanKey)}</Styled.KeyCell>
-      <Styled.DescCell>{intl.formatMessage(intlMessages.togglePan)}</Styled.DescCell>
-    </tr>
-  ));
+  const shortcutItems = [];
+  shortcutItems.push(renderItem(intl.formatMessage(intlMessages.togglePan), intl.formatMessage(intlMessages.togglePanKey)));
+  shortcutItems.push(renderItem(intl.formatMessage(intlMessages.toggleFullscreen), intl.formatMessage(intlMessages.toggleFullscreenKey)));
+  shortcutItems.push(renderItem(intl.formatMessage(intlMessages.nextSlideDesc), intl.formatMessage(intlMessages.nextSlideKey)));
+  shortcutItems.push(renderItem(intl.formatMessage(intlMessages.previousSlideDesc), intl.formatMessage(intlMessages.previousSlideKey)));
 
-  shortcutItems.push((
-    <tr key={_.uniqueId('hotkey-item-')}>
-      <Styled.KeyCell>{intl.formatMessage(intlMessages.toggleFullscreenKey)}</Styled.KeyCell>
-      <Styled.DescCell>{intl.formatMessage(intlMessages.toggleFullscreen)}</Styled.DescCell>
-    </tr>
-  ));
-
-  shortcutItems.push((
-    <tr key={_.uniqueId('hotkey-item-')}>
-      <Styled.KeyCell>{intl.formatMessage(intlMessages.nextSlideKey)}</Styled.KeyCell>
-      <Styled.DescCell>{intl.formatMessage(intlMessages.nextSlideDesc)}</Styled.DescCell>
-    </tr>
-  ));
-
-  shortcutItems.push((
-    <tr key={_.uniqueId('hotkey-item-')}>
-      <Styled.KeyCell>{intl.formatMessage(intlMessages.previousSlideKey)}</Styled.KeyCell>
-      <Styled.DescCell>{intl.formatMessage(intlMessages.previousSlideDesc)}</Styled.DescCell>
-    </tr>
-  ));
+  const whiteboardShortcutItems = [];
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.select), '1'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.pencil), '2'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.eraser), '3'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.rectangle), '4'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.elipse), '5'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.triangle), '6'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.line), '7'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.arrow), '8'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.text), '9'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.note), '0'));
 
   return (
     <Modal
@@ -193,21 +232,69 @@ const ShortcutHelpComponent = (props) => {
         description: intl.formatMessage(intlMessages.closeDesc),
       }}
     >
-      {!accessMod ? <p>{intl.formatMessage(intlMessages.accessKeyNotAvailable)}</p>
-        : (
-          <span>
-            <Styled.ShortcutTable>
+      <Styled.SettingsTabs
+        onSelect={(tab) => setSelectedTab(tab)}
+        selectedIndex={selectedTab}
+        role="presentation"
+      >
+        <StyledSettings.SettingsTabList>
+          <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
+            <StyledSettings.SettingsIcon iconName="application" />
+            <span id="appicationTab">{'General'}</span>
+          </StyledSettings.SettingsTabSelector>
+
+          <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
+            <StyledSettings.SettingsIcon iconName="alert" />
+            <span id="presentationTab">{'Presentation'}</span>
+          </StyledSettings.SettingsTabSelector>
+
+          <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
+            <StyledSettings.SettingsIcon iconName="alert" />
+            <span id="whiteboardTab">{'Whiteboard'}</span>
+          </StyledSettings.SettingsTabSelector>
+        </StyledSettings.SettingsTabList>
+
+        <StyledSettings.SettingsTabPanel selectedClassName="is-selected">
+        {!accessMod ? <p>{intl.formatMessage(intlMessages.accessKeyNotAvailable)}</p>
+          : (
+            <span>
+              <Styled.ShortcutTable>
+                <tbody>
+                  <tr>           
+                    <th>{intl.formatMessage(intlMessages.functionLabel)}</th>
+                    <th>{intl.formatMessage(intlMessages.comboLabel)}</th>
+                  </tr>
+                  {generalShortcutItems}
+                </tbody>
+              </Styled.ShortcutTable>
+            </span>
+          )
+        }
+        </StyledSettings.SettingsTabPanel>
+        <StyledSettings.SettingsTabPanel selectedClassName="is-selected">
+          <Styled.ShortcutTable>
               <tbody>
                 <tr>
-                  <th>{intl.formatMessage(intlMessages.comboLabel)}</th>
                   <th>{intl.formatMessage(intlMessages.functionLabel)}</th>
+                  <th>{intl.formatMessage(intlMessages.comboLabel)}</th>
                 </tr>
                 {shortcutItems}
               </tbody>
             </Styled.ShortcutTable>
-          </span>
-        )
-      }
+        </StyledSettings.SettingsTabPanel>
+        <StyledSettings.SettingsTabPanel selectedClassName="is-selected">
+          <Styled.ShortcutTable>
+              <tbody>
+                <tr>
+                  <th>{intl.formatMessage(intlMessages.functionLabel)}</th>
+                  <th>{intl.formatMessage(intlMessages.comboLabel)}</th>
+                </tr>
+                {whiteboardShortcutItems}
+              </tbody>
+            </Styled.ShortcutTable>
+        </StyledSettings.SettingsTabPanel>
+
+      </Styled.SettingsTabs>
     </Modal>
   );
 };
diff --git a/bigbluebutton-html5/imports/ui/components/shortcut-help/styles.js b/bigbluebutton-html5/imports/ui/components/shortcut-help/styles.js
index 2ba1952118..49bedc80b1 100644
--- a/bigbluebutton-html5/imports/ui/components/shortcut-help/styles.js
+++ b/bigbluebutton-html5/imports/ui/components/shortcut-help/styles.js
@@ -1,12 +1,17 @@
 import styled from 'styled-components';
 import { borderSize, smPaddingX } from '/imports/ui/stylesheets/styled-components/general';
 import { colorGrayLighter } from '/imports/ui/stylesheets/styled-components/palette';
+import { Tabs } from 'react-tabs';
+
+import { smallOnly } from '/imports/ui/stylesheets/styled-components/breakpoints';
 
 const KeyCell = styled.td`
   border: ${borderSize} solid ${colorGrayLighter};
   text-align: center;
   padding: ${smPaddingX};
   margin: auto;
+  width: 6rem;
+  min-width: 6rem;
 `;
 
 const DescCell = styled.td`
@@ -18,11 +23,25 @@ const DescCell = styled.td`
 const ShortcutTable = styled.table`
   border: ${borderSize} solid ${colorGrayLighter};
   border-collapse: collapse;
-  margin: auto;
+  margin: 0;
+  width: 100%;
+`;
+
+const SettingsTabs = styled(Tabs)`
+  display: flex;
+  flex-flow: row;
+  justify-content: flex-start;
+  margin-top: 1rem;
+
+  @media ${smallOnly} {
+    width: 100%;
+    flex-flow: column;
+  }
 `;
 
 export default {
   KeyCell,
   DescCell,
   ShortcutTable,
+  SettingsTabs,
 };
diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index e404049576..1db562237b 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -750,6 +750,17 @@
     "app.shortcut-help.toggleFullscreenKey": "Enter",
     "app.shortcut-help.nextSlideKey": "Right Arrow",
     "app.shortcut-help.previousSlideKey": "Left Arrow",
+    "app.shortcut-help.select": "Select Tool",
+    "app.shortcut-help.pencil": "Pencil",
+    "app.shortcut-help.eraser": "Eraser",
+    "app.shortcut-help.rectangle": "Rectangle",
+    "app.shortcut-help.elipse": "Elipse",
+    "app.shortcut-help.triangle": "Triangle",
+    "app.shortcut-help.line": "Line",
+    "app.shortcut-help.arrow": "Arrow",
+    "app.shortcut-help.text": "Text Tool",
+    "app.shortcut-help.note": "Sticky Note",
+
     "app.lock-viewers.title": "Lock viewers",
     "app.lock-viewers.description": "These options enable you to restrict viewers from using specific features.",
     "app.lock-viewers.featuresLable": "Feature",

From b838d3862d6644eb12e5900fd419d839aa0266ad Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Tue, 2 Aug 2022 11:43:29 +0000
Subject: [PATCH 36/50] localize tabs in shortcut modal

---
 .../ui/components/shortcut-help/component.jsx | 19 ++++++++++++++++---
 bigbluebutton-html5/public/locales/en.json    |  4 +++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
index b03932d9bd..4b94586931 100644
--- a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
@@ -155,6 +155,19 @@ const intlMessages = defineMessages({
     id: 'app.shortcut-help.note',
     description: 'describes the sticky note shortcut key',
   },
+  general: {
+    id: 'app.shortcut-help.general',
+    description: 'general tab heading',
+  },
+  presentation: {
+    id: 'app.shortcut-help.presentation',
+    description: 'presentation tab heading',
+    "app.shortcut-help.whiteboard": "Whiteboard",
+  },
+  whiteboard: {
+    id: 'app.shortcut-help.whiteboard',
+    description: 'whiteboard tab heading',
+  }
 });
 
 const renderItem = (func, key) => {
@@ -240,17 +253,17 @@ const ShortcutHelpComponent = (props) => {
         <StyledSettings.SettingsTabList>
           <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
             <StyledSettings.SettingsIcon iconName="application" />
-            <span id="appicationTab">{'General'}</span>
+            <span id="appicationTab">{intl.formatMessage(intlMessages.general)}</span>
           </StyledSettings.SettingsTabSelector>
 
           <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
             <StyledSettings.SettingsIcon iconName="alert" />
-            <span id="presentationTab">{'Presentation'}</span>
+            <span id="presentationTab">{intl.formatMessage(intlMessages.presentation)}</span>
           </StyledSettings.SettingsTabSelector>
 
           <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
             <StyledSettings.SettingsIcon iconName="alert" />
-            <span id="whiteboardTab">{'Whiteboard'}</span>
+            <span id="whiteboardTab">{intl.formatMessage(intlMessages.whiteboard)}</span>
           </StyledSettings.SettingsTabSelector>
         </StyledSettings.SettingsTabList>
 
diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index 1db562237b..73a598d511 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -760,7 +760,9 @@
     "app.shortcut-help.arrow": "Arrow",
     "app.shortcut-help.text": "Text Tool",
     "app.shortcut-help.note": "Sticky Note",
-
+    "app.shortcut-help.general": "General",
+    "app.shortcut-help.presentation": "Presentation",
+    "app.shortcut-help.whiteboard": "Whiteboard",
     "app.lock-viewers.title": "Lock viewers",
     "app.lock-viewers.description": "These options enable you to restrict viewers from using specific features.",
     "app.lock-viewers.featuresLable": "Feature",

From 3529fe9f28dd484fe471798710e99d7e05cd2e72 Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Tue, 2 Aug 2022 15:53:40 +0200
Subject: [PATCH 37/50] Rename parameters; hide download button and label when
 disabled

---
 .../PresentationWithAnnotationsMsgHdlr.scala              | 6 +++---
 .../server/methods/exportPresentationToChat.js            | 2 +-
 .../presentation/presentation-uploader/component.jsx      | 6 ++++--
 .../presentation/presentation-uploader/container.jsx      | 3 ++-
 bigbluebutton-html5/imports/ui/services/features/index.js | 8 ++++----
 .../grails-app/conf/bigbluebutton.properties              | 2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
index 7b99b47d6a..e1afe8f806 100644
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
@@ -89,7 +89,7 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
 
     val currentPres: Option[PresentationInPod] = presentationPods.flatMap(_.getPresentation(presId)).headOption
 
-    if (liveMeeting.props.meetingProp.disabledFeatures.contains("presentationWithAnnotationDownload")) {
+    if (liveMeeting.props.meetingProp.disabledFeatures.contains("downloadPresentationWithAnnotations")) {
       val reason = "Annotated presentation download disabled for this meeting."
       PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
     } else if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
@@ -129,8 +129,8 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
     val presentationPods: Vector[PresentationPod] = state.presentationPodManager.getAllPresentationPodsInMeeting()
     val currentPres: Option[PresentationInPod] = presentationPods.flatMap(_.getCurrentPresentation()).headOption
 
-    if (liveMeeting.props.meetingProp.disabledFeatures.contains("exportPresentationWithAnnotation")) {
-      val reason = "Annotated presentation export disabled for this meeting."
+    if (liveMeeting.props.meetingProp.disabledFeatures.contains("importPresentationWithAnnotationsFromBreakoutRooms")) {
+      val reason = "Importing slides from breakout rooms disabled for this meeting."
       PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
     } else if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
       val reason = "No permission to export presentation."
diff --git a/bigbluebutton-html5/imports/api/presentations/server/methods/exportPresentationToChat.js b/bigbluebutton-html5/imports/api/presentations/server/methods/exportPresentationToChat.js
index d85083372c..3a008fe4f3 100644
--- a/bigbluebutton-html5/imports/api/presentations/server/methods/exportPresentationToChat.js
+++ b/bigbluebutton-html5/imports/api/presentations/server/methods/exportPresentationToChat.js
@@ -5,7 +5,7 @@ import Logger from '/imports/startup/server/logger';
 import setPresentationExporting from '/imports/api/presentations/server/modifiers/setPresentationExporting';
 import Presentations from '/imports/api/presentations';
 
-const EXPORTING_THRESHOLD_PER_SLIDE = 60000;
+const EXPORTING_THRESHOLD_PER_SLIDE = 2500;
 
 export default function exportPresentationToChat(presentationId) {
   const REDIS_CONFIG = Meteor.settings.private.redis;
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
index 6622a5969f..13e217ae64 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx
@@ -768,7 +768,7 @@ class PresentationUploader extends Component {
 
   renderPresentationList() {
     const { presentations } = this.state;
-    const { intl } = this.props;
+    const { intl, allowDownloadable } = this.props;
 
     let presentationsSorted = presentations;
 
@@ -810,7 +810,9 @@ class PresentationUploader extends Component {
             </tr>
             <Styled.Head>
               <th colSpan={4}>{intl.formatMessage(intlMessages.currentLabel)}</th>
-              <th>{intl.formatMessage(intlMessages.downloadLabel)}</th>
+              {
+                allowDownloadable ? <th>{intl.formatMessage(intlMessages.downloadLabel)}</th> : null
+              }
             </Styled.Head>
           </thead>
           <tbody>
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
index 6808ca2532..f37a632090 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/container.jsx
@@ -7,6 +7,7 @@ import Service from './service';
 import PresentationUploader from './component';
 import { UsersContext } from '/imports/ui/components/components-data/users-context/context';
 import Auth from '/imports/ui/services/auth';
+import { isDownloadPresentationWithAnnotationsEnabled } from '/imports/ui/services/features';
 
 const PRESENTATION_CONFIG = Meteor.settings.public.presentation;
 
@@ -38,7 +39,7 @@ export default withTracker(() => {
     fileSizeMax: PRESENTATION_CONFIG.mirroredFromBBBCore.uploadSizeMax,
     filePagesMax: PRESENTATION_CONFIG.mirroredFromBBBCore.uploadPagesMax,
     fileValidMimeTypes: PRESENTATION_CONFIG.uploadValidMimeTypes,
-    allowDownloadable: PRESENTATION_CONFIG.allowDownloadable,
+    allowDownloadable: isDownloadPresentationWithAnnotationsEnabled(),
     handleSave: (presentations) => Service.persistPresentationChanges(
       currentPresentations,
       presentations,
diff --git a/bigbluebutton-html5/imports/ui/services/features/index.js b/bigbluebutton-html5/imports/ui/services/features/index.js
index 8950b79993..141d7a5923 100644
--- a/bigbluebutton-html5/imports/ui/services/features/index.js
+++ b/bigbluebutton-html5/imports/ui/services/features/index.js
@@ -56,10 +56,10 @@ export function isCustomVirtualBackgroundsEnabled() {
   return getDisabledFeatures().indexOf('customVirtualBackgrounds') === -1;
 }
 
-export function isPresentationWithAnnotationDownloadEnabled() {
-  return getDisabledFeatures().indexOf('presentationWithAnnotationDownload') === -1;
+export function isDownloadPresentationWithAnnotationsEnabled() {
+  return getDisabledFeatures().indexOf('downloadPresentationWithAnnotations') === -1 && Meteor.settings.public.presentation.allowDownloadable;
 }
 
-export function isExportPresentationWithAnnotationEnabled() {
-  return getDisabledFeatures().indexOf('exportPresentationWithAnnotation') === -1;
+export function isImportPresentationWithAnnotationsFromBreakoutRoomsEnabled() {
+  return getDisabledFeatures().indexOf('importPresentationWithAnnotationsFromBreakoutRooms') === -1;
 }
diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index b4535071f5..edbd9e8763 100755
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -418,7 +418,7 @@ endWhenNoModeratorDelayInMinutes=1
 
 # List of features to disable (comma-separated)
 # Available options: breakoutRooms, captions, chat, externalVideos, layouts, learningDashboard, polls, screenshare,
-# sharedNotes, virtualBackgrounds, presentationWithAnnotationDownload, exportPresentationWithAnnotation
+# sharedNotes, virtualBackgrounds, downloadPresentationWithAnnotations, importPresentationWithAnnotationsFromBreakoutRooms
 #disabledFeatures=
 
 # Notify users that recording is on

From 7c6f7f64b14fae6fd4b4e7aff516dfd44038f30c Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Tue, 2 Aug 2022 15:33:33 +0000
Subject: [PATCH 38/50] update icons in shortcuts modal

---
 .../imports/ui/components/shortcut-help/component.jsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
index 4b94586931..9b700f3f41 100644
--- a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
@@ -257,12 +257,12 @@ const ShortcutHelpComponent = (props) => {
           </StyledSettings.SettingsTabSelector>
 
           <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
-            <StyledSettings.SettingsIcon iconName="alert" />
+            <StyledSettings.SettingsIcon iconName="presentation" />
             <span id="presentationTab">{intl.formatMessage(intlMessages.presentation)}</span>
           </StyledSettings.SettingsTabSelector>
 
           <StyledSettings.SettingsTabSelector selectedClassName="is-selected">
-            <StyledSettings.SettingsIcon iconName="alert" />
+            <StyledSettings.SettingsIcon iconName="whiteboard" />
             <span id="whiteboardTab">{intl.formatMessage(intlMessages.whiteboard)}</span>
           </StyledSettings.SettingsTabSelector>
         </StyledSettings.SettingsTabList>

From 9e219d9cb3113b035f0ced3e83140274775eda9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Souza?= <contato@ramonsouza.com>
Date: Tue, 2 Aug 2022 17:33:53 -0300
Subject: [PATCH 39/50] adjust cc icon position

---
 .../imports/ui/components/audio/captions/button/styles.js      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/audio/captions/button/styles.js b/bigbluebutton-html5/imports/ui/components/audio/captions/button/styles.js
index 15f36d3435..602aa8a38f 100644
--- a/bigbluebutton-html5/imports/ui/components/audio/captions/button/styles.js
+++ b/bigbluebutton-html5/imports/ui/components/audio/captions/button/styles.js
@@ -9,6 +9,9 @@ const ClosedCaptionToggleButton = styled(Button)`
       background-color: transparent !important;
       border-color: ${colorWhite} !important;
     }
+    i {
+      margin-top: .4rem;
+    }
   `}
 `;
 

From b66e44a4cb9290ab6724170fb833931dbf6faf6a Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Wed, 3 Aug 2022 14:19:12 +0000
Subject: [PATCH 40/50] Upgrade tldraw to latest version

---
 bigbluebutton-html5/client/main.html          | 29 ------------
 .../ui/components/whiteboard/component.jsx    | 47 ++++++++++++++++---
 .../ui/components/whiteboard/container.jsx    |  4 +-
 bigbluebutton-html5/package.json              |  5 +-
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/bigbluebutton-html5/client/main.html b/bigbluebutton-html5/client/main.html
index 987c6fc420..5c9ad032fd 100755
--- a/bigbluebutton-html5/client/main.html
+++ b/bigbluebutton-html5/client/main.html
@@ -94,35 +94,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       color: var(--palette-placeholder-text);
       opacity: 1;
     }
-
-    #TD-PrimaryTools {
-      flex-direction: column;
-    }
-
-    #TD-Tools {
-        position: absolute;
-        right: 1rem;
-        bottom: 5rem;
-    }
-
-    [dir="rtl"] #TD-Tools {
-        left: 1rem;
-        right: auto;
-    }
-
-    #TD-Tools > div {
-      flex-direction: column;
-    }
-
-    #TD-Styles + div {
-      display: flex;
-      padding-right: 2.5rem;
-    }
-
-    [dir="rtl"] #TD-Styles + div  {
-      padding-left: 2.5rem;
-      padding-right: 0px;
-    }
   </style>
   <script>
     document.addEventListener('gesturestart', function (e) {
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
index 5657bdc57f..dcf9ed2b90 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
@@ -47,6 +47,7 @@ export default function Whiteboard(props) {
     zoomChanger,
     isZoomed,
     isMultiUserActive,
+    isRTL,
   } = props;
 
   const { pages, pageStates } = initDefaultPages(curPres?.pages.length || 1);
@@ -204,6 +205,39 @@ export default function Whiteboard(props) {
     }
   }, [curPageId, slidePosition]);
 
+  React.useEffect(() => {
+    if (hasWBAccess || isPresenter) {
+      const tdTools = document.getElementById("TD-Tools"); 
+      const tdPrimaryTools = document.getElementById("TD-PrimaryTools");
+      if (tdPrimaryTools) tdPrimaryTools.style.flexDirection = 'column';
+  
+      if (tdTools) {
+        tdTools.firstChild.style.flexDirection = 'column';
+        tdTools.parentElement.style.overflow = 'visible';
+        tdTools.style.bottom = '6rem';
+        tdTools.style.right = '0.5rem';
+        tdTools.style.position = 'absolute';
+
+        // removes tldraw native help menu button
+        tdTools.parentElement?.nextSibling?.remove();
+
+        if (isRTL) {
+          tdTools.style.left = '0.5rem';
+          tdTools.style.right = 'auto';
+        }
+      }
+  
+      // removes image tool from the tldraw toolbar
+      document.getElementById("TD-PrimaryTools-Image").style.display = 'none';
+
+      const tdStyles = document.getElementById("TD-Styles");
+      if (tdStyles) {
+        document.getElementById("TD-Styles").style.marginRight = isRTL ? 'auto' : '2.5rem';
+        document.getElementById("TD-Styles").style.marginLeft = isRTL ? '2.5rem' : 'auto';
+      }
+    }
+  });
+
   const hasWBAccess = props?.hasMultiUserAccess(props.whiteboardId, props.currentUser.userId);
 
   const onMount = (app) => {
@@ -247,7 +281,7 @@ export default function Whiteboard(props) {
     }
   };
 
-  const onPatch = (s, reason) => {
+  const onPatch = (e, t, reason) => {
     if (reason && isPresenter && (reason.includes("zoomed") || reason.includes("panned"))) {
       if (cameraFitSlide.zoom === 0) {
         //can happen when the slide finish uploading
@@ -295,6 +329,7 @@ export default function Whiteboard(props) {
       showZoom={false}
       showUI={curPres ? (isPresenter || hasWBAccess) : true}
       showMenu={curPres ? false : true}
+    
       showMultiplayerMenu={false}
       readOnly={false}
       onPatch={onPatch}
@@ -344,8 +379,7 @@ export default function Whiteboard(props) {
         }
       }}
       onCommand={(e, s, g) => {
-
-        if (s.includes('move_to_page')) {
+        if (s?.id.includes('move_to_page')) {
           let groupShapes = [];
           let nonGroupShapes = [];
           let movedShapes = {};
@@ -373,7 +407,7 @@ export default function Whiteboard(props) {
           return;
         }
 
-        if (s.includes('ungroup')) {
+        if (s?.id.includes('ungroup')) {
           e?.selectedIds?.map(id => {
             persistShape(e.getShape(id), whiteboardId);
           })
@@ -390,9 +424,10 @@ export default function Whiteboard(props) {
 
         const conditions = [
           "session:complete", "style", "updated_shapes", "duplicate", "stretch", 
-          "align", "move", "delete", "create", "flip", "toggle", "group", "translate"
+          "align", "move", "delete", "create", "flip", "toggle", "group", "translate",
+          "transform_single", "arrow", "edit", "erase", "rotate",   
         ]
-        if (conditions.some(el => s?.startsWith(el))) {
+        if (conditions.some(el => s?.id?.startsWith(el))) {
           e.selectedIds.forEach(id => {
             const shape = e.getShape(id);
             const shapeBounds = e.getShapeBounds(id);
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
index 07210a77e8..5c84990142 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
@@ -5,13 +5,15 @@ import React, { useContext } from "react";
 import { UsersContext } from "../components-data/users-context/context";
 import Auth from "/imports/ui/services/auth";
 import PresentationToolbarService from '../presentation/presentation-toolbar/service';
+import { layoutSelect } from '../layout/context';
 
 const WhiteboardContainer = (props) => {
     const usingUsersContext = useContext(UsersContext);
+    const isRTL = layoutSelect((i) => i.isRTL);
     const { users } = usingUsersContext;
     const currentUser = users[Auth.meetingID][Auth.userID];
     const isPresenter = currentUser.presenter;
-    return <Whiteboard {...{isPresenter, currentUser}} {...props} meetingId={Auth.meetingID} />
+    return <Whiteboard {...{isPresenter, currentUser, isRTL}} {...props} meetingId={Auth.meetingID} />
 };
 
 export default withTracker(({ whiteboardId, curPageId, intl, zoomChanger }) => {
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index e828db1b9e..6ada8e2dba 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -32,9 +32,8 @@
     "@browser-bunyan/server-stream": "^1.8.0",
     "@jitsi/sdp-interop": "0.1.14",
     "@material-ui/core": "^4.12.4",
-    "@mconf/bbb-diff": "1.2.0",
-    "@tldraw/core": "^1.9.1",
-    "@tldraw/tldraw": "1.8.1",
+    "@tldraw/core": "1.15.0",
+    "@tldraw/tldraw": "1.20.0",
     "@mconf/bbb-diff": "^1.2.0",
     "autoprefixer": "^10.4.4",
     "axios": "^0.21.3",

From 48cc57dbaf359da88435a75664a4b04a26ae4de8 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Wed, 3 Aug 2022 14:30:22 +0000
Subject: [PATCH 41/50] move variable definition

---
 .../imports/ui/components/whiteboard/component.jsx           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
index dcf9ed2b90..1452f627a9 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
@@ -205,6 +205,8 @@ export default function Whiteboard(props) {
     }
   }, [curPageId, slidePosition]);
 
+  const hasWBAccess = props?.hasMultiUserAccess(props.whiteboardId, props.currentUser.userId);
+
   React.useEffect(() => {
     if (hasWBAccess || isPresenter) {
       const tdTools = document.getElementById("TD-Tools"); 
@@ -238,8 +240,6 @@ export default function Whiteboard(props) {
     }
   });
 
-  const hasWBAccess = props?.hasMultiUserAccess(props.whiteboardId, props.currentUser.userId);
-
   const onMount = (app) => {
     setTLDrawAPI(app);
     props.setTldrawAPI(app);
@@ -329,7 +329,6 @@ export default function Whiteboard(props) {
       showZoom={false}
       showUI={curPres ? (isPresenter || hasWBAccess) : true}
       showMenu={curPres ? false : true}
-    
       showMultiplayerMenu={false}
       readOnly={false}
       onPatch={onPatch}

From 3409544d75fdec9271fea240e1f64a2dd6ac68bb Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Thu, 4 Aug 2022 12:51:06 +0000
Subject: [PATCH 42/50] add package lock

---
 bigbluebutton-html5/package-lock.json | 317 +++++++++++++++++---------
 1 file changed, 208 insertions(+), 109 deletions(-)

diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index ee3ba4898b..ada45f6cf9 100644
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -712,23 +712,6 @@
         "@radix-ui/react-primitive": "0.1.4"
       }
     },
-    "@radix-ui/react-checkbox": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-0.1.5.tgz",
-      "integrity": "sha512-M8Y4dSXsKSbF+FryG5VvZKr/1MukMVG7swq9p5s7wYb8Rvn0UM0rQ5w8BWmSWSV4BL/gbJdhwVCznwXXlgZRZg==",
-      "requires": {
-        "@babel/runtime": "^7.13.10",
-        "@radix-ui/primitive": "0.1.0",
-        "@radix-ui/react-compose-refs": "0.1.0",
-        "@radix-ui/react-context": "0.1.1",
-        "@radix-ui/react-label": "0.1.5",
-        "@radix-ui/react-presence": "0.1.2",
-        "@radix-ui/react-primitive": "0.1.4",
-        "@radix-ui/react-use-controllable-state": "0.1.0",
-        "@radix-ui/react-use-previous": "0.1.1",
-        "@radix-ui/react-use-size": "0.1.1"
-      }
-    },
     "@radix-ui/react-collection": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-0.1.4.tgz",
@@ -854,18 +837,6 @@
         "@radix-ui/react-use-layout-effect": "0.1.0"
       }
     },
-    "@radix-ui/react-label": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-0.1.5.tgz",
-      "integrity": "sha512-Au9+n4/DhvjR0IHhvZ1LPdx/OW+3CGDie30ZyCkbSHIuLp4/CV4oPPGBwJ1vY99Jog3zyQhsGww9MXj8O9Aj/A==",
-      "requires": {
-        "@babel/runtime": "^7.13.10",
-        "@radix-ui/react-compose-refs": "0.1.0",
-        "@radix-ui/react-context": "0.1.1",
-        "@radix-ui/react-id": "0.1.5",
-        "@radix-ui/react-primitive": "0.1.4"
-      }
-    },
     "@radix-ui/react-menu": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-0.1.6.tgz",
@@ -891,6 +862,28 @@
         "react-remove-scroll": "^2.4.0"
       }
     },
+    "@radix-ui/react-popover": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-0.1.6.tgz",
+      "integrity": "sha512-zQzgUqW4RQDb0ItAL1xNW4K4olUrkfV3jeEPs9rG+nsDQurO+W9TT+YZ9H1mmgAJqlthyv1sBRZGdBm4YjtD6Q==",
+      "requires": {
+        "@babel/runtime": "^7.13.10",
+        "@radix-ui/primitive": "0.1.0",
+        "@radix-ui/react-compose-refs": "0.1.0",
+        "@radix-ui/react-context": "0.1.1",
+        "@radix-ui/react-dismissable-layer": "0.1.5",
+        "@radix-ui/react-focus-guards": "0.1.0",
+        "@radix-ui/react-focus-scope": "0.1.4",
+        "@radix-ui/react-id": "0.1.5",
+        "@radix-ui/react-popper": "0.1.4",
+        "@radix-ui/react-portal": "0.1.4",
+        "@radix-ui/react-presence": "0.1.2",
+        "@radix-ui/react-primitive": "0.1.4",
+        "@radix-ui/react-use-controllable-state": "0.1.0",
+        "aria-hidden": "^1.1.1",
+        "react-remove-scroll": "^2.4.0"
+      }
+    },
     "@radix-ui/react-popper": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-0.1.4.tgz",
@@ -936,24 +929,6 @@
         "@radix-ui/react-slot": "0.1.2"
       }
     },
-    "@radix-ui/react-radio-group": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-0.1.5.tgz",
-      "integrity": "sha512-ybgHsmh/V2crKvK6xZ56dpPul7b+vyxcq7obWqHbr5W6Ca11wdm0E7lS0i/Y6pgfIKYOWIARmZYDpRMEeRCPOw==",
-      "requires": {
-        "@babel/runtime": "^7.13.10",
-        "@radix-ui/primitive": "0.1.0",
-        "@radix-ui/react-compose-refs": "0.1.0",
-        "@radix-ui/react-context": "0.1.1",
-        "@radix-ui/react-label": "0.1.5",
-        "@radix-ui/react-presence": "0.1.2",
-        "@radix-ui/react-primitive": "0.1.4",
-        "@radix-ui/react-roving-focus": "0.1.5",
-        "@radix-ui/react-use-controllable-state": "0.1.0",
-        "@radix-ui/react-use-previous": "0.1.1",
-        "@radix-ui/react-use-size": "0.1.1"
-      }
-    },
     "@radix-ui/react-roving-focus": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-0.1.5.tgz",
@@ -1100,14 +1075,15 @@
       "integrity": "sha512-9g9dWI4gsSVe8bNLlb+lMkBYsnIKCZTmvqvDG+Avnn69XfmHZKiaMrx7cgTaddq7aTPPmXiTsbFcUy0xgI4+wA=="
     },
     "@tldraw/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@tldraw/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-52tRphl8sOQj5oglbhDe4KSetfuQ1ZRpMewkRU6l3XV3OA+ipLk/y6MHaEm8eymoDeWeox/QaiV+URqK/89+gQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@tldraw/core/-/core-1.15.0.tgz",
+      "integrity": "sha512-4A9Xyh/VQBCtzVxZF/a7pXkP6AbFqVE8LcD9gmKWnaSYW6haLhc/Ie1O477T5xKV2HMfWJ52x1dUEn3jOGFVCg==",
       "requires": {
         "@tldraw/intersect": "^1.7.1",
-        "@tldraw/vec": "^1.7.0",
-        "@use-gesture/react": "^10.2.4",
+        "@tldraw/vec": "^1.7.1",
+        "@use-gesture/react": "^10.2.14",
         "mobx-react-lite": "^3.2.3",
+        "perfect-freehand": "^1.1.0",
         "resize-observer-polyfill": "^1.5.1"
       }
     },
@@ -1120,33 +1096,148 @@
       }
     },
     "@tldraw/tldraw": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@tldraw/tldraw/-/tldraw-1.8.1.tgz",
-      "integrity": "sha512-JpMS3+JfyJQpPw55DAwbxL8YCvVx9xSseL1Bx+72LhAydl+Gpt42Cc8Bw+DiTXg/eVwE0/rfy7ZvClNgLcnNWQ==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/@tldraw/tldraw/-/tldraw-1.20.0.tgz",
+      "integrity": "sha512-dVy/l7ceTRwEBzpFvmT2vqDCmbiAJtF55Jv6At9Y9oNDF+xT81dgXupHVw0wSiQRW3ZwD2hxPjnFWqi6uHBS+w==",
       "requires": {
-        "@radix-ui/react-alert-dialog": "^0.1.5",
-        "@radix-ui/react-checkbox": "^0.1.4",
-        "@radix-ui/react-context-menu": "^0.1.4",
-        "@radix-ui/react-dropdown-menu": "^0.1.4",
-        "@radix-ui/react-icons": "^1.0.3",
-        "@radix-ui/react-radio-group": "^0.1.4",
-        "@radix-ui/react-tooltip": "^0.1.6",
-        "@stitches/react": "^1.2.6",
-        "@tldraw/core": "^1.8.0",
+        "@radix-ui/react-alert-dialog": "^0.1.7",
+        "@radix-ui/react-context-menu": "^0.1.6",
+        "@radix-ui/react-dialog": "^0.1.7",
+        "@radix-ui/react-dropdown-menu": "^0.1.6",
+        "@radix-ui/react-icons": "^1.1.1",
+        "@radix-ui/react-popover": "^0.1.6",
+        "@radix-ui/react-tooltip": "^0.1.7",
+        "@stitches/react": "^1.2.8",
+        "@tldraw/core": "^1.15.0",
         "@tldraw/intersect": "^1.7.1",
-        "@tldraw/vec": "^1.7.0",
+        "@tldraw/vec": "^1.7.1",
         "idb-keyval": "^6.1.0",
-        "perfect-freehand": "^1.0.16",
-        "react-hotkey-hook": "^1.0.2",
+        "lz-string": "^1.4.4",
+        "perfect-freehand": "^1.1.0",
+        "react-error-boundary": "^3.1.4",
         "react-hotkeys-hook": "^3.4.4",
-        "tslib": "^2.3.1",
+        "react-intl": "^6.0.3",
+        "tslib": "^2.4.0",
         "zustand": "^3.6.9"
+      },
+      "dependencies": {
+        "@formatjs/ecma402-abstract": {
+          "version": "1.11.8",
+          "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.8.tgz",
+          "integrity": "sha512-fgLqyWlwmTEuqV/TSLEL/t9JOmHNLFvCdgzXB0jc2w+WOItPCOJ1T0eyN6fQBQKRPfSqqNlu+kWj7ijcOVTVVQ==",
+          "requires": {
+            "@formatjs/intl-localematcher": "0.2.28",
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/fast-memoize": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.4.tgz",
+          "integrity": "sha512-9ARYoLR8AEzXvj2nYrOVHY/h1dDMDWGTnKDLXSISF1uoPakSmfcZuSqjiqZX2wRkEUimPxdwTu/agyozBtZRHA==",
+          "requires": {
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/icu-messageformat-parser": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.4.tgz",
+          "integrity": "sha512-3PqMvKWV1oyok0BuiXUAHIaotdhdTJw6OICqCZbfUgKT+ZRwRWO4IlCgvXJeCITaKS5p+PY0XXKjf/vUyIpWjQ==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "@formatjs/icu-skeleton-parser": "1.3.10",
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/icu-skeleton-parser": {
+          "version": "1.3.10",
+          "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.10.tgz",
+          "integrity": "sha512-kXJmtLDqFF5aLTf8IxdJXnhrIX1Qb4Qp3a9jqRecGDYfzOa9hMhi9U0nKyhrJJ4cXxBzptcgb+LWkyeHL6nlBQ==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/intl": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.3.1.tgz",
+          "integrity": "sha512-f06qZ/ukpeN24gc01qFjh3P+r3FU/ikY4yG+fDJu6dPNvpUQzDy98lYogA1dr6ig2UtrnoEk3xncyFPL1e9cZw==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "@formatjs/fast-memoize": "1.2.4",
+            "@formatjs/icu-messageformat-parser": "2.1.4",
+            "@formatjs/intl-displaynames": "6.0.3",
+            "@formatjs/intl-listformat": "7.0.3",
+            "intl-messageformat": "10.1.1",
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/intl-displaynames": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.0.3.tgz",
+          "integrity": "sha512-Mxh6W1VOlmiEvO/QPBrBQHlXrIn5VxjJWyyEI0V7ZHNGl0ee8AjSlq7vIJG8GodRJqGUuutF6N3OB/6qFv0YWg==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "@formatjs/intl-localematcher": "0.2.28",
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/intl-listformat": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.0.3.tgz",
+          "integrity": "sha512-ampNLRGZl/08epHa3i5sRmcHGLneC6JrknexbbgnexYFNSmJ6AbL/dCzgrQzw2Efl+5AZK7UbNFxcDYY3RePvw==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "@formatjs/intl-localematcher": "0.2.28",
+            "tslib": "2.4.0"
+          }
+        },
+        "@formatjs/intl-localematcher": {
+          "version": "0.2.28",
+          "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.28.tgz",
+          "integrity": "sha512-FLsc6Gifs1np/8HnCn/7Q+lHMmenrD5fuDhRT82yj0gi9O19kfaFwjQUw1gZsyILuRyT93GuzdifHj7TKRhBcw==",
+          "requires": {
+            "tslib": "2.4.0"
+          }
+        },
+        "intl-messageformat": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.1.1.tgz",
+          "integrity": "sha512-FeJne2oooYW6shLPbrqyjRX6hTELVrQ90Dn88z7NomLk/xZBCLxLPAkgaYaTQJBRBV78nZ933d8APHHkTQrD9Q==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "@formatjs/fast-memoize": "1.2.4",
+            "@formatjs/icu-messageformat-parser": "2.1.4",
+            "tslib": "2.4.0"
+          }
+        },
+        "react-intl": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.0.5.tgz",
+          "integrity": "sha512-nDZ3BosuE8WdovcGxsrjj1aIgJZklSL5aORs5oah+5tLQTzUdOEstzJEYQPM+sxl1dkDOu7RCuw0z9oI9ENf9g==",
+          "requires": {
+            "@formatjs/ecma402-abstract": "1.11.8",
+            "@formatjs/icu-messageformat-parser": "2.1.4",
+            "@formatjs/intl": "2.3.1",
+            "@formatjs/intl-displaynames": "6.0.3",
+            "@formatjs/intl-listformat": "7.0.3",
+            "@types/hoist-non-react-statics": "^3.3.1",
+            "@types/react": "16 || 17 || 18",
+            "hoist-non-react-statics": "^3.3.2",
+            "intl-messageformat": "10.1.1",
+            "tslib": "2.4.0"
+          }
+        },
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
       }
     },
     "@tldraw/vec": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@tldraw/vec/-/vec-1.7.0.tgz",
-      "integrity": "sha512-uidcNCtm6kL6M4GcXvPb0+WxVeJ3H1csYqsPwDNhVwIrF6eCUKNCoh+70G0kUk2S0EIMmufp3COhagIS8Xnqig=="
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@tldraw/vec/-/vec-1.7.1.tgz",
+      "integrity": "sha512-qM6Z9RvkLFFEzr91mmsA4HI14msyDgDDOu36csIzG5BYu2bFmEz5siQ8WntHgDtUjzJHP+VSSOTbAXhklEZHLA=="
     },
     "@types/hoist-non-react-statics": {
       "version": "3.3.1",
@@ -1198,16 +1289,16 @@
       "integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="
     },
     "@use-gesture/core": {
-      "version": "10.2.13",
-      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.13.tgz",
-      "integrity": "sha512-o+IDJm94ztxsNlsYYT9SF74swJm6WMqmu6oV/LQzbw2E9iIOUW0CanJmrO1ksEOmSMr7W+xVdAge8FJhT/MGEQ=="
+      "version": "10.2.17",
+      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.17.tgz",
+      "integrity": "sha512-62hCybe4x6oGZ1/JA9gSYIdghV1FqxCdvYWt9SqCEAAikwT1OmVl2Q/Uu8CP636L57D+DfXtw6PWM+fdhr4oJQ=="
     },
     "@use-gesture/react": {
-      "version": "10.2.13",
-      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.13.tgz",
-      "integrity": "sha512-8A4EfyEtJ09njHl28DH7h8fYkbWGXCPGoP/RXZ8eQQHKIDT4GwnagWDM+KfwkuBu+v98MG+IOq9RjzZkSfcwNg==",
+      "version": "10.2.17",
+      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.17.tgz",
+      "integrity": "sha512-Vfrp1KgdYn/kOEUAYNXtGBCl2dr38s3G6rru1TOPs+cVUjfNyNxvJK56grUyJ336N3rQLK8F9G7+FfrHuc3g/Q==",
       "requires": {
-        "@use-gesture/core": "10.2.13"
+        "@use-gesture/core": "10.2.17"
       }
     },
     "acorn": {
@@ -3332,9 +3423,9 @@
       "dev": true
     },
     "hotkeys-js": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.9.3.tgz",
-      "integrity": "sha512-s+f0xyvDmf6+DyrFQ2SY+eA7lbvMbjqkqi0I0SpMgnN5tZx7DeH8nsWhkJR4KEq3pxDPHJppDUhdt1rZFW5LeQ=="
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.9.4.tgz",
+      "integrity": "sha512-2zuLt85Ta+gIyvs4N88pCYskNrxf1TFv3LR9t5mdAZIX8BcgQQ48F2opUptvHa6m8zsy5v/a0i9mWzTrlNWU0Q=="
     },
     "html-to-image": {
       "version": "1.9.0",
@@ -3451,9 +3542,9 @@
       "dev": true
     },
     "idb-keyval": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.1.0.tgz",
-      "integrity": "sha512-u/qHZ75rlD3gH+Zah8dAJVJcGW/RfCnfNrFkElC5RpRCnpsCXXhqjVk+6MoVKJ3WhmNbRYdI6IIVP88e+5sxGw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.0.tgz",
+      "integrity": "sha512-uw+MIyQn2jl3+hroD7hF8J7PUviBU7BPKWw4f/ISf32D4LoGu98yHjrzWWJDASu9QNrX10tCJqk9YY0ClWm8Ng==",
       "requires": {
         "safari-14-idb-fix": "^3.0.0"
       }
@@ -4175,6 +4266,11 @@
         "yallist": "^4.0.0"
       }
     },
+    "lz-string": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
+      "integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ=="
+    },
     "makeup-screenreader-trap": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/makeup-screenreader-trap/-/makeup-screenreader-trap-0.0.5.tgz",
@@ -5540,9 +5636,9 @@
       "dev": true
     },
     "perfect-freehand": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/perfect-freehand/-/perfect-freehand-1.0.16.tgz",
-      "integrity": "sha512-D4+avUeR8CHSl2vaPbPYX/dNpSMRYO3VOFp7qSSc+LRkSgzQbLATVnXosy7VxtsSHEh1C5t8K8sfmo0zCVnfWQ=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/perfect-freehand/-/perfect-freehand-1.1.0.tgz",
+      "integrity": "sha512-nVWukMN9qlii1dQsQHVvfaNpeOAWVLgTZP6e/tFcU6cWlLo+6YdvfRGBL2u5pU11APlPbHeB0SpMcGA8ZjPgcQ=="
     },
     "performance-now": {
       "version": "2.1.0",
@@ -5910,22 +6006,25 @@
         "prop-types": "^15.6.2"
       }
     },
+    "react-error-boundary": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.4.tgz",
+      "integrity": "sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==",
+      "requires": {
+        "@babel/runtime": "^7.12.5"
+      }
+    },
     "react-fast-compare": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
       "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
     },
-    "react-hotkey-hook": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/react-hotkey-hook/-/react-hotkey-hook-1.0.2.tgz",
-      "integrity": "sha512-95GiOW8ORMqbBQ23+VHMF0giRmpiI8sFHPjbOR/e64zWI0QT+QO3Q/022c0HNBS/LrQsbGdjm64BNMah0WvlnA=="
-    },
     "react-hotkeys-hook": {
-      "version": "3.4.6",
-      "resolved": "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-3.4.6.tgz",
-      "integrity": "sha512-SiGKHnauaAQglRA7qeiW5LTa0KoT2ssv8YGYKZQoM3P9v5JFEHJdXOSFml1N6K86oKQ8dLCLlxqBqGlSJWGmxQ==",
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-3.4.7.tgz",
+      "integrity": "sha512-+bbPmhPAl6ns9VkXkNNyxlmCAIyDAcWbB76O4I0ntr3uWCRuIQf/aRLartUahe9chVMPj+OEzzfk3CQSjclUEQ==",
       "requires": {
-        "hotkeys-js": "3.9.3"
+        "hotkeys-js": "3.9.4"
       }
     },
     "react-intl": {
@@ -5984,30 +6083,30 @@
       }
     },
     "react-remove-scroll": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.3.tgz",
-      "integrity": "sha512-NQ1bXrxKrnK5pFo/GhLkXeo3CrK5steI+5L+jynwwIemvZyfXqaL0L5BzwJd7CSwNCU723DZaccvjuyOdoy3Xw==",
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
+      "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
       "requires": {
-        "react-remove-scroll-bar": "^2.3.1",
-        "react-style-singleton": "^2.2.0",
-        "tslib": "^2.0.0",
+        "react-remove-scroll-bar": "^2.3.3",
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.1.0",
         "use-callback-ref": "^1.3.0",
         "use-sidecar": "^1.1.2"
       }
     },
     "react-remove-scroll-bar": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.1.tgz",
-      "integrity": "sha512-IvGX3mJclEF7+hga8APZczve1UyGMkMG+tjS0o/U1iLgvZRpjFAQEUBJ4JETfvbNlfNnZnoDyWJCICkA15Mghg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.3.tgz",
+      "integrity": "sha512-i9GMNWwpz8XpUpQ6QlevUtFjHGqnPG4Hxs+wlIJntu/xcsZVEpJcIV71K3ZkqNy2q3GfgvkD7y6t/Sv8ofYSbw==",
       "requires": {
-        "react-style-singleton": "^2.2.0",
+        "react-style-singleton": "^2.2.1",
         "tslib": "^2.0.0"
       }
     },
     "react-style-singleton": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.0.tgz",
-      "integrity": "sha512-nK7mN92DMYZEu3cQcAhfwE48NpzO5RpxjG4okbSqRRbfal9Pk+fG2RdQXTMp+f6all1hB9LIJSt+j7dCYrU11g==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
+      "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
       "requires": {
         "get-nonce": "^1.0.0",
         "invariant": "^2.2.4",

From 3242e2606589540431ace2069b09e7c6f13bca0e Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Thu, 4 Aug 2022 15:23:17 +0200
Subject: [PATCH 43/50] Drop redundant quote

---
 bbb-export-annotations/workers/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bbb-export-annotations/workers/process.js b/bbb-export-annotations/workers/process.js
index cdd7b06cf2..f60307a2d5 100644
--- a/bbb-export-annotations/workers/process.js
+++ b/bbb-export-annotations/workers/process.js
@@ -147,7 +147,7 @@ function render_textbox(textColor, font, fontSize, textAlign, text, id, textBoxW
   // Texbox scaled by a constant factor to improve resolution at small scales
   const size = textBoxWidth ? ['-size', `${textBoxWidth * config.process.textScaleFactor}x`] : [];
 
-  const pangoText = `pango:"<span font_family='${font}' font='${fontSize}' color='${textColor}'>${text}</span>"`;
+  const pangoText = `pango:<span font_family='${font}' font='${fontSize}' color='${textColor}'>${text}</span>`;
 
   const justify = textAlign === 'justify';
   textAlign = justify ? 'left' : textAlign;

From eb191992355afe4468b635a1f89a3834fdf590e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Souza?= <contato@ramonsouza.com>
Date: Thu, 4 Aug 2022 14:17:45 -0300
Subject: [PATCH 44/50] adjust dial-in button styles

---
 .../imports/ui/components/audio/audio-modal/component.jsx      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
index 4f302a8f57..633bb7d541 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -456,13 +456,12 @@ class AudioModal extends Component {
           <Styled.AudioDial
             label={dialAudioLabel}
             size="md"
-            color="primary"
+            color="secondary"
             onClick={() => {
               this.setState({
                 content: 'audioDial',
               });
             }}
-            ghost
           />
         ) : null}
         <CaptionsSelectContainer />

From 34ec0ebbd6b79f25ad9df7a84192dcce9aed3e84 Mon Sep 17 00:00:00 2001
From: Anton B <antonbsa.bck@gmail.com>
Date: Fri, 5 Aug 2022 14:00:26 -0300
Subject: [PATCH 45/50] test: fix wrong test plan link

---
 bigbluebutton-tests/playwright/settings/settings.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-tests/playwright/settings/settings.spec.js b/bigbluebutton-tests/playwright/settings/settings.spec.js
index 7649386167..dd93262ff9 100644
--- a/bigbluebutton-tests/playwright/settings/settings.spec.js
+++ b/bigbluebutton-tests/playwright/settings/settings.spec.js
@@ -2,7 +2,7 @@ const { test } = require('@playwright/test');
 const { Language } = require('./language');
 
 test.describe.parallel('Settings', () => {
-  // https://docs.bigbluebutton.org/2.6/release-tests.html#sharing-screen-in-full-screen-mode-automated
+  // https://docs.bigbluebutton.org/2.6/release-tests.html#application-settings
   test(`Locales`, async ({ browser, page }) => {
     test.slow();
     const language = new Language(browser, page);

From 3ebfdef9bde0d6b053adc239931846970a213e52 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Mon, 8 Aug 2022 22:47:51 +0000
Subject: [PATCH 46/50] use api toolbar general position | sync current locale

---
 .../ui/components/whiteboard/component.jsx    | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
index 1452f627a9..4a2a07355f 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
@@ -210,37 +210,18 @@ export default function Whiteboard(props) {
   React.useEffect(() => {
     if (hasWBAccess || isPresenter) {
       const tdTools = document.getElementById("TD-Tools"); 
-      const tdPrimaryTools = document.getElementById("TD-PrimaryTools");
-      if (tdPrimaryTools) tdPrimaryTools.style.flexDirection = 'column';
-  
       if (tdTools) {
-        tdTools.firstChild.style.flexDirection = 'column';
-        tdTools.parentElement.style.overflow = 'visible';
-        tdTools.style.bottom = '6rem';
-        tdTools.style.right = '0.5rem';
-        tdTools.style.position = 'absolute';
-
         // removes tldraw native help menu button
         tdTools.parentElement?.nextSibling?.remove();
-
-        if (isRTL) {
-          tdTools.style.left = '0.5rem';
-          tdTools.style.right = 'auto';
-        }
       }
-  
       // removes image tool from the tldraw toolbar
       document.getElementById("TD-PrimaryTools-Image").style.display = 'none';
-
-      const tdStyles = document.getElementById("TD-Styles");
-      if (tdStyles) {
-        document.getElementById("TD-Styles").style.marginRight = isRTL ? 'auto' : '2.5rem';
-        document.getElementById("TD-Styles").style.marginLeft = isRTL ? '2.5rem' : 'auto';
-      }
     }
   });
 
   const onMount = (app) => {
+    app.setSetting('language', document.getElementsByTagName('html')[0]?.lang || 'en');
+    app.setSetting('dockPosition', isRTL ? 'left' : 'right');
     setTLDrawAPI(app);
     props.setTldrawAPI(app);
     // disable for non presenter that doesn't have multi user access

From 7f4151e6eb94cf5990c6c3d04ddbdce1f7939789 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Tue, 9 Aug 2022 11:45:46 +0000
Subject: [PATCH 47/50] update shortcut keys list

---
 .../ui/components/shortcut-help/component.jsx | 101 +++++++++++++++++-
 bigbluebutton-html5/public/locales/en.json    |  19 ++++
 2 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
index 9b700f3f41..b9c08bf846 100644
--- a/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/shortcut-help/component.jsx
@@ -162,14 +162,90 @@ const intlMessages = defineMessages({
   presentation: {
     id: 'app.shortcut-help.presentation',
     description: 'presentation tab heading',
-    "app.shortcut-help.whiteboard": "Whiteboard",
   },
   whiteboard: {
     id: 'app.shortcut-help.whiteboard',
     description: 'whiteboard tab heading',
+  },
+  zoomIn: {
+    id: 'app.shortcut-help.zoomIn',
+    description: 'describes the zoom in shortcut key',
+  },
+  zoomOut: {
+    id: 'app.shortcut-help.zoomOut',
+    description: 'describes the zoom out shortcut key',
+  },
+  zoomFit: {
+    id: 'app.shortcut-help.zoomFit',
+    description: 'describes the zoom to fit shortcut key',
+  },
+  zoomSelect: {
+    id: 'app.shortcut-help.zoomSelect',
+    description: 'describes the zoom to selection shortcut key',
+  },
+  flipH: {
+    id: 'app.shortcut-help.flipH',
+    description: 'describes the flip horozontally shortcut key',
+  },
+  flipV: {
+    id: 'app.shortcut-help.flipV',
+    description: 'describes the flip vertically shortcut key',
+  },
+  lock: {
+    id: 'app.shortcut-help.lock',
+    description: 'describes the lock / unlock shape shortcut key',
+  },
+  moveToFront: {
+    id: 'app.shortcut-help.moveToFront',
+    description: 'describes the move to front shortcut key',
+  },
+  moveToBack: {
+    id: 'app.shortcut-help.moveToBack',
+    description: 'describes the move to back shortcut key',
+  },
+  moveForward: {
+    id: 'app.shortcut-help.moveForward',
+    description: 'describes the move forward shortcut key',
+  },
+  moveBackward: {
+    id: 'app.shortcut-help.moveBackward',
+    description: 'describes the move backward shortcut key',
+  },
+  undo: {
+    id: 'app.shortcut-help.undo',
+    description: 'describes the undo shortcut key',
+  },
+  redo: {
+    id: 'app.shortcut-help.redo',
+    description: 'describes the redo shortcut key',
+  },
+  cut: {
+    id: 'app.shortcut-help.cut',
+    description: 'describes the cut shortcut key',
+  },
+  copy: {
+    id: 'app.shortcut-help.copy',
+    description: 'describes the cut shortcut key',
+  },
+  paste: {
+    id: 'app.shortcut-help.paste',
+    description: 'describes the paste shortcut key',
+  },
+  selectAll: {
+    id: 'app.shortcut-help.selectAll',
+    description: 'describes the select all shortcut key',
+  },
+  delete: {
+    id: 'app.shortcut-help.delete',
+    description: 'describes the delete shortcut key',
+  },
+  duplicate: {
+    id: 'app.shortcut-help.duplicate',
+    description: 'describes the duplicate shortcut key',
   }
 });
 
+
 const renderItem = (func, key) => {
   return (
     <tr key={_.uniqueId('hotkey-item-')}>
@@ -226,6 +302,7 @@ const ShortcutHelpComponent = (props) => {
   shortcutItems.push(renderItem(intl.formatMessage(intlMessages.previousSlideDesc), intl.formatMessage(intlMessages.previousSlideKey)));
 
   const whiteboardShortcutItems = [];
+  //tools
   whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.select), '1'));
   whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.pencil), '2'));
   whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.eraser), '3'));
@@ -236,6 +313,28 @@ const ShortcutHelpComponent = (props) => {
   whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.arrow), '8'));
   whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.text), '9'));
   whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.note), '0'));
+  //views
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.zoomIn), 'Ctrl +'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.zoomOut), 'Ctrl -'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.zoomFit), '↑ + 1'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.zoomSelect), '↑ + 2'));
+//transform
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.flipH), '↑ + H'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.flipV), '↑ + V'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.lock), 'Ctrl ↑ L'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.moveToFront), '↑ ]'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.moveForward), ']'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.moveBackward), '['));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.moveToBack), '↑ ['));
+  //edit
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.undo), 'Ctrl Z'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.redo), 'Ctrl ↑ Z'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.cut), 'Ctrl X'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.copy), 'Ctrl C'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.paste), 'Ctrl V'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.selectAll), 'Ctrl A'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.delete), 'Del'));
+  whiteboardShortcutItems.push(renderItem(intl.formatMessage(intlMessages.duplicate), 'Ctrl D'));
 
   return (
     <Modal
diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index 940d54da0b..c2a168c2ef 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -764,6 +764,25 @@
     "app.shortcut-help.general": "General",
     "app.shortcut-help.presentation": "Presentation",
     "app.shortcut-help.whiteboard": "Whiteboard",
+    "app.shortcut-help.zoomIn": "Zoom In",
+    "app.shortcut-help.zoomOut": "Zoom Out",
+    "app.shortcut-help.zoomFit": "Zoom to Fit",
+    "app.shortcut-help.zoomSelect": "Zoom to Selection",
+    "app.shortcut-help.flipH": "Flip Horozontal",
+    "app.shortcut-help.flipV": "Flip Vertical",
+    "app.shortcut-help.lock": "Lock / Unlock",
+    "app.shortcut-help.moveToFront": "Move to Front",
+    "app.shortcut-help.moveToBack": "Move to Back",
+    "app.shortcut-help.moveForward": "Move Forward",
+    "app.shortcut-help.moveBackward": "Move Backward",
+    "app.shortcut-help.undo": "Undo",
+    "app.shortcut-help.redo": "Redo",
+    "app.shortcut-help.cut": "Cut",
+    "app.shortcut-help.copy": "Copy",
+    "app.shortcut-help.paste": "Paste",
+    "app.shortcut-help.selectAll": "Select All",
+    "app.shortcut-help.delete": "Delete",
+    "app.shortcut-help.duplicate": "Duplicate",
     "app.lock-viewers.title": "Lock viewers",
     "app.lock-viewers.description": "These options enable you to restrict viewers from using specific features.",
     "app.lock-viewers.featuresLable": "Feature",

From 94d7c48a245935dd7fa86ef954d11f6f926ae5d8 Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Wed, 10 Aug 2022 14:30:39 +0200
Subject: [PATCH 48/50] Remove protocol, hostname, port from config file

---
 bbb-export-annotations/config/settings.json | 9 ++-------
 bbb-export-annotations/workers/notifier.js  | 8 ++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bbb-export-annotations/config/settings.json b/bbb-export-annotations/config/settings.json
index 138961c510..5cccc7aae1 100644
--- a/bbb-export-annotations/config/settings.json
+++ b/bbb-export-annotations/config/settings.json
@@ -22,14 +22,9 @@
     "notifier": {
       "pod_id": "DEFAULT_PRESENTATION_POD",
       "is_downloadable": "false",
-      "msgName": "NewPresAnnFileAvailableMsg",
-      "protocol": "https",
-      "host": "localhost"
-    },
-    "bbbWeb": {
-      "host": "127.0.0.1",
-      "port": 8090
+      "msgName": "NewPresAnnFileAvailableMsg"
     },
+    "bbbWebAPI": "http://127.0.0.1:8090",
     "redis": {
       "host": "127.0.0.1",
       "port": 6379,
diff --git a/bbb-export-annotations/workers/notifier.js b/bbb-export-annotations/workers/notifier.js
index 5c77ae9369..bdd798eb71 100644
--- a/bbb-export-annotations/workers/notifier.js
+++ b/bbb-export-annotations/workers/notifier.js
@@ -27,7 +27,11 @@ async function notifyMeetingActor() {
 
   await client.connect();
   client.on('error', (err) => logger.info('Redis Client Error', err));
-  const link = `${config.notifier.protocol}://${config.notifier.host}/bigbluebutton/presentation/${exportJob.parentMeetingId}/${exportJob.parentMeetingId}/${exportJob.presId}/pdf/${jobId}/${filename_with_extension}`;
+
+  const link = path.join(`${path.sep}bigbluebutton`, 'presentation',
+      exportJob.parentMeetingId, exportJob.parentMeetingId,
+      exportJob.presId, 'pdf', jobId, filename_with_extension);
+
   const notification = {
     envelope: {
       name: config.notifier.msgName,
@@ -57,7 +61,7 @@ async function notifyMeetingActor() {
 
 /** Upload PDF to a BBB room */
 async function upload() {
-  const callbackUrl = `http://${config.bbbWeb.host}:${config.bbbWeb.port}/bigbluebutton/presentation/${exportJob.presentationUploadToken}/upload`;
+  const callbackUrl = `${config.bbbWebAPI}/bigbluebutton/presentation/${exportJob.presentationUploadToken}/upload`;
   const formData = new FormData();
   const file = `${exportJob.presLocation}/pdfs/${jobId}/${filename_with_extension}`;
 

From 093d960a2cdba8e0c193239d9c6399a0ba788456 Mon Sep 17 00:00:00 2001
From: Daniel Petri Rocha <daniel.petri@tum.de>
Date: Wed, 10 Aug 2022 15:03:26 +0200
Subject: [PATCH 49/50] Remove unnecessry message passing between workers

---
 bbb-export-annotations/workers/collector.js | 4 +---
 bbb-export-annotations/workers/notifier.js  | 4 +---
 bbb-export-annotations/workers/process.js   | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bbb-export-annotations/workers/collector.js b/bbb-export-annotations/workers/collector.js
index 02e42d3f13..aaa28ccc02 100644
--- a/bbb-export-annotations/workers/collector.js
+++ b/bbb-export-annotations/workers/collector.js
@@ -2,7 +2,7 @@ const Logger = require('../lib/utils/logger');
 const config = require('../config');
 const fs = require('fs');
 const redis = require('redis');
-const {Worker, workerData, parentPort} = require('worker_threads');
+const {Worker, workerData} = require('worker_threads');
 const path = require('path');
 const cp = require('child_process');
 
@@ -100,5 +100,3 @@ const exportJob = JSON.parse(job);
 
   kickOffProcessWorker(exportJob.jobId);
 })();
-
-parentPort.postMessage({message: workerData});
diff --git a/bbb-export-annotations/workers/notifier.js b/bbb-export-annotations/workers/notifier.js
index bdd798eb71..b33a3fb60c 100644
--- a/bbb-export-annotations/workers/notifier.js
+++ b/bbb-export-annotations/workers/notifier.js
@@ -6,7 +6,7 @@ const redis = require('redis');
 const axios = require('axios').default;
 const path = require('path');
 
-const {workerData, parentPort} = require('worker_threads');
+const {workerData} = require('worker_threads');
 
 const [jobType, jobId, filename_with_extension] = workerData;
 
@@ -90,5 +90,3 @@ fs.rm(dropbox, {recursive: true}, (err) => {
     throw err;
   }
 });
-
-parentPort.postMessage({message: workerData});
diff --git a/bbb-export-annotations/workers/process.js b/bbb-export-annotations/workers/process.js
index f60307a2d5..8fcac14f48 100644
--- a/bbb-export-annotations/workers/process.js
+++ b/bbb-export-annotations/workers/process.js
@@ -3,7 +3,7 @@ const config = require('../config');
 const fs = require('fs');
 const {create} = require('xmlbuilder2', {encoding: 'utf-8'});
 const cp = require('child_process');
-const {Worker, workerData, parentPort} = require('worker_threads');
+const {Worker, workerData} = require('worker_threads');
 const path = require('path');
 const sanitize = require('sanitize-filename');
 const {getStroke, getStrokePoints} = require('perfect-freehand');
@@ -878,5 +878,3 @@ cp.spawnSync(config.shared.ghostscript, mergePDFs, {shell: false});
 logger.info(`Saved PDF at ${outputDir}/${jobId}/${filename_with_extension}`);
 
 kickOffNotifierWorker(exportJob.jobType, filename_with_extension);
-
-parentPort.postMessage({message: workerData});

From 494251f2d05dba95e792cb73b89bafd918eb26f3 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 10 Aug 2022 20:20:46 +0000
Subject: [PATCH 50/50] build: export-annotations depend on cairosvg
 imagemagick ghostscript

---
 build/packages-template/bbb-export-annotations/opts-focal.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/packages-template/bbb-export-annotations/opts-focal.sh b/build/packages-template/bbb-export-annotations/opts-focal.sh
index d51848d8cf..9330c6aef9 100644
--- a/build/packages-template/bbb-export-annotations/opts-focal.sh
+++ b/build/packages-template/bbb-export-annotations/opts-focal.sh
@@ -1,3 +1,3 @@
 . ./opts-global.sh
 
-OPTS="$OPTS -t deb -d nodejs,npm,bbb-apps-akka,bbb-web"
+OPTS="$OPTS -t deb -d nodejs,npm,bbb-apps-akka,bbb-web,cairosvg,ghostscript,imagemagick"