test CI run

- implement breakout-rooms
- integrated into the participants panel
- managed by moderators
- moderators can send participants to breakout-rooms
- participants can join breakout rooms by themselve
- participants can leave breakout rooms anytime

Co-authored-by: Robert Pintilii <robert.pin9@gmail.com>
Co-authored-by: Saúl Ibarra Corretgé <saghul@jitsi.org>

.eslintignore

@@ -8,8 +8,12 @@ libs/*
 resources/*
 react/features/stream-effects/virtual-background/vendor/*
 load-test/*
+react/features/facial-recognition/resources/*
 
 # ESLint will by default ignore its own configuration file. However, there does
 # not seem to be a reason why we will want to risk being inconsistent with our
 # remaining JavaScript source code.
 !.eslintrc.js
+
+# Not worth it.
+actionTypes.js

.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
     'extends': [
-        'eslint-config-jitsi'
+        '@jitsi/eslint-config'
     ]
 };

.github/workflows/ci.yml

@@ -10,9 +10,12 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '14.x'
-    - run: npm i -g npm@7
+        node-version: '16.x'
     - run: npm install
+    - name: Check git status
+      run: git status
+    - name: Check git diff
+      run: git diff
     - name: Check if the git repository is clean
       run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
     - run: npm run lint

.nvmrc

@@ -0,0 +1 @@
+16

Makefile

@@ -7,6 +7,7 @@ OLM_DIR = node_modules/@matrix-org/olm
 RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/
 TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite
 MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models/
+FACIAL_MODELS_DIR = react/features/facial-recognition/resources
 NODE_SASS = ./node_modules/.bin/sass
 NPM = npm
 OUTPUT_DIR = .
@@ -28,7 +29,7 @@ clean:
 	rm -fr $(BUILD_DIR)
 
 .NOTPARALLEL:
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-css deploy-local
+deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-css deploy-local deploy-facial-expressions
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -37,24 +38,26 @@ deploy-init:
 deploy-appbundle:
 	cp \
 		$(BUILD_DIR)/app.bundle.min.js \
-		$(BUILD_DIR)/app.bundle.min.map \
+		$(BUILD_DIR)/app.bundle.min.js.map \
 		$(BUILD_DIR)/do_external_connect.min.js \
-		$(BUILD_DIR)/do_external_connect.min.map \
+		$(BUILD_DIR)/do_external_connect.min.js.map \
 		$(BUILD_DIR)/external_api.min.js \
-		$(BUILD_DIR)/external_api.min.map \
+		$(BUILD_DIR)/external_api.min.js.map \
 		$(BUILD_DIR)/flacEncodeWorker.min.js \
-		$(BUILD_DIR)/flacEncodeWorker.min.map \
+		$(BUILD_DIR)/flacEncodeWorker.min.js.map \
 		$(BUILD_DIR)/dial_in_info_bundle.min.js \
-		$(BUILD_DIR)/dial_in_info_bundle.min.map \
+		$(BUILD_DIR)/dial_in_info_bundle.min.js.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
-		$(BUILD_DIR)/alwaysontop.min.map \
+		$(BUILD_DIR)/alwaysontop.min.js.map \
 		$(OUTPUT_DIR)/analytics-ga.js \
 		$(BUILD_DIR)/analytics-ga.min.js \
-		$(BUILD_DIR)/analytics-ga.min.map \
+		$(BUILD_DIR)/analytics-ga.min.js.map \
+		$(BUILD_DIR)/facial-expressions-worker.min.js \
+		$(BUILD_DIR)/facial-expressions-worker.min.js.map \
 		$(DEPLOY_DIR)
 	cp \
 		$(BUILD_DIR)/close3.min.js \
-		$(BUILD_DIR)/close3.min.map \
+		$(BUILD_DIR)/close3.min.js.map \
 		$(DEPLOY_DIR) || true
 
 deploy-lib-jitsi-meet:
@@ -85,12 +88,17 @@ deploy-rnnoise-binary:
 deploy-tflite:
 	cp \
 		$(TFLITE_WASM)/*.wasm \
-		$(DEPLOY_DIR)		
+		$(DEPLOY_DIR)
 
 deploy-meet-models:
 	cp \
 		$(MEET_MODELS_DIR)/*.tflite \
-		$(DEPLOY_DIR)	
+		$(DEPLOY_DIR)
+
+deploy-facial-expressions:
+	cp \
+		$(FACIAL_MODELS_DIR)/* \
+		$(DEPLOY_DIR)
 
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
@@ -101,7 +109,7 @@ deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
 .NOTPARALLEL:
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm
+dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-facial-expressions
 	$(WEBPACK_DEV_SERVER)
 
 source-package:

README.md

@@ -1,6 +1,6 @@
 # <p align="center">Jitsi Meet</p>
 
-Jitsi Meet is a set of Open Source projects which empower users to use and deploy
+aaaJitsi Meet is a set of Open Source projects which empower users to use and deploy
 video conferencing platforms with state-of-the-art video quality and features.
 
 <hr />

android/app/src/main/java/org/jitsi/meet/MainActivity.java

@@ -82,7 +82,7 @@ public class MainActivity extends JitsiMeetActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         JitsiMeet.showSplashScreen(this);
-        super.onCreate(savedInstanceState);
+        super.onCreate(null);
     }
 
     @Override

android/build.gradle

@@ -110,7 +110,7 @@ allprojects {
 
             project.version = "${json.version}-jitsi-${versionQualifierNumber}"
 
-            task androidSourcesJar(type: Jar) {
+            task jitsiAndroidSourcesJar(type: Jar) {
                 classifier = 'sources'
                 from android.sourceSets.main.java.source
             }
@@ -124,7 +124,7 @@ allprojects {
                     artifact("${project.buildDir}/outputs/aar/${project.name}-release.aar") {
                         extension "aar"
                     }
-                    artifact(androidSourcesJar)
+                    artifact(jitsiAndroidSourcesJar)
                     pom.withXml {
                         def pomXml = asNode()
                         pomXml.appendNode('name', project.name)

android/sdk/build.gradle

@@ -70,9 +70,15 @@ dependencies {
     implementation project(':react-native-calendar-events')
     implementation project(':react-native-community_netinfo')
     implementation project(':react-native-default-preference')
+    implementation project(':react-native-gesture-handler')
+    implementation project(':react-native-get-random-values')
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
+    implementation project(':react-native-masked-view_masked-view')
     implementation project(':react-native-performance')
+    implementation project(':react-native-reanimated')
+    implementation project(':react-native-safe-area-context')
+    implementation project(':react-native-screens')
     implementation project(':react-native-slider')
     implementation project(':react-native-sound')
     implementation project(':react-native-splash-screen')

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java

@@ -24,7 +24,7 @@ import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.facebook.react.modules.core.PermissionListener;
@@ -38,7 +38,7 @@ import android.app.Activity;
  * A base activity for SDK users to embed. It uses {@link JitsiMeetFragment} to do the heavy
  * lifting and wires the remaining Activity lifecycle methods so it works out of the box.
  */
-public class JitsiMeetActivity extends FragmentActivity
+public class JitsiMeetActivity extends AppCompatActivity
     implements JitsiMeetActivityInterface {
 
     protected static final String TAG = JitsiMeetActivity.class.getSimpleName();

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

@@ -175,21 +175,27 @@ class ReactInstanceManagerHolder {
 
         List<ReactPackage> packages
             = new ArrayList<>(Arrays.asList(
+                new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
+                new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.calendarevents.CalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),
-                new com.horcrux.svg.SvgPackage(),
+                new com.reactnativecommunity.netinfo.NetInfoPackage(),
+                new com.oblador.performance.PerformancePackage(),
+                new com.reactnativecommunity.slider.ReactSliderPackage(),
+                new com.brentvatne.react.ReactVideoPackage(),
+                new com.swmansion.reanimated.ReanimatedPackage(),
+                new org.reactnative.maskedview.RNCMaskedViewPackage(),
+                new com.reactnativecommunity.webview.RNCWebViewPackage(),
                 new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
                 new com.learnium.RNDeviceInfo.RNDeviceInfo(),
-                new com.oblador.performance.PerformancePackage(),
-                new com.ocetnik.timer.BackgroundTimerPackage(),
-                new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
-                new com.reactnativecommunity.netinfo.NetInfoPackage(),
-                new com.reactnativecommunity.slider.ReactSliderPackage(),
-                new com.reactnativecommunity.webview.RNCWebViewPackage(),
+                new com.swmansion.gesturehandler.react.RNGestureHandlerPackage(),
+                new org.linusu.RNGetRandomValuesPackage(),
                 new com.rnimmersive.RNImmersivePackage(),
+                new com.swmansion.rnscreens.RNScreensPackage(),
                 new com.zmxv.RNSound.RNSoundPackage(),
-                new com.brentvatne.react.ReactVideoPackage(),
+                new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
+                new com.horcrux.svg.SvgPackage(),
                 new ReactPackageAdapter() {
                     @Override
                     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {

android/settings.gradle

@@ -15,14 +15,26 @@ include ':react-native-default-preference'
 project(':react-native-default-preference').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-default-preference/android')
 include ':react-native-device-info'
 project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
+include ':react-native-get-random-values'
+project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-get-random-values/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
+include ':react-native-masked-view_masked-view'
+project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
 include ':react-native-performance'
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
+include ':react-native-reanimated'
+project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
+include ':react-native-safe-area-context'
+project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-safe-area-context/android')
+include ':react-native-screens'
+project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
 include ':react-native-slider'
 project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
 include ':react-native-sound'

conference.js

@@ -1,8 +1,8 @@
 /* global APP, JitsiMeetJS, config, interfaceConfig */
 
 import { jitsiLocalStorage } from '@jitsi/js-utils';
+import Logger from '@jitsi/logger';
 import EventEmitter from 'events';
-import Logger from 'jitsi-meet-logger';
 
 import { openConnection } from './connection';
 import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants';
@@ -29,6 +29,7 @@ import { shouldShowModeratedNotification } from './react/features/av-moderation/
 import {
     AVATAR_URL_COMMAND,
     EMAIL_COMMAND,
+    _conferenceWillJoin,
     authStatusChanged,
     commonUserJoinedHandling,
     commonUserLeftHandling,
@@ -47,7 +48,7 @@ import {
     onStartMutedPolicyChanged,
     p2pStatusChanged,
     sendLocalParticipant,
-    _conferenceWillJoin
+    nonParticipantMessageReceived
 } from './react/features/base/conference';
 import { getReplaceParticipant } from './react/features/base/config/functions';
 import {
@@ -107,6 +108,7 @@ import {
     getLocalJitsiAudioTrack,
     getLocalJitsiVideoTrack,
     getLocalTracks,
+    getLocalVideoTrack,
     isLocalCameraTrackMuted,
     isLocalTrackMuted,
     isUserInteractionRequiredForUnmute,
@@ -129,7 +131,8 @@ import {
     isPrejoinPageEnabled,
     isPrejoinPageVisible,
     makePrecallTest,
-    setJoiningInProgress
+    setJoiningInProgress,
+    setPrejoinPageVisibility
 } from './react/features/prejoin';
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
 import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
@@ -758,7 +761,7 @@ export default {
         // XXX The API will take care of disconnecting from the XMPP
         // server (and, thus, leaving the room) on unload.
         return new Promise((resolve, reject) => {
-            (new ConferenceConnector(resolve, reject)).connect();
+            new ConferenceConnector(resolve, reject).connect();
         });
     },
 
@@ -1013,6 +1016,14 @@ export default {
      * dialogs in case of media permissions error.
      */
     muteVideo(mute, showUI = true) {
+        if (this.videoSwitchInProgress) {
+            // Turning the camera on while the screen sharing mode is being turned off is causing issues around
+            // the presenter mode handling. It should be okay for the user to click the button again once that's done.
+            console.warn('muteVideo - unable to perform operations while video switch is in progress');
+
+            return;
+        }
+
         if (!mute
                 && isUserInteractionRequiredForUnmute(APP.store.getState())) {
             logger.error('Unmuting video requires user interaction');
@@ -1350,11 +1361,49 @@ export default {
         }
     },
 
-    _createRoom(localTracks) {
+    /**
+     * Used by the Breakout Rooms feature to join a breakout room or go back to the main room.
+     */
+    async joinRoom(roomName, isBreakoutRoom = false) {
+        this.roomName = roomName;
+
+        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks();
+        const localTracks = await tryCreateLocalTracks;
+
+        this._displayErrorsForCreateInitialLocalTracks(errors);
+        localTracks.forEach(track => {
+            if ((track.isAudioTrack() && this.isLocalAudioMuted())
+                || (track.isVideoTrack() && this.isLocalVideoMuted())) {
+                track.mute();
+            }
+        });
+        this._createRoom(localTracks, isBreakoutRoom);
+
+        return new Promise((resolve, reject) => {
+            new ConferenceConnector(resolve, reject).connect();
+        });
+    },
+
+    _createRoom(localTracks, isBreakoutRoom = false) {
+        const extraOptions = {};
+
+        if (isBreakoutRoom) {
+            // We must be in a room already.
+            if (!room?.xmpp?.breakoutRoomsComponentAddress) {
+                throw new Error('Breakout Rooms not enabled');
+            }
+
+            // TODO: re-evaluate this. -saghul
+            extraOptions.customDomain = room.xmpp.breakoutRoomsComponentAddress;
+        }
+
         room
             = connection.initJitsiConference(
                 APP.conference.roomName,
-                this._getConferenceOptions());
+                {
+                    ...this._getConferenceOptions(),
+                    ...extraOptions
+                });
 
         // Filter out the tracks that are muted (except on Safari).
         const tracks = browser.isWebKitBased() ? localTracks : localTracks.filter(track => !track.isMuted());
@@ -1548,6 +1597,8 @@ export default {
         if (config.enableScreenshotCapture) {
             APP.store.dispatch(toggleScreenshotCaptureSummary(false));
         }
+        const tracks = APP.store.getState()['features/base/tracks'];
+        const duration = getLocalVideoTrack(tracks)?.jitsiTrack.getDuration() ?? 0;
 
         // It can happen that presenter GUM is in progress while screensharing is being turned off. Here it needs to
         // wait for that GUM to be resolved in order to prevent leaking the presenter track(this.localPresenterVideo
@@ -1609,7 +1660,8 @@ export default {
         return promise.then(
             () => {
                 this.videoSwitchInProgress = false;
-                sendAnalytics(createScreenSharingEvent('stopped'));
+                sendAnalytics(createScreenSharingEvent('stopped',
+                    duration === 0 ? null : duration));
                 logger.info('Screen sharing stopped.');
             },
             error => {
@@ -1639,7 +1691,7 @@ export default {
     async toggleScreenSharing(toggle = !this._untoggleScreenSharing, options = {}, ignoreDidHaveVideo) {
         logger.debug(`toggleScreenSharing: ${toggle}`);
         if (this.videoSwitchInProgress) {
-            return Promise.reject('Switch in progress.');
+            return Promise.reject(`toggleScreenSharing: ${toggle} aborted - video switch in progress.`);
         }
         if (!JitsiMeetJS.isDesktopSharingEnabled()) {
             return Promise.reject('Cannot toggle screen sharing: not supported.');
@@ -2005,6 +2057,9 @@ export default {
         room.on(JitsiConferenceEvents.CONFERENCE_JOINED, () => {
             this._onConferenceJoined();
         });
+        room.on(JitsiConferenceEvents.CONFERENCE_JOIN_IN_PROGRESS, () => {
+            APP.store.dispatch(setPrejoinPageVisibility(false));
+        });
 
         room.on(
             JitsiConferenceEvents.CONFERENCE_LEFT,
@@ -2206,6 +2261,10 @@ export default {
                 }
             });
 
+        room.on(
+            JitsiConferenceEvents.NON_PARTICIPANT_MESSAGE_RECEIVED,
+            (...args) => APP.store.dispatch(nonParticipantMessageReceived(...args)));
+
         room.on(
             JitsiConferenceEvents.LOCK_STATE_CHANGED,
             (...args) => APP.store.dispatch(lockStateChanged(room, ...args)));
@@ -2634,12 +2693,17 @@ export default {
 
         APP.store.dispatch(updateDeviceList(devices));
 
+        // Firefox users can choose their preferred device in the gUM prompt. In that case
+        // we should respect that and not attempt to switch to the preferred device from
+        // our settings.
+        const newLabelsOnly = mediaDeviceHelper.newDeviceListAddedLabelsOnly(oldDevices, devices);
         const newDevices
             = mediaDeviceHelper.getNewMediaDevicesAfterDeviceListChanged(
                 devices,
                 this.isSharingScreen,
                 localVideo,
-                localAudio);
+                localAudio,
+                newLabelsOnly);
         const promises = [];
         const audioWasMuted = this.isLocalAudioMuted();
         const videoWasMuted = this.isLocalVideoMuted();
@@ -2883,6 +2947,17 @@ export default {
         });
     },
 
+    /**
+     * Leaves the room.
+     *
+     * @returns {Promise}
+     */
+    leaveRoom() {
+        if (room && room.isJoined()) {
+            return room.leave();
+        }
+    },
+
     /**
      * Leaves the room and calls JitsiConnection.disconnect.
      *
@@ -2977,6 +3052,15 @@ export default {
         room.sendEndpointMessage(to, payload);
     },
 
+    /**
+     * Sends a facial expression as a string and its duration as a number
+     * @param {object} payload - Object containing the {string} facialExpression
+     * and {number} duration
+     */
+    sendFacialExpression(payload) {
+        room.sendFacialExpression(payload);
+    },
+
     /**
      * Adds new listener.
      * @param {String} eventName the name of the event

config.js

@@ -279,6 +279,7 @@ var config = {
     //     autoHide: true,
     //     autoHideTimeout: 5000,
     //     disabled: false,
+    //     disableDetails: false,
     //     inactiveDisabled: false
     // },
 
@@ -429,6 +430,12 @@ var config = {
     // Hides lobby button
     // hideLobbyButton: false,
 
+    // If Lobby is enabled starts knocking automatically.
+    // autoKnockLobby: false,
+
+    // Hides add breakout room button
+    // hideAddRoomButton: false,
+
     // Require users to always specify a display name.
     // requireDisplayName: true,
 
@@ -648,6 +655,9 @@ var config = {
     // Enables sending participants' emails (if available) to callstats and other analytics
     // enableEmailInStats: false,
 
+    // Enables detecting faces of participants and get their expression and send it to other participants
+    // enableFacialRecognition: true,
+
     // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
     // The default value is 100%. If set to 0, no automatic feedback will be requested
     // feedbackPercentage: 100,
@@ -825,6 +835,10 @@ var config = {
     //     format: 'flac'
     //
 
+    // },
+    // e2ee: {
+    //   labels,
+    //   externallyManagedKey: false
     // },
 
     // Options related to end-to-end (participant to participant) ping.
@@ -895,22 +909,55 @@ var config = {
      If there is no url set or there are missing fields, the defaults are applied.
      The config file should be in JSON.
      None of the fields are mandatory and the response must have the shape:
-     {
-         // The domain url to apply (will replace the domain in the sharing conference link/embed section)
-         inviteDomain: 'example-company.org,
-         // The hex value for the colour used as background
-         backgroundColor: '#fff',
-         // The url for the image used as background
-         backgroundImageUrl: 'https://example.com/background-img.png',
-         // The anchor url used when clicking the logo image
-         logoClickUrl: 'https://example-company.org',
-         // The url used for the image used as logo
-         logoImageUrl: 'https://example.com/logo-img.png',
-         // Overwrite for pool of background images for avatars
-         avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'],
-         // The lobby/prejoin screen background
-         premeetingBackground: 'url(https://example.com/premeeting-background.png)'
-     }
+    {
+        // The domain url to apply (will replace the domain in the sharing conference link/embed section)
+        inviteDomain: 'example-company.org,
+        // The hex value for the colour used as background
+        backgroundColor: '#fff',
+        // The url for the image used as background
+        backgroundImageUrl: 'https://example.com/background-img.png',
+        // The anchor url used when clicking the logo image
+        logoClickUrl: 'https://example-company.org',
+        // The url used for the image used as logo
+        logoImageUrl: 'https://example.com/logo-img.png',
+        // Overwrite for pool of background images for avatars
+        avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'],
+        // The lobby/prejoin screen background
+        premeetingBackground: 'url(https://example.com/premeeting-background.png)',
+        // A list of images that can be used as video backgrounds.
+        // When this field is present, the default images will be replaced with those provided.
+        virtualBackgrounds: ['https://example.com/img.jpg'],
+        // Object containing a theme's properties. It also supports partial overwrites of the main theme.
+        // For a list of all possible theme tokens and their current defaults, please check:
+        // https://github.com/jitsi/jitsi-meet/tree/master/resources/custom-theme/custom-theme.json
+        // For a short explanations on each of the tokens, please check:
+        // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/ui/Tokens.js
+        // IMPORTANT!: This is work in progress so many of the various tokens are not yet applied in code
+        // or they are partially applied.
+        customTheme: {
+            palette: {
+                ui01: "orange !important",
+                ui02: "maroon",
+                surface02: 'darkgreen',
+                ui03: "violet",
+                ui04: "magenta",
+                ui05: "blueviolet",
+                field02Hover: 'red',
+                action01: 'green',
+                action01Hover: 'lightgreen',
+                action02Disabled: 'beige',
+                success02: 'cadetblue',
+                action02Hover: 'aliceblue'
+            },
+            typography: {
+                labelRegular: {
+                    fontSize: 25,
+                    lineHeight: 30,
+                    fontWeight: 500
+                }
+            }
+        }
+    }
     */
     // dynamicBrandingUrl: '',
 
@@ -918,6 +965,9 @@ var config = {
     // Only the default ones from will be available.
     // disableAddingBackgroundImages: false,
 
+    // Disables using screensharing as virtual background.
+    // disableScreensharingVirtualBackground: false,
+
     // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
     // backgroundAlpha: 1,
 

connection.js

@@ -1,7 +1,7 @@
 /* global APP, JitsiMeetJS, config */
 
 import { jitsiLocalStorage } from '@jitsi/js-utils';
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 
 import { redirectToTokenAuthService } from './modules/UI/authentication/AuthHandler';
 import { LoginDialog } from './react/features/authentication/components';

css/_atlaskit_overrides.scss

@@ -24,61 +24,6 @@
     bottom: calc(#{$newToolbarSizeWithPadding}) !important;
 }
 
-.modal-dialog-form {
-    /**
-     * Override @atlaskit/dropdown-menu styling when in a modal because the
-     * dropdown backgrounds clash with the modal backgrounds.
-     */
-    .dropdown-menu div[style*="transform"] {
-        outline: 1px solid #455166;
-    }
-    .dropdown-menu button:not(:active):not(:hover) > span {
-        color: #B8C7E0;
-    }
-
-    /**
-    * Override @atlaskit/tab styling when in a modal because the
-    * tab text color clash with the modal backgrounds.
-    */
-    div[role="tablist"] > div:not([data-selected]):not(:hover),
-    label > div > span {
-        color: #B8C7E0 !important;
-    }
-}
-
-/**
- * Override @atlaskit/modal-dialog header styling
- */
-.atlaskit-portal [role="dialog"] header {
-    box-shadow: none;
-    .jitsi-icon {
-        cursor: pointer;
-    }
-
-    .jitsi-icon svg {
-        fill: #B8C7E0;
-    }
-}
-
-/**
- * Override @atlaskit/modal-dialog footer styling.
- */
- .atlaskit-portal [role="dialog"] footer {
-     box-shadow: none;
- }
-
-/**
- * Make header close button more easily tappable on mobile.
- */
-.mobile-browser .atlaskit-portal [role="dialog"] header .jitsi-icon {
-    display: grid;
-    place-items: center;
-    height: 48px;
-    width: 48px;
-    background: #2a3a4b;
-    border-radius: 3px;
-}
-
 /**
  * Override @atlaskit/theme styling for the top toolbar so it displays over
  * the video thumbnail while obscuring as little as possible.
@@ -158,3 +103,20 @@ div.Tooltip {
     line-height: 14px;
     padding: 8px;
 }
+
+// make modal full screen on landscape orientation
+@media (max-height: 420px) {
+    .atlaskit-portal {
+        .css-1oc7v0j {
+            height: 100%;
+            padding: 0;
+            max-width: 100%;
+            top: 0;
+            width: 100%;
+
+            &> div {
+                height: 100%;
+            }
+        }
+    }
+}

css/_chat.scss

@@ -2,34 +2,39 @@
     background-color: $chatBackgroundColor;
     box-sizing: border-box;
     color: #FFF;
-    display: flex;
-    flex-direction: column;
     height: 100%;
-    left: -$sidebarWidth;
-    overflow: hidden;
     position: absolute;
     top: 0;
     width: $sidebarWidth;
     z-index: $sideToolbarContainerZ;
 
-    /**
-     * The sidebar (chat) is off-screen when hidden. Move it flush to the left
-     * side of the window when it should be visible.
-     */
-    &.slideInExt {
-        left: 0;
+    @media (max-width: 580px) {
+        width: 100%;
     }
 }
 
+.chat-panel {
+    display: flex;
+    flex-direction: column;
+    // extract header + tabs height
+    height: calc(100% - 102px);
+}
+
+.chat-panel-no-tabs {
+    // extract header height
+    height: calc(100% - 70px);
+}
+
 #chatconversation {
     box-sizing: border-box;
     flex: 1;
     font-size: 10pt;
+    // extract message input height
+    height: calc(100% - 68px);
     line-height: 20px;
     overflow: auto;
     padding: 16px;
     text-align: left;
-    width: $sidebarWidth;
     word-wrap: break-word;
 
     display: flex;
@@ -58,28 +63,6 @@
     a:active {
         color: black;
     }
-
-    &::-webkit-scrollbar {
-        background: #06a5df;
-        width: 7px;
-    }
-
-    &::-webkit-scrollbar-button {
-        display: none;
-    }
-
-    &::-webkit-scrollbar-track {
-        background: black;
-    }
-
-    &::-webkit-scrollbar-track-piece {
-        background: black;
-    }
-
-    &::-webkit-scrollbar-thumb {
-        background: #06a5df;
-        border-radius: 4px;
-    }
 }
 
 #chat-recipient {
@@ -319,10 +302,6 @@
         text-overflow: ellipsis;
         overflow: hidden;
     }
-
-    @media (max-width: 580px) {
-        display: none !important;
-    }
 }
 
 .sr-only {
@@ -563,11 +542,6 @@
     }
 }
 
-.touchmove-hack {
-    display: flex;
-    flex: 1;
-    overflow: auto;
-}
 
 /**
  * Make header close button more easily tappable on mobile.

css/_connection-info.scss

@@ -11,12 +11,6 @@
 {
     @extend %connection-info;
 
-    /**
-     * Apply negative margin to reduce the appearance of padding in AtlasKit
-     * InlineDialog.
-     */
-    margin: -15px;
-
     > table {
         white-space: nowrap;
         @extend %connection-info;

css/_labels.scss

@@ -1,37 +0,0 @@
-.label {
-    align-items: center;
-    background: #36383C;
-    border-radius: 3px;
-    color: #fff;
-    display: flex;
-    font-size: 12px;
-    font-weight: 600;
-    height: 28px;
-    margin: 0 0 4px 4px;
-    padding: 0 8px;
-
-    &--green {
-        background: #31B76A;
-    }
-
-    &--red {
-        background: #E34F56
-    }
-
-    &--white {
-        background: #fff;
-        color: #5e6d7a;
-
-        svg {
-            fill: #5e6d7a;
-        }
-    }
-}
-
-.label-text-with-icon {
-    margin-left: 8px;
-}
-
-.participants-count {
-    cursor: pointer;
-}

css/_participants-pane.scss

@@ -56,3 +56,9 @@
         border-radius: 3px;
     }
 }
+
+.mobile-browser.shift-right {
+    .participants_pane {
+        z-index: -1;
+    }
+}

css/_polls.scss

@@ -1,5 +1,7 @@
 .poll-dialog {
-    font-size: 1rem;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 20px;
 
     h1, span, li, strong {
         color: #bce;
@@ -16,28 +18,58 @@
 }
 
 .poll-header {
-    padding: 8px 16px;
+    margin-bottom: 8px;
 }
 
-.poll-answer-container{
-    padding: 8px;
+.poll-creator {
+    color: #C2C2C2;
+    font-weight: 600;
+    margin: 4px 0 16px 0;
+}
+
+.poll-answer-container {
     background: #3D3D3D;
     border-radius: 3px;
     margin-bottom: 8px;
+
+    @media (max-width: 580px) {
+      &> span {
+        padding: 8px 0;
+      }
+
+      svg {
+        margin-top: 6px;
+      }
+    }
+}
+
+.poll-answer-option {
+   font-weight: 400;
+   display: block;
+   margin: 4px;
+
+   @media (max-width: 580px) {
+      font-size: 16px;
+      margin: 11px 8px
+   }
 }
 
 .poll-answer-field-list, .poll-answer-list, .poll-result-list {
     list-style-type: none;
-    padding: 0 16px;
+    padding: 0;
     margin: 0;
 }
 
+.poll-answer-field-list {
+    padding: 0 16px;
+}
+
 ol.poll-result-list {
     margin-bottom: 1.5em;
 }
 
 .poll-result-list > li {
-    margin-bottom: 8px;
+    margin-bottom: 16px;
 }
 
 .poll-answer-field {
@@ -60,7 +92,7 @@ ol.poll-result-list {
 .poll-create-container .jsYMHu {
     background: #292929;
     border-color: #808090;
-    color: white // #808090
+    color: #fff // #808090
 }
 
 .poll-add-button {
@@ -72,7 +104,7 @@ ol.poll-result-list {
 .poll-remove-option-button {
     background: 0 0;
     border: none;
-    color: #8B8B8B;
+    color: #E04757;
     padding-left: 0;
 }
 
@@ -85,7 +117,7 @@ ol.poll-result-list {
 
 .poll-icon-button, .poll-drag-handle {
     .jitsi-icon svg {
-        fill: #bce;
+        fill: #929292;
     }
 }
 
@@ -94,6 +126,7 @@ ol.poll-result-list {
     border: none;
     cursor: grab;
     padding-left: 8;
+    padding-top: 8px;
     display: flex;
 }
 
@@ -105,13 +138,12 @@ ol.poll-result-list {
 }
 
 .poll-question {
-    font-size: 1.2em;
+    font-size: 16px;
     font-weight: 600;
-    margin-bottom: 0.5em;
+    line-height: 26px;
 }
 
 .poll-answer-voters {
-    font-size: 1em;
     font-weight: lighter;
     list-style-type: none;
     border: #616161 solid 1px;
@@ -191,29 +223,36 @@ ol.poll-result-list {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+
+    a.poll-detail-link, a.poll-change-vote-link {
+      color: #669AEC;
+      cursor: pointer;
+      font-weight: 600;
+      text-decoration: none;
+
+      &:hover {
+        color: #669AEC;
+      }
+
+      &:visited {
+        color: #669AEC;
+      }
+    }
 }
 
-a.poll-detail-link, a.poll-change-vote-link {
-    color: #246FE5;
-    cursor: pointer;
-    text-decoration: none;
-}
 
 .polls-pane-content {
-    display: flex;
-    flex-direction: column;
-    font-weight: 600;
-    height: 85%;
-    align-items: stretch;
+    height: 100%;
+    position: relative;
 }
 
 .pane-content{
     display: flex;
     flex-direction: column;
+    height: 100%;
     justify-content: center;
     align-items: center;
     width: 100%;
-    height: 100%;
 }
 
 .empty-pane-icon {
@@ -228,37 +267,41 @@ a.poll-detail-link, a.poll-change-vote-link {
 }
 
 .empty-pane-message {
+    color: #fff;
+    padding: 0 16px;
     text-align: center;
-}
 
-.poll-results {
-    color: white;
-}
-
-.poll-answer {
-    h1, strong ,span {
-        color: white;
-    }
 }
 
 .poll-results, .poll-answer {
-    margin-bottom: 16px;
     background: #292929;
     border-radius: 8px;
-    padding: 12px 8px;
-    border-width: thin;
-    border-style: solid;
-    border-color: #616161;
+    border: 1px solid #666666;
+    margin: 16px;
+    padding: 16px;
     word-break: break-word;
 }
 
+.poll-results {
+    color: #fff;
+}
+
+.poll-answer {
+
+    h1, strong ,span {
+        color: #fff;
+    }
+}
+
 .poll-create-label {
-    color: white;
-    margin-bottom: 4;
+    color: #C2C2C2;
     display: flex;
+    font-weight: 400;
+    margin-bottom: 4;
 }
 
 .expandable-input{
+    line-height: 18px;
     resize: none;
     width: 100%;
     height: 40px;
@@ -271,24 +314,31 @@ a.poll-detail-link, a.poll-change-vote-link {
     padding: 10px 16px;
 }
 
+#polls-panel {
+    height: calc(100% - 102px);
+}
+
 .poll-container {
-    box-sizing: border-box;
-    flex: 1;
+    font-size: 14px;
+    font-weight: 600;
+    height: calc(100% - 88px);
+    line-height: 20px;
     overflow-y: auto;
     position: relative;
-    padding: 16px;
 
     & > * + *:not(.ignore-child) {
         margin-top: 16px;
     }
 
-    &::-webkit-scrollbar {
-        display: none;
+    @media (max-width: 580px) {
+        height: calc(100% - 102px);
     }
 }
 
 .poll-create-header {
+    color: #fff;
     font-size: 20px;
+    line-height: 28px;
     margin: 20px 16px;
     font-weight: 600;
 }
@@ -297,28 +347,45 @@ a.poll-detail-link, a.poll-change-vote-link {
     padding: 8px 0;
 }
 
+.poll-create-footer {
+    background-color: #141414;
+    bottom: 0;
+    position: absolute;
+    width: calc(100% - 32px);
+}
+
 .poll-footer {
-    display: flex;
-    justify-content: flex-end;
-    padding: 8px 16px;
-    height: 40px;
-    align-items: stretch;
-
-    & > *:not(:last-child) {
-        margin-right: 16px;
-    }
+  display: flex;
+  justify-content: space-between;
+  padding: 0 16px 16px 16px;
 }
 
-.poll-primary-button {
-    align-items: center;
+.poll-answer-footer {
+  padding: 8px 0 0 0;
+}
+
+.poll-button {
+   align-items: center;
+   border: 0;
+   border-radius: 6px;
+   font-size: 14px;
+   font-weight: 600;
+   display: flex;
+   justify-content: center;
+   min-height: 40px;
+   width: 100%;
+
+   &:disabled {
+     cursor: initial;
+   }
+
+   @media (max-width: 580px) {
+     min-height: 48px;
+   }
+}
+
+.poll-button-primary {
     background-color: #0056E0;
-    border: 0;
-    border-radius: 6px;
-    display: flex;
-    font-weight: unset;
-    justify-content: center;
-    font-size: 15px;
-    flex: 1;
 
     &:hover {
         background-color: #246FE5;
@@ -337,23 +404,10 @@ a.poll-detail-link, a.poll-change-vote-link {
         background-color: #00225A;
         color: #858585;
     }
-
-    & > *:not(:last-child) {
-        margin-right: 8px;
-    }
 }
 
-.poll-secondary-button {
-    align-items: center;
+.poll-button-secondary {
     background-color: #3D3D3D;
-    border: 0;
-    border-radius: 6px;
-    display: flex;
-    font-weight: unset;
-    justify-content: center;
-    font-size: 15px;
-    height: 40px;
-    width: 100%;
 
     &:hover {
         background-color: #525252;
@@ -372,79 +426,19 @@ a.poll-detail-link, a.poll-change-vote-link {
         background-color: #141414;
         color: #858585;
     }
-
-    & > *:not(:last-child) {
-        margin-right: 8px;
-    }
 }
 
-.poll-small-primary-button {
-    align-items: center;
-    background-color: #0056E0;
-    border: 0;
-    border-radius: 6px;
-    display: flex;
-    font-weight: unset;
-    justify-content: center;
-    font-size: 15px;
-    height: 40px;
-    width: 50%;
-
-    &:hover {
-        background-color: #246FE5;
-    }
-
-    &:active {
-        background-color: #0045B3;
-    }
-
-    &:focus {
-        background-color: #0045B3;
-        border: 3px solid #99BBF3;
-    }
-
-    &:disabled {
-        background-color: #00225A;
-        color: #858585;
-        cursor: default;
-    }
-
-    & > *:not(:last-child) {
-        margin-right: 8px;
-    }
+.poll-button-short {
+  max-width: 132px;
 }
 
-.poll-small-secondary-button {
-    align-items: center;
-    background-color: #3D3D3D;
-    border: 0;
-    border-radius: 6px;
-    display: flex;
-    font-weight: unset;
-    justify-content: center;
-    font-size: 15px;
-    height: 40px;
-    width: 50%;
-
-    &:hover {
-        background-color: #525252;
-    }
-
-    &:active {
-        background-color: #292929;
-    }
-
-    &:focus {
-        background-color: #292929;
-        border: 3px solid #858585;
-    }
-
-    &:disabled {
-        background-color: #141414;
-        color: #858585;
-    }
-
-    & > *:not(:last-child) {
-        margin-right: 8px;
-    }
+.poll-button-shortest {
+  max-width: 117px;
+}
+
+.poll-button-short,
+.poll-button-shortest {
+   @media (max-width: 580px) {
+     min-width: 49%;
+   }
 }

css/_popover.scss

@@ -46,3 +46,7 @@
     padding: 16px 24px;
     z-index: $popoverZ;
 }
+
+.padded-content {
+    padding: 4px 8px;
+}

css/_popup_menu.scss

@@ -5,6 +5,7 @@
 .popupmenu {
     background-color: $menuBG;
     border-radius: 3px;
+    list-style-type: none;
     min-width: 150px;
     text-align: left;
     padding: 0px;
@@ -38,6 +39,11 @@
         }
     }
 
+    &__list {
+        margin: 0;
+        padding: 0;
+    }
+
     &__text {
         display: inline-block;
         margin-left: 8px;

css/_toolbars.scss

@@ -77,14 +77,6 @@
     }
 }
 
-.toolbox-button {
-    color: $toolbarButtonColor;
-    cursor: pointer;
-    display: inline-block;
-    line-height: $newToolbarSize;
-    text-align: center;
-}
-
 .toolbar-button-with-badge {
     display: inline-block;
     position: relative;
@@ -115,86 +107,6 @@
     padding-bottom: env(safe-area-inset-bottom, 0);
 }
 
-.toolbox-content-items {
-    background: $newToolbarBackgroundColor;
-    border-radius: 6px;
-    margin: 0 auto;
-    padding: 6px;
-    text-align: center;
-    pointer-events: all;
-    box-shadow: 0px 2px 8px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.15);
-
-    >div {
-        margin-left: 8px;
-
-        &:first-child {
-            margin-left: 0;
-        }
-    }
-}
-
-.overflow-menu {
-    font-size: 14px;
-    list-style-type: none;
-    padding: 8px 0;
-    background-color: $menuBG;
-
-    .profile-text {
-        max-width: 150px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-}
-
-.overflow-menu-item {
-    align-items: center;
-    color: $overflowMenuItemColor;
-    cursor: pointer;
-    display: flex;
-    font-size: 14px;
-    font-weight: 400;
-    height: 40px;
-    line-height: 24px;
-    padding: 8px 16px;
-    box-sizing: border-box;
-
-    @media (hover: hover) and (pointer: fine) {
-        &:hover {
-            background: $overflowMenuItemBackground;
-        }
-    }
-
-    div {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-    }
-
-    &.unclickable {
-        cursor: default;
-    }
-    &.disabled {
-        cursor: initial;
-        color: #929292;
-
-        &:hover {
-            background: none;
-        }
-
-        svg {
-            fill: #929292;
-        }
-
-    }
-
-    @media (hover: hover) and (pointer: fine) {
-        &.unclickable:hover {
-            background: inherit;
-        }
-    }
-}
-
 .beta-tag {
     background: #36383C;
     border-radius: 3px;
@@ -205,73 +117,12 @@
     text-transform: uppercase;
 }
 
-.overflow-menu-item-icon {
-    margin-right: 16px;
-
-    i {
-        display: inline;
-        font-size: 24px;
-    }
-
-    @media (hover: hover) and (pointer: fine) {
-        i:hover {
-            background-color: initial;
-        }
-    }
-
-    img {
-        max-width: 24px;
-        max-height: 24px;
-    }
-
-    svg {
-        fill: #fff;
-        height: 20px;
-        width: 20px;
-    }
-}
-
-
 .overflow-menu-hr {
     border-top: 1px solid #4C4D50;
     border-bottom: 0;
     margin: 8px 0;
 }
 
-.toolbox-icon {
-    display: flex;
-    border-radius: 3px;
-    flex-direction: column;
-    font-size: 24px;
-    height: $newToolbarSize;
-    justify-content: center;
-    width: $newToolbarSize;
-
-    @media (hover: hover) and (pointer: fine) {
-        &:hover {
-            background: $newToolbarButtonHoverColor;
-        }
-    }
-
-    @media (max-width: 320px) {
-        height: 36px;
-        width: 36px;
-    }
-
-    &.toggled {
-        background: $newToolbarButtonToggleColor;
-    }
-
-    &.disabled {
-        cursor: initial !important;
-        background-color: #36383c !important;
-
-        svg {
-            fill: #929292 !important;
-        }
-    }
-}
-
 .hangup-button {
     background-color: $hangupColor;
 

css/_variables.scss

@@ -122,7 +122,7 @@ $zindex10: 10;
 $reloadZ: 20;
 $poweredByZ: 100;
 $ringingZ: 300;
-$sideToolbarContainerZ: 200;
+$sideToolbarContainerZ: 300;
 $toolbarZ: 250;
 $drawerZ: 351;
 $tooltipsZ: 401;
@@ -269,4 +269,4 @@ $verySmallScreen: 500px;
 * Prejoin / premeeting screen
 */
 
-$prejoinDefaultContentWidth: 336px;
+$prejoinDefaultContentWidth: 336px;

css/_videolayout_default.scss

@@ -87,7 +87,6 @@
 
     &__toolbar {
         bottom: 0;
-        height: $thumbnailToolbarHeight;
         padding: 0 5px 0 5px;
     }
 
@@ -190,6 +189,20 @@
         z-index: $zindex2;
     }
 
+    &__participant-name {
+        color: #fff;
+        background-color: rgba(0,0,0,.4);
+        padding: 3px 7px;
+        border-radius: 3px;
+        max-width: calc(100% - 32px);
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        height: 16px;
+        display: inline-block;
+        text-align: right;
+    }
+
     @media (min-width: 581px) {
         &.shift-right {
             &#largeVideoContainer {
@@ -281,21 +294,8 @@
 #alwaysOnTop .displayname,
 .videocontainer .displayname,
 .videocontainer .editdisplayname {
-    display: inline-block;
-    position: absolute;
-    left: 10%;
-    width: 80%;
-    top: 50%;
-    @include transform(translateY(-40%));
-    color: $participantNameColor;
-    text-align: center;
-    text-overflow: ellipsis;
-    font-size: 12px;
     font-weight: 100;
-    overflow: hidden;
-    white-space: nowrap;
-    line-height: $thumbnailToolbarHeight;
-    z-index: $zindex2;
+    color: $participantNameColor;
 }
 
 #alwaysOnTop .displayname {
@@ -415,6 +415,11 @@
     &.status-other {
         background: $connectionIndicatorBg;
     }
+
+    &.status-disabled {
+        background: transparent;
+        border: none
+    }
 }
 
 .local-video-menu-trigger,

css/buttons/copy.scss

@@ -1,38 +0,0 @@
-.copy-button {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 8px 8px 8px 16px;
-    margin-top: 5px;
-    width: calc(100% - 24px);
-    height: 24px;
-
-    background: #0376DA;
-    border-radius: 4px;
-    cursor: pointer;
-
-    &:hover {
-        background: #278ADF;
-        font-weight: 600;
-    }
-
-    &-content {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        max-width: 292px;
-        margin-right: 16px;
-
-        &.selected {
-            font-weight: 600;
-        }
-    }
-
-    &.clicked {
-        background: #31B76A;
-    }
-
-    & > div > svg > path {
-        fill: #fff;
-    }
-}

css/main.scss

@@ -33,7 +33,6 @@ $flagsImagePath: "../images/";
 @import 'inlay';
 @import 'reload_overlay/reload_overlay';
 @import 'mini_toolbox';
-@import 'buttons/copy.scss';
 @import 'modals/desktop-picker/desktop-picker';
 @import 'modals/device-selection/device-selection';
 @import 'modals/dialog';
@@ -44,7 +43,6 @@ $flagsImagePath: "../images/";
 @import 'modals/screen-share/share-audio';
 @import 'modals/screen-share/share-screen-warning';
 @import 'modals/speaker_stats/speaker_stats';
-@import 'modals/video-quality/video-quality';
 @import 'modals/virtual-background/virtual-background';
 @import 'modals/local-recording/local-recording';
 @import 'videolayout_default';
@@ -78,7 +76,6 @@ $flagsImagePath: "../images/";
 @import 'filmstrip/tile_view_overrides';
 @import 'filmstrip/vertical_filmstrip';
 @import 'filmstrip/vertical_filmstrip_overrides';
-@import 'labels';
 @import 'unsupported-browser/main';
 @import 'modals/invite/add-people';
 @import 'deep-linking/main';

css/modals/_dialog.scss

@@ -122,9 +122,6 @@
         margin-bottom: 8px;
     }
 }
-.modal-dialog-footer {
-    font-size: $modalButtonFontSize;
-}
 
 /**
  * Styling inline dialog errors.

css/modals/speaker_stats/_speaker_stats.scss

@@ -27,7 +27,10 @@
 
     .speaker-stats-item__status,
     .speaker-stats-item__name,
-    .speaker-stats-item__time {
+    .speaker-stats-item__time,
+    .speaker-stats-item__name_expressions_on,
+    .speaker-stats-item__time_expressions_on,
+    .speaker-stats-item__expression {
         display: inline-block;
         margin: 5px 0;
         vertical-align: middle;
@@ -41,9 +44,35 @@
     .speaker-stats-item__time {
         width: 55%;
     }
+    .speaker-stats-item__name_expressions_on {
+        width: 20%;
+    }
+    .speaker-stats-item__time_expressions_on {
+        width: 25%;
+    }
+
+    .speaker-stats-item__expression {
+        width: 7%;
+        text-align: center;
+    }
+
+    @media(max-width: 750px) {
+        .speaker-stats-item__name_expressions_on {
+            width: 25%;
+        }
+        .speaker-stats-item__time_expressions_on {
+            width: 30%;
+        }
+        .speaker-stats-item__expression {
+            width: 10%;
+        }
+    }
 
     .speaker-stats-item__name,
-    .speaker-stats-item__time {
+    .speaker-stats-item__time,
+    .speaker-stats-item__name_expressions_on,
+    .speaker-stats-item__time_expressions_on,
+    .speaker-stats-item__expression {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;

css/modals/video-quality/_video-quality.scss

@@ -1,114 +0,0 @@
-.video-quality-dialog {
-    .video-quality-dialog-title {
-        margin-bottom: 10px;
-    }
-
-    .video-quality-dialog-contents {
-        align-items: center;
-        display: flex;
-        flex-direction: column;
-        padding: 10px;
-        min-width: 250px;
-
-        .video-quality-dialog-slider-container {
-            width: 100%;
-            text-align: center;
-        }
-
-        .video-quality-dialog-slider {
-            width: calc(100% - 5px);
-
-            @mixin sliderTrackStyles() {
-                height: 15px;
-                border-radius: 10px;
-                background: rgb(14, 22, 36);
-            }
-
-            &::-ms-track {
-                @include sliderTrackStyles();
-            }
-
-            &::-moz-range-track {
-                @include sliderTrackStyles();
-            }
-
-            &::-webkit-slider-runnable-track {
-                @include sliderTrackStyles();
-            }
-
-            @mixin sliderThumbStyles() {
-                top: 50%;
-                border: none;
-                position: relative;
-                opacity: 0;
-            }
-
-            &::-ms-thumb {
-                @include sliderThumbStyles();
-            }
-
-            &::-moz-range-thumb {
-                @include sliderThumbStyles();
-
-            }
-
-            &::-webkit-slider-thumb {
-                @include sliderThumbStyles();
-            }
-        }
-
-        .video-quality-dialog-labels {
-            box-sizing: border-box;
-            display: flex;
-            margin-top: 5px;
-            position: relative;
-            width: 90%;
-        }
-
-        .video-quality-dialog-label-container {
-            position: absolute;
-            text-align: center;
-            transform: translate(-50%, 0%);
-
-            &::before {
-                content: '';
-                border-radius: 50%;
-                left: 0;
-                height: 6px;
-                margin: 0 auto;
-                pointer-events: none;
-                position: absolute;
-                right: 0;
-                top: -16px;
-                width: 6px;
-            }
-        }
-
-        .video-quality-dialog-label-container.active {
-            color: $videoQualityActive;
-            font-weight: bold;
-
-            &::before {
-                background: $videoQualityActive;
-                height: 12px;
-                top: -19px;
-                width: 12px;
-            }
-        }
-
-        .video-quality-dialog-label-container:first-child {
-            position: relative;
-        }
-
-        .video-quality-dialog-label {
-            display: table-caption;
-            word-spacing: unset;
-        }
-    }
-}
-
-.modal-dialog-form {
-    .video-quality-dialog-title {
-        display: none;
-    }
-}

css/premeeting/_prejoin.scss

@@ -21,7 +21,6 @@
 .prejoin-preview {
     &-dropdown-btns {
         padding: 8px 0;
-        width: calc(100% - 48px);
     }
   
     &-dropdown-btn {
@@ -59,8 +58,6 @@
             background: #fff;
             padding: 0;
             position: absolute !important;
-            top: 48px !important;
-            transform: none !important;
             width: 100%;
         }
     }

css/premeeting/_premeeting-screens.scss

@@ -138,7 +138,6 @@
 
                 .toolbox-content-items {
                     background: transparent;
-                    border-radius: 0;
                     box-shadow: none;
                     display: flex;
                     justify-content: space-evenly;
@@ -171,6 +170,19 @@
         }
     }
 
+    // mobile phone landscape
+    @media (max-height: 420px) {
+        flex-direction: row;
+
+        div.content {
+            padding: 16px 16px 0 16px;
+        }
+
+        .con-status {
+            display: none;
+        }
+    }
+
     @media (max-width: 400px) {
         .content {
             padding: 16px;

debian/jitsi-meet-prosody.postinst

@@ -130,6 +130,8 @@ case "$1" in
             echo -e "    storage = \"memory\"" >> $PROSODY_HOST_CONFIG
             echo -e "    modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
             echo -e "    admins = { \"$JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN\", \"jvb@$JICOFO_AUTH_DOMAIN\" }" >> $PROSODY_HOST_CONFIG
+            echo -e "    muc_room_locking = false" >> $PROSODY_HOST_CONFIG
+            echo -e "    muc_room_default_public_jids = true" >> $PROSODY_HOST_CONFIG
         fi
 
         # Convert the old focus component config to the new one.

debian/jitsi-meet-tokens.postinst

@@ -61,7 +61,7 @@ case "$1" in
                 sed -i '/^\s*--\s*"token_verification"/ s/--\s*//' $PROSODY_HOST_CONFIG
 
                 # Install luajwt
-                if ! luarocks install luajwtjitsi; then
+                if ! luarocks install luajwtjitsi 2.0-0; then
                    echo "Failed to install luajwtjitsi - try installing it manually"
                 fi
 

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -52,10 +52,12 @@ VirtualHost "jitmeet.example.com"
         "external_services";
         "conference_duration";
         "muc_lobby_rooms";
+        "muc_breakout_rooms";
         "av_moderation";
     }
     c2s_require_encryption = false
     lobby_muc = "lobby.jitmeet.example.com"
+    breakout_rooms_muc = "breakout.jitmeet.example.com"
     main_muc = "conference.jitmeet.example.com"
     -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
 
@@ -67,6 +69,19 @@ Component "conference.jitmeet.example.com" "muc"
         "muc_domain_mapper";
         "polls";
         --"token_verification";
+        "muc_rate_limit";
+    }
+    admins = { "focusUser@auth.jitmeet.example.com" }
+    muc_room_locking = false
+    muc_room_default_public_jids = true
+
+Component "breakout.jitmeet.example.com" "muc"
+    restrict_room_creation = true
+    storage = "memory"
+    modules_enabled = {
+        "muc_meeting_id";
+        "muc_domain_mapper";
+        --"token_verification";
     }
     admins = { "focusUser@auth.jitmeet.example.com" }
     muc_room_locking = false

flow-typed/npm/uuid_v3.x.x.js

@@ -1,102 +0,0 @@
-// flow-typed signature: 609c1622fc97de96d59519934aa5ce87
-// flow-typed version: c6154227d1/uuid_v3.x.x/flow_>=v0.32.x <=v0.103.x
-
-declare module "uuid" {
-  declare class uuid {
-    static (
-      options?: {|
-        random?: number[],
-        rng?: () => number[] | Buffer
-      |},
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string,
-
-    static v1(
-      options?: {|
-        node?: number[],
-        clockseq?: number,
-        msecs?: number | Date,
-        nsecs?: number
-      |},
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string,
-
-    static v4(
-      options?: {|
-        random?: number[],
-        rng?: () => number[] | Buffer
-      |},
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string
-  }
-  declare module.exports: Class<uuid>;
-}
-
-declare module "uuid/v1" {
-  declare class v1 {
-    static (
-      options?: {|
-        node?: number[],
-        clockseq?: number,
-        msecs?: number | Date,
-        nsecs?: number
-      |},
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string
-  }
-
-  declare module.exports: Class<v1>;
-}
-
-declare module "uuid/v3" {
-  declare class v3 {
-    static (
-      name?: string | number[],
-      namespace?: string | number[],
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string,
-
-     static name: string,
-     static DNS: string,
-     static URL: string
-  }
-
-  declare module.exports: Class<v3>;
-}
-
-declare module "uuid/v4" {
-  declare class v4 {
-    static (
-      options?: {|
-        random?: number[],
-        rng?: () => number[] | Buffer
-      |},
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string
-  }
-
-  declare module.exports: Class<v4>;
-}
-
-declare module "uuid/v5" {
-  declare class v5 {
-    static (
-      name?: string | number[],
-      namespace?: string | number[],
-      buffer?: number[] | Buffer,
-      offset?: number
-    ): string,
-
-     static name: string,
-     static DNS: string,
-     static URL: string
-  }
-
-  declare module.exports: Class<v5>;
-}

flow-typed/npm/uuid_v8.x.x.js

@@ -0,0 +1,71 @@
+declare module 'uuid' {
+  // v1 (Timestamp)
+  declare type V1Options = {|
+    node?: $ReadOnlyArray<number>,
+    clockseq?: number,
+    msecs?: number,
+    nsecs?: number,
+    random?: $ReadOnlyArray<number>,
+    rng?: () => $ReadOnlyArray<number>,
+  |};
+
+  declare export function v1(options?: V1Options): string;
+
+  declare export function v1(
+    options: V1Options | null,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  // v3 (Namespace)
+  declare function v3Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>
+  ): string;
+
+  declare function v3Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  declare export var v3: {|
+    [[call]]: typeof v3Impl,
+    DNS: string,
+    URL: string,
+  |};
+
+  // v4 (Random)
+  declare type V4Options = {|
+    random?: $ReadOnlyArray<number>,
+    rng?: () => $ReadOnlyArray<number>,
+  |};
+
+  declare export function v4(options?: V4Options): string;
+
+  declare export function v4(
+    options: V4Options | null,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  // v5 (Namespace)
+  declare function v5Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>
+  ): string;
+
+  declare function v5Impl(
+    name: string | $ReadOnlyArray<number>,
+    namespace: string | $ReadOnlyArray<number>,
+    buffer: Array<number>,
+    offset?: number
+  ): Array<number>;
+
+  declare export var v5: {|
+    [[call]]: typeof v5Impl,
+    DNS: string,
+    URL: string,
+  |};
+}

ios/Podfile

@@ -57,6 +57,7 @@ target 'JitsiMeetSDK' do
   pod 'amplitude-react-native', :path => '../node_modules/@amplitude/react-native'
   pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
   pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
+  pod 'react-native-get-random-values', :path => '../node_modules/react-native-get-random-values'
   pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
   pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
   pod 'react-native-performance', :path => '../node_modules/react-native-performance/ios'
@@ -72,6 +73,11 @@ target 'JitsiMeetSDK' do
   pod 'RNSVG', :path => '../node_modules/react-native-svg'
   pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
   pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
+  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
+  pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
+  pod 'RNScreens', :path => '../node_modules/react-native-screens'
+  pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
+  pod 'RNCMaskedView', :path => '../node_modules/@react-native-masked-view/masked-view'
 
   # Native pod dependencies
   #

ios/Podfile.lock

@@ -109,7 +109,7 @@ PODS:
   - GTMAppAuth (1.2.2):
     - AppAuth/Core (~> 1.4)
     - GTMSessionFetcher/Core (~> 1.5)
-  - GTMSessionFetcher/Core (1.6.1)
+  - GTMSessionFetcher/Core (1.7.0)
   - nanopb (1.30906.0):
     - nanopb/decode (= 1.30906.0)
     - nanopb/encode (= 1.30906.0)
@@ -284,12 +284,16 @@ PODS:
     - React
   - react-native-calendar-events (2.0.0):
     - React
+  - react-native-get-random-values (1.7.0):
+    - React-Core
   - react-native-keep-awake (4.0.0):
     - React
   - react-native-netinfo (4.1.5):
     - React
   - react-native-performance (2.0.0):
     - React-Core
+  - react-native-safe-area-context (3.3.2):
+    - React-Core
   - react-native-slider (3.0.3):
     - React
   - react-native-splash-screen (3.2.0):
@@ -359,13 +363,21 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
   - RNCAsyncStorage (1.15.5):
     - React-Core
+  - RNCMaskedView (0.2.6):
+    - React-Core
   - RNDefaultPreference (1.4.2):
     - React
   - RNDeviceInfo (8.0.0):
     - React-Core
+  - RNGestureHandler (1.10.3):
+    - React-Core
   - RNGoogleSignin (3.0.1):
     - GoogleSignIn (~> 5.0.0)
     - React
+  - RNReanimated (1.13.3):
+    - React-Core
+  - RNScreens (2.18.1):
+    - React-Core
   - RNSound (0.11.0):
     - React
     - RNSound/Core (= 0.11.0)
@@ -402,9 +414,11 @@ DEPENDENCIES:
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
   - react-native-calendar-events (from `../node_modules/react-native-calendar-events`)
+  - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-performance (from `../node_modules/react-native-performance/ios`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
   - react-native-video (from `../node_modules/react-native-video/react-native-video.podspec`)
@@ -421,9 +435,13 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
+  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
+  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)"
+  - RNReanimated (from `../node_modules/react-native-reanimated`)
+  - RNScreens (from `../node_modules/react-native-screens`)
   - RNSound (from `../node_modules/react-native-sound`)
   - RNSVG (from `../node_modules/react-native-svg`)
   - RNWatch (from `../node_modules/react-native-watch-connectivity`)
@@ -487,12 +505,16 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-background-timer"
   react-native-calendar-events:
     :path: "../node_modules/react-native-calendar-events"
+  react-native-get-random-values:
+    :path: "../node_modules/react-native-get-random-values"
   react-native-keep-awake:
     :path: "../node_modules/react-native-keep-awake"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-performance:
     :path: "../node_modules/react-native-performance/ios"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
   react-native-slider:
     :path: "../node_modules/@react-native-community/slider"
   react-native-splash-screen:
@@ -525,12 +547,20 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
+  RNCMaskedView:
+    :path: "../node_modules/@react-native-masked-view/masked-view"
   RNDefaultPreference:
     :path: "../node_modules/react-native-default-preference"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
+  RNGestureHandler:
+    :path: "../node_modules/react-native-gesture-handler"
   RNGoogleSignin:
     :path: "../node_modules/@react-native-community/google-signin"
+  RNReanimated:
+    :path: "../node_modules/react-native-reanimated"
+  RNScreens:
+    :path: "../node_modules/react-native-screens"
   RNSound:
     :path: "../node_modules/react-native-sound"
   RNSVG:
@@ -542,7 +572,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Amplitude: 263118b9e691e73a1c864b05bb08a3aff3636d16
-  amplitude-react-native: 833a4bd7f656f826bda1de01a7b8593b58842209
+  amplitude-react-native: 9369759dc6d01590aeb6261f714d53beaebc7e6f
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
@@ -563,7 +593,7 @@ SPEC CHECKSUMS:
   GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
   GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
-  GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
+  GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
   ObjectiveDropboxOfficial: b4765572e334d6fc6214b43a7595510324bbbbaa
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
@@ -576,16 +606,18 @@ SPEC CHECKSUMS:
   React-jsi: ddb471a56185e4007835a1bba0882ecb5ce3dc0e
   React-jsiexecutor: 67106691c60030ec888d7cbbc4f48a3168e27a02
   React-jsinspector: 92ceee6c66dc19886289b52436ade7e020b89602
-  react-native-background-timer: e0384ea2fa5a98f67f84f9c4dc274260ddd674ed
-  react-native-calendar-events: 1442fad71a00388f933cfa25512588fec300fcf8
-  react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
-  react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
-  react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0
-  react-native-slider: b733e17fdd31186707146debf1f04b5d94aa1a93
+  react-native-background-timer: 029c606b3fd6dd476b153e177c518b6ade4c169f
+  react-native-calendar-events: 82dc6c915653a1a8a266e43fdbbfdb3b1022ca99
+  react-native-get-random-values: 237bffb1c7e05fb142092681531810a29ba53015
+  react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
+  react-native-netinfo: 0e563248a4b9a99c33ec29bd03c2d50767db22a6
+  react-native-performance: 6bd6cfac80594775fb782405fceaaf206becf53b
+  react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
+  react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-video: 1574074179ecaf6a9dd067116c8f31bf9fec15c8
+  react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
   react-native-webrtc: 41526e4060dac373c18676f866962d4180ee47b9
-  react-native-webview: b2542d6fd424bcc3e3b2ec5f854f0abb4ec86c87
+  react-native-webview: dfd7202ff115c44d3ea401c2f36122fb3ac79f07
   React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
   React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
   React-RCTBlob: 70d88f7b68b5c44953cdb286ac2e36a7a509a97e
@@ -596,15 +628,19 @@ SPEC CHECKSUMS:
   React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
   React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
   ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
-  RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589
-  RNDefaultPreference: 56a405ce61033ac77b95004dccd7ac54c2eb50d1
-  RNDeviceInfo: 72ded653ce636b3f03571e90bed99309a714944e
+  RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
+  RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
+  RNDefaultPreference: 1f8133ec0bc0f9453cdada578564ba1ef551fb44
+  RNDeviceInfo: 87d2d175c760f6bcf58acd036f887e8b2392802c
+  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
-  RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20
+  RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
+  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
+  RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 3cc305fd6ee83fff506c10c4805471fa72b61c9a
+PODFILE CHECKSUM: 836d4804218c0608e1326471ec83fe31cfa9c86d
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -24,6 +24,8 @@
 		0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4E51B76425E5345E0038575A /* ScheenshareEventEmiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */; };
 		4E51B76525E5345E0038575A /* ScheenshareEventEmiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */; };
+		4ED4FFF32721B9B90074E620 /* JitsiAudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4ED4FFF42721B9B90074E620 /* JitsiAudioSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */; };
 		6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
 		C6245F5D2053091D0040BE68 /* image-resize@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5B2053091D0040BE68 /* image-resize@2x.png */; };
@@ -77,6 +79,9 @@
 		0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4E51B76225E5345E0038575A /* ScheenshareEventEmiter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScheenshareEventEmiter.h; sourceTree = "<group>"; };
 		4E51B76325E5345E0038575A /* ScheenshareEventEmiter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScheenshareEventEmiter.m; sourceTree = "<group>"; };
+		4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiAudioSession.h; sourceTree = "<group>"; };
+		4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiAudioSession.m; sourceTree = "<group>"; };
+		4ED4FFF52721BAE10074E620 /* JitsiAudioSession+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiAudioSession+Private.h"; sourceTree = "<group>"; };
 		891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = "<group>"; };
 		98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
@@ -174,6 +179,9 @@
 				DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */,
 				DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */,
 				DEFE535321FB1BF800011A3A /* JitsiMeet.m */,
+				4ED4FFF12721B9B90074E620 /* JitsiAudioSession.h */,
+				4ED4FFF52721BAE10074E620 /* JitsiAudioSession+Private.h */,
+				4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */,
 				DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */,
 				DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */,
 				DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */,
@@ -277,6 +285,7 @@
 				4E51B76425E5345E0038575A /* ScheenshareEventEmiter.h in Headers */,
 				DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
+				4ED4FFF32721B9B90074E620 /* JitsiAudioSession.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
 				DE81A2D42316AC4D00AE1940 /* JitsiMeetLogger.h in Headers */,
 				DE65AACA2317FFCD00290BEC /* LogUtils.h in Headers */,
@@ -438,6 +447,7 @@
 			files = (
 				0BB9AD7B1F5EC8F4001C08DB /* CallKit.m in Sources */,
 				DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */,
+				4ED4FFF42721B9B90074E620 /* JitsiAudioSession.m in Sources */,
 				0BB9AD7D1F60356D001C08DB /* AppInfo.m in Sources */,
 				DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */,
 				DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */,

ios/sdk/src/AudioMode.m

@@ -20,6 +20,7 @@
 #import <React/RCTLog.h>
 #import <WebRTC/WebRTC.h>
 
+#import "JitsiAudioSession+Private.h"
 #import "LogUtils.h"
 
 
@@ -113,7 +114,7 @@ RCT_EXPORT_MODULE();
         isSpeakerOn = NO;
         isEarpieceOn = NO;
 
-        RTCAudioSession *session = [RTCAudioSession sharedInstance];
+        RTCAudioSession *session = JitsiAudioSession.rtcAudioSession;
         [session addDelegate:self];
     }
 
@@ -127,7 +128,7 @@ RCT_EXPORT_MODULE();
 
 - (BOOL)setConfigWithoutLock:(RTCAudioSessionConfiguration *)config
                        error:(NSError * _Nullable *)outError {
-    RTCAudioSession *session = [RTCAudioSession sharedInstance];
+    RTCAudioSession *session = JitsiAudioSession.rtcAudioSession;
 
     return [session setConfiguration:config error:outError];
 }
@@ -135,7 +136,7 @@ RCT_EXPORT_MODULE();
 - (BOOL)setConfig:(RTCAudioSessionConfiguration *)config
             error:(NSError * _Nullable *)outError {
 
-    RTCAudioSession *session = [RTCAudioSession sharedInstance];
+    RTCAudioSession *session = JitsiAudioSession.rtcAudioSession;
     [session lockForConfiguration];
     BOOL success = [self setConfigWithoutLock:config error:outError];
     [session unlockForConfiguration];
@@ -178,7 +179,7 @@ RCT_EXPORT_METHOD(setAudioDevice:(NSString *)device
                   reject:(RCTPromiseRejectBlock)reject) {
     DDLogInfo(@"[AudioMode] Selected device: %@", device);
     
-    RTCAudioSession *session = [RTCAudioSession sharedInstance];
+    RTCAudioSession *session = JitsiAudioSession.rtcAudioSession;
     [session lockForConfiguration];
     BOOL success;
     NSError *error = nil;
@@ -273,7 +274,7 @@ RCT_EXPORT_METHOD(updateDeviceList) {
             RTCAudioSessionConfiguration *config = [self configForMode:self->activeMode];
             [self setConfig:config error:nil];
             if (self->forceSpeaker && !self->isSpeakerOn) {
-                RTCAudioSession *session = [RTCAudioSession sharedInstance];
+                RTCAudioSession *session = JitsiAudioSession.rtcAudioSession;
                 [session lockForConfiguration];
                 [session overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:nil];
                 [session unlockForConfiguration];

ios/sdk/src/JitsiAudioSession+Private.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright @ 2017-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "JitsiAudioSession.h"
+#import <WebRTC/WebRTC.h>
+
+@interface JitsiAudioSession (Private)
+
++ (RTCAudioSession *)rtcAudioSession;
+
+@end

ios/sdk/src/JitsiAudioSession.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright @ 2017-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class AVAudioSession;
+
+@interface JitsiAudioSession : NSObject
+
++ (void)activateWithAudioSession:(AVAudioSession *)session;
++ (void)deactivateWithAudioSession:(AVAudioSession *)session;
+
+@end

ios/sdk/src/JitsiAudioSession.m

@@ -0,0 +1,34 @@
+/*
+ * Copyright @ 2017-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "JitsiAudioSession.h"
+#import "JitsiAudioSession+Private.h"
+
+@implementation JitsiAudioSession
+
++ (RTCAudioSession *)rtcAudioSession {
+    return [RTCAudioSession sharedInstance];
+}
+
++ (void)activateWithAudioSession:(AVAudioSession *)session {
+    [self.rtcAudioSession audioSessionDidActivate:session];
+}
+
++ (void)deactivateWithAudioSession:(AVAudioSession *)session {
+    [self.rtcAudioSession audioSessionDidDeactivate:session];
+}
+
+@end

ios/sdk/src/JitsiMeet.m

@@ -127,6 +127,7 @@
 }
 
 - (void)destroyReactNativeBridge {
+    [_bridgeWrapper invalidate];
     _bridgeWrapper = nil;
 }
 

ios/sdk/src/JitsiMeetSDK.h

@@ -20,4 +20,5 @@
 #import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>
 #import <JitsiMeetSDK/JitsiMeetLogger.h>
 #import <JitsiMeetSDK/JitsiMeetBaseLogHandler.h>
+#import <JitsiMeetSDK/JitsiAudioSession.h>
 #import <JitsiMeetSDK/InfoPlistUtil.h>

ios/sdk/src/RCTBridgeWrapper.h

@@ -34,4 +34,6 @@
 
 @property (nonatomic, readonly, strong)  RCTBridge *bridge;
 
+- (void)invalidate;
+
 @end

ios/sdk/src/RCTBridgeWrapper.m

@@ -33,6 +33,10 @@
     return self;
 }
 
+- (void)invalidate {
+    [_bridge invalidate];
+}
+
 #pragma mark helper methods for getting the packager URL
 
 #if DEBUG

ios/sdk/src/callkit/CallKit.m

@@ -31,6 +31,7 @@
 #import <JitsiMeetSDK/JitsiMeetSDK-Swift.h>
 
 #import "../LogUtils.h"
+#import "JitsiAudioSession.h"
 
 
 // The events emitted/supported by RNCallKit:
@@ -319,13 +320,13 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
 - (void) providerDidActivateAudioSessionWithSession:(AVAudioSession *)session {
     DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:didActivateAudioSession:]");
 
-    [[RTCAudioSession sharedInstance] audioSessionDidActivate:session];
+    [JitsiAudioSession activateWithAudioSession:session];
 }
 
 - (void) providerDidDeactivateAudioSessionWithSession:(AVAudioSession *)session {
     DDLogInfo(@"[RNCallKit][CXProviderDelegate][provider:didDeactivateAudioSession:]");
 
-    [[RTCAudioSession sharedInstance] audioSessionDidDeactivate:session];
+    [JitsiAudioSession deactivateWithAudioSession:session];
 }
 
 - (void) providerTimedOutPerformingActionWithAction:(CXAction *)action {

lang/main-ca.json

@@ -236,7 +236,7 @@
         "remoteControlDeniedMessage": "{{user}} ha rebutjat la petició de control remot!",
         "remoteControlErrorMessage": "S'ha produït un error en intentar sol·licitar a {{user}} permisos de control remot!",
         "remoteControlRequestMessage": "Voleu permetre a {{user}} de controlar remotament el vostre escriptori?",
-        "remoteControlShareScreenWarning": "Tingueu present que si pitgeu \"Permet\" compartireu la vostra pantalla!",
+        "remoteControlShareScreenWarning": "Tingueu present que si pitgeu \"Permet\"compartireu la vostra pantalla!",
         "remoteControlStopMessage": "La sessió de control remot ha finalitzat!",
         "remoteControlTitle": "Control d'escriptori remot",
         "Remove": "Suprimeix",
@@ -577,7 +577,7 @@
     },
     "startupoverlay": {
         "title": "{{app}} requereix usar el micròfon i la càmera.",
-        "policyText": " "
+        "policyText": ""
     },
     "suspendedoverlay": {
         "rejoinKeyTitle": "Torna a entrar",
@@ -782,5 +782,42 @@
     },
     "helpView": {
         "header": "Centre d'ajuda"
+    },
+    "lobby": {
+        "admit": "Acceptar",
+        "admitAll": "Acceptar Tots",
+        "knockingParticipantList": "Participants en espera",
+        "allow": "Permetre",
+        "backToKnockModeButton": "Sol·licitar entrada",
+        "dialogTitle": "Sala d’espera",
+        "disableDialogContent": "La sala d’espera està habilitada actualment. Aquesta funció garanteix que els participants no desitjats no puguin unir-se a la seva reunió. Vols deshabilitar-ho?",
+        "disableDialogSubmit": "Deshabilitat",
+        "emailField": "Introdueix el teu email",
+        "enableDialogPasswordField": "Estableix la contrasenya (opcional)",
+        "enableDialogSubmit": "Habilitat",
+        "enableDialogText": "La sala d’espera li permet protegir la seva reunió en permetre que les persones només entrin després d’una aprovació formal per part d’un moderador.",
+        "enterPasswordButton": "Introduir la contrasenya de la reunió",
+        "enterPasswordTitle": "Introdueixi la contrasenya per a unir-se a la reunió",
+        "errorMissingPassword": "Si us plau, Introdueixi la contrasenya de la reunió",
+        "invalidPassword": "Contrasenya errònia",
+        "joiningMessage": "T’uniràs a la reunió tan aviat com algú accepti la teva sol·licitud",
+        "joinWithPasswordMessage": "Intentant unir-se amb contrasenya, esperi ...",
+        "joinRejectedMessage": "Un moderador va rebutjar la seva sol·licitud per a unir-se.",
+        "joinTitle": "Unir-se a la reunió",
+        "joiningTitle": "Sol·licitar unir-se a la reunió...",
+        "joiningWithPasswordTitle": "Connectant-se a la reunió amb contrasenya...",
+        "knockButton": "Sol·licitar entrada a la reunió",
+        "knockTitle": "Algú vol unir-se a la reunió",
+        "nameField": "Introdueix el teu nom",
+        "notificationLobbyAccessDenied": "{{originParticipantName}} ha rebutjat l’entrada a la reunió de {{targetParticipantName}}",
+        "notificationLobbyAccessGranted": "{{originParticipantName}} ha acceptat l’entrada a la reunió de {{targetParticipantName}}",
+        "notificationLobbyDisabled": "La sala d’espera ha estat deshabilitada per {{originParticipantName}}",
+        "notificationLobbyEnabled": "La sala d’espera ha estat habilitada per {{originParticipantName}}",
+        "notificationTitle": "Sala d’espera",
+        "passwordField": "Introduir la contrasenya de la reunió",
+        "passwordJoinButton": "Unir-se",
+        "reject": "Rebutjar",
+        "rejectAll": "Rebutjar Tots",
+        "toggleLabel": "Habilitar sala d’espera"
     }
 }

lang/main-de.json

@@ -213,7 +213,9 @@
         "done": "Fertig",
         "e2eeDescription": "Ende-zu-Ende-Verschlüsselung ist derzeit noch EXPERIMENTELL. Bitte beachten Sie, dass das Aktivieren der Ende-zu-Ende-Verschlüsselung diverse serverseitige Funktionen deaktiviert: Aufnahmen, Livestreaming und Telefoneinwahl. Bitte beachten Sie außerdem, dass der Konferenz dann nur noch mit Browsern beigetreten werden kann, die Insertable Streams unterstützen.",
         "e2eeLabel": "Ende-zu-Ende-Verschlüsselung aktivieren",
+        "e2eeDisabledDueToMaxModeDescription": "Ende-zu-Ende-Verschlüsselung kann aufgrund der großen Zahl an Anwesenden nicht aktiviert werden.",
         "e2eeWarning": "WARNUNG: Nicht alle Personen dieser Konferenz scheinen Ende-zu-Ende-Verschlüsselung zu unterstützen. Wenn Sie diese aktivieren, können die entsprechenden Personen nichts mehr sehen oder hören.",
+        "e2eeWillDisableDueToMaxModeDescription": "WARNUNG: Ende-zu-Ende-Verschlüsselung wird automatisch deaktiviert, wenn weitere Anwesende an der Konferenz teilnehmen.",
         "enterDisplayName": "Bitte geben Sie hier Ihren Namen ein",
         "embedMeeting": "Besprechung einbetten",
         "error": "Fehler",
@@ -333,6 +335,7 @@
         "shareScreenWarningH1": "Wenn Sie Ihren Bildschirm freigeben wollen:",
         "shareScreenWarningD1": "müssen Sie Ihre Audiofreigabe stoppen, bevor Sie ihren Bildschirm freigeben.",
         "shareScreenWarningD2": "müssen Sie Ihre Audiofreigabe stoppen und dann die Bildschirmfreigabe mit der Option \"Audio freigeben\" starten.",
+        "sharedVideoLinkPlaceholder": "YouTube-URL oder direkte Video-URL",
         "stopLiveStreaming": "Livestream stoppen",
         "stopRecording": "Aufnahme stoppen",
         "stopRecordingWarning": "Sind Sie sicher, dass Sie die Aufnahme stoppen möchten?",
@@ -498,6 +501,7 @@
         "expandedPending": "Livestream wird gestartet …",
         "failedToStart": "Livestream konnte nicht gestartet werden",
         "getStreamKeyManually": "Wir waren nicht in der Lage, Livestreams abzurufen. Versuchen Sie, Ihren Livestream-Schlüssel von YouTube zu erhalten.",
+        "inProgress": "Livestreaming gestartet",
         "invalidStreamKey": "Der Livestream-Schlüssel ist u. U. falsch.",
         "off": "Livestream gestoppt",
         "offBy": "{{name}} stoppte den Livestream",
@@ -505,6 +509,7 @@
         "onBy": "{{name}} startete den Livestream",
         "pending": "Livestream wird gestartet …",
         "serviceName": "Livestreaming-Dienst",
+        "sessionAlreadyActive": "Diese Konferenz wird bereits als Livestream übertragen.",
         "signedInAs": "Sie sind derzeit angemeldet als:",
         "signIn": "Mit Google anmelden",
         "signInCTA": "Anmelden oder den Streamschlüssel des YouTube-Livestreams eingeben.",
@@ -548,13 +553,14 @@
     "lockRoomPasswordUppercase": "Passwort",
     "me": "ich",
     "notify": {
+        "allowAction": "Erlauben",
+        "allowedUnmute": "Sie können die Stummschaltung aufheben, Ihre Kamera einschalten oder Ihren Bildschirm teilen.",
         "connectedOneMember": "{{name}} nimmt am Meeting teil",
         "connectedThreePlusMembers": "{{name}} und {{count}} andere Personen nehmen am Meeting teil",
         "connectedTwoMembers": "{{first}} und {{second}} nehmen am Meeting teil",
         "disconnected": "getrennt",
         "focus": "Konferenzleitung",
         "focusFail": "{{component}} ist im Moment nicht verfügbar – wiederholen in {{ms}} Sekunden",
-        "grantedTo": "Moderationsrechte an {{to}} vergeben!",
         "hostAskedUnmute": "Die Moderation bittet Sie, das Mikrofon zu aktivieren",
         "invitedOneMember": "{{name}} wurde eingeladen",
         "invitedThreePlusMembers": "{{name}} und {{count}} andere wurden eingeladen",
@@ -598,7 +604,6 @@
         "moderationStoppedTitle": "Moderation gestoppt",
         "moderationToggleDescription": "von {{participantDisplayName}}",
         "raiseHandAction": "Melden",
-        "groupTitle": "Benachrichtigungen",
         "reactionSounds": "Interaktionstöne deaktivieren",
         "groupTitle": "Benachrichtigungen"
     },
@@ -612,10 +617,12 @@
         },
         "actions": {
             "allow": "Anwesenden erlauben:",
+            "allowVideo": "Kamera einschalten",
             "audioModeration": "Für sich selbst die Stummschaltung aufzuheben",
             "blockEveryoneMicCamera": "Kamera und Mikrofon von allen sperren",
             "invite": "Person einladen",
             "askUnmute": "Anfragen, Stummschaltung aufzuheben",
+            "moreModerationActions": "Weitere Moderationsoptionen",
             "mute": "Stummschalten",
             "muteAll": "Alle stummschalten",
             "muteEveryoneElse": "Alle anderen stummschalten",
@@ -623,11 +630,13 @@
             "stopVideo": "Kamera ausschalten",
             "unblockEveryoneMicCamera": "Kamera und Mikrofon von allen entsperren",
             "videoModeration": "Kamera einschalten"
-        }
+        },
+        "search": "Suche Anwesende"
     },
     "passwordSetRemotely": "von einer anderen Person gesetzt",
     "passwordDigitsOnly": "Bis zu {{number}} Ziffern",
     "polls": {
+        "by": "Von {{ name }}",
         "create": {
             "addOption": "Antwort hinzufügen",
             "answerPlaceholder": "Antwort {{index}}",
@@ -695,6 +704,7 @@
         "errorDialOutFailed": "Anruf fehlgeschlagen. Anruf fehlgeschlagen",
         "errorDialOutStatus": "Fehler beim Abrufen des Anrufstatus",
         "errorMissingName": "Bitte geben Sie Ihren Namen ein, um der Konferenz beizutreten.",
+        "errorNoPermissions": "Sie müssen den Zugriff auf Mikrofon und Kamera erlauben",
         "errorStatusCode": "Anruf fehlgeschlagen. Statuscode: {{status}}",
         "errorValidation": "Nummerverifikation fehlgeschlagen",
         "iWantToDialIn": "Ich möchte mich einwählen",
@@ -752,6 +762,7 @@
         "expandedPending": "Aufzeichnung wird gestartet…",
         "failedToStart": "Die Aufnahme konnte nicht gestartet werden",
         "fileSharingdescription": "Aufzeichnung mit den Personen der Konferenz teilen",
+        "inProgress": "Aufzeichnung gestartet",
         "linkGenerated": "Link zur Aufzeichnung wurde generiert.",
         "live": "LIVE",
         "loggedIn": "Als {{userName}} angemeldet",
@@ -764,6 +775,7 @@
         "serviceDescription": "Ihre Aufzeichnung wird vom Aufzeichnungsdienst gespeichert",
         "serviceDescriptionCloud": "Cloud-Aufzeichnung",
         "serviceName": "Aufnahmedienst",
+        "sessionAlreadyActive": "Diese Konferenz wird bereits aufgezeichnet.",
         "signIn": "Anmelden",
         "signOut": "Abmelden",
         "unavailable": "Oh! Der {{serviceName}} ist aktuell nicht verfügbar. Wir arbeiten an der Behebung des Problems. Bitte versuchen Sie es später noch einmal.",
@@ -850,7 +862,14 @@
         "name": "Name",
         "seconds": "{{count}} Sek.",
         "speakerStats": "Sprechstatistik",
-        "speakerTime": "Sprechzeit"
+        "speakerTime": "Sprechzeit",
+        "happy": "Fröhlich",
+        "neutral": "Neutral",
+        "sad": "Traurig",
+        "surprised": "Überrascht",
+        "angry": "Sauer",
+        "fearful": "Ängstlich",
+        "disgusted": "Angeekelt"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -898,7 +917,7 @@
             "pip": "Bild-in-Bild-Modus ein-/ausschalten",
             "privateMessage": "Private Nachricht senden",
             "profile": "Profil bearbeiten",
-            "raiseHand": "Hand erheben / senken",
+            "raiseHand": "Hand heben",
             "reactionsMenu": "Interaktionsmenü öffnen / schließen",
             "recording": "Aufzeichnung ein-/ausschalten",
             "remoteMute": "Personen stummschalten",
@@ -935,7 +954,7 @@
         "chat": "Chat öffnen / schließen",
         "clap": "Klatschen",
         "closeChat": "Chat schließen",
-        "closeReactionsMenu": "Interationsmenü schließen",
+        "closeReactionsMenu": "Interaktionsmenü schließen",
         "disableReactionSounds": "Sie können die Interaktionstöne für diese Konferenz deaktivieren",
         "documentClose": "Geteiltes Dokument schließen",
         "documentOpen": "Geteiltes Dokument öffnen",
@@ -970,12 +989,12 @@
         "noisyAudioInputTitle": "Ihr Mikrofon scheint lärmintensiv zu sein!",
         "noisyAudioInputDesc": "Es klingt, als ob Ihr Mikrofon Störgeräusche verursacht. Bitte überlegen Sie, ob Sie das Gerät stummschalten oder austauschen wollen.",
         "openChat": "Chat öffnen",
-        "openReactionsMenu": "Interationsmenü öffnen",
+        "openReactionsMenu": "Interaktionsmenü öffnen",
         "participants": "Anwesende",
         "pip": "Bild-in-Bild-Modus einschalten",
         "privateMessage": "Private Nachricht senden",
         "profile": "Profil bearbeiten",
-        "raiseHand": "Hand erheben / senken",
+        "raiseHand": "Hand heben",
         "raiseYourHand": "Melden",
         "reactionBoo": "Buhen senden",
         "reactionClap": "Klatschen senden",
@@ -1040,7 +1059,10 @@
         "pending": "{{displayName}} wurde eingeladen"
     },
     "videoStatus": {
+        "adjustFor": "Einstellen für:",
         "audioOnly": "AUD",
+        "bestPerformance": "Beste Leistung",
+        "highestQuality": "Höchste Qualität",
         "audioOnlyExpanded": "Sie befinden sich im Modus „Nur Audio“. Dieser Modus benötigt weniger Bandbreite, Sie sehen jedoch nicht die Videos der anderen.",
         "callQuality": "Videoqualität",
         "hd": "HD",
@@ -1051,6 +1073,7 @@
         "ld": "LD",
         "ldTooltip": "Video wird in niedriger Auflösung angezeigt",
         "lowDefinition": "Niedrige Auflösung",
+        "performanceSettings": "Qualitätseinstellungen",
         "sd": "SD",
         "sdTooltip": "Video wird in Standardauflösung angezeigt",
         "standardDefinition": "Standardauflösung"
@@ -1124,6 +1147,12 @@
         "button": "Andere einladen",
         "youAreAlone": "Nur Sie sind in dieser Konferenz"
     },
+    "termsView": {
+        "header": "Nutzungsbedingungen"
+    },
+    "privacyView": {
+        "header": "Datenschutz"
+    },
     "helpView": {
         "header": "Hilfecenter"
     },

lang/main-fr.json

@@ -187,7 +187,7 @@
     "Back": "Retour",
     "cameraConstraintFailedError": "Votre caméra ne satisfait pas certaines des contraintes nécessaires.",
     "cameraNotFoundError": "La caméra n'a pas été trouvée.",
-    "cameraNotSendingData": "Nous sommes incapables d'accéder à votre caméra. Veuillez sélectionner un autre périphérique dans les paramètres ou rafraîchir la page.",
+    "cameraNotSendingData": "Impossible d'accéder à votre caméra. Veuillez sélectionner un autre périphérique dans les paramètres ou rafraîchir la page.",
     "cameraNotSendingDataTitle": "Impossible d'accéder à votre caméra",
     "cameraPermissionDeniedError": "Vous n'avez pas autorisé l'utilisation de votre caméra. Vous pouvez toujours participer à la conférence, mais les autres ne pourront pas vous voir. Utilisez le bouton de la caméra dans la barre d'adresse pour résoudre ce problème.",
     "cameraTimeoutError": "Impossible de démarrer la source vidéo. Délai dépassé!",
@@ -211,9 +211,11 @@
     "dismiss": "Rejeter",
     "displayNameRequired": "Bonjour ! Quel est votre nom ?",
     "done": "Terminé",
-    "e2eeDescription": "Le chiffrement de Bout-en-Bout est actuellement EXPERIMENTAL. Veuillez garder à l'esprit que l'activation du chiffrement de Bout-en-Bout désactivera les services fournis côté serveur tels que : l'enregistrement, la diffusion en direct et la participation par téléphone. Gardez également à l'esprit que la réunion ne fonctionnera que pour les personnes qui se joignent à partir de navigateurs prenant en charge les flux insérables.",
+    "e2eeDescription": "Le chiffrement de Bout-en-Bout est actuellement EXPERIMENTAL. Veuillez garder à l'esprit que l'activation du chiffrement de Bout-en-Bout désactivera les services fournis côté serveur tels que : l'enregistrement, la diffusion en direct et la participation par téléphone. Gardez également à l'esprit que la réunion ne fonctionnera que pour les personnes qui se connectent à partir de navigateurs prenant en charge les flux insérables.",
     "e2eeLabel": "Activer le chiffrement de Bout-en-Bout",
+    "e2eeDisabledDueToMaxModeDescription": "Impossible d'activer le chiffrement de bout en bout en raison du trop grand nombre de participants à la conférence.",
     "e2eeWarning": "ATTENTION : Tous les participants de cette réunion ne semblent pas prendre en charge le chiffrement de Bout-en-Bout. Si vous activez le chiffrement, ils ne pourront ni vous voir, ni vous entendre.",
+    "e2eeWillDisableDueToMaxModeDescription": "ATTENTION: le chiffrement de bout en bout sera automatiquement arrêté si plus de participants joignent la conférence.",
     "enterDisplayName": "Merci de saisir votre nom ici",
     "embedMeeting": "Intégrer la réunion",
     "error": "Erreur",
@@ -221,6 +223,7 @@
     "grantModeratorDialog": "Êtes-vous sûr de vouloir rendre ce participant modérateur ?",
     "grantModeratorTitle": "Nommer modérateur",
     "IamHost": "Je suis l'hôte",
+    "hideShareAudioHelper": "Ne pas montrer ce dialogue à nouveau",
     "incorrectRoomLockPassword": "Mot de passe incorrect",
     "incorrectPassword": "Nom d'utilisateur ou mot de passe incorrect",
     "internalError": "Oups ! Quelque chose s'est mal passée. L'erreur suivante s'est produite : {{error}}",
@@ -232,14 +235,14 @@
     "kickTitle": "Oups ! vous avez été expulsé(e) par {{participantDisplayName}}",
     "liveStreaming": "Direct",
     "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Impossible durant l'enregistrement",
-    "liveStreamingDisabledTooltip": "La diffusion en direct est désactivé",
+    "liveStreamingDisabledTooltip": "La diffusion en direct est désactivée",
     "lockMessage": "Impossible de verrouiller la conférence.",
     "lockRoom": "Ajouter un $t(lockRoomPassword) à la réunion ",
     "lockTitle": "Échec du verrouillage",
     "login": "Connexion",
     "logoutQuestion": "Voulez-vous vraiment vous déconnecter et arrêter la conférence ?",
     "logoutTitle": "Déconnexion",
-    "maxUsersLimitReached": "Le nombre maximal de participant est atteint. Le conférence est complète. Merci de contacter l'organisateur de la réunion ou réessayer plus tard !",
+    "maxUsersLimitReached": "Le nombre maximal de participants est atteint. Le conférence est complète. Merci de contacter l'organisateur de la réunion ou réessayer plus tard !",
     "maxUsersLimitReachedTitle": "Le nombre maximal de participants est atteint",
     "micConstraintFailedError": "Votre microphone ne satisfait pas certaines des contraintes nécessaires.",
     "micNotFoundError": "Le microphone n'a pas été détecté.",
@@ -253,10 +256,12 @@
     "muteEveryoneElseDialog": "Une fois leur micro coupé, vous ne pourrez plus le réactiver, mais ils pourront l'activer par eux-mêmes à tout moment.",
     "muteEveryoneElseTitle": "Couper le micro de tout le monde sauf de {{whom}} ?",
     "muteEveryoneDialog": "Êtes-vous sûr de vouloir couper les micros de tout le monde ? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
+    "muteEveryoneDialogModerationOn": "Les participants peuvent demander à parler n'importe quand",
     "muteEveryoneTitle": "Couper le micro de tout le monde ?",
     "muteEveryoneElsesVideoDialog": "Une fois la caméra coupée, vous ne pourrez plus la rallumer, mais ils peuvent la rallumer à tout moment.",
     "muteEveryoneElsesVideoTitle": "Couper la vidéo de tout le monde sauf {{whom}}?",
     "muteEveryonesVideoDialog": "Êtes-vous sûr de vouloir couper la caméra de tout le monde? Vous ne pourrez pas la réactiver, mais ils peuvent la remettre à tout moment.",
+    "muteEveryonesVideoDialogModerationOn": "Les participants peuvent demander à activer leur caméra n'importe quand.",
     "muteEveryonesVideoDialogOk": "Désactiver",
     "muteEveryonesVideoTitle": "Couper la caméra de tout le monde?",
     "muteEveryoneSelf": "vous",
@@ -264,16 +269,21 @@
     "muteParticipantBody": "Vous ne pourrez plus réactiver son micro, mais il pourra l'activer par lui-même à tout moment.",
     "muteParticipantButton": "Couper le micro",
     "muteParticipantDialog": "Êtes-vous sûr(e) de vouloir couper le micro de ce participant ? Seul le participant pourra ensuite réactiver son micro à tout moment.",
+    "muteParticipantsVideoDialog": "Êtes-vous sûr(e) de vouloir couper la caméra de ce participant ? Seul le participant pourra ensuite réactiver sa caméra à tout moment.",
     "muteParticipantTitle": "Couper le micro de ce participant ?",
     "muteParticipantsVideoButton": "Couper la caméra",
     "muteParticipantsVideoTitle": "Couper la caméra de ce participant?",
     "muteParticipantsVideoBody": "Vous ne pourrez pas rallumer la caméra, mais ils peuvent la rallumer à tout moment.",
+    "noDropboxToken": "Pas de jeton Dropbox valide",
     "Ok": "Ok",
     "password": "Mot de passe",
     "passwordLabel": "La réunion a été verrouillée par un(e) participant(e). Veuillez entrer le $t(lockRoomPassword) pour la rejoindre.",
     "passwordNotSupported": "La définition d'un $t(lockRoomPassword) de réunion n'est pas prise en charge.",
     "passwordNotSupportedTitle": "L'ajout d'un $t(lockRoomPassword) n'est pas supporté",
     "passwordRequired": "$t(lockRoomPasswordUppercase) requis",
+    "permissionErrorTitle": "Permission nécessaire",
+    "permissionCameraRequiredError": "L'autorisation caméra est nécessaire pour participer aux réunions avec vidéo. Merci de l'accorder dans les paramètres",
+    "permissionMicRequiredError": "L'autorisation microphone est nécessaire pour participer aux réunions avec son. Merci de l'accorder dans les paramètres",
     "popupError": "Votre navigateur bloque les fenêtres pop-up. Veuillez autoriser les fenêtres pop-up dans les paramètres de votre navigateur.",
     "popupErrorTitle": "Pop-up bloquée",
     "readMore": "plus",
@@ -296,18 +306,24 @@
     "reservationErrorMsg": "Code d'erreur: {{code}}, message: {{msg}}",
     "retry": "Réessayer",
     "screenSharingAudio": "Partager l'audio",
-    "screenSharingFailed": "Oops ! Quelque chose s'est mal passée, nous n'avons pas pu démarrer le partage d'écran !",
+    "screenSharingFailed": "Houla ! Quelque chose s'est mal passé, nous n'avons pas pu démarrer le partage d'écran !",
     "screenSharingFailedTitle": "Echec du partage d'écran !",
-    "screenSharingPermissionDeniedError": "Oops ! Un problème est survenu avec vos autorisations de partage d'écran. Veuillez réessayer.",
-    "screenSharingPermissionDeniedError": "Oups ! Une erreur s'est produite avec vos autorisations d'extension de partage d'écran. Veuillez rafraîchir et réessayer.",
+    "screenSharingPermissionDeniedError": "Houla ! Un problème est survenu avec vos autorisations de partage d'écran. Veuillez réessayer.",
     "sendPrivateMessage": "Vous avez récemment reçu un message privé. Aviez-vous l'intention d'y répondre en privé, ou vouliez-vous envoyer votre message au groupe ?",
     "sendPrivateMessageCancel": "Envoyer au groupe",
     "sendPrivateMessageOk": "Envoyer en privé",
     "sendPrivateMessageTitle": "Envoyer en privé ?",
     "serviceUnavailable": "Service indisponible",
     "sessTerminated": "Appel terminé",
-    "sessionRestarted": "L'appel est relancé par le pont",
+    "sessionRestarted": "L'appel est relancé par la passerelle",
     "Share": "Partager",
+    "shareAudio": "Continuer",
+    "shareAudioTitle" : "Comment partager le son",
+    "shareAudioWarningTitle": "Vous devez cesser de partager l'écran avant de partager l'audio",
+    "shareAudioWarningH1": "Si vous voulez partager uniquement de l'audio:",
+    "shareAudioWarningD1": "vous devez cesser le partage d'écran avant de partager votre son.",
+    "shareAudioWarningD2": "viys devez partager votre écran à nouveau et cocher l'ootion \"Partager l'audio\".",
+    "shareMediaWarningGenericH2": "Si vous voulez partager votre écran et l'audio",
     "shareVideoLinkError": "Veuillez renseigner un lien Youtube fonctionnel.",
     "shareVideoTitle": "Partager une vidéo",
     "shareYourScreen": "Partager votre écran",
@@ -315,6 +331,11 @@
     "startLiveStreaming": "Démarrer la diffusion en direct",
     "startRecording": "Commencer l'enregistrement",
     "startRemoteControlErrorMessage": "Une erreur est survenue lors de la tentative de démarrage de la session de contrôle à distance !",
+    "shareScreenWarningTitle": "Vous devez cesser de partager votre audio avant de partager votre écran",
+    "shareScreenWarningH1": "Si vous voulez partager uniquement votre écran:",
+    "shareScreenWarningD1": "vous devez arrêter le partage d'audio avant de partager votre écran.",
+    "shareScreenWarningD2": "vous devez arrêter le partage d'audio, démarrer le partage d'écran et cocher l'option  \"Partager l'audio\".",
+    "sharedVideoLinkPlaceholder": "lien YouTube ou lien vidéo direct",
     "stopLiveStreaming": "Arrêter la diffusion en direct",
     "stopRecording": "Arrêter l'enregistrement",
     "stopRecordingWarning": "Désirez-vous vraiment arrêter l'enregistrement ?",
@@ -331,9 +352,12 @@
     "userIdentifier": "Identifiant utilisateur",
     "userPassword": "mot de passe utilisateur",
     "videoLink": "Lien de la vidéo",
+    "viewUpgradeOptions": "Voir les options de mise à jour",
+    "viewUpgradeOptionsContent": "Pour obtenir un accès illimité à des capacités premium comme l'enregistrement, les transcriptions, diffusion RTMP et plus, vous devez mettre à jour votre plan.",
+    "viewUpgradeOptionsTitle": "Vous avez découvert une capacité premium !",
     "WaitForHostMsg": "La conférence <b>{{room}}</b> n'a pas encore commencé. Si vous en êtes l'hôte, veuillez vous authentifier. Sinon, veuillez attendre son arrivée.",
     "WaitForHostMsgWOk": "La conférence <b>{{room}}</b> n'a pas encore commencé. Si vous en êtes l'hôte, veuillez appuyer sur Ok pour vous authentifier. Sinon, veuillez attendre son arrivée.",
-    "WaitingForHostTitle": "En attente du hôte ...",
+    "WaitingForHostTitle": "En attente de l'hôte ...",
     "Yes": "Oui",
     "yourEntireScreen": "Votre écran entier",
     "remoteUserControls": "Contrôles de l'utilisateur distant {{username}}",
@@ -346,7 +370,7 @@
     "title": "Document partagé"
   },
   "e2ee": {
-    "labelToolTip": "L'audio et la vidéo de cette conférence sont chiffrés de Bout-en-Bout"
+    "labelToolTip": "Le son et la vidéo de cette conférence sont chiffrés de Bout-en-Bout"
   },
   "embedMeeting": {
     "title": "Intégrer cette réunion"
@@ -368,9 +392,11 @@
     "image4" : "Lampadaire noir",
     "image5" : "Montagne",
     "image6" : "Forêt ",
-    "image7" : "Lever du soleil",
+    "image7" : "Lever de soleil",
     "desktopShareError": "Impossible de créer le partage de bureau",
-    "desktopShare":"Partage de bureau"
+    "desktopShare":"Partage de bureau",
+    "webAssemblyWarning": "WebAssembly non supporté",
+    "backgroundEffectError": "Erreur dans l'application de l'effet d'arrière-plan."
   },
   "feedback": {
     "average": "Moyen",
@@ -405,8 +431,12 @@
     "genericError": "Oups, quelque chose a mal tourné.",
     "inviteLiveStream": "Pour voir la diffusion en direct de cette réunion, cliquez sur ce lien : {{url}}",
     "invitePhone": "Pour rejoindre depuis un téléphone, saisissez : {{number}},,{{conferenceID}}#\n",
-    "invitePhoneAlternatives": "Vous cherchez un numéro d'appel différent ?\nAfficher les numéros d'appel de la réunion: {{url}}\n\n\nSi vous appelez également via un téléphone de salle, vous pouvez vous connecter sans audio: {{silentUrl}}",
+    "invitePhoneAlternatives": "Vous cherchez un numéro d'appel différent ?\nAfficher les numéros d'appel de la réunion: {{url}}\n\n\nSi vous appelez également via un téléphone de réunion, vous pouvez vous connecter sans audio: {{silentUrl}}",
     "inviteSipEndpoint": "Pour rejoindre en utilisant l'adresse SIP, entrez ceci : {{sipUri}}",
+    "inviteTextiOSPersonal": "{{name}} vous invite à une réunion.",
+    "inviteTextiOSJoinSilent": "Si vous téléphonez avec un téléphone de réunion, utilisez ce lien pour rejoindre sans vous connecter en audio: {{silentUrl}}.",
+    "inviteTextiOSInviteUrl": "Clickez le lien suivant pour rejoindre: {{inviteUrl}}.",
+    "inviteTextiOSPhone": "Pour rejoindre par téléphone, utilisez ce numéro: {{number}},,{{conferenceID}}#. Si vous voulez utiliser un autre numéro, voici la liste complête: {{didUrl}}.",
     "inviteURLFirstPartGeneral": "Vous êtes invité(e) à participer à une réunion.",
     "inviteURLFirstPartPersonal": "{{name}} vous invite à une réunion.\n",
     "inviteURLSecondPart": "\nRejoindre la réunion :\n{{url}}\n",
@@ -417,6 +447,7 @@
     "noRoom": "Aucune réunion n'a été spécifiée pour l'appel entrant.",
     "numbers": "Numéros d'appel",
     "password": "$t(lockRoomPasswordUppercase) :",
+    "sip": "adresse SIP",
     "title": "Partager",
     "tooltip": "Partager le lien et les informations de connexion pour cette conférence",
     "label": "Information de la réunion"
@@ -430,7 +461,7 @@
     "send": "Envoyer"
   },
   "inlineDialogFailure": {
-    "msg": "Nous avons trébuché un peu.",
+    "msg": "Il y a eu un petit problème.",
     "retry": "Réessayer",
     "support": "Support",
     "supportMsg": "Si ceci persiste, contactez"
@@ -454,6 +485,8 @@
     "videoMute": "Démarrer / Arrêter votre caméra"
   },
   "liveStreaming": {
+    "limitNotificationDescriptionWeb": "En raison d'une forte demande, votre diffusion sera limitée à {{limit}} min. Pour une diffusion illimitée, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
+    "limitNotificationDescriptionNative": "Votre diffusion sera limitée à {{limit}} min. Pour une diffusion illimitée, essayez {{app}}.",
     "busy": "Nous tentons de libérer des ressources de diffusion. Veuillez réessayez dans quelques minutes.",
     "busyTitle": "Tous les flux sont actuellement occupés",
     "changeSignIn": "Changer de compte.",
@@ -461,8 +494,6 @@
     "chooseCTA": "Choisissez une option de diffusion. Vous êtes actuellement connecté comme {{email}}.",
     "enterStreamKey": "Entrez votre clé de diffusion Youtube ici",
     "error": "La diffusion a échouée. Veuillez réessayer ultérieurement.",
-    "enterStreamKey": "Entrez votre clé de flux direct YouTube ici.",
-    "error": "Le Streaming a échoué. Veuillez réessayer.",
     "errorAPI": "Une erreur s'est produite lors de l'accès à vos diffusions YouTube. Veuillez réessayer de vous connecter.",
     "errorLiveStreamNotEnabled": "La diffusion en direct n'est pas activée pour {{email}}. Merci de l'activer ou de vous connecter avec un compte où elle est déjà activée.",
     "expandedOff": "La diffusion en direct a été arrêtée",
@@ -471,8 +502,6 @@
     "failedToStart": "La diffusion n'a pas réussi à démarrer",
     "getStreamKeyManually": "Nous n'avons pas réussi à récupérer un flux de direct. Essayez d'obtenir votre clé de diffusion en direct sur YouTube.",
     "invalidStreamKey": "La clé de diffusion en direct n'est peut-être pas correcte.",
-    "limitNotificationDescriptionWeb": "En raison d'une forte demande, votre diffusion sera limitée à {{limit}} min. Pour un streaming illimité, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
-    "limitNotificationDescriptionNative": "Votre diffusion sera limitée à {{limit}} min. Pour un streaming illimité, essayez {{app}}.",
     "off": "La diffusion en direct (streaming) a été arrêté",
     "offBy": "{{name}} a arrêté la diffusion en direct",
     "on": "En direct",
@@ -509,7 +538,7 @@
       "finishedModerator": "L'enregistrement de la session {{token}} s'est terminé. L'enregistrement a bien été sauvegardée. Merci de demander aux autres participants de soumettre leurs enregistrements.",
       "notModerator": "Vous n'êtes pas le modérateur. Vous ne pouvez pas démarrer ou arrêter un enregistrement local."
     },
-    "moderator": "Modérateur ",
+    "moderator": "Droits de modérateur accordés",
     "no": "Non",
     "participant": "Participant(e)",
     "participantStats": "Statistiques du participant",
@@ -522,13 +551,15 @@
   "lockRoomPasswordUppercase": "Mot de passe",
   "me": "moi",
   "notify": {
+    "allowAction": "Permettre",
+    "allowedUnmute": "Vous pouvez réactiver votre écran, votre caméra ou partager votre écran.",
     "connectedOneMember": "{{name}} a rejoint la réunion",
     "connectedThreePlusMembers": "{{name}} et {{count}} autres personnes ont rejoint la réunion",
     "connectedTwoMembers": "{{first}} et {{second}} ont rejoint la réunion",
     "disconnected": "déconnecté",
     "focus": "Focus de conférence",
     "focusFail": "{{component}} n'est pas disponible - réessayez dans {{ms}} sec",
-    "grantedTo": "Droits modérateur accordés à {{to}} !",
+    "hostAskedUnmute": "Le modérateur souhaite vous donner la parole",
     "invitedOneMember": "{{name}} a été invité(e)",
     "invitedThreePlusMembers": "{{name}} et {{count}} autres ont été invités",
     "invitedTwoMembers": "{{first}} et {{second}} ont été invités",
@@ -549,42 +580,60 @@
     "somebody": "Quelqu'un",
     "startSilentTitle": "Vous avez rejoint sans sortie audio !",
     "startSilentDescription": "Rejoignez la réunion de nouveau pour activer l'audio",
-    "suboptimalBrowserWarning": "Nous craignons que votre expérience de réunion en ligne ne soit bonne ici. Nous cherchons des moyens d'améliorer cela, mais d'ici-là, essayez d'utiliser l'un des <a href='{{recommendedBrowserPageLink}}' target='_blank'>navigateurs supportés</a>.",
+    "suboptimalBrowserWarning": "Nous craignons que votre expérience de réunion en ligne ne soit pas idéale ici. Nous cherchons des moyens d'améliorer cela, mais d'ici-là, essayez d'utiliser l'un des <a href='{{recommendedBrowserPageLink}}' target='_blank'>navigateurs supportés</a>.",
     "suboptimalExperienceTitle": "Avertissement du navigateur",
     "unmute": "Rétablir le son",
     "newDeviceCameraTitle": "Nouvelle caméra détectée",
     "newDeviceAudioTitle": "Nouveau périphérique audio détecté",
     "newDeviceAction": "Utiliser",
-    "OldElectronAPPTitle": "Vulnérabilité de sécurité !",
-    "oldElectronClientDescription1": "Vous semblez utiliser une ancienne version du client Jitsi Meet qui présente des vulnérabilités de sécurité connues. Veuillez vous assurer de mettre à jour vers notre ",
+    "OldElectronAPPTitle": "Faille de sécurité !",
+    "oldElectronClientDescription1": "Vous semblez utiliser une ancienne version du client Jitsi Meet qui présente des failles de sécurité connues. Veuillez vous assurer de mettre à jour vers notre ",
     "oldElectronClientDescription2": "dernière build",
     "oldElectronClientDescription3": " rapidement !",
+    "moderationInEffectDescription": "Merci de levez la main pour demander la parole.",
+    "moderationInEffectCSDescription": "Merci de lever la main si vous voulez partager votre écran.",
+    "moderationInEffectVideoDescription": "Merci de lever la main si vous souhaitez démarrer votre caméra.",
+    "moderationInEffectTitle": "Votre micro est coupé par le modérateur",
+    "moderationInEffectCSTitle": "Le partage d'écran est interdit par le modérateur",
+    "moderationInEffectVideoTitle": "Votre caméra est coupée par le modérateur",
+    "moderationRequestFromModerator": "Le modérateur souhaite que vous activiez votre micro",
+    "moderationRequestFromParticipant": "Souhaite parler",
+    "moderationStartedTitle": "Modération démarrée",
+    "moderationStoppedTitle": "Modération arrêtée",
+    "moderationToggleDescription": "par {{participantDisplayName}}",
+    "raiseHandAction": "Lever la main",
+    "reactionSounds": "Bloquer les réactions sonores",
     "groupTitle": "Notifications"
   },
   "participantsPane": {
     "close": "Fermer",
+    "header": "Participants",
     "headings": {
       "lobby": "Salle d'attente ({{count}})",
       "participantsList": "Participants de la réunion ({{count}})",
       "waitingLobby": "Dans la salle d'attente ({{count}})"
     },
     "actions": {
-      "allow": "Autoriser les participant à:",
+      "allow": "Autoriser les participants à:",
+      "allowVideo": "permettre la vidéo",
+      "audioModeration": "réouvrir leur micro",
       "blockEveryoneMicCamera": "Bloquer tous les micros et caméras",
       "invite": "Inviter quelqu'un",
       "askUnmute": "Demander de réactiver le micro",
       "mute": "Couper le micro",
       "muteAll": "Couper le micro de tout le monde",
       "muteEveryoneElse": "Couper le micro de tous les autres",
-      "startModeration": "Réactiver son micro ou démarrer sa vidéo",
       "stopEveryonesVideo": "Couper toutes les caméras",
       "stopVideo": "Couper la vidéo",
-      "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras"
-    }
+      "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras",
+      "videoModeration": "Démarrer leur vidéo"
+    },
+    "search": "Rechercher des participants"
   },
   "passwordSetRemotely": "défini par un autre participant",
   "passwordDigitsOnly": "Jusqu'à {{number}} chiffres",
   "polls": {
+    "by": "Par {{ name }}",
     "create": {
       "addOption": "Ajouter une option",
       "answerPlaceholder": "Option {{index}}",
@@ -609,7 +658,7 @@
     },
     "notification": {
       "title": "Un nouveau sondage a été ajouté à la réunion",
-      "description": "Ouvrez l'onget des sondages pour voter"
+      "description": "Ouvrez l'onglet des sondages pour voter"
     }
   },
   "poweredby": "produit par",
@@ -629,8 +678,8 @@
       "poor": "Vous avez une mauvaise connexion"
     },
     "connectionDetails": {
-      "audioClipping": "Attendez vous à ce que votre audio soit coupé.",
-      "audioHighQuality": "Votre audio sera de bonne qualité.",
+      "audioClipping": "Attendez vous à ce que votre son soit coupé.",
+      "audioHighQuality": "Votre son sera de bonne qualité.",
       "audioLowNoVideo": "Attendez vous à une faible qualité audio et aucune vidéo",
       "goodQuality": "Impressionnant ! La qualité de vos médias sera excellente",
       "noMediaConnectivity": "Nous n'avons pas pu trouver un moyen d'établir une connectivité multimédia pour ce test. Cela est généralement causé par un pare-feu ou un NAT.",
@@ -652,6 +701,7 @@
     "errorDialOutFailed": "Impossible de composer le numéro. L'appel a échoué",
     "errorDialOutStatus": "Erreur lors de l'obtention de l'état d'appel sortant",
     "errorMissingName": "Veuillez entrer votre nom pour entrer en conférence",
+    "errorNoPermissions": "Vous devez permettre l'accès microphone et caméra",
     "errorStatusCode": "Erreur de numérotation, code d'état: {{status}}",
     "errorValidation": "La validation du numéro a échoué",
     "iWantToDialIn": "Je veux me connecter",
@@ -662,7 +712,6 @@
     "linkCopied": "Lien copié dans le presse-papiers",
     "lookGood": "Il semble que votre microphone fonctionne correctement",
     "or": "ou",
-    "calling": "Appel",
     "premeeting": "Pré-séance",
     "showScreen": "Activer l'écran de pré-séance",
     "startWithPhone": "Commencez avec l'audio du téléphone",
@@ -695,19 +744,22 @@
   },
   "raisedHand": "Aimerait prendre la parole",
   "recording": {
+    "limitNotificationDescriptionWeb": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
+    "limitNotificationDescriptionNative": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <3> {{app}} </3>.",
     "authDropboxText": "Téléchargement vers Dropbox",
     "availableSpace": "Espace disponible : {{spaceLeft}} Mo (approximativement {{duration}} minutes d'enregistrement)",
     "beta": "BETA",
     "busy": "Nous sommes en train de libérer les ressources d'enregistrement. Réessayez dans quelques minutes.",
     "busyTitle": "Tous les enregistreurs sont actuellement occupés",
+    "copyLink": "Copier lien",
     "error": "Échec de l'enregistrement. Veuillez réessayer.",
+    "errorFetchingLink": "Erreur de récupération du lien d'enregistrement.",
     "expandedOff": "L'enregistrement a été arrêté",
     "expandedOn": "Cette conférence est actuellement en cours d'enregistrement.",
     "expandedPending": "Démarrage de l'enregistrement ...",
     "failedToStart": "L'enregistrement n'a pas réussi à démarrer",
     "fileSharingdescription": "Partager l'enregistrement avec les participants de la réunion",
-    "limitNotificationDescriptionWeb": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
-    "limitNotificationDescriptionNative": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <3> {{app}} </3>.",
+    "linkGenerated": "Nous avons généré un lien à votre enregistrement.",
     "live": "DIRECT",
     "loggedIn": "Connecté en tant que {{userName}}",
     "off": "Enregistrement arrêté",
@@ -722,27 +774,33 @@
     "signIn": "Se connecter",
     "signOut": "Se déconnecter",
     "unavailable": "Oups ! Le {{serviceName}} est actuellement indisponible. Nous tentons de résoudre le problème. Veuillez réessayer plus tard.",
-    "unavailableTitle": "Enregistrement indisponible"
+    "unavailableTitle": "Enregistrement indisponible",
+    "uploadToCloud": "Envoyer vers le cloud"
   },
   "sectionList": {
     "pullToRefresh": "Tirer pour recharger"
   },
   "security": {
-    "about": "Vous pouvez ajouter un mot de passe à votre réunion. Les participants devront fournir le mot de passe avant qu'ils soient autorisés à rejoindre la réunion.",
-    "aboutReadOnly": "Les modérateurs peuvent ajouter un mot de passe à la réunion. Les participants devront fournir le mot de passe avant qu'ils soient autorisés à rejoindre la réunion.",
+    "about": "Vous pouvez ajouter un mot de passe à votre réunion. Les participants devront fournir le mot de passe avant de pouvoir rejoindre la réunion.",
+    "aboutReadOnly": "Les modérateurs peuvent ajouter un mot de passe à la réunion. Les participants devront fournir le mot de passe avant de pouvoir rejoindre la réunion.",
     "insecureRoomNameWarning": "Le nom de la salle est peu sûr. Des participants non désirés peuvent rejoindre votre réunion. Pensez à sécuriser votre réunion en cliquant sur le bouton de sécurité.",
     "securityOptions": "Options de sécurité"
   },
   "settings": {
     "calendar": {
-      "about": "L'intégration de {{appName}} avec votre calendrier permet d'accéder de manière sécurisée aux événement à venir.",
+      "about": "L'intégration de {{appName}} avec votre calendrier permet d'accéder de manière sécurisée aux événements à venir.",
       "disconnect": "Se déconnecter",
       "microsoftSignIn": "Se connecter avec Microsoft",
       "signedIn": "Accès aux événements du calendrier {{email}}. Cliquez sur le bouton se déconnecter ci-dessous pour arrêter l'accès aux événements du calendrier.",
       "title": "Calendrier"
     },
+    "desktopShareFramerate": "Images par seconde pour le Partage d'écran",
+    "desktopShareWarning": "Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
+    "desktopShareHighFpsWarning": "Augmenter le nombre d'images par seconde pour le partage d'écran peut impacter votre bande passante. Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
     "devices": "Périphériques",
     "followMe": "Tout le monde me suit",
+    "framesPerSecond": "images par seconde",
+    "incomingMessage": "un message arrive",
     "language": "Langue",
     "loggedIn": "Connecté en tant que {{name}}",
     "microphones": "Microphones",
@@ -750,13 +808,19 @@
     "more": "Plus",
     "name": "Nom",
     "noDevice": "Aucun",
+    "participantJoined": "un participant arrive",
+    "participantLeft": "un participant quitte",
+    "playSounds": "Jouer un son quand",
+    "reactions": "il y a une réaction à la réunion",
     "sameAsSystem": "Identique au système ({{label}})",
     "selectAudioOutput": "Sortie audio",
     "selectCamera": "Caméra",
     "selectMic": "Microphone",
-    "speakers": "Intervenants",
+    "sounds": "Sons",
+    "speakers": "Haut-parleurs",
     "startAudioMuted": "Tout le monde commence en muet",
     "startVideoMuted": "Tout le monde commence sans vidéo",
+    "talkWhileMuted": "vous parlez en étant muet",
     "title": "Paramètres"
   },
   "settingsView": {
@@ -787,6 +851,7 @@
   },
   "speaker": "Haut-parleur",
   "speakerStats": {
+    "search": "Recherche",
     "hours": "{{count}}h",
     "minutes": "{{count}}m",
     "name": "Nom",
@@ -808,19 +873,23 @@
     "accessibilityLabel": {
       "audioOnly": "Activer / Désactiver le mode voix uniquement",
       "audioRoute": "Sélectionner la source audio",
+      "boo": "Hou",
       "callQuality": "Ajuster la qualité vidéo",
       "cc": "Activer / Désactiver les sous-titres",
       "chat": "Afficher / Masquer la discussion instantanée",
+      "clap": "Applaudir",
       "document": "Activer / Désactiver le document partagé",
       "download": "Télécharger nos applications",
       "embedMeeting": "Intégrer la réunion",
       "feedback": "Laisser des commentaires",
       "fullScreen": "Activer / Désactiver le plein écran",
-      "grantModerator": "Nommer modérateur",
+      "grantModerator": "donner des droits de modérateur",
       "hangup": "Quitter la conversation",
       "help": "Aide",
       "invite": "Inviter des participants",
       "kick": "Expulser le participant",
+      "laugh": "Rire",
+      "like": "Approuver",
       "lobbyButton": "Activer / Désactiver le mode salle d'attente",
       "localRecording": "Activer / Désactiver les contrôles d'enregistrement local",
       "lockRoom": "Activer / Désactiver le mot de passe de la réunion",
@@ -837,6 +906,7 @@
       "privateMessage": "Envoyer un message privé",
       "profile": "Éditer votre profil",
       "raiseHand": "Lever la main",
+      "reactionsMenu": "Ouvrir / fermer le menu réactions",
       "recording": "Activer / Désactiver l'enregistrement",
       "remoteMute": "Couper le micro du participant",
       "remoteVideoMute": "Couper la caméra du participant",
@@ -848,7 +918,9 @@
       "shareYourScreen": "Activer / Désactiver le partage d'écran",
       "shortcuts": "Afficher / Masquer les raccourcis",
       "show": "Afficher en premier plan",
+      "silence": "Silence",
       "speakerStats": "Afficher / Cacher les statistiques de parole",
+      "surprised": "Surpris",
       "tileView": "Activer / Désactiver la vue mosaïque",
       "toggleCamera": "Changer de caméra",
       "toggleFilmstrip": "Basculer de pellicule",
@@ -860,13 +932,18 @@
     },
     "addPeople": "Ajouter des personnes à votre appel",
     "audioSettings": "Paramètres audio",
+    "videoSettings": "Paramètres vidéo",
     "audioOnlyOff": "Désactiver le mode bande passante réduite",
     "audioOnlyOn": "Activer le mode bande passante réduite",
     "audioRoute": "Sélectionner la source audio",
     "authenticate": "Authentifiez-vous",
+    "boo": "Huer",
     "callQuality": "Ajuster la qualité vidéo",
     "chat": "Ouvrir / Fermer le chat",
+    "clap": "Applaudir",
     "closeChat": "Fermer le chat",
+    "closeReactionsMenu": "Fermer le menu réactions",
+    "disableReactionSounds": "Vous pouvez interdire les réactions sonores à cette réunion",
     "documentClose": "Fermer le document partagé",
     "documentOpen": "Ouvrir le document partagé",
     "download": "Télécharger nos applications",
@@ -880,6 +957,8 @@
     "hangup": "Quitter",
     "help": "Aide",
     "invite": "Inviter des participants",
+    "laugh": "Rire",
+    "like": "Approuver",
     "lobbyButtonDisable": "Désactiver le mode salle d'attente / contrôle des participant(e)s",
     "lobbyButtonEnable": "Activer le mode salle d'attente / contrôle des participant(e)s",
     "login": "Connexion",
@@ -896,31 +975,40 @@
     "noAudioSignalDialInDesc": "Vous pouvez également appeler en utilisant :",
     "noAudioSignalDialInLinkDesc": "Numéros d'appel",
     "noisyAudioInputTitle": "Votre microphone semble être bruyant !",
-    "noisyAudioInputDesc": "Il semble que votre microphone fasse du bruit, veuillez le couper ou changer de périphérique.",
+    "noisyAudioInputDesc": "Il semble que votre microphone soit bruyant, veuillez le couper ou changer de périphérique.",
     "openChat": "Ouvrir le chat",
+    "openReactionsMenu": "Ouvrir le menu Réactions",
     "participants": "Participants",
     "pip": "Entrer en mode Picture-in-Picture",
     "privateMessage": "Envoyer un message privé",
     "profile": "Éditer votre profil",
     "raiseHand": "Lever / Baisser la main",
     "raiseYourHand": "Lever la main",
+    "reactionBoo": "Envoyer réaction huer",
+    "reactionClap": "Envoyer réaction applaudir",
+    "reactionLaugh": "Envoyer réaction rire",
+    "reactionLike": "Envoyer réaction approuver",
+    "reactionSilence": "Envoyer réaction silence",
+    "reactionSurprised": "Envoyer réaction surprise",
     "security": "Options de sécurité",
     "Settings": "Paramètres",
     "shareaudio": "Partager l'audio",
     "sharedvideo": "Partager une vidéo YouTube",
     "shareRoom": "Inviter quelqu'un",
     "shortcuts": "Afficher les raccourcis",
+    "silence": "Silence",
     "speakerStats": "Statistiques de l'interlocuteur",
     "startScreenSharing": "Démarrer le partage d'écran",
     "startSubtitles": "Activer les sous-titres",
+    "stopAudioSharing": "Arrêter le partage son",
     "stopScreenSharing": "Arrêter le partage d'écran",
     "stopSubtitles": "Désactiver les sous-titres",
     "stopSharedVideo": "Arrêter la vidéo YouTube",
+    "surprised": "Surpris",
     "talkWhileMutedPopup": "Vous voulez parler ? Votre micro est coupé.",
     "tileViewToggle": "Activer / Désactiver la vue mosaïque",
     "toggleCamera": "Changer de caméra",
     "videomute": "Démarrer / Arrêter la caméra",
-    "videoSettings": "Paramètres vidéo",
     "selectBackground": "Sélectionner un arrière-plan"
   },
   "transcribing": {
@@ -959,7 +1047,10 @@
     "pending": "{{displayName}} a été invité(e)"
   },
   "videoStatus": {
+    "adjustFor": "Ajuster pour:",
     "audioOnly": "VOIX",
+    "bestPerformance": "la meilleure performance",
+    "highestQuality": "la meilleure qualité",
     "audioOnlyExpanded": "Vous êtes en mode bande passante réduite. Dans ce mode, vous ne recevrez que le partage audio et le partage d'écran.",
     "callQuality": "Qualité vidéo",
     "hd": "HD",
@@ -970,6 +1061,7 @@
     "ld": "BD",
     "ldTooltip": "Regardez la vidéo en basse définition",
     "lowDefinition": "Basse définition",
+    "performanceSettings": "Paramètres de performance",
     "sd": "MD",
     "sdTooltip": "Regardez la vidéo en définition standard",
     "standardDefinition": "Moyenne Définition"
@@ -981,7 +1073,7 @@
     "domuteOthers": "Couper le micro de tous les autres",
     "domuteVideoOfOthers": "Couper la caméra des autres",
     "flip": "Balancer",
-    "grantModerator": "Nommer modérateur",
+    "grantModerator": "Donner des droits de modérateur",
     "kick": "Exclure",
     "moderator": "Modérateur",
     "mute": "Un participant a coupé son micro",
@@ -1061,6 +1153,7 @@
     "enableDialogText": "Le mode salle d'attente vous permet de protéger votre réunion en autorisant les personnes à entrer qu'après l'approbation formelle d'un modérateur.",
     "enterPasswordButton": "Saisissez un mot de passe de réunion",
     "enterPasswordTitle": "Saisissez le mot de passe pour rejoindre la réunion",
+    "errorMissingPassword": "Veuillez saisir le mot de passe de la réunion",
     "invalidPassword": "Mot de passe invalide",
     "joiningMessage": "Vous allez rejoindre une réunion dès que quelqu'un aura accepté votre demande",
     "joinWithPasswordMessage": "Tentative de rejoindre avec mot de passe, patientez s'il vous plait ...",
@@ -1079,6 +1172,7 @@
     "passwordField": "Veuillez saisir le mot de passe de la réunion",
     "passwordJoinButton": "Rejoindre",
     "reject": "Refuser",
+    "rejectAll": "Refuser tout",
     "toggleLabel": "Activer la salle d'attente"
   }
 }

lang/main-oc.json

@@ -327,11 +327,11 @@
         "muteEveryoneDialogModerationOn": "Los participants pòdon enviar una requèsta per parlar quand vòlgan.",
         "muteEveryoneElsesVideoTitle": "Arrestar la vidèo de tot lo monde levat {{whom}} ?",
         "muteEveryonesVideoTitle": "Arrestar la vidèo de tot lo monde ?",
-        "muteParticipantsVideoButton": "Arrestar la camèra",
+        "muteParticipantsVideoButton": "Arrestar la vidèo",
         "muteParticipantsVideoTitle": "Desactivar la camèra d’aqueste participant ?",
         "noDropboxToken": "Cap de geton Dropbox pas valid",
         "password": "Senhal",
-        "sessionRestarted": "Sonada reaviada pel pont",
+        "sessionRestarted": "Sonada reaviada a causa d’un problèma de connexion",
         "shareAudio": "Contunhar",
         "shareAudioTitle": "Cossí partejar l’àudio",
         "shareAudioWarningTitle": "Devètz arrestar lo partiment d’ecran abans lo partiment d’àudio",
@@ -883,8 +883,8 @@
             "clap": "Picar de las mans",
             "laugh": "Rire",
             "like": "Levar lo det gròs",
-            "muteEveryonesVideo": "Copar la camèra dels autres",
-            "muteEveryoneElsesVideo": "Copar la camèra de los demai",
+            "muteEveryonesVideo": "Copar la vidèo del monde",
+            "muteEveryoneElsesVideo": "Copar la vidèo de los demai",
             "participants": "Participants",
             "remoteVideoMute": "Copar la camèra del participant",
             "shareaudio": "Partejar l’àudio",
@@ -1025,7 +1025,11 @@
         "lowDefinition": "Bassa definicion",
         "sd": "SD",
         "sdTooltip": "Difusion vidèo en definicion estandard",
-        "standardDefinition": "Definicion estandard"
+        "standardDefinition": "Definicion estandard",
+        "performanceSettings": "Paramètres de performança",
+        "adjustFor": "Ajustar per :",
+        "bestPerformance": "Melhora performança",
+        "highestQuality": "Qualitat mai nauta"
     },
     "videothumbnail": {
         "connectionInfo": "Info connexion",
@@ -1137,7 +1141,8 @@
             "unblockEveryoneMicCamera": "Desblocar lo microfòn e la camèra de tot lo monde",
             "videoModeration": "Aviar lor vidèo",
             "allowVideo": "Autorizar la vidèo"
-        }
+        },
+        "search": "Cercar participants"
     },
     "jitsiHome": "{{logo}} Logotipe, mena a la pagina d'acuèlh",
     "polls": {

lang/main-pt.json

@@ -268,12 +268,12 @@
         "muteEveryoneStartMuted": "A partir de agora, toda a gente começa a ficar calada",
         "muteParticipantBody": "Não poderá reativá-los, mas eles podem reativar-se a qualquer momento.",
         "muteParticipantButton": "Silenciar",
-        "muteParticipantDialog": "Tem a certeza de que quer silenciar este participante? Não poderá reativá-los, mas eles podem reativar-se a qualquer momento.",
         "muteParticipantsVideoDialog": "Tem a certeza de que quer desativar a câmara deste participante? Não poderá voltar a ativar a câmara, mas eles podem voltar a reativá-la a qualquer momento.",
-        "muteParticipantTitle": "Silenciar este participante?",
+        "muteParticipantsVideoDialogModerationOn": "Tem a certeza de que quer desligar a câmara deste participante? Não será capaz de voltar a ligar a câmara e eles também não.",
         "muteParticipantsVideoButton": "Parar vídeo",
         "muteParticipantsVideoTitle": "Desativar a câmara deste participante?",
         "muteParticipantsVideoBody": "Não poderá voltar a ligar a câmara, mas eles podem voltar a ligá-la a qualquer momento.",
+        "muteParticipantsVideoBodyModerationOn": "Não será capaz de voltar a ligar a câmara e eles também não.",
         "noDropboxToken": "Nenhum token do Dropbox válido",
         "Ok": "OK",
         "password": "Palavra-passe",
@@ -377,7 +377,7 @@
     },
     "virtualBackground": {
         "apply": "Aplicar",
-        "title": "Planos de Fundo virtuais",
+        "title": "Planos de fundo virtuais",
         "blur": "Desfocagem",
         "slightBlur": "Desfocagem ligeira",
         "removeBackground": "Remover imagem de fundo",
@@ -568,9 +568,9 @@
         "moderator": "É agora um moderador",
         "muted": "Você iniciou uma conversa com o microfone desativado.",
         "mutedTitle": "Você está silenciado!",
-        "mutedRemotelyTitle": "Foi silenciado pelo {{moderador}}",
+        "mutedRemotelyTitle": "Foi silenciado pelo {{participantDisplayName}}",
         "mutedRemotelyDescription": "Pode sempre voltar a ativar o microfone quando estiver pronto para falar. Silencie de volta quando estiver pronto para manter o barulho afastado da reunião.",
-        "videoMutedRemotelyTitle": "A sua câmara foi desligada pelo {{moderador}}.",
+        "videoMutedRemotelyTitle": "A sua câmara foi desligada pelo {{participantDisplayName}}.",
         "videoMutedRemotelyDescription": "Pode sempre ligá-la novamente.",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removido por outro participante",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) definido por outro participante",
@@ -616,22 +616,25 @@
         "actions": {
             "allow": "Permitir aos participantes:",
             "allowVideo": "Permitir vídeo",
-            "audioModeration": "Eles próprios ativam o som",
+            "audioModeration": "Ativarem o microfone deles",
             "blockEveryoneMicCamera": "Bloquear o microfone e a câmara de todos",
             "invite": "Convidar alguém",
             "askUnmute": "Pedir para ligar o microfone",
+            "moreModerationActions": "Mais opções de moderação",
             "mute": "Silenciar",
             "muteAll": "Silenciar todos",
             "muteEveryoneElse": "Silenciar todos os outros",
             "stopEveryonesVideo": "Desligar a câmara de todos",
             "stopVideo": "Desligar a câmara",
             "unblockEveryoneMicCamera": "Desbloquear o microfone e a câmara de todos",
-            "videoModeration": "Ligar a câmara deles"
-        }
+            "videoModeration": "Ligarem a câmara deles"
+        },
+        "search": "Pesquisar participantes"
     },
     "passwordSetRemotely": "Definido por outro participante",
     "passwordDigitsOnly": "Até {{number}} dígitos",
     "polls": {
+        "by": "Por {{ name }}",
         "create": {
             "addOption": "Adicionar opção",
             "answerPlaceholder": "Opção {{index}}",
@@ -1045,7 +1048,10 @@
         "pending": "{{displayName}} foi convidado"
     },
     "videoStatus": {
+        "adjustFor": "Ajustar para:",
         "audioOnly": "AUD",
+        "bestPerformance": "Melhor desempenho",
+        "highestQuality": "Máxima qualidade",
         "audioOnlyExpanded": "Está em modo de baixa largura de banda. Neste modo, receberá apenas partilha de áudio e ecrã.",
         "callQuality": "Qualidade de vídeo",
         "hd": "HD",
@@ -1056,6 +1062,7 @@
         "ld": "LD",
         "ldTooltip": "Ver vídeo em baixa definição",
         "lowDefinition": "Baixa definição (LD)",
+        "performanceSettings": "Definições de desempenho",
         "sd": "SD",
         "sdTooltip": "Ver vídeo em definição padrão",
         "standardDefinition": "Definição padrão"

lang/main-ptBR.json

@@ -2,10 +2,10 @@
     "addPeople": {
         "add": "Convidar",
         "addContacts": "Convide seus contatos",
+        "contacts": "contatos",
         "copyInvite": "Copiar convite da reunião",
         "copyLink": "Copiar link da reunião",
         "copyStream": "Copiar link da transmissão ao vivo",
-        "contacts": "contatos",
         "countryNotSupported": "Ainda não suportamos este destino.",
         "countryReminder": "Ligando de fora dos EUA? Por favor, certifique-se de começar com o código do país!",
         "defaultEmail": "Seu email padrão",
@@ -32,9 +32,9 @@
     "audioDevices": {
         "bluetooth": "Bluetooth",
         "headphones": "Fones de ouvido",
+        "none": "Sem dispositivos de áudio disponível",
         "phone": "Celular",
-        "speaker": "Alto-falantes",
-        "none": "Sem dispositivos de áudio disponível"
+        "speaker": "Alto-falantes"
     },
     "audioOnly": {
         "audioOnly": "Largura de banda baixa"
@@ -61,28 +61,32 @@
         "enter": "Entrar no bate-papo",
         "error": "Erro: sua mensagem não foi enviada. Motivo: {{error}}",
         "fieldPlaceHolder": "Digite sua mensagem aqui",
+        "message": "Mensagem",
+        "messageAccessibleTitle": "{{user}} disse:",
+        "messageAccessibleTitleMe": "Você disse:",
         "messagebox": "Digite uma mensagem",
         "messageTo": "Mensagem privada para {{recipient}}",
-        "noMessagesMessage": "Não há mensagens na reunião ainda. Inicie uma conversa aqui!",
         "nickname": {
             "popover": "Escolha um apelido",
             "title": "Digite um apelido para usar o bate-papo",
             "titleWithPolls": "Digite um apelido para usar o bate-papo"
         },
+        "noMessagesMessage": "Não há mensagens na reunião ainda. Inicie uma conversa aqui!",
         "privateNotice": "Mensagem privada para {{recipient}}",
+        "smileysPanel": "Painel de Emojis",
+        "tabs": {
+            "chat": "Conversa",
+            "polls": "Votações"
+        },
         "title": "Bate-papo",
         "titleWithPolls": "Bate-papo",
-        "you": "você",
-        "message": "Mensagem",
-        "messageAccessibleTitle": "{{user}} disse:",
-        "messageAccessibleTitleMe": "Você disse:",
-        "smileysPanel": "Painel de Emojis"
+        "you": "você"
     },
     "chromeExtensionBanner": {
-        "installExtensionText": "Instale a extensão para integrar com Google Calendar e Office 365",
         "buttonText": "Instalar extensão do Chrome",
+        "close": "Fechar",
         "dontShowAgain": "Não me mostre isso de novo",
-        "close": "Fechar"
+        "installExtensionText": "Instale a extensão para integrar com Google Calendar e Office 365"
     },
     "connectingOverlay": {
         "joiningRoom": "Conectando você à reunião…"
@@ -120,6 +124,7 @@
         "maxEnabledResolution": "envio máx",
         "more": "Mostrar mais",
         "packetloss": "Perda de pacote:",
+        "participant_id": "Id participante:",
         "quality": {
             "good": "Boa",
             "inactive": "Inativo",
@@ -133,7 +138,6 @@
         "remoteport_plural": "Portas remotas:",
         "resolution": "Resolução:",
         "savelogs": "Grave os logs",
-        "participant_id": "Id participante:",
         "status": "Conexão:",
         "transport": "Transporte:",
         "transport_plural": "Transportes:",
@@ -208,18 +212,20 @@
         "displayNameRequired": "Oi! Qual o seu nome?",
         "done": "Feito",
         "e2eeDescription": "Encriptação ponto-a-ponto é, no momento, EXPERIMENTAL. Por favor tenha em mente que habilitar a encriptação ponto-a-ponto irá desativar os serviços disponíveis no servidor como: gravação, transmissão ao vivo e telefonar participantes. Além disso a reunião só irá funcionar para os participantes entrando em browsers com suporte a funcionalidade.",
-        "e2eeLabel": "Enable End-to-End Encryption",
+       "e2eeDisabledDueToMaxModeDescription": "Não foi possível habilitar a criptografia de ponta-a-ponta devido ao grande número de participantes na conferência.", 
+       "e2eeLabel": "Enable End-to-End Encryption",
         "e2eeWarning": "WARNING: Not all participants in this meeting seem to have support for End-to-End encryption. If you enable it they won't be able to see nor hear you.",
-        "enterDisplayName": "Digite seu nome aqui",
+        "e2eeWillDisableDueToMaxModeDescription": "AVISO: A criptografia de ponta-a-ponta será automaticamente desativada se mais participantes entrarem na conferência.",
         "embedMeeting": "Reunião em formato compacto",
+        "enterDisplayName": "Digite seu nome aqui",
         "error": "Erro",
         "gracefulShutdown": "Nosso serviço está em manutenção. Tente novamente mais tarde.",
         "grantModeratorDialog": "Tem certeza que quer participar como moderador da reunião?",
         "grantModeratorTitle": "Permitir moderador",
         "hideShareAudioHelper": "Não mostre este diálogo novamente",
         "IamHost": "Eu sou o anfitrião",
-        "incorrectRoomLockPassword": "Senha incorreta",
         "incorrectPassword": "Usuário ou senha incorretos",
+        "incorrectRoomLockPassword": "Senha incorreta",
         "internalError": "Oops! Alguma coisa está errada. O seguinte erro ocorreu: {{error}}",
         "internalErrorTitle": "Erro interno",
         "kickMessage": "Você pode entrar em contato com {{participantDisplayName}} para obter mais detalhes.",
@@ -230,11 +236,12 @@
         "liveStreaming": "Transmissão ao Vivo",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Não é possível transmitir enquanto a gravação está ativa",
         "liveStreamingDisabledTooltip": "Iniciar transmissão ao vivo desativada.",
+        "localUserControls": "Controles de usuários locais",
         "lockMessage": "Falha ao bloquear a conferência.",
         "lockRoom": "Adicionar reunião $t(lockRoomPasswordUppercase)",
         "lockTitle": "Bloqueio falhou",
-        "logoutQuestion": "Deseja encerrar a sessão e finalizar a conferência?",
         "login": "Entrar",
+        "logoutQuestion": "Deseja encerrar a sessão e finalizar a conferência?",
         "logoutTitle": "Encerrar sessão",
         "maxUsersLimitReached": "O limite para o número máximo de participantes foi atingido. A conferência está cheia. Entre em contato com o proprietário da reunião ou tente novamente mais tarde!",
         "maxUsersLimitReachedTitle": "Limite máximo de participantes atingido",
@@ -245,25 +252,29 @@
         "micPermissionDeniedError": "Não foi permitido acessar o seu microfone. Você ainda pode entrar na conferência, mas sem enviar áudio. Clique no botão do microfone para tentar reparar.",
         "micTimeoutError": "Não foi possível iniciar fonte de áudio. Tempo esgotado!",
         "micUnknownError": "Não pode usar o microfone por uma razão desconhecida.",
-        "muteEveryoneElseDialog": "Uma vez silenciados, você não poderá reativar o som deles, mas eles poderão reativar o som a qualquer momento.",
-        "muteEveryoneElseTitle": "Silenciar todo mundo exceto {{whom}}?",
-        "muteEveryoneDialog": "Tem certeza que deseja silenciar todos? Você não poderá ativar o som deles, mas eles podem ativar o som eles mesmo a qualquer momento.",
-        "muteEveryoneTitle": "Silenciar todos?",
+        "moderationAudioLabel": "Permitir aos participantes reativar o som",
+        "moderationVideoLabel": "Permitir aos participantes reativar o vídeo",
+        "muteEveryoneDialog": "Você não poderá reativar o som deles, mas eles poderão reativar a qualquer momento.",
+        "muteEveryoneDialogModerationOn": "Os participantes podem enviar solicitação para reativar seus sons a qualquer momento.",
+        "muteEveryoneElseDialog": "Uma vez silenciados, você não poderá reativar o som deles, mas eles poderão reativar seus sons a qualquer momento.",
         "muteEveryoneElsesVideoDialog": "Você não poderá reativar posteriormente, mas cada participante pode ativar sua própria câmera a qualquer momento.",
         "muteEveryoneElsesVideoTitle": "Desativar a câmera de todos exceto {{whom}}?",
-        "muteEveryonesVideoDialog": "Tem certeza que deseja desativar a câmera de todos? Você não poderá reativar posteriormente, mas cada participante pode ativar sua própria câmera a qualquer momento.",
-        "muteEveryonesVideoDialogOk": "Desabilitar",
-        "muteEveryonesVideoTitle": "Desativar a câmera de todos?",
+        "muteEveryoneElseTitle": "Silenciar todo mundo exceto {{whom}}?",
         "muteEveryoneSelf": "a si próprio",
         "muteEveryoneStartMuted": "Todos iniciam silenciados daqui para frente",
+        "muteEveryonesVideoDialog": "Tem certeza que deseja desativar a câmera de todos? Você não poderá reativar posteriormente, mas cada participante pode ativar sua própria câmera a qualquer momento.",
+        "muteEveryonesVideoDialogModerationOn": "Os participantes podem enviar solicitação para reativar seus vídeos a qualquer momento.",
+        "muteEveryonesVideoDialogOk": "Desabilitar",
+        "muteEveryonesVideoTitle": "Desativar a câmera de todos?",
+        "muteEveryoneTitle": "Silenciar todos?",
         "muteParticipantBody": "Você não está habilitado para tirar o mudo deles, mas eles podem tirar o mudo deles mesmos a qualquer tempo.",
         "muteParticipantButton": "Mudo",
         "muteParticipantDialog": "Tem certeza de que deseja silenciar este participante? Você não poderá desfazer isso, mas o participante pode reabilitar o áudio a qualquer momento.",
-        "muteParticipantsVideoDialog": "Tem certeza de que deseja desativar a câmera deste participante? Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
-        "muteParticipantTitle": "Deixar mudo este participante?",
-        "muteParticipantsVideoButton": "Desativar a câmera",
-        "muteParticipantsVideoTitle": "Desativar a câmera deste participante?",
         "muteParticipantsVideoBody": "Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
+        "muteParticipantsVideoButton": "Desativar a câmera",
+        "muteParticipantsVideoDialog": "Tem certeza de que deseja desativar a câmera deste participante? Você não poderá reativar posteriormente, mas o participante pode ativar sua própria câmera a qualquer momento.",
+        "muteParticipantsVideoTitle": "Desativar a câmera deste participante?",
+        "muteParticipantTitle": "Deixar mudo este participante?",
         "noDropboxToken": "Nenhum token do Dropbox válido",
         "Ok": "OK",
         "password": "Senha",
@@ -271,8 +282,8 @@
         "passwordNotSupported": "A configuração de uma reunião $t(lockRoomPassword) não é suportada.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) não suportado",
         "passwordRequired": "$t(lockRoomPasswordUppercase) requerido",
-        "permissionErrorTitle": "Permissão necessária",
         "permissionCameraRequiredError": "É necessário permitir acesso à câmera para participar de reuniões com vídeo. Ative a permissão nas configurações",
+        "permissionErrorTitle": "Permissão necessária",
         "permissionMicRequiredError": "É necessário permitir acesso ao microfone para participar de reuniões com áudio. Ative a permissão nas configurações",
         "popupError": "Seu navegador está bloqueando janelas popup deste site. Habilite os popups nas configurações de segurança no seu navegador e tente novamente.",
         "popupErrorTitle": "Popup bloqueado",
@@ -288,6 +299,7 @@
         "remoteControlShareScreenWarning": "Note que se você pressionar \"Permitir\" você vai compartilhar sua tela!",
         "remoteControlStopMessage": "A sessão de controle remoto terminou!",
         "remoteControlTitle": "Conexão de área de trabalho remota",
+        "remoteUserControls": "Controles de usuários remotos de {{username}}",
         "Remove": "Remover",
         "removePassword": "Remover $t(lockRoomPassword)",
         "removeSharedVideoMsg": "Deseja remover seu vídeo compartilhado?",
@@ -304,16 +316,21 @@
         "sendPrivateMessageOk": "Enviar em privado",
         "sendPrivateMessageTitle": "Enviar em privado?",
         "serviceUnavailable": "Serviço indisponível",
-        "sessTerminated": "Chamada terminada",
         "sessionRestarted": "Chamada reiniciada pelo bridge",
+        "sessTerminated": "Chamada terminada",
         "Share": "Compartilhar",
         "shareAudio": "Continuar",
         "shareAudioTitle": "Como compartilhar áudio",
-        "shareAudioWarningTitle": "Você precisa parar o compartilhamento de tela antes de compartilhar seu áudio",
-        "shareAudioWarningH1": "Se você quiser compartilhar apenas seu áudio:",
         "shareAudioWarningD1": "você precisa parar o compartilhamento de tela antes de compartilhar seu áudio.",
         "shareAudioWarningD2": "você precisa reiniciar o compartilhamento de tela e selecionar a opção \"compartilhar áudio\".",
+        "shareAudioWarningH1": "Se você quiser compartilhar apenas seu áudio:",
+        "shareAudioWarningTitle": "Você precisa parar o compartilhamento de tela antes de compartilhar seu áudio",
+        "sharedVideoLinkPlaceholder": "link do YouTube ou link direto de vídeo",
         "shareMediaWarningGenericH2": "Se você quiser compartilhar sua tela e seu áudio",
+        "shareScreenWarningD1": "você precisa parar o compartilhamento de áudio antes de compartilhar sua tela.",
+        "shareScreenWarningD2": "você precisa parar o compartilhamento de áudio, iniciar o compartilhamento de tela e selecionar a opção \"compartilhar áudio\".",
+        "shareScreenWarningH1": "Se você quiser compartilhar apenas sua tela:",
+        "shareScreenWarningTitle": "Você precisa parar o compartilhamento de áudio antes de compartilhar sua tela",
         "shareVideoLinkError": "Por favor, forneça um link do youtube correto.",
         "shareVideoTitle": "Compartilhar um vídeo",
         "shareYourScreen": "Compartilhar sua tela",
@@ -321,10 +338,6 @@
         "startLiveStreaming": "Iniciar transmissão ao vivo",
         "startRecording": "Iniciar gravação",
         "startRemoteControlErrorMessage": "Um erro ocorreu enquanto tentava iniciar uma sessão de controle remoto!",
-        "shareScreenWarningTitle": "Você precisa parar o compartilhamento de áudio antes de compartilhar sua tela",
-        "shareScreenWarningH1": "Se você quiser compartilhar apenas sua tela:",
-        "shareScreenWarningD1": "você precisa parar o compartilhamento de áudio antes de compartilhar sua tela.",
-        "shareScreenWarningD2": "você precisa parar o compartilhamento de áudio, iniciar o compartilhamento de tela e selecionar a opção \"compartilhar áudio\".",
         "stopLiveStreaming": "Parar transmissão ao vivo",
         "stopRecording": "Parar a gravação",
         "stopRecordingWarning": "Tem certeza que deseja parar a gravação?",
@@ -348,9 +361,7 @@
         "WaitForHostMsgWOk": "A conferência <b>{{room}}</b> ainda não começou. Se você é o anfitrião, pressione OK para autenticar. Do contrário, aguarde a chegada do anfitrião.",
         "WaitingForHostTitle": "Esperando o anfitrião...",
         "Yes": "Sim",
-        "yourEntireScreen": "Toda sua tela",
-        "remoteUserControls": "Controles de usuários remotos de {{username}}",
-        "localUserControls": "Controles de usuários locais"
+        "yourEntireScreen": "Toda sua tela"
     },
     "dialOut": {
         "statusMessage": "está agora {{status}}"
@@ -364,37 +375,18 @@
     "embedMeeting": {
         "title": "Reunião em formato compacto"
     },
-    "virtualBackground": {
-        "apply": "Aplicar",
-        "title": "Fundos virtuais",
-        "blur": "Desfoque",
-        "slightBlur": "Desfoque suave",
-        "removeBackground": "Remover fundo",
-        "addBackground": "Adicionar novo fundo",
-        "pleaseWait": "Aguarde...",
-        "none": "Nenhum",
-        "uploadedImage": "Imagem enviada {{index}}",
-        "deleteImage": "Excluir imagem",
-        "image1": "Praia",
-        "image2": "Parede branca neutra",
-        "image3": "Quarto branco vazio",
-        "image4": "Luminária preta",
-        "image5": "Montanha",
-        "image6": "Floresta",
-        "image7": "Alvorada",
-        "desktopShareError": "Não foi possível compartilhar o desktop",
-        "desktopShare": "Compartilhar desktop",
-        "webAssemblyWarning": "Não há suporte para WebAssembly"
-    },
     "feedback": {
         "average": "Média",
         "bad": "Ruim",
         "detailsLabel": "Nos conte mais sobre isso.",
         "good": "Boa",
         "rateExperience": "Avalie sua experiência na reunião",
+        "star": "Estrela",
         "veryBad": "Muito ruim",
-        "veryGood": "Muito boa",
-        "star": "Estrela"
+        "veryGood": "Muito boa"
+    },
+    "helpView": {
+        "header": "Centro de ajuda"
     },
     "incomingCall": {
         "answer": "Responder",
@@ -408,10 +400,10 @@
         "addPassword": "Adicione $t(lockRoomPassword)",
         "cancelPassword": "Cancela $t(lockRoomPassword)",
         "conferenceURL": "Link:",
+        "copyNumber": "Copiar número",
         "country": "País",
         "dialANumber": "Para entrar na reunião, disque um desses números e depois insira o PIN.",
         "dialInConferenceID": "PIN:",
-        "copyNumber": "Copiar número",
         "dialInNotSupported": "Desculpe, a discagem não é atualmente suportada.",
         "dialInNumber": "Discar:",
         "dialInSummaryError": "Ocorreu um erro ao buscar a informação de discagem. Tente novamente mais tarde.",
@@ -421,13 +413,14 @@
         "invitePhone": "Para participar por telefone, toque aqui: {{number}},,{{conferenceID}}#\n",
         "invitePhoneAlternatives": "Procurando um número de discagem diferente?\nVeja os números de discagem da reunião: {{url}} \n\n\nSe você também estiver discando através de um telefone da sala, participe sem conectar-se ao áudio: {{silentUrl}}",
         "inviteSipEndpoint": "Para participar usando o endereço SIP, insira isto: {{sipUri}}",
-        "inviteTextiOSPersonal": "{{name}} está convidando você para uma reunião.",
-        "inviteTextiOSJoinSilent": "Se você estiver discando através de um telefone da sala, use este link para participar sem conectar-se ao áudio: {{silentUrl}}.",
         "inviteTextiOSInviteUrl": "Clique no seguinte link para entrar: {{inviteUrl}}.",
+        "inviteTextiOSJoinSilent": "Se você estiver discando através de um telefone da sala, use este link para participar sem conectar-se ao áudio: {{silentUrl}}.",
+        "inviteTextiOSPersonal": "{{name}} está convidando você para uma reunião.",
         "inviteTextiOSPhone": "Para participar por telefone, use este número: {{number}},,{{conferenceID}}#. Se você estiver procurando um número diferente, esta é a lista completa: {{didUrl}}.",
         "inviteURLFirstPartGeneral": "Você foi convidado para uma reunião.",
         "inviteURLFirstPartPersonal": "{{name}} está convidando você para uma reunião.\n",
         "inviteURLSecondPart": "\nEntre na reunião:\n{{url}}\n",
+        "label": "Informações da reunião",
         "liveStreamURL": "Transmissão ao vivo:",
         "moreNumbers": "Mais números",
         "noNumbers": "Sem números de discagem.",
@@ -437,8 +430,13 @@
         "password": "$t(lockRoomPasswordUppercase):",
         "sip": "endereço SIP",
         "title": "Compartilhar",
-        "tooltip": "Compartilhar link e discagem para esta reunião",
-        "label": "Informações da reunião"
+        "tooltip": "Compartilhar link e discagem para esta reunião"
+    },
+    "inlineDialogFailure": {
+        "msg": "Tivemos um pequeno problema.",
+        "retry": "Tentar novamente",
+        "support": "Suporte",
+        "supportMsg": "Se isso continuar acontecendo, chegar a"
     },
     "inviteDialog": {
         "alertText": "Não foi possível convidar alguns participantes.",
@@ -448,12 +446,6 @@
         "searchPlaceholder": "Participante ou nº de telefone",
         "send": "Enviar"
     },
-    "inlineDialogFailure": {
-        "msg": "Tivemos um pequeno problema.",
-        "retry": "Tentar novamente",
-        "support": "Suporte",
-        "supportMsg": "Se isso continuar acontecendo, chegar a"
-    },
     "jitsiHome": "Logo de {{logo}} (direciona para página inicial)",
     "keyboardShortcuts": {
         "focusLocal": "Focar no seu vídeo",
@@ -473,8 +465,6 @@
         "videoMute": "Iniciar ou parar sua câmera"
     },
     "liveStreaming": {
-        "limitNotificationDescriptionWeb": "Devido a alta demanda sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
-        "limitNotificationDescriptionNative": "Sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente {{app}}.",
         "busy": "Estamos trabalhando para liberar os recursos de transmissão. Tente novamente em alguns minutos.",
         "busyTitle": "Todas as transmissões estão atualmente ocupadas",
         "changeSignIn": "Alternar contas.",
@@ -489,7 +479,10 @@
         "expandedPending": "Iniciando a transmissão ao vivo...",
         "failedToStart": "Falha ao iniciar a transmissão ao vivo",
         "getStreamKeyManually": "Não conseguimos buscar nenhuma transmissão ao vivo. Tente obter sua chave de transmissão ao vivo no YouTube.",
+        "googlePrivacyPolicy": "Política de Privacidade do Google",
         "invalidStreamKey": "A senha para transmissão ao vivo pode estar incorreta.",
+        "limitNotificationDescriptionNative": "Sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente {{app}}.",
+        "limitNotificationDescriptionWeb": "Devido a alta demanda sua transmissão será limitada a {{limit}} minutos. Para transmissão ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "off": "Transmissão ao vivo encerrada",
         "offBy": "{{name}} parou a transmissão ao vivo",
         "on": "Transmissão ao Vivo",
@@ -503,8 +496,44 @@
         "start": "Iniciar uma transmissão ao vivo",
         "streamIdHelp": "O que é isso?",
         "unavailableTitle": "Transmissão ao vivo indisponível",
-        "youtubeTerms": "Termos de serviços do YouTube",
-        "googlePrivacyPolicy": "Política de Privacidade do Google"
+        "youtubeTerms": "Termos de serviços do YouTube"
+    },
+    "lobby": {
+        "admit": "Aceitar",
+        "admitAll": "Aceitar todos",
+        "allow": "Permitir",
+        "backToKnockModeButton": "Sem senha, peça para se juntar",
+        "dialogTitle": "Modo sala de espera",
+        "disableDialogContent": "O modo sala de espera está habilitado. Este recurso evita que particpantes não convidados juntem-se à sua conferência. Deseja desabilitar?",
+        "disableDialogSubmit": "Desabilitar",
+        "emailField": "Informe seu email",
+        "enableDialogPasswordField": "Definir senha (opcional)",
+        "enableDialogSubmit": "Habilitar",
+        "enableDialogText": "O modo sala de espera protege a sua conferência, permitindo a entrada de participantes apenas após a aprovação formal do moderador.",
+        "enterPasswordButton": "Informe a senha da conferência",
+        "enterPasswordTitle": "Informe a senha para se juntar à conferência",
+        "errorMissingPassword": "Por favor informe a senha da conferência",
+        "invalidPassword": "Senha inválida",
+        "joiningMessage": "Você se juntará à conferência tão logo alguém aprove sua solicitação",
+        "joiningTitle": "Pedindo para se juntar à conferência...",
+        "joiningWithPasswordTitle": "Participando com senha...",
+        "joinRejectedMessage": "Sua solicitação de participação foi rejeitada pelo moderador.",
+        "joinTitle": "Junte-se à conferência",
+        "joinWithPasswordMessage": "Tentando entrar com a senha, por favor aguarde...",
+        "knockButton": "Peça para participar",
+        "knockingParticipantList": "Remover lista de participantes",
+        "knockTitle": "Alguém deseja participar da conferência",
+        "nameField": "Informe seu nome",
+        "notificationLobbyAccessDenied": "{{targetParticipantName}} foi rejeitado por {{originParticipantName}}",
+        "notificationLobbyAccessGranted": "{{targetParticipantName}} foi aceito por {{originParticipantName}}",
+        "notificationLobbyDisabled": "Sala de espera foi desabilitada por {{originParticipantName}}",
+        "notificationLobbyEnabled": "Sala de espera foi habilitada por {{originParticipantName}}",
+        "notificationTitle": "Sala de espera",
+        "passwordField": "Informe a senha da conferência",
+        "passwordJoinButton": "Solicitar",
+        "reject": "Rejeitar",
+        "rejectAll": "Rejeitar todos",
+        "toggleLabel": "Habilitar sala de espera"
     },
     "localRecording": {
         "clientState": {
@@ -537,84 +566,120 @@
     },
     "lockRoomPassword": "senha",
     "lockRoomPasswordUppercase": "Senha",
+    "lonelyMeetingExperience": {
+        "button": "Convidar outros",
+        "youAreAlone": "Você é o único na reunião"
+    },
     "me": "eu",
     "notify": {
+        "allowAction": "Permitir",
+        "allowedUnmute": "Você pode religar seu microfone, ativar sua câmera ou compartilhar sua tela.",
         "connectedOneMember": "{{name}} entrou na reunião",
         "connectedThreePlusMembers": "{{name}} e outros {{count}} entraram na reunião",
         "connectedTwoMembers": "{{first}} e {{second}} entraram na reunião",
         "disconnected": "desconectado",
         "focus": "Foco da conferência",
         "focusFail": "{{component}} não disponível - tente em {{ms}} seg",
-        "grantedTo": "Direitos de moderador concedido para {{to}}!",
+        "groupTitle": "Notificações",
         "hostAskedUnmute": "O anfitrião deseja que você ative o som",
         "invitedOneMember": "{{name}} foi convidado(a)",
         "invitedThreePlusMembers": "{{name}} e {{count}} outros foram convidados",
         "invitedTwoMembers": "{{first}} e {{second}} foram convidados",
         "kickParticipant": "{{kicked}} foi removido por {{kicker}}",
         "me": "Eu",
-        "moderator": "Direitos de moderador concedidos!",
-        "muted": "Você iniciou uma conversa em mudo.",
-        "mutedTitle": "Você está mudo!",
-        "mutedRemotelyTitle": "Você foi silenciado por {{participantDisplayName}}!",
-        "mutedRemotelyDescription": "Você sempre pode ativar o som quando estiver pronto para falar. Retire o som quando terminar para manter o ruído longe da reunião.",
-        "videoMutedRemotelyTitle": "Sua câmera foi desativada por {{participantDisplayName}}!",
-        "videoMutedRemotelyDescription": "Você pode ativar sua câmera a qualquer momento.",
-        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removido por outro participante",
-        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) definido por outro participante",
-        "raisedHand": "{{name}} gostaria de falar.",
-        "screenShareNoAudio": "O compartilhamento de áudio não foi selecionado na tela de escolha de janela.",
-        "screenShareNoAudioTitle": "Compartilhamento de áudio não selecionado",
-        "somebody": "Alguém",
-        "startSilentTitle": "Você entrou sem saída de áudio!",
-        "startSilentDescription": "Volte à reunião para habilitar o áudio",
-        "suboptimalBrowserWarning": "Tememos que sua experiência de reunião não seja tão boa aqui. Estamos procurando maneiras de melhorar isso, mas até então, tente usar um dos <a href='{{recommendedBrowserPageLink}}' target='_blank'>navegadores completamente suportados</a>.",
-        "suboptimalExperienceTitle": "Alerta do navegador",
-        "unmute": "Ativar som",
-        "newDeviceCameraTitle": "Nova câmera detectada",
-        "newDeviceAudioTitle": "Novo dispositivo de áudio detectado",
-        "newDeviceAction": "Usar",
-        "OldElectronAPPTitle": "Vulnerabilidade de segurança!",
-        "oldElectronClientDescription1": "Você está usando um versão antiga do cliente Jitsi Meet que possui uma conhecida vulnerabilidade de segurança. Por favor tenha certeza de atulizar para a nossa ",
-        "oldElectronClientDescription2": "última versão",
-        "oldElectronClientDescription3": " agora!",
-        "moderationInEffectDescription": "Levante a mão se quiser falar",
         "moderationInEffectCSDescription": "Levante a mão se quiser compartilhar seu vídeo",
-        "moderationInEffectVideoDescription": "Levante a mão se quiser que seu vídeo fique visível",
-        "moderationInEffectTitle": "O microfone foi silenciado pelo moderador",
         "moderationInEffectCSTitle": "O compartilhamento de conteúdo foi desativado pelo moderador",
+        "moderationInEffectDescription": "Levante a mão se quiser falar",
+        "moderationInEffectTitle": "O microfone foi silenciado pelo moderador",
+        "moderationInEffectVideoDescription": "Levante a mão se quiser que seu vídeo fique visível",
         "moderationInEffectVideoTitle": "O vídeo foi desativado pelo moderador",
         "moderationRequestFromModerator": "O anfitrião deseja que você ative o som",
         "moderationRequestFromParticipant": "Quer falar",
         "moderationStartedTitle": "Moderação iniciada",
         "moderationStoppedTitle": "Moderação encerrada",
         "moderationToggleDescription": "por {{participantDisplayName}}",
+        "moderator": "Direitos de moderador concedidos!",
+        "muted": "Você iniciou uma conversa em mudo.",
+        "mutedRemotelyDescription": "Você sempre pode ativar o som quando estiver pronto para falar. Retire o som quando terminar para manter o ruído longe da reunião.",
+        "mutedRemotelyTitle": "Você foi silenciado por {{participantDisplayName}}!",
+        "mutedTitle": "Você está mudo!",
+        "newDeviceAction": "Usar",
+        "newDeviceAudioTitle": "Novo dispositivo de áudio detectado",
+        "newDeviceCameraTitle": "Nova câmera detectada",
+        "OldElectronAPPTitle": "Vulnerabilidade de segurança!",
+        "oldElectronClientDescription1": "Você está usando um versão antiga do cliente Jitsi Meet que possui uma conhecida vulnerabilidade de segurança. Por favor tenha certeza de atulizar para a nossa ",
+        "oldElectronClientDescription2": "última versão",
+        "oldElectronClientDescription3": " agora!",
+        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removido por outro participante",
+        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) definido por outro participante",
+        "raisedHand": "{{name}} gostaria de falar.",
         "raiseHandAction": "Levantar a mão",
-        "groupTitle": "Notificações"
+        "reactionSounds": "Desabilitar sons",
+        "screenShareNoAudio": "O compartilhamento de áudio não foi selecionado na tela de escolha de janela.",
+        "screenShareNoAudioTitle": "Compartilhamento de áudio não selecionado",
+        "somebody": "Alguém",
+        "startSilentDescription": "Volte à reunião para habilitar o áudio",
+        "startSilentTitle": "Você entrou sem saída de áudio!",
+        "suboptimalBrowserWarning": "Tememos que sua experiência de reunião não seja tão boa aqui. Estamos procurando maneiras de melhorar isso, mas até então, tente usar um dos <a href='{{recommendedBrowserPageLink}}' target='_blank'>navegadores completamente suportados</a>.",
+        "suboptimalExperienceTitle": "Alerta do navegador",
+        "unmute": "Ativar som",
+        "videoMutedRemotelyDescription": "Você pode ativar sua câmera a qualquer momento.",
+        "videoMutedRemotelyTitle": "Sua câmera foi desativada por {{participantDisplayName}}!"
     },
     "participantsPane": {
+        "actions": {
+            "allow": "Permitir aos participantes:",
+            "allowVideo": "Permitir vídeo",
+            "askUnmute": "Pedir para ativar som",
+            "audioModeration": "Reativarem seus sons",
+            "blockEveryoneMicCamera": "Bloquear microfone e câmera de todos",
+            "invite": "Convidar alguém",
+            "mute": "Silenciar",
+            "muteAll": "Silenciar todos",
+            "muteEveryoneElse": "Silenciar todos os demais",
+            "stopEveryonesVideo": "Parar vídeo de todos",
+            "stopVideo": "Parar vídeo",
+            "unblockEveryoneMicCamera": "Desbloquear microfone e câmera de todos",
+            "videoModeration": "Ativarem seus vídeos"
+        },
         "close": "Fechar",
         "header": "Participantes",
         "headings": {
             "lobby": "Sala de espera ({{count}})",
             "participantsList": "Participantes da reunião ({{count}})",
             "waitingLobby": "Aguardando na sala de espera ({{count}})"
-        },
-        "actions": {
-            "allow": "Permitir aos participantes:",
-            "blockEveryoneMicCamera": "Bloquear microfone e câmera de todos",
-            "invite": "Convidar alguém",
-            "askUnmute": "Pedir para ativar som",
-            "mute": "Silenciar",
-            "muteAll": "Silenciar todos",
-            "muteEveryoneElse": "Silenciar todos os demais",
-            "startModeration": "Ativar som eles mesmos ou iniciar vídeo",
-            "stopEveryonesVideo": "Parar vídeo de todos",
-            "stopVideo": "Parar vídeo",
-            "unblockEveryoneMicCamera": "Desbloquear microfone e câmera de todos"
         }
     },
-    "passwordSetRemotely": "Definido por outro participante",
     "passwordDigitsOnly": "Até {{number}} dígitos",
+    "passwordSetRemotely": "Definido por outro participante",
+    "polls": {
+        "answer": {
+            "skip": "Desistir",
+            "submit": "Enviar"
+        },
+        "create": {
+            "addOption": "Adicionar opção",
+            "answerPlaceholder": "Opção {{index}}",
+            "cancel": "Cancelar",
+            "create": "Iniciar uma votação",
+            "pollOption": "Opção {{index}}",
+            "pollQuestion": "Pergunta",
+            "questionPlaceholder": "Faça uma pergunta",
+            "removeOption": "Remover opção",
+            "send": "Enviar"
+        },
+        "notification": {
+            "description": "Abra a aba das votações para votar",
+            "title": "Uma nova votação foi iniciada nesta conferência"
+        },
+        "results": {
+            "changeVote": "Mudar voto",
+            "empty": "Não há votações nesta reunião por enquanto. Inicie uma votação aqui!",
+            "hideDetailedResults": "Ocultar detalhes",
+            "showDetailedResults": "Mostrar detalhes",
+            "vote": "Voto"
+        }
+    },
     "poweredby": "distribuído por",
     "prejoin": {
         "audioAndVideoError": "Erro de áudio e vídeo error:",
@@ -646,30 +711,31 @@
             "videoTearing": "Espera-se um vídeo pixelado ou com artefatos visuais."
         },
         "copyAndShare": "Copiar e compartilhar o link da reunião",
+        "dialing": "Discando",
         "dialInMeeting": "Discar para a reunião",
         "dialInPin": "Discar para a reunião e inserir o código PIN:",
-        "dialing": "Discando",
         "doNotShow": "Não mostre esta tela novamente",
         "errorDialOut": "Não é possível discar",
         "errorDialOutDisconnected": "Não é possível discar. Desconectando",
         "errorDialOutFailed": "Não é possível discar. Chamada finalizada",
         "errorDialOutStatus": "Erro ao tentar discar",
         "errorMissingName": "Por favor entre com seu nome para participar da reunião",
+        "errorNoPermissions": "Você precisa permitir acesso ao microfone e à câmera",
         "errorStatusCode": "Erro ao discar, código de estado: {{status}}",
         "errorValidation": "Validação do número falhou",
+        "initiated": "Chamada iniciada",
         "iWantToDialIn": "Eu quere discar",
         "joinAudioByPhone": "Participar com o áudio via ligação",
         "joinMeeting": "Participar da reunião",
         "joinWithoutAudio": "Participar sem áudio",
-        "initiated": "Chamada iniciada",
+        "keyboardShortcuts": "Habilitar atalhos de teclado",
         "linkCopied": "Link copiado para a área de transferência",
         "lookGood": "Seu microfone está funcionando corretamente",
         "or": "ou",
         "premeeting": "Pré-reunião",
-        "showScreen": "Habilitar tela pré-reunião",
-        "keyboardShortcuts": "Habilitar atalhos de teclado",
-        "startWithPhone": "Iniciar com o áudio da ligação",
         "screenSharingError": "Erro de compartilhamento de tela:",
+        "showScreen": "Habilitar tela pré-reunião",
+        "startWithPhone": "Iniciar com o áudio da ligação",
         "videoOnlyError": "Erro de vídeo:",
         "videoTrackError": "Não é possível criar faixa de vídeo.",
         "viewAllNumbers": "veja todos os números"
@@ -697,8 +763,6 @@
     },
     "raisedHand": "Gostaria de falar",
     "recording": {
-        "limitNotificationDescriptionWeb": "Devido a demanda, sua gravação ficará limitada a {{limit}} minutos. Para gravação ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
-        "limitNotificationDescriptionNative": "Devido a demanda, sua gravação ficará limitada a {{limit}} minutos. Para gravação ilimitada tente <3>{{app}}</3>.",
         "authDropboxText": "Enviar para o Dropbox",
         "availableSpace": "Espaço disponível: {{spaceLeft}} MB (aproximadamente {{duration}} minutos de gravação)",
         "beta": "BETA",
@@ -712,6 +776,8 @@
         "expandedPending": "Iniciando gravação...",
         "failedToStart": "Falha ao iniciar a gravação",
         "fileSharingdescription": "Compartilhar gravação com participantes da reunião",
+        "limitNotificationDescriptionNative": "Devido a demanda, sua gravação ficará limitada a {{limit}} minutos. Para gravação ilimitada tente <3>{{app}}</3>.",
+        "limitNotificationDescriptionWeb": "Devido a demanda, sua gravação ficará limitada a {{limit}} minutos. Para gravação ilimitada tente <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "linkGenerated": "Geramos um link para sua gravação.",
         "live": "AOVIVO",
         "loggedIn": "Conectado como {{userName}}",
@@ -748,8 +814,8 @@
             "title": "Calendário"
         },
         "desktopShareFramerate": "Taxa de quadros do compartilhamento de desktop",
-        "desktopShareWarning": "Você precisa reiniciar o compartilhamento de tela para que as novas configurações tenham efeito.",
         "desktopShareHighFpsWarning": "Uma taxa de quadros mais alta para compartilhamento de desktop pode afetar sua largura de banda. Você precisa reiniciar o compartilhamento de tela para que as novas configurações tenham efeito.",
+        "desktopShareWarning": "Você precisa reiniciar o compartilhamento de tela para que as novas configurações tenham efeito.",
         "devices": "Dispositivos",
         "followMe": "Todos me seguem",
         "framesPerSecond": "quadros por segundo",
@@ -764,6 +830,7 @@
         "participantJoined": "Participante Entrou",
         "participantLeft": "Participante Saiu",
         "playSounds": "Tocar sons",
+        "reactions": "Reações da reunião",
         "sameAsSystem": "Igual ao sistema ({{label}})",
         "selectAudioOutput": "Saída de áudio",
         "selectCamera": "Câmera",
@@ -777,16 +844,16 @@
     },
     "settingsView": {
         "advanced": "Avançado",
-        "alertOk": "OK",
         "alertCancel": "Cancelar",
+        "alertOk": "OK",
         "alertTitle": "Atenção",
         "alertURLText": "A URL digitada do servidor é inválida",
         "buildInfoSection": "Informações de compilação",
         "conferenceSection": "Conferência",
         "disableCallIntegration": "Desativar integração de chamada nativa",
-        "disableP2P": "Desativar modo ponto a ponto",
         "disableCrashReporting": "Desabilitar aviso de falha",
         "disableCrashReportingWarning": "Tem certeza eue quer desabilitar o aviso de falha? A opção será habilitada após reiniciar o app.",
+        "disableP2P": "Desativar modo ponto a ponto",
         "displayName": "Nome de exibição",
         "email": "E-mail",
         "header": "Configurações",
@@ -806,13 +873,14 @@
         "hours": "{{count}}h",
         "minutes": "{{count}}m",
         "name": "Nome",
+        "search": "Busca",
         "seconds": "{{count}}s",
         "speakerStats": "Estatísticas do Apresentador",
         "speakerTime": "Tempo do Apresentador"
     },
     "startupoverlay": {
-        "policyText": " ",
         "genericTitle": "A reunião precisa usar seu microfone e câmera.",
+        "policyText": " ",
         "title": "O {{app}} precisa usar seu microfone e câmera."
     },
     "suspendedoverlay": {
@@ -829,9 +897,11 @@
             "cc": "Alternar legendas",
             "chat": "Alternar para janela de chat",
             "clap": "Aplauso",
+            "collapse": "Recolher",
             "document": "Alternar para documento compartilhado",
             "download": "Baixe nossos aplicativos",
             "embedMeeting": "Reunião em formato compacto",
+            "expand": "Expandir",
             "feedback": "Deixar feedback",
             "fullScreen": "Alternar para tela cheia",
             "grantModerator": "Atribuir Moderador",
@@ -850,10 +920,9 @@
             "mute": "Alternar mudo do áudio",
             "muteEveryone": "Silenciar todos",
             "muteEveryoneElse": "Silenciar todos os demais",
-            "muteEveryonesVideo": "Desativar a câmera de todos",
             "muteEveryoneElsesVideo": "Desativar a câmera de todos os demais",
+            "muteEveryonesVideo": "Desativar a câmera de todos",
             "participants": "Participantes",
-            "party": "Festa",
             "pip": "Alternar modo Picture-in-Picture",
             "privateMessage": "Enviar mensagem privada",
             "profile": "Editar seu perfil",
@@ -863,6 +932,7 @@
             "remoteMute": "Silenciar participante",
             "remoteVideoMute": "Desativar a câmera do participante",
             "security": "Opções de segurança",
+            "selectBackground": "Selecionar Fundo",
             "Settings": "Alternar configurações",
             "shareaudio": "Compartilhar áudio",
             "sharedvideo": "Alternar compartilhamento de vídeo do YouTube",
@@ -870,23 +940,20 @@
             "shareYourScreen": "Alternar compartilhamento de tela",
             "shortcuts": "Alternar atalhos",
             "show": "Mostrar no palco",
+            "silence": "Silenciar",
             "speakerStats": "Alternar estatísticas do apresentador",
             "surprised": "Surpresa",
             "tileView": "Alternar visualização em blocos",
             "toggleCamera": "Alternar câmera",
             "toggleFilmstrip": "Alterar tira de filme",
-            "videomute": "Alternar mudo do vídeo",
             "videoblur": "Alternar desfoque de vídeo",
-            "selectBackground": "Selecionar Fundo",
-            "expand": "Expandir",
-            "collapse": "Recolher"
+            "videomute": "Alternar mudo do vídeo"
         },
         "addPeople": "Adicionar pessoas à sua chamada",
-        "audioSettings": "Configurações de áudio",
-        "videoSettings": "Configurações de vídeo",
         "audioOnlyOff": "Desabilitar modo de largura de banda baixa",
         "audioOnlyOn": "Habilitar modo de largura de banda baixa",
         "audioRoute": "Selecionar o dispositivo de som",
+        "audioSettings": "Configurações de áudio",
         "authenticate": "Autenticar",
         "boo": "Vaia",
         "callQuality": "Gerenciar qualidade do vídeo",
@@ -894,6 +961,7 @@
         "clap": "Aplauso",
         "closeChat": "Fechar chat",
         "closeReactionsMenu": "Fechar menu de reações",
+        "disableReactionSounds": "Você pode desabilitar os sons de reação para esta reunião",
         "documentClose": "Fechar documento compartilhado",
         "documentOpen": "Abrir documento compartilhado",
         "download": "Baixe nossos aplicativos",
@@ -919,17 +987,16 @@
         "mute": "Mudo / Não mudo",
         "muteEveryone": "Silenciar todos",
         "muteEveryonesVideo": "Desativar a câmera de todos",
-        "noAudioSignalTitle": "Não há entrada de áudio vindo do seu microfone!",
         "noAudioSignalDesc": "Se você não o desativou propositalmente das configurações do sistema ou do hardware, considere trocar o dispositivo.",
         "noAudioSignalDescSuggestion": "Se você não o desativou propositalmente das configurações do sistema ou do hardware, considere trocar para o dispositivo sugerido.",
         "noAudioSignalDialInDesc": "Você também pode discar usando:",
         "noAudioSignalDialInLinkDesc": "Discar números",
-        "noisyAudioInputTitle": "O seu microfone parece estar barulhento!",
+        "noAudioSignalTitle": "Não há entrada de áudio vindo do seu microfone!",
         "noisyAudioInputDesc": "Parece que o microfone está fazendo barulho, considere silenciar ou alterar o dispositivo.",
+        "noisyAudioInputTitle": "O seu microfone parece estar barulhento!",
         "openChat": "Abrir chat",
         "openReactionsMenu": "Abrir menu de reações",
         "participants": "Participantes",
-        "party": "Festa",
         "pip": "Entrar em modo Quadro-a-Quadro",
         "privateMessage": "Enviar mensagem privada",
         "profile": "Editar seu perfil",
@@ -939,27 +1006,29 @@
         "reactionClap": "Enviar reação de aplauso",
         "reactionLaugh": "Enviar reação de risada",
         "reactionLike": "Enviar reação de gostei",
-        "reactionParty": "Enviar reação de festa",
+        "reactionSilence": "Enviar reação de silêncio",
         "reactionSurprised": "Enviar reação de surpresa",
         "security": "Opções de segurança",
+        "selectBackground": "Selecionar fundo",
         "Settings": "Configurações",
         "shareaudio": "Compartilhar áudio",
         "sharedvideo": "Compartilhar um vídeo do YouTube",
         "shareRoom": "Convidar alguém",
         "shortcuts": "Ver atalhos",
+        "silence": "Silêncio",
         "speakerStats": "Estatísticas do Apresentador",
         "startScreenSharing": "Iniciar compart. de tela",
         "startSubtitles": "Iniciar legendas",
         "stopAudioSharing": "Parar compart. de áudio",
         "stopScreenSharing": "Parar compart. de tela",
-        "stopSubtitles": "Parar legendas",
         "stopSharedVideo": "Parar vídeo do YouTube",
+        "stopSubtitles": "Parar legendas",
         "surprised": "Surpresa",
         "talkWhileMutedPopup": "Tentando falar? Você está em mudo.",
         "tileViewToggle": "Alternar visualização em blocos",
         "toggleCamera": "Alternar câmera",
         "videomute": "Iniciar ou parar a câmera",
-        "selectBackground": "Selecionar fundo"
+        "videoSettings": "Configurações de vídeo"
     },
     "transcribing": {
         "ccButtonTooltip": "Iniciar/parar legendas",
@@ -985,7 +1054,6 @@
         "react-nativeGrantPermissions": "Selecione <b><i>Permitir</i></b> quando seu navegador perguntar pelas permissões.",
         "safariGrantPermissions": "Selecione <b><i>OK</i></b> quando seu navegador perguntar pelas permissões."
     },
-    "volumeSlider": "Controle de volume",
     "videoSIPGW": {
         "busy": "Estamos trabalhando para liberar recursos. Por favor, tente novamente em alguns minutos.",
         "busyTitle": "O serviço da sala está ocupado",
@@ -1015,8 +1083,8 @@
     "videothumbnail": {
         "connectionInfo": "Informações da Conexão",
         "domute": "Mudo",
-        "domuteVideo": "Desativar a câmera",
         "domuteOthers": "Silenciar todos os demais",
+        "domuteVideo": "Desativar a câmera",
         "domuteVideoOfOthers": "Desativar a câmera de todos os demais",
         "flip": "Inverter",
         "grantModerator": "Atribuir Moderador",
@@ -1024,17 +1092,41 @@
         "moderator": "Moderador",
         "mute": "Participante está mudo",
         "muted": "Mudo",
-        "videoMuted": "Câmera desativada",
         "remoteControl": "Controle remoto",
         "show": "Mostrar no palco",
-        "videomute": "O participante parou a câmera"
+        "videomute": "O participante parou a câmera",
+        "videoMuted": "Câmera desativada"
     },
+    "virtualBackground": {
+        "addBackground": "Adicionar novo fundo",
+        "apply": "Aplicar",
+        "backgroundEffectError": "Falha ao aplicar efeito de fundo.",
+        "blur": "Desfoque",
+        "deleteImage": "Excluir imagem",
+        "desktopShare": "Compartilhar desktop",
+        "desktopShareError": "Não foi possível compartilhar o desktop",
+        "image1": "Praia",
+        "image2": "Parede branca neutra",
+        "image3": "Quarto branco vazio",
+        "image4": "Luminária preta",
+        "image5": "Montanha",
+        "image6": "Floresta",
+        "image7": "Alvorada",
+        "none": "Nenhum",
+        "pleaseWait": "Aguarde...",
+        "removeBackground": "Remover fundo",
+        "slightBlur": "Desfoque suave",
+        "title": "Fundos virtuais",
+        "uploadedImage": "Imagem enviada {{index}}",
+        "webAssemblyWarning": "Não há suporte para WebAssembly"
+    },
+    "volumeSlider": "Controle de volume",
     "welcomepage": {
-        "addMeetingName": "Adicionar nome da reunião",
         "accessibilityLabel": {
             "join": "Toque para entrar",
             "roomname": "Digite o nome da sala"
         },
+        "addMeetingName": "Adicionar nome da reunião",
         "appDescription": "Vá em frente, converse por vídeo com toda a equipe. De fato, convide todos que você conhece. {{app}} é uma solução de videoconferência totalmente criptografada e 100% de código aberto que você pode usar todos os dias, a cada dia, gratuitamente — sem necessidade de conta.",
         "audioVideoSwitch": {
             "audio": "Voz",
@@ -1047,77 +1139,34 @@
         "getHelp": "Obter ajuda",
         "go": "IR",
         "goSmall": "IR",
-        "headerTitle": "Jitsi Meet",
         "headerSubtitle": "Reuniões com segurança e alta qualidade",
+        "headerTitle": "Jitsi Meet",
         "info": "Informações",
-        "join": "CRIAR / ENTRAR",
         "jitsiOnMobile": "Jitsi em dispositivos móveis – baixe nossos aplicativos e inicie uma reunião em qualquer lugar",
-        "mobileDownLoadLinkIos": "Baixar aplicativo móvel para iOS",
+        "join": "CRIAR / ENTRAR",
+        "logo": {
+            "calendar": "Logo do Calendário",
+            "desktopPreviewThumbnail": "Miniatura de Visualização do Desktop",
+            "googleLogo": "Logo do Google",
+            "logoDeepLinking": "Logo do Jitsi Meet",
+            "microsoftLogo": "Logo da Microsoft",
+            "policyLogo": "Logo da Política de Privacidade"
+        },
         "mobileDownLoadLinkAndroid": "Baixar aplicativo móvel para Android",
         "mobileDownLoadLinkFDroid": "Baixar aplicativo móvel para F-Droid",
+        "mobileDownLoadLinkIos": "Baixar aplicativo móvel para iOS",
         "moderatedMessage": "Ou <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">agende uma URL de reunião</a> antes, onde você é o único moderador.",
         "privacy": "Política de Privacidade",
         "recentList": "Recente",
         "recentListDelete": "Remover",
         "recentListEmpty": "Sua lista recente está vazia. As reuniões que você realizar serão exibidas aqui.",
         "reducedUIText": "Bem-vindo ao {{app}}!",
-        "roomNameAllowedChars": "Nome da reunião não deve conter qualquer um destes caracteres: ?. &, :, ', \", %, #.",
         "roomname": "Digite o nome da sala",
+        "roomNameAllowedChars": "Nome da reunião não deve conter qualquer um destes caracteres: ?. &, :, ', \", %, #.",
         "roomnameHint": "Digite o nome ou a URL da sala que você deseja entrar. Você pode digitar um nome, e apenas deixe para as pessoas que você quer se reunir digitem o mesmo nome.",
         "sendFeedback": "Enviar comentários",
         "startMeeting": "Iniciar reunião",
         "terms": "Termos",
-        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas",
-        "logo": {
-            "calendar": "Logo do Calendário",
-            "microsoftLogo": "Logo da Microsoft",
-            "logoDeepLinking": "Logo do Jitsi Meet",
-            "desktopPreviewThumbnail": "Miniatura de Visualização do Desktop",
-            "googleLogo": "Logo do Google",
-            "policyLogo": "Logo da Política de Privacidade"
-        }
-    },
-    "lonelyMeetingExperience": {
-        "button": "Convidar outros",
-        "youAreAlone": "Você é o único na reunião"
-    },
-    "helpView": {
-        "header": "Centro de ajuda"
-    },
-    "lobby": {
-        "admit": "Aceitar",
-        "admitAll": "Aceitar todos",
-        "knockingParticipantList": "Remover lista de participantes",
-        "allow": "Permitir",
-        "backToKnockModeButton": "Sem senha, peça para se juntar",
-        "dialogTitle": "Modo sala de espera",
-        "disableDialogContent": "O modo sala de espera está habilitado. Este recurso evita que particpantes não convidados juntem-se à sua conferência. Deseja desabilitar?",
-        "disableDialogSubmit": "Desabilitar",
-        "emailField": "Informe seu email",
-        "enableDialogPasswordField": "Definir senha (opcional)",
-        "enableDialogSubmit": "Habilitar",
-        "enableDialogText": "O modo sala de espera protege a sua conferência, permitindo a entrada de participantes apenas após a aprovação formal do moderador.",
-        "enterPasswordButton": "Informe a senha da conferência",
-        "enterPasswordTitle": "Informe a senha para se juntar à conferência",
-        "invalidPassword": "Senha inválida",
-        "joiningMessage": "Você se juntará à conferência tão logo alguém aprove sua solicitação",
-        "joinWithPasswordMessage": "Tentando entrar com a senha, por favor aguarde...",
-        "joinRejectedMessage": "Sua solicitação de participação foi rejeitada pelo moderador.",
-        "joinTitle": "Junte-se à conferência",
-        "joiningTitle": "Pedindo para se juntar à conferência...",
-        "joiningWithPasswordTitle": "Participando com senha...",
-        "knockButton": "Peça para participar",
-        "knockTitle": "Alguém deseja participar da conferência",
-        "nameField": "Informe seu nome",
-        "notificationLobbyAccessDenied": "{{targetParticipantName}} foi rejeitado por {{originParticipantName}}",
-        "notificationLobbyAccessGranted": "{{targetParticipantName}} foi aceito por {{originParticipantName}}",
-        "notificationLobbyDisabled": "Sala de espera foi desabilitada por {{originParticipantName}}",
-        "notificationLobbyEnabled": "Sala de espera foi habilitada por {{originParticipantName}}",
-        "notificationTitle": "Sala de espera",
-        "passwordField": "Informe a senha da conferência",
-        "passwordJoinButton": "Solicitar",
-        "reject": "Rejeitar",
-        "rejectAll": "Rejeitar todos",
-        "toggleLabel": "Habilitar sala de espera"
+        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas"
     }
 }

lang/main-ru.json

@@ -238,10 +238,10 @@
         "internalError": "Что-то пошло не так. Ошибка: {{error}}",
         "internalErrorTitle": "Внутренняя ошибка",
         "kickMessage": "Вы можете связаться с {{participantDisplayName}} для получения более подробной информации.",
-        "kickParticipantButton": "Выгнать",
-        "kickParticipantDialog": "Вы уверены, что хотите выгнать этого участника?",
-        "kickParticipantTitle": "Выгнать этого участника?",
-        "kickTitle": "Ай! {{participantDisplayName}} выгнал вас из конференции.",
+        "kickParticipantButton": "Отключить",
+        "kickParticipantDialog": "Вы уверены, что хотите отключить этого участника?",
+        "kickParticipantTitle": "Отключить этого участника?",
+        "kickTitle": "{{participantDisplayName}} отключил вас от конференции.",
         "liveStreaming": "Трансляция",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Невозможно пока активна запись",
         "liveStreamingDisabledForGuestTooltip": "Гости не могут начать трансляцию",
@@ -482,6 +482,7 @@
         "passwordField": "Введите пароль встречи",
         "passwordJoinButton": "Присоединиться",
         "reject": "Отказать",
+        "rejectAll": "Отказать всем",
         "toggleLabel": "Включить лобби"
     },
     "localRecording": {
@@ -523,6 +524,7 @@
     },
     "me": "я",
     "notify": {
+        "allowAction": "Разрешить",
         "OldElectronAPPTitle": "Уязвимость в системе безопасности!",
         "connectedOneMember": "{{name}} присоединился к конференции",
         "connectedThreePlusMembers": "{{name}} и {{count}} других пользователей присоединились к конференции",
@@ -534,7 +536,7 @@
         "invitedOneMember": "{{name}} был приглашен",
         "invitedThreePlusMembers": "Приглашены {{name}} и {{count}} других пользователей(ля)",
         "invitedTwoMembers": "{{first}} и {{second}} присоединились к конференции",
-        "kickParticipant": "{{kicker}} выгнал {{kicked}}",
+        "kickParticipant": "{{kicker}} отключил {{kicked}}",
         "me": "Я",
         "moderator": "Получены права модератора!",
         "muted": "Вы начали разговор без звука.",
@@ -801,7 +803,7 @@
         "moreOptions": "Больше настроек",
         "mute": "Микрофон (вкл./выкл.)",
         "muteEveryone": "Выкл. микрофон у всех",
-        "muteEveryonesVideo": "Выкл. Камеру у всех",
+        "muteEveryonesVideo": "Выкл. камеру у всех",
         "noAudioSignalTitle": "От вашего микрофона не идет звуковой сигнал!",
         "noAudioSignalDesc": "Если вы специально не отключали микрофон в системных настройках, подумайте о том, чтобы поменять его.",
         "noAudioSignalDescSuggestion": "Если вы специально не отключали микрофон в системных настройках, вы можете попробовать использовать следующее устройство:",

lang/main.json

@@ -39,6 +39,20 @@
     "audioOnly": {
         "audioOnly": "Low bandwidth"
     },
+    "breakoutRooms": {
+        "defaultName": "Breakout room #{{index}}",
+        "mainRoom": "Main room",
+        "actions": {
+            "add": "Add breakout room",
+            "autoAssign": "Auto assign to breakout rooms",
+            "close": "Close",
+            "join": "Join",
+            "leaveBreakoutRoom": "Leave breakout room",
+            "more": "More",
+            "remove": "Remove",
+            "sendToBreakoutRoom": "Send participant to:"
+        }
+    },
     "calendarSync": {
         "addMeetingURL": "Add a meeting link",
         "confirmAddLink": "Do you want to add a Jitsi link to this event?",
@@ -268,12 +282,12 @@
         "muteEveryoneStartMuted": "Everyone starts muted from now on",
         "muteParticipantBody": "You won't be able to unmute them, but they can unmute themselves at any time.",
         "muteParticipantButton": "Mute",
-        "muteParticipantDialog": "Are you sure you want to mute this participant? You won't be able to unmute them, but they can unmute themselves at any time.",
         "muteParticipantsVideoDialog": "Are you sure you want to turn off this participant's camera? You won't be able to turn the camera back on, but they can turn it back on at any time.",
-        "muteParticipantTitle": "Mute this participant?",
+        "muteParticipantsVideoDialogModerationOn": "Are you sure you want to turn off this participant's camera? You won't be able to turn the camera back on and neither will they.",
         "muteParticipantsVideoButton": "Stop video",
         "muteParticipantsVideoTitle": "Disable camera of this participant?",
         "muteParticipantsVideoBody": "You won't be able to turn the camera back on, but they can turn it back on at any time.",
+        "muteParticipantsVideoBodyModerationOn": "You won't be able to turn the camera back on and neither will they.",
         "noDropboxToken": "No valid Dropbox token",
         "Ok": "OK",
         "password": "Password",
@@ -501,6 +515,7 @@
         "expandedPending": "The live streaming is being started...",
         "failedToStart": "Live Streaming failed to start",
         "getStreamKeyManually": "We weren’t able to fetch any live streams. Try getting your live stream key from YouTube.",
+        "inProgress": "Recording or live streaming in progress",
         "invalidStreamKey": "Live stream key may be incorrect.",
         "off": "Live Streaming stopped",
         "offBy": "{{name}} stopped the live streaming",
@@ -508,6 +523,7 @@
         "onBy": "{{name}} started the live streaming",
         "pending": "Starting Live Stream...",
         "serviceName": "Live Streaming service",
+        "sessionAlreadyActive": "This session is already being recorded or live streamed.",
         "signedInAs": "You are currently signed in as:",
         "signIn": "Sign in with Google",
         "signInCTA": "Sign in or enter your live stream key from YouTube.",
@@ -568,9 +584,9 @@
         "moderator": "You're now a moderator",
         "muted": "You have started the conversation muted.",
         "mutedTitle": "You're muted!",
-        "mutedRemotelyTitle": "You've been muted by {{moderator}}",
+        "mutedRemotelyTitle": "You've been muted by {{participantDisplayName}}",
         "mutedRemotelyDescription": "You can always unmute when you're ready to speak. Mute back when you're done to keep noise away from the meeting.",
-        "videoMutedRemotelyTitle": "Your video has been turned off by {{moderator}}",
+        "videoMutedRemotelyTitle": "Your video has been turned off by {{participantDisplayName}}",
         "videoMutedRemotelyDescription": "You can always turn it on again.",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removed by another participant",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) set by another participant",
@@ -620,6 +636,8 @@
             "blockEveryoneMicCamera": "Block everyone's mic and camera",
             "invite": "Invite Someone",
             "askUnmute": "Ask to unmute",
+            "moreModerationActions": "More moderation options",
+            "moreParticipantOptions": "More participant options",
             "mute": "Mute",
             "muteAll": "Mute all",
             "muteEveryoneElse": "Mute everyone else",
@@ -627,11 +645,13 @@
             "stopVideo": "Stop video",
             "unblockEveryoneMicCamera": "Unblock everyone's mic and camera",
             "videoModeration": "Start their video"
-        }
+        },
+        "search": "Search participants"
     },
     "passwordSetRemotely": "Set by another participant",
     "passwordDigitsOnly": "Up to {{number}} digits",
     "polls": {
+        "by": "By {{ name }}",
         "create": {
             "addOption": "Add option",
             "answerPlaceholder": "Option {{index}}",
@@ -757,6 +777,7 @@
         "expandedPending": "Recording is being started...",
         "failedToStart": "Recording failed to start",
         "fileSharingdescription": "Share recording with meeting participants",
+        "inProgress": "Recording or live streaming in progress",
         "linkGenerated": "We have generated a link to your recording.",
         "live": "LIVE",
         "loggedIn": "Logged in as {{userName}}",
@@ -769,6 +790,7 @@
         "serviceDescription": "Your recording will be saved by the recording service",
         "serviceDescriptionCloud": "Cloud recording",
         "serviceName": "Recording service",
+        "sessionAlreadyActive": "This session is already being recorded or live streamed.",
         "signIn": "Sign in",
         "signOut": "Sign out",
         "unavailable": "Oops! The {{serviceName}} is currently unavailable. We're working on resolving the issue. Please try again later.",
@@ -855,7 +877,14 @@
         "name": "Name",
         "seconds": "{{count}}s",
         "speakerStats": "Speaker Stats",
-        "speakerTime": "Speaker Time"
+        "speakerTime": "Speaker Time",
+        "happy": "Happy",
+        "neutral": "Neutral",
+        "sad": "Sad",
+        "surprised": "Surprised",
+        "angry": "Angry",
+        "fearful": "Fearful",
+        "disgusted": "Disgusted"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -872,6 +901,7 @@
             "audioOnly": "Toggle audio only",
             "audioRoute": "Select the sound device",
             "boo": "Boo",
+            "breakoutRoom": "Join/leave breakout room",
             "callQuality": "Manage video quality",
             "cc": "Toggle subtitles",
             "chat": "Open / Close chat",
@@ -955,7 +985,9 @@
         "hangup": "Leave the meeting",
         "help": "Help",
         "invite": "Invite people",
+        "joinBreakoutRoom": "Join breakout room",
         "laugh": "Laugh",
+        "leaveBreakoutRoom": "Leave breakout room",
         "like": "Thumbs Up",
         "lobbyButtonDisable": "Disable lobby mode",
         "lobbyButtonEnable": "Enable lobby mode",
@@ -1045,7 +1077,10 @@
         "pending": "{{displayName}} has been invited"
     },
     "videoStatus": {
+        "adjustFor": "Adjust for:",
         "audioOnly": "AUD",
+        "bestPerformance": "Best performance",
+        "highestQuality": "Highest quality",
         "audioOnlyExpanded": "You are in low bandwidth mode. In this mode you will receive only audio and screen sharing.",
         "callQuality": "Video Quality",
         "hd": "HD",
@@ -1056,6 +1091,7 @@
         "ld": "LD",
         "ldTooltip": "Viewing low definition video",
         "lowDefinition": "Low definition",
+        "performanceSettings": "Performance settings",
         "sd": "SD",
         "sdTooltip": "Viewing standard definition video",
         "standardDefinition": "Standard definition"
@@ -1129,6 +1165,12 @@
         "button": "Invite others",
         "youAreAlone": "You are the only one in the meeting"
     },
+    "termsView": {
+        "header": "Terms"
+    },
+    "privacyView": {
+        "header": "Privacy"
+    },
     "helpView": {
         "header": "Help center"
     },

modules/API/API.js

@@ -1,6 +1,6 @@
 // @flow
 
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 
 import {
     createApiEvent,
@@ -37,7 +37,8 @@ import {
     kickParticipant,
     raiseHand,
     isParticipantModerator,
-    isLocalParticipantModerator
+    isLocalParticipantModerator,
+    hasRaisedHand
 } from '../../react/features/base/participants';
 import { updateSettings } from '../../react/features/base/settings';
 import { isToggleCameraEnabled, toggleCamera } from '../../react/features/base/tracks';
@@ -51,7 +52,7 @@ import {
     processExternalDeviceRequest
 } from '../../react/features/device-selection/functions';
 import { isEnabled as isDropboxEnabled } from '../../react/features/dropbox';
-import { toggleE2EE } from '../../react/features/e2ee/actions';
+import { setMediaEncryptionKey, toggleE2EE } from '../../react/features/e2ee/actions';
 import { setVolume } from '../../react/features/filmstrip';
 import { invite } from '../../react/features/invite';
 import {
@@ -61,7 +62,7 @@ import {
     captureLargeVideoScreenshot,
     resizeLargeVideo
 } from '../../react/features/large-video/actions.web';
-import { toggleLobbyMode } from '../../react/features/lobby/actions';
+import { toggleLobbyMode, setKnockingParticipantApproval } from '../../react/features/lobby/actions';
 import { isForceMuted } from '../../react/features/participants-pane/functions';
 import { RECORDING_TYPES } from '../../react/features/recording/constants';
 import { getActiveSession } from '../../react/features/recording/functions';
@@ -113,6 +114,9 @@ let videoAvailable = true;
  */
 function initCommands() {
     commands = {
+        'answer-knocking-participant': (id, approved) => {
+            APP.store.dispatch(setKnockingParticipantApproval(id, approved));
+        },
         'approve-video': participantId => {
             if (!isLocalParticipantModerator(APP.store.getState())) {
                 return;
@@ -278,7 +282,7 @@ function initCommands() {
             if (!localParticipant) {
                 return;
             }
-            const { raisedHand } = localParticipant;
+            const raisedHand = hasRaisedHand(localParticipant);
 
             sendAnalytics(createApiEvent('raise-hand.toggled'));
             APP.store.dispatch(raiseHand(!raisedHand));
@@ -360,6 +364,9 @@ function initCommands() {
             logger.debug('Toggle E2EE key command received');
             APP.store.dispatch(toggleE2EE(enabled));
         },
+        'set-media-encryption-key': keyInfo => {
+            APP.store.dispatch(setMediaEncryptionKey(JSON.parse(keyInfo)));
+        },
         'set-video-quality': frameHeight => {
             logger.debug('Set video quality command received');
             sendAnalytics(createApiEvent('set.video.quality'));
@@ -1458,6 +1465,33 @@ class API {
         });
     }
 
+    /**
+     * Notify external application (if API is enabled) that the current recording link is
+     * available.
+     *
+     * @param {string} link - The recording download link.
+     * @returns {void}
+     */
+    notifyRecordingLinkAvailable(link: string) {
+        this._sendEvent({
+            name: 'recording-link-available',
+            link
+        });
+    }
+
+    /**
+     * Notify external application (if API is enabled) that a participant is knocking in the lobby.
+     *
+     * @param {Object} participant - Participant data such as id and name.
+     * @returns {void}
+     */
+    notifyKnockingParticipant(participant: Object) {
+        this._sendEvent({
+            name: 'knocking-participant',
+            participant
+        });
+    }
+
     /**
      * Notify external application (if API is enabled) that an error occured.
      *

modules/API/constants.js

@@ -12,6 +12,6 @@ import { parseURLParams } from '../../react/features/base/util/parseURLParams';
 export const API_ID = parseURLParams(window.location).jitsi_meet_external_api_id;
 
 /**
- * The payload name for the datachannel/endpoint text message event
+ * The payload name for the datachannel/endpoint text message event.
  */
 export const ENDPOINT_TEXT_MESSAGE_NAME = 'endpoint-text-message';

modules/API/external/external_api.js

@@ -24,9 +24,10 @@ const ALWAYS_ON_TOP_FILENAMES = [
 
 /**
  * Maps the names of the commands expected by the API with the name of the
- * commands expected by jitsi-meet
+ * commands expected by jitsi-meet.
  */
 const commands = {
+    answerKnockingParticipant: 'answer-knocking-participant',
     approveVideo: 'approve-video',
     askToUnmute: 'ask-to-unmute',
     avatarUrl: 'avatar-url',
@@ -49,6 +50,7 @@ const commands = {
     sendTones: 'send-tones',
     setFollowMe: 'set-follow-me',
     setLargeVideoParticipant: 'set-large-video-participant',
+    setMediaEncryptionKey: 'set-media-encryption-key',
     setParticipantVolume: 'set-participant-volume',
     setTileView: 'set-tile-view',
     setVideoQuality: 'set-video-quality',
@@ -62,6 +64,7 @@ const commands = {
     toggleCamera: 'toggle-camera',
     toggleCameraMirror: 'toggle-camera-mirror',
     toggleChat: 'toggle-chat',
+    toggleE2EE: 'toggle-e2ee',
     toggleFilmStrip: 'toggle-film-strip',
     toggleModeration: 'toggle-moderation',
     toggleRaiseHand: 'toggle-raise-hand',
@@ -74,7 +77,7 @@ const commands = {
 
 /**
  * Maps the names of the events expected by the API with the name of the
- * events expected by jitsi-meet
+ * events expected by jitsi-meet.
  */
 const events = {
     'avatar-changed': 'avatarChanged',
@@ -94,6 +97,7 @@ const events = {
     'feedback-prompt-displayed': 'feedbackPromptDisplayed',
     'filmstrip-display-changed': 'filmstripDisplayChanged',
     'incoming-message': 'incomingMessage',
+    'knocking-participant': 'knockingParticipant',
     'log': 'log',
     'mic-error': 'micError',
     'moderation-participant-approved': 'moderationParticipantApproved',
@@ -110,6 +114,7 @@ const events = {
     'password-required': 'passwordRequired',
     'proxy-connection-event': 'proxyConnectionEvent',
     'raise-hand-updated': 'raiseHandUpdated',
+    'recording-link-available': 'recordingLinkAvailable',
     'recording-status-changed': 'recordingStatusChanged',
     'video-ready-to-close': 'readyToClose',
     'video-conference-joined': 'videoConferenceJoined',
@@ -126,7 +131,8 @@ const events = {
 };
 
 /**
- * Last id of api object
+ * Last id of api object.
+ *
  * @type {number}
  */
 let id = 0;
@@ -384,7 +390,7 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         }
 
         return ALWAYS_ON_TOP_FILENAMES.map(
-            filename => (new URL(filename, baseURL)).href
+            filename => new URL(filename, baseURL).href
         );
     }
 
@@ -1181,6 +1187,40 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
      * @returns {void}
      */
     stopRecording(mode) {
-        this.executeCommand('startRecording', mode);
+        this.executeCommand('stopRecording', mode);
+    }
+
+    /**
+     * Sets e2ee enabled/disabled.
+     *
+     * @param {boolean} enabled - The new value for e2ee enabled.
+     * @returns {void}
+     */
+    toggleE2EE(enabled) {
+        this.executeCommand('toggleE2EE', enabled);
+    }
+
+    /**
+     * Sets the key and keyIndex for e2ee.
+     *
+     * @param {Object} keyInfo - Json containing key information.
+     * @param {CryptoKey} [keyInfo.encryptionKey] - The encryption key.
+     * @param {number} [keyInfo.index] - The index of the encryption key.
+     * @returns {void}
+     */
+    async setMediaEncryptionKey(keyInfo) {
+        const { key, index } = keyInfo;
+
+        if (key) {
+            const exportedKey = await crypto.subtle.exportKey('raw', key);
+
+            this.executeCommand('setMediaEncryptionKey', JSON.stringify({
+                exportedKey: Array.from(new Uint8Array(exportedKey)),
+                index }));
+        } else {
+            this.executeCommand('setMediaEncryptionKey', JSON.stringify({
+                exportedKey: false,
+                index }));
+        }
     }
 }

modules/API/external/functions.js

@@ -1,6 +1,6 @@
 // @flow
 
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 
 const logger = Logger.getLogger(__filename);
 

modules/UI/UI.js

@@ -3,8 +3,8 @@
 
 const UI = {};
 
+import Logger from '@jitsi/logger';
 import EventEmitter from 'events';
-import Logger from 'jitsi-meet-logger';
 
 import { isMobileBrowser } from '../../react/features/base/environment/utils';
 import { setColorAlpha } from '../../react/features/base/util';

modules/UI/authentication/AuthHandler.js

@@ -1,6 +1,6 @@
 // @flow
 
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 
 import { openConnection } from '../../../connection';
 import {

modules/UI/util/MessageHandler.js

@@ -1,4 +1,4 @@
-/* global $, APP */
+/* global APP */
 
 import {
     NOTIFICATION_TIMEOUT,
@@ -8,44 +8,6 @@ import {
 } from '../../../react/features/notifications';
 
 const messageHandler = {
-    OK: 'dialog.OK',
-    CANCEL: 'dialog.Cancel',
-
-    /**
-     * Returns the formatted title string.
-     *
-     * @return the title string formatted as a div.
-     */
-    _getFormattedTitleString(titleKey) {
-        const $titleString = $('<h2>');
-
-        $titleString.addClass('aui-dialog2-header-main');
-        $titleString.attr('data-i18n', titleKey);
-
-        return $('<div>').append($titleString)
-            .html();
-    },
-
-    /**
-     * Returns the dialog css classes.
-     *
-     * @return the dialog css classes
-     */
-    _getDialogClasses(size = 'small') {
-        return {
-            box: '',
-            form: '',
-            prompt: `dialog aui-layer aui-dialog2 aui-dialog2-${size}`,
-            close: 'aui-hide',
-            fade: 'aui-blanket',
-            button: 'button-control',
-            message: 'aui-dialog2-content',
-            buttons: 'aui-dialog2-footer',
-            defaultButton: 'button-control_primary',
-            title: 'aui-dialog2-header'
-        };
-    },
-
     /**
      * Opens new popup window for given <tt>url</tt> centered over current
      * window.

modules/UI/videolayout/LargeVideoManager.js

@@ -1,6 +1,6 @@
 /* global $, APP */
 /* eslint-disable no-unused-vars */
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
@@ -8,6 +8,7 @@ import { Provider } from 'react-redux';
 
 import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
 import { Avatar } from '../../../react/features/base/avatar';
+import theme from '../../../react/features/base/components/themes/participantsPaneTheme.json';
 import { i18next } from '../../../react/features/base/i18n';
 import {
     JitsiParticipantConnectionStatus
@@ -20,7 +21,6 @@ import {
     updateKnownLargeVideoResolution
 } from '../../../react/features/large-video/actions';
 import { getParticipantsPaneOpen } from '../../../react/features/participants-pane/functions';
-import theme from '../../../react/features/participants-pane/theme.json';
 import { PresenceLabel } from '../../../react/features/presence-status';
 import { shouldDisplayTileView } from '../../../react/features/video-layout';
 /* eslint-enable no-unused-vars */

modules/UI/videolayout/VideoContainer.js

@@ -495,6 +495,10 @@ export class VideoContainer extends LargeContainer {
 
         stream.attach(this.$video[0]);
 
+        // Ensure large video gets play() called on it when a new stream is attached to it. This is necessary in the
+        // case of Safari as autoplay doesn't kick-in automatically on Safari 15 and newer versions.
+        browser.isWebKitBased() && this.$video[0].play();
+
         const flipX = stream.isLocal() && this.localFlipX && !this.isScreenSharing();
 
         this.$video.css({

modules/UI/videolayout/VideoLayout.js

@@ -1,6 +1,6 @@
 /* global APP  */
 
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 
 import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media';
 import {

modules/devices/mediaDeviceHelper.js

@@ -8,7 +8,8 @@ import {
 import {
     getUserSelectedCameraDeviceId,
     getUserSelectedMicDeviceId,
-    getUserSelectedOutputDeviceId
+    getUserSelectedOutputDeviceId,
+    updateSettings
 } from '../../react/features/base/settings';
 
 /**
@@ -51,15 +52,19 @@ function getNewAudioOutputDevice(newDevices) {
  * list of available devices has been changed.
  * @param {MediaDeviceInfo[]} newDevices
  * @param {JitsiLocalTrack} localAudio
+ * @param {boolean} newLabel
  * @returns {string|undefined} - ID of new microphone device to use, undefined
  *      if audio input device should not be changed.
  */
-function getNewAudioInputDevice(newDevices, localAudio) {
+function getNewAudioInputDevice(newDevices, localAudio, newLabel) {
     const availableAudioInputDevices = newDevices.filter(
         d => d.kind === 'audioinput');
     const selectedAudioInputDeviceId = getUserSelectedMicDeviceId(APP.store.getState());
     const selectedAudioInputDevice = availableAudioInputDevices.find(
         d => d.deviceId === selectedAudioInputDeviceId);
+    const localAudioDeviceId = localAudio?.getDeviceId();
+    const localAudioDevice = availableAudioInputDevices.find(
+        d => d.deviceId === localAudioDeviceId);
 
     // Here we handle case when no device was initially plugged, but
     // then it's connected OR new device was connected when previous
@@ -75,12 +80,22 @@ function getNewAudioInputDevice(newDevices, localAudio) {
             return availableAudioInputDevices[0].deviceId;
         }
     } else if (selectedAudioInputDevice
-        && selectedAudioInputDeviceId !== localAudio.getDeviceId()) {
+        && selectedAudioInputDeviceId !== localAudioDeviceId) {
 
-        // And here we handle case when we already have some device working,
-        // but we plug-in a "preferred" (previously selected in settings, stored
-        // in local storage) device.
-        return selectedAudioInputDeviceId;
+        if (newLabel) {
+            // If a Firefox user with manual permission prompt chose a different
+            // device from what we have stored as the preferred device we accept
+            // and store that as the new preferred device.
+            APP.store.dispatch(updateSettings({
+                userSelectedMicDeviceId: localAudioDeviceId,
+                userSelectedMicDeviceLabel: localAudioDevice.label
+            }));
+        } else {
+            // And here we handle case when we already have some device working,
+            // but we plug-in a "preferred" (previously selected in settings, stored
+            // in local storage) device.
+            return selectedAudioInputDeviceId;
+        }
     }
 }
 
@@ -89,15 +104,19 @@ function getNewAudioInputDevice(newDevices, localAudio) {
  * list of available devices has been changed.
  * @param {MediaDeviceInfo[]} newDevices
  * @param {JitsiLocalTrack} localVideo
+ * @param {boolean} newLabel
  * @returns {string|undefined} - ID of new camera device to use, undefined
  *      if video input device should not be changed.
  */
-function getNewVideoInputDevice(newDevices, localVideo) {
+function getNewVideoInputDevice(newDevices, localVideo, newLabel) {
     const availableVideoInputDevices = newDevices.filter(
         d => d.kind === 'videoinput');
     const selectedVideoInputDeviceId = getUserSelectedCameraDeviceId(APP.store.getState());
     const selectedVideoInputDevice = availableVideoInputDevices.find(
         d => d.deviceId === selectedVideoInputDeviceId);
+    const localVideoDeviceId = localVideo?.getDeviceId();
+    const localVideoDevice = availableVideoInputDevices.find(
+        d => d.deviceId === localVideoDeviceId);
 
     // Here we handle case when no video input device was initially plugged,
     // but then device is connected OR new device was connected when
@@ -113,11 +132,22 @@ function getNewVideoInputDevice(newDevices, localVideo) {
             return availableVideoInputDevices[0].deviceId;
         }
     } else if (selectedVideoInputDevice
-            && selectedVideoInputDeviceId !== localVideo.getDeviceId()) {
-        // And here we handle case when we already have some device working,
-        // but we plug-in a "preferred" (previously selected in settings, stored
-        // in local storage) device.
-        return selectedVideoInputDeviceId;
+            && selectedVideoInputDeviceId !== localVideoDeviceId) {
+
+        if (newLabel) {
+            // If a Firefox user with manual permission prompt chose a different
+            // device from what we have stored as the preferred device we accept
+            // and store that as the new preferred device.
+            APP.store.dispatch(updateSettings({
+                userSelectedCameraDeviceId: localVideoDeviceId,
+                userSelectedCameraDeviceLabel: localVideoDevice.label
+            }));
+        } else {
+            // And here we handle case when we already have some device working,
+            // but we plug-in a "preferred" (previously selected in settings, stored
+            // in local storage) device.
+            return selectedVideoInputDeviceId;
+        }
     }
 }
 
@@ -139,14 +169,42 @@ export default {
             newDevices,
             isSharingScreen,
             localVideo,
-            localAudio) {
+            localAudio,
+            newLabels) {
         return {
-            audioinput: getNewAudioInputDevice(newDevices, localAudio),
-            videoinput: isSharingScreen ? undefined : getNewVideoInputDevice(newDevices, localVideo),
+            audioinput: getNewAudioInputDevice(newDevices, localAudio, newLabels),
+            videoinput: isSharingScreen ? undefined : getNewVideoInputDevice(newDevices, localVideo, newLabels),
             audiooutput: getNewAudioOutputDevice(newDevices)
         };
     },
 
+    /**
+     * Checks if the only difference between an object of known devices compared
+     * to an array of new devices are only the labels for the devices.
+     * @param {Object} oldDevices
+     * @param {MediaDeviceInfo[]} newDevices
+     * @returns {boolean}
+     */
+    newDeviceListAddedLabelsOnly(oldDevices, newDevices) {
+        const oldDevicesFlattend = oldDevices.audioInput.concat(oldDevices.audioOutput).concat(oldDevices.videoInput);
+
+        if (oldDevicesFlattend.length !== newDevices.length) {
+            return false;
+        }
+        oldDevicesFlattend.forEach(oldDevice => {
+            if (oldDevice.label !== '') {
+                return false;
+            }
+            const newDevice = newDevices.find(nd => nd.deviceId === oldDevice.deviceId);
+
+            if (!newDevice || newDevice.label === '') {
+                return false;
+            }
+        });
+
+        return true;
+    },
+
     /**
      * Tries to create new local tracks for new devices obtained after device
      * list changed. Shows error dialog in case of failures.

modules/keyboardshortcut/keyboardshortcut.js

@@ -1,6 +1,6 @@
 /* global APP */
 import { jitsiLocalStorage } from '@jitsi/js-utils';
-import Logger from 'jitsi-meet-logger';
+import Logger from '@jitsi/logger';
 
 import {
     ACTION_SHORTCUT_PRESSED as PRESSED,

modules/util/TaskQueue.js

@@ -1,4 +1,4 @@
-const logger = require('jitsi-meet-logger').getLogger(__filename);
+const logger = require('@jitsi/logger').getLogger(__filename);
 
 /**
  * Manages a queue of functions where the current function in progress will

package.json

@@ -35,6 +35,8 @@
     "@atlaskit/tooltip": "17.1.2",
     "@hapi/bourne": "2.0.0",
     "@jitsi/js-utils": "2.0.0",
+    "@jitsi/logger": "2.0.0",
+    "@jitsi/rtcstats": "9.0.1",
     "@material-ui/core": "4.11.3",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "@microsoft/microsoft-graph-client": "1.1.0",
@@ -42,25 +44,32 @@
     "@react-native-community/google-signin": "3.0.1",
     "@react-native-community/netinfo": "4.1.5",
     "@react-native-community/slider": "3.0.3",
+    "@react-native-masked-view/masked-view": "0.2.6",
+    "@react-navigation/bottom-tabs": "5.11.15",
+    "@react-navigation/drawer": "5.12.9",
+    "@react-navigation/material-top-tabs": "5.3.19",
+    "@react-navigation/native": "5.9.8",
+    "@react-navigation/stack": "5.14.9",
     "@svgr/webpack": "4.3.2",
+    "@xmldom/xmldom": "0.7.5",
     "amplitude-js": "8.2.1",
     "base64-js": "1.3.1",
     "bc-css-flags": "3.0.0",
     "clipboard-copy": "4.0.1",
     "clsx": "1.1.1",
     "dropbox": "10.7.0",
+    "face-api.js": "0.22.2",
     "focus-visible": "5.1.0",
     "i18n-iso-countries": "6.8.0",
     "i18next": "17.0.6",
     "i18next-browser-languagedetector": "3.0.1",
     "i18next-xhr-backend": "3.0.0",
     "image-capture": "0.4.0",
-    "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#v1.0.0",
     "jquery": "3.5.1",
     "jquery-i18next": "1.2.1",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#a5cc2321b8528c3117d366ef198a3428fe5bed67",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#bdfbb82087ce2a9336157da35e739fb4b250ed66",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.21",
     "moment": "2.29.1",
@@ -81,14 +90,20 @@
     "react-native-collapsible": "1.5.1",
     "react-native-default-preference": "1.4.2",
     "react-native-device-info": "8.0.0",
+    "react-native-gesture-handler": "1.10.3",
+    "react-native-get-random-values": "1.7.0",
     "react-native-immersive": "2.0.0",
     "react-native-keep-awake": "4.0.0",
     "react-native-paper": "4.8.1",
     "react-native-performance": "2.0.0",
+    "react-native-reanimated": "1.13.3",
+    "react-native-safe-area-context": "3.3.2",
+    "react-native-screens": "2.18.1",
     "react-native-sound": "github:jitsi/react-native-sound#3fe5480fce935e888d5089d94a191c7c7e3aa190",
     "react-native-splash-screen": "3.2.0",
     "react-native-svg": "12.1.0",
     "react-native-svg-transformer": "0.14.3",
+    "react-native-tab-view": "2.16.0",
     "react-native-url-polyfill": "1.2.0",
     "react-native-video": "5.1.1",
     "react-native-watch-connectivity": "0.4.3",
@@ -104,40 +119,33 @@
     "redux-thunk": "2.2.0",
     "resemblejs": "4.0.0",
     "rnnoise-wasm": "github:jitsi/rnnoise-wasm#566a16885897704d6e6d67a1d5ac5d39781db2af",
-    "rtcstats": "github:jitsi/rtcstats#v8.1.0",
     "styled-components": "3.4.9",
     "util": "0.12.1",
-    "uuid": "3.1.0",
+    "uuid": "8.3.2",
     "wasm-check": "2.0.1",
     "windows-iana": "^3.1.0",
-    "xmldom": "0.5.0",
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "7.9.0",
-    "@babel/plugin-proposal-class-properties": "7.1.0",
-    "@babel/plugin-proposal-export-default-from": "7.0.0",
-    "@babel/plugin-proposal-export-namespace-from": "7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.4.4",
-    "@babel/plugin-proposal-optional-chaining": "7.2.0",
-    "@babel/plugin-transform-flow-strip-types": "7.0.0",
-    "@babel/preset-env": "7.1.0",
-    "@babel/preset-flow": "7.0.0",
-    "@babel/preset-react": "7.0.0",
-    "@babel/runtime": "7.15.3",
-    "babel-eslint": "10.0.1",
-    "babel-loader": "8.0.4",
+    "@babel/core": "7.16.0",
+    "@babel/eslint-parser": "7.16.0",
+    "@babel/plugin-proposal-export-default-from": "7.16.0",
+    "@babel/preset-env": "7.16.0",
+    "@babel/preset-flow": "7.16.0",
+    "@babel/preset-react": "7.16.0",
+    "@babel/runtime": "7.16.0",
+    "@jitsi/eslint-config": "4.0.0",
+    "babel-loader": "8.2.3",
     "babel-plugin-optional-require": "0.3.1",
     "circular-dependency-plugin": "5.2.0",
     "clean-css-cli": "4.3.0",
     "css-loader": "3.6.0",
-    "eslint": "5.6.1",
-    "eslint-config-jitsi": "github:jitsi/eslint-config-jitsi#2.0.0",
-    "eslint-plugin-flowtype": "2.50.3",
-    "eslint-plugin-import": "2.20.2",
-    "eslint-plugin-jsdoc": "3.8.0",
-    "eslint-plugin-react": "7.11.1",
-    "eslint-plugin-react-native": "3.3.0",
+    "eslint": "8.1.0",
+    "eslint-plugin-flowtype": "8.0.3",
+    "eslint-plugin-import": "2.25.2",
+    "eslint-plugin-jsdoc": "37.0.3",
+    "eslint-plugin-react": "7.26.1",
+    "eslint-plugin-react-native": "3.11.0",
     "expose-loader": "3.0.0",
     "flow-bin": "0.104.0",
     "imports-loader": "0.7.1",

patches/eslint-plugin-flowtype+8.0.3.patch

@@ -0,0 +1,11 @@
+diff --git a/node_modules/eslint-plugin-flowtype/dist/configs/recommended.json b/node_modules/eslint-plugin-flowtype/dist/configs/recommended.json
+index 90a0d69..2ad7d68 100644
+--- a/node_modules/eslint-plugin-flowtype/dist/configs/recommended.json
++++ b/node_modules/eslint-plugin-flowtype/dist/configs/recommended.json
+@@ -1,5 +1,5 @@
+ {
+-  "parser": "@babel/eslint",
++  "parser": "@babel/eslint-parser",
+   "parserOptions": {
+     "babelOptions": {
+       "plugins": [

react/.eslintrc.js

@@ -1,9 +1,18 @@
 module.exports = {
     'extends': [
         '../.eslintrc.js',
-        'eslint-config-jitsi/flow',
-        'eslint-config-jitsi/jsdoc',
-        'eslint-config-jitsi/react',
+        '@jitsi/eslint-config/flow',
+        '@jitsi/eslint-config/jsdoc',
+        '@jitsi/eslint-config/react',
         '.eslintrc-react-native.js'
-    ]
+    ],
+    'rules': {
+        // XXX remove this eventually.
+        'react/jsx-indent-props': 0
+    },
+    'settings': {
+        'react': {
+            'version': 'detect'
+        }
+    }
 };

react/features/always-on-top/AlwaysOnTop.js

@@ -33,7 +33,7 @@ type State = {
  * Represents the always on top page.
  *
  * @class AlwaysOnTop
- * @extends Component
+ * @augments Component
  */
 export default class AlwaysOnTop extends Component<*, State> {
     _hovered: boolean;

react/features/always-on-top/Toolbar.js

@@ -30,7 +30,7 @@ type Props = {
 /**
  * Represents the toolbar in the Always On Top window.
  *
- * @extends Component
+ * @augments Component
  */
 export default class Toolbar extends Component<Props> {
     /**

react/features/analytics/AnalyticsEvents.js

@@ -2,6 +2,7 @@
  * The constant for the event type 'track'.
  * TODO: keep these constants in a single place. Can we import them from
  * lib-jitsi-meet's AnalyticsEvents somehow?
+ *
  * @type {string}
  */
 const TYPE_TRACK = 'track';
@@ -10,6 +11,7 @@ const TYPE_TRACK = 'track';
  * The constant for the event type 'UI' (User Interaction).
  * TODO: keep these constants in a single place. Can we import them from
  * lib-jitsi-meet's AnalyticsEvents somehow?
+ *
  * @type {string}
  */
 const TYPE_UI = 'ui';
@@ -143,7 +145,6 @@ export function createCalendarClickedEvent(eventName, attributes = {}) {
 export function createCalendarSelectedEvent(attributes = {}) {
     return {
         action: 'selected',
-        actionSubject: 'calendar.selected',
         attributes,
         source: 'calendar',
         type: TYPE_UI
@@ -159,8 +160,8 @@ export function createCalendarSelectedEvent(attributes = {}) {
  */
 export function createCalendarConnectedEvent(attributes = {}) {
     return {
-        action: 'calendar.connected',
-        actionSubject: 'calendar.connected',
+        action: 'connected',
+        actionSubject: 'calendar',
         attributes
     };
 }
@@ -212,7 +213,6 @@ export function createChromeExtensionBannerEvent(installPressed, attributes = {}
 export function createRecentSelectedEvent(attributes = {}) {
     return {
         action: 'selected',
-        actionSubject: 'recent.list.selected',
         attributes,
         source: 'recent.list',
         type: TYPE_UI
@@ -376,6 +376,28 @@ export function createPinnedEvent(action, participantId, attributes) {
     };
 }
 
+/**
+ * Creates a poll event.
+ * The following events will be created:
+ * - poll.created
+ * - poll.vote.checked
+ * - poll.vote.sent
+ * - poll.vote.skipped
+ * - poll.vote.detailsViewed
+ * - poll.vote.changed
+ * - poll.option.added
+ * - poll.option.moved
+ * - poll.option.removed.
+ *
+ * @param {string} action - The action.
+ * @returns {Object}
+ */
+export function createPollEvent(action) {
+    return {
+        action: `poll.${action}`
+    };
+}
+
 /**
  * Creates an event which indicates that a button in the profile panel was
  * clicked.
@@ -511,12 +533,11 @@ export function createRejoinedEvent({ url, lastConferenceDuration, timeSinceLeft
 export function createRemoteMuteConfirmedEvent(participantId, mediaType) {
     return {
         action: 'clicked',
-        actionSubject: 'remote.mute.dialog.confirm.button',
         attributes: {
             'participant_id': participantId,
             'media_type': mediaType
         },
-        source: 'remote.mute.dialog',
+        source: 'remote.mute.button',
         type: TYPE_UI
     };
 }
@@ -560,33 +581,22 @@ export function createRTCStatsTraceCloseEvent(closeEvent) {
     return event;
 }
 
-/**
- * Creates an event indicating that an action related to video blur
- * occurred (e.g. It was started or stopped).
- *
- * @param {string} action - The action which occurred.
- * @returns {Object} The event in a format suitable for sending via
- * sendAnalytics.
- */
-export function createVideoBlurEvent(action) {
-    return {
-        action,
-        actionSubject: 'video.blur'
-    };
-}
-
 /**
  * Creates an event indicating that an action related to screen sharing
  * occurred (e.g. It was started or stopped).
  *
  * @param {string} action - The action which occurred.
+ * @param {number?} value - The screenshare duration in seconds.
  * @returns {Object} The event in a format suitable for sending via
  * sendAnalytics.
  */
-export function createScreenSharingEvent(action) {
+export function createScreenSharingEvent(action, value = null) {
     return {
         action,
-        actionSubject: 'screen.sharing'
+        actionSubject: 'screen.sharing',
+        attributes: {
+            value
+        }
     };
 }
 
@@ -603,26 +613,6 @@ export function createScreenSharingIssueEvent(attributes) {
     };
 }
 
-/**
- * The local participant failed to send a "selected endpoint" message to the
- * bridge.
- *
- * @param {Error} error - The error which caused the failure.
- * @returns {Object} The event in a format suitable for sending via
- * sendAnalytics.
- */
-export function createSelectParticipantFailedEvent(error) {
-    const event = {
-        action: 'select.participant.failed'
-    };
-
-    if (error) {
-        event.error = error.toString();
-    }
-
-    return event;
-}
-
 /**
  * Creates an event associated with the "shared video" feature.
  *
@@ -660,7 +650,6 @@ export function createShortcutEvent(
         attributes = {}) {
     return {
         action,
-        actionSubject: 'keyboard.shortcut',
         actionSubjectId: shortcut,
         attributes,
         source: 'keyboard.shortcut',
@@ -806,8 +795,24 @@ export function createToolbarEvent(buttonName, attributes = {}) {
 export function createReactionMenuEvent(buttonName) {
     return {
         action: 'clicked',
-        actionSubject: buttonName,
-        source: 'reaction.button',
+        actionSubject: 'button',
+        source: 'reaction',
+        buttonName,
+        type: TYPE_UI
+    };
+}
+
+/**
+ * Creates an event associated with disabling of reaction sounds.
+ *
+ * @returns {Object} The event in a format suitable for sending via
+ * sendAnalytics.
+ */
+export function createReactionSoundsDisabledEvent() {
+    return {
+        action: 'disabled',
+        actionSubject: 'sounds',
+        source: 'reaction.settings',
         type: TYPE_UI
     };
 }
@@ -876,6 +881,6 @@ export function createWelcomePageEvent(action, actionSubject, attributes = {}) {
  */
 export function createScreensharingCaptureTakenEvent() {
     return {
-        action: 'screen.sharing.capture'
+        action: 'screen.sharing.capture.taken'
     };
 }

react/features/analytics/functions.js

@@ -187,7 +187,7 @@ export function initAnalytics({ getState }: { getState: Function }, handlers: Ar
     permanentProperties.externalApi = typeof API_ID === 'number';
 
     // Report if we are loaded in iframe
-    permanentProperties.inIframe = _inIframe();
+    permanentProperties.inIframe = inIframe();
 
     // Report the tenant from the URL.
     permanentProperties.tenant = tenant || '/';
@@ -227,7 +227,7 @@ export function initAnalytics({ getState }: { getState: Function }, handlers: Ar
  * @returns {boolean} Returns {@code true} if loaded in iframe.
  * @private
  */
-function _inIframe() {
+export function inIframe() {
     if (navigator.product === 'ReactNative') {
         return false;
     }

react/features/analytics/handlers/AbstractHandler.js

@@ -1,5 +1,5 @@
 /**
- * Abstract implementation of analytics handler
+ * Abstract implementation of analytics handler.
  */
 export default class AbstractHandler {
     /**

react/features/app/components/App.native.js

@@ -51,7 +51,7 @@ type Props = AbstractAppProps & {
 /**
  * Root app {@code Component} on mobile/React Native.
  *
- * @extends AbstractApp
+ * @augments AbstractApp
  */
 export class App extends AbstractApp {
     _init: Promise<*>;

react/features/app/components/App.web.js

@@ -4,6 +4,7 @@ import { AtlasKitThemeProvider } from '@atlaskit/theme';
 import React from 'react';
 
 import { DialogContainer } from '../../base/dialog';
+import GlobalStyles from '../../base/ui/components/GlobalStyles';
 import JitsiThemeProvider from '../../base/ui/components/JitsiThemeProvider';
 import { ChromeExtensionBanner } from '../../chrome-extension-banner';
 
@@ -16,7 +17,7 @@ import '../reducers';
 /**
  * Root app {@code Component} on Web/React.
  *
- * @extends AbstractApp
+ * @augments AbstractApp
  */
 export class App extends AbstractApp {
     /**
@@ -29,6 +30,7 @@ export class App extends AbstractApp {
         return (
             <JitsiThemeProvider>
                 <AtlasKitThemeProvider mode = 'dark'>
+                    <GlobalStyles />
                     <ChromeExtensionBanner />
                     { super._createMainElement(component, props) }
                 </AtlasKitThemeProvider>

react/features/app/getRouteToRender.native.js

@@ -0,0 +1,41 @@
+
+import { isRoomValid } from '../base/conference';
+import { toState } from '../base/redux';
+import { ConferenceNavigationContainer } from '../conference';
+import RootNavigationContainer from '../welcome/components/RootNavigationContainer';
+
+/**
+ * Determines which route is to be rendered in order to depict a specific Redux
+ * store.
+ *
+ * @param {(Function|Object)} stateful - THe redux store, state, or
+ * {@code getState} function.
+ * @returns {Promise<Object>}
+ */
+export function _getRouteToRender(stateful) {
+    const state = toState(stateful);
+
+    return _getMobileRoute(state);
+}
+
+/**
+ * Returns the {@code Route} to display on the React Native app.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {Promise}
+ */
+function _getMobileRoute(state) {
+    const route = {
+        component: null,
+        href: undefined
+    };
+
+    if (isRoomValid(state['features/base/conference'].room)) {
+        route.component = ConferenceNavigationContainer;
+    } else {
+        route.component = RootNavigationContainer;
+    }
+
+    return Promise.resolve(route);
+}
+

react/features/app/getRouteToRender.web.js

@@ -1,7 +1,5 @@
-// @flow
 
 import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random';
-import type { Component } from 'react';
 
 import { isRoomValid } from '../base/conference';
 import { isSupportedBrowser } from '../base/environment';
@@ -9,25 +7,7 @@ import { toState } from '../base/redux';
 import { Conference } from '../conference';
 import { getDeepLinkingPage } from '../deep-linking';
 import { UnsupportedDesktopBrowser } from '../unsupported-browser';
-import {
-    BlankPage,
-    WelcomePage,
-    isWelcomePageAppEnabled,
-    isWelcomePageUserEnabled
-} from '../welcome';
-
-/**
- * Object describing application route.
- *
- * @typedef {Object} Route
- * @property {Component} component - React Component constructor.
- * @property {string|undefined} href - New location, in case navigation involves
- * a location change.
- */
-export type Route = {
-    component: Class<Component<*>>,
-    href: ?string
-};
+import { BlankPage, isWelcomePageUserEnabled, WelcomePage } from '../welcome';
 
 /**
  * Determines which route is to be rendered in order to depict a specific Redux
@@ -35,46 +15,22 @@ export type Route = {
  *
  * @param {(Function|Object)} stateful - THe redux store, state, or
  * {@code getState} function.
- * @returns {Promise<Route>}
+ * @returns {Promise<Object>}
  */
-export function _getRouteToRender(stateful: Function | Object): Promise<Route> {
+export function _getRouteToRender(stateful) {
     const state = toState(stateful);
 
-    if (navigator.product === 'ReactNative') {
-        return _getMobileRoute(state);
-    }
-
     return _getWebConferenceRoute(state) || _getWebWelcomePageRoute(state);
 }
 
-/**
- * Returns the {@code Route} to display on the React Native app.
- *
- * @param {Object} state - The redux state.
- * @returns {Promise<Route>}
- */
-function _getMobileRoute(state): Promise<Route> {
-    const route = _getEmptyRoute();
-
-    if (isRoomValid(state['features/base/conference'].room)) {
-        route.component = Conference;
-    } else if (isWelcomePageAppEnabled(state)) {
-        route.component = WelcomePage;
-    } else {
-        route.component = BlankPage;
-    }
-
-    return Promise.resolve(route);
-}
-
 /**
  * Returns the {@code Route} to display when trying to access a conference if
  * a valid conference is being joined.
  *
  * @param {Object} state - The redux state.
- * @returns {Promise<Route>|undefined}
+ * @returns {Promise|undefined}
  */
-function _getWebConferenceRoute(state): ?Promise<Route> {
+function _getWebConferenceRoute(state) {
     if (!isRoomValid(state['features/base/conference'].room)) {
         return;
     }
@@ -111,9 +67,9 @@ function _getWebConferenceRoute(state): ?Promise<Route> {
  * Returns the {@code Route} to display when trying to access the welcome page.
  *
  * @param {Object} state - The redux state.
- * @returns {Promise<Route>}
+ * @returns {Promise<Object>}
  */
-function _getWebWelcomePageRoute(state): Promise<Route> {
+function _getWebWelcomePageRoute(state) {
     const route = _getEmptyRoute();
 
     if (isWelcomePageUserEnabled(state)) {
@@ -137,9 +93,9 @@ function _getWebWelcomePageRoute(state): Promise<Route> {
 /**
  * Returns the default {@code Route}.
  *
- * @returns {Route}
+ * @returns {Object}
  */
-function _getEmptyRoute(): Route {
+function _getEmptyRoute() {
     return {
         component: BlankPage,
         href: undefined

react/features/app/middleware.js

@@ -2,6 +2,7 @@
 
 import {
     createConnectionEvent,
+    inIframe,
     sendAnalytics
 } from '../analytics';
 import { SET_ROOM } from '../base/conference';
@@ -53,6 +54,10 @@ function _connectionEstablished(store, next, action) {
     // determined by when no one needs them anymore.
     const { history, location } = window;
 
+    if (inIframe()) {
+        return;
+    }
+
     if (history
             && location
             && history.length

react/features/app/middlewares.any.js

@@ -19,6 +19,7 @@ import '../base/sounds/middleware';
 import '../base/testing/middleware';
 import '../base/tracks/middleware';
 import '../base/user-interaction/middleware';
+import '../breakout-rooms/middleware';
 import '../calendar-sync/middleware';
 import '../chat/middleware';
 import '../conference/middleware';

react/features/app/middlewares.web.js

@@ -17,5 +17,6 @@ import '../screen-share/middleware';
 import '../shared-video/middleware';
 import '../talk-while-muted/middleware';
 import '../virtual-background/middleware';
+import '../facial-recognition/middleware';
 
 import './middlewares.any';

react/features/app/reducers.any.js

@@ -26,6 +26,7 @@ import '../base/sounds/reducer';
 import '../base/testing/reducer';
 import '../base/tracks/reducer';
 import '../base/user-interaction/reducer';
+import '../breakout-rooms/reducer';
 import '../calendar-sync/reducer';
 import '../chat/reducer';
 import '../deep-linking/reducer';
@@ -54,4 +55,3 @@ import '../toolbox/reducer';
 import '../transcribing/reducer';
 import '../video-layout/reducer';
 import '../videosipgw/reducer';
-import '../welcome/reducer';

react/features/app/reducers.web.js

@@ -2,6 +2,7 @@
 
 import '../base/devices/reducer';
 import '../e2ee/reducer';
+import '../facial-recognition/reducer';
 import '../feedback/reducer';
 import '../local-recording/reducer';
 import '../no-audio-signal/reducer';

react/features/audio-level-indicator/components/AudioLevelIndicator.js

@@ -29,7 +29,7 @@ type Props = {
 /**
  * Creates a ReactElement responsible for drawing audio levels.
  *
- * @extends {Component}
+ * @augments {Component}
  */
 class AudioLevelIndicator extends Component<Props> {
     /**

react/features/authentication/components/native/LoginDialog.js

@@ -29,7 +29,7 @@ import './styles';
 type Props = {
 
     /**
-     * {@link JitsiConference} that needs authentication - will hold a valid
+     * {@link JitsiConference} That needs authentication - will hold a valid
      * value in XMPP login + guest access mode.
      */
     _conference: Object,

react/features/authentication/components/web/LoginDialog.js

@@ -21,7 +21,7 @@ import {
 type Props = {
 
     /**
-     * {@link JitsiConference} that needs authentication - will hold a valid
+     * {@link JitsiConference} That needs authentication - will hold a valid
      * value in XMPP login + guest access mode.
      */
     _conference: Object,

react/features/av-moderation/actions.js

@@ -31,11 +31,13 @@ import { isEnabledFromState } from './functions';
 export const approveParticipantAudio = (id: string) => (dispatch: Function, getState: Function) => {
     const state = getState();
     const { conference } = getConferenceState(state);
+    const participant = getParticipantById(state, id);
 
     const isAudioModerationOn = isEnabledFromState(MEDIA_TYPE.AUDIO, state);
     const isVideoModerationOn = isEnabledFromState(MEDIA_TYPE.VIDEO, state);
+    const isVideoForceMuted = isForceMuted(participant, MEDIA_TYPE.VIDEO, state);
 
-    if (isAudioModerationOn || !isVideoModerationOn) {
+    if (isAudioModerationOn || !isVideoModerationOn || !isVideoForceMuted) {
         conference.avModerationApprove(MEDIA_TYPE.AUDIO, id);
     }
 };

react/features/av-moderation/middleware.js

@@ -8,6 +8,7 @@ import { MEDIA_TYPE } from '../base/media';
 import {
     getLocalParticipant,
     getRemoteParticipants,
+    hasRaisedHand,
     isLocalParticipantModerator,
     isParticipantModerator,
     PARTICIPANT_UPDATED,
@@ -134,7 +135,7 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
             if (isLocalParticipantModerator(state)) {
 
                 // this is handled only by moderators
-                if (participant.raisedHand) {
+                if (hasRaisedHand(participant)) {
                     // if participant raises hand show notification
                     !isParticipantApproved(participant.id, MEDIA_TYPE.AUDIO)(state)
                     && dispatch(participantPendingAudio(participant));
@@ -148,7 +149,7 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
 
                 // this is the granted moderator case
                 getRemoteParticipants(state).forEach(p => {
-                    p.raisedHand && !isParticipantApproved(p.id, MEDIA_TYPE.AUDIO)(state)
+                    hasRaisedHand(p) && !isParticipantApproved(p.id, MEDIA_TYPE.AUDIO)(state)
                         && dispatch(participantPendingAudio(p));
                 });
             }

react/features/base/app/components/BaseApp.js

@@ -259,5 +259,5 @@ export default class BaseApp extends Component<*, State> {
      *
      * @returns {React$Element}
      */
-    _renderDialogContainer: () => React$Element<*>
+    _renderDialogContainer: () => React$Element<*>;
 }

react/features/base/app/reducer.js

@@ -12,13 +12,6 @@ ReducerRegistry.register('features/base/app', (state = {}, action) => {
         if (state.app !== app) {
             return {
                 ...state,
-
-                /**
-                 * The one and only (i.e. singleton) {@link BaseApp} instance
-                 * which is currently mounted.
-                 *
-                 * @type {BaseApp}
-                 */
                 app
             };
         }

react/features/base/avatar/components/Avatar.js

@@ -38,12 +38,12 @@ export type Props = {
 
     /**
      * Display name of the entity to render an avatar for (if any). This is handy when we need
-     * an avatar for a non-participasnt entity (e.g. a recent list item).
+     * an avatar for a non-participasnt entity (e.g. A recent list item).
      */
     displayName?: string,
 
     /**
-     * Whether or not to update the background color of the avatar
+     * Whether or not to update the background color of the avatar.
      */
     dynamicColor?: Boolean,
 
@@ -220,7 +220,7 @@ export function _mapStateToProps(state: Object, ownProps: Props) {
         _customAvatarBackgrounds: state['features/dynamic-branding'].avatarBackgrounds,
         _initialsBase,
         _loadableAvatarUrl: _participant?.loadableAvatarUrl,
-        colorBase: !colorBase && _participant ? _participant.id : colorBase
+        colorBase
     };
 }
 

react/features/base/avatar/components/native/StatelessAvatar.js

@@ -63,7 +63,7 @@ export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
         );
     }
 
-    _isIcon: (?string | ?Object) => boolean
+    _isIcon: (?string | ?Object) => boolean;
 
     /**
      * Renders a badge representing the avatar status.

react/features/base/avatar/components/web/StatelessAvatar.js

@@ -13,7 +13,7 @@ type Props = AbstractProps & {
     className?: string,
 
     /**
-     * The default avatar URL if we want to override the app bundled one (e.g. AlwaysOnTop)
+     * The default avatar URL if we want to override the app bundled one (e.g. AlwaysOnTop).
      */
     defaultAvatar?: string,
 
@@ -157,5 +157,5 @@ export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
         return '';
     }
 
-    _isIcon: (?string | ?Object) => boolean
+    _isIcon: (?string | ?Object) => boolean;
 }

react/features/base/avatar/functions.js

@@ -53,7 +53,7 @@ export function getInitials(s: ?string) {
     let initials = '';
 
     for (const w of words) {
-        (initials.length < 2) && (initials += w.substr(0, 1).toUpperCase());
+        (initials.length < 2) && (initials += String.fromCodePoint(w.codePointAt(0)).toUpperCase());
     }
 
     return initials;