fix(polls) use medium timeout for poll notifications

- add possibility to allow execution of the button's routine besides triggering
`toolbarButtonClicked` API event
- keep backwards compatibility
- get rid of `ToolbarButton`

android/app/proguard-rules.pro

@@ -85,4 +85,9 @@
 # ^^^ We added the above when we switched minifyEnabled on.
 
 # Rule to avoid build errors related to SVGs.
--keep public class com.horcrux.svg.** {*;}
+-keep public class com.horcrux.svg.** {*;}
+
+# https://github.com/facebook/fresco/issues/2638
+-keep public class com.facebook.imageutils.** {
+   public *;
+}

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=21.5.0
-sdkVersion=4.0.0
+appVersion=21.6.0
+sdkVersion=4.1.0

android/sdk/build.gradle

@@ -68,6 +68,7 @@ dependencies {
     implementation project(':react-native-async-storage')
     implementation project(':react-native-background-timer')
     implementation project(':react-native-calendar-events')
+    implementation project(':react-native-community_clipboard')
     implementation project(':react-native-community_netinfo')
     implementation project(':react-native-default-preference')
     implementation project(':react-native-gesture-handler')

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

@@ -180,6 +180,7 @@ class ReactInstanceManagerHolder {
                 new com.calendarevents.CalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),
+                new com.reactnativecommunity.clipboard.ClipboardPackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
                 new com.oblador.performance.PerformancePackage(),
                 new com.reactnativecommunity.slider.ReactSliderPackage(),

android/settings.gradle

@@ -9,6 +9,8 @@ include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 include ':react-native-calendar-events'
 project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
+include ':react-native-community_clipboard'
+project(':react-native-community_clipboard').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/clipboard/android')
 include ':react-native-community_netinfo'
 project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-default-preference'

conference.js

@@ -71,13 +71,12 @@ import {
     JitsiMediaDevicesEvents,
     JitsiParticipantConnectionStatus,
     JitsiTrackErrors,
-    JitsiTrackEvents
+    JitsiTrackEvents,
+    JitsiRecordingConstants
 } from './react/features/base/lib-jitsi-meet';
 import {
     getStartWithAudioMuted,
     getStartWithVideoMuted,
-    isAudioMuted,
-    isVideoMuted,
     isVideoMutedByUser,
     MEDIA_TYPE,
     setAudioAvailable,
@@ -136,12 +135,12 @@ import { mediaPermissionPromptVisibilityChanged, toggleSlowGUMOverlay } from './
 import { suspendDetected } from './react/features/power-monitor';
 import {
     initPrejoin,
-    isPrejoinPageEnabled,
     isPrejoinPageVisible,
     makePrecallTest,
     setJoiningInProgress,
     setPrejoinPageVisibility
 } from './react/features/prejoin';
+import { getActiveSession } from './react/features/recording/functions';
 import { disableReceiver, stopReceiver } from './react/features/remote-control';
 import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture';
@@ -797,7 +796,7 @@ export default {
             logger.warn('initial device list initialization failed', error);
         }
 
-        if (isPrejoinPageEnabled(APP.store.getState())) {
+        if (isPrejoinPageVisible(APP.store.getState())) {
             _connectionPromise = connect(roomName).then(c => {
                 // we want to initialize it early, in case of errors to be able
                 // to gather logs
@@ -1333,18 +1332,19 @@ export default {
     /**
      * Used by the Breakout Rooms feature to join a breakout room or go back to the main room.
      */
-    async joinRoom(roomName) {
+    async joinRoom(roomName, options) {
         // Reset VideoLayout. It's destroyed in features/video-layout/middleware.web.js so re-initialize it.
         VideoLayout.initLargeVideo();
         VideoLayout.resizeVideoArea();
 
-        // Destroy old tracks.
-        APP.store.dispatch(destroyLocalTracks());
+        // Restore initial state.
         this._localTracksInitialized = false;
+        this.isSharingScreen = false;
+        this.localPresenterVideo = null;
 
         this.roomName = roomName;
 
-        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks();
+        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
         const localTracks = await tryCreateLocalTracks;
 
         this._displayErrorsForCreateInitialLocalTracks(errors);
@@ -1710,10 +1710,10 @@ export default {
                 = this._turnScreenSharingOff.bind(this, didHaveVideo);
 
             const desktopVideoStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
-            const dekstopAudioStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
+            const desktopAudioStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
 
-            if (dekstopAudioStream) {
-                dekstopAudioStream.on(
+            if (desktopAudioStream) {
+                desktopAudioStream.on(
                     JitsiTrackEvents.LOCAL_TRACK_STOPPED,
                     () => {
                         logger.debug(`Local screensharing audio track stopped. ${this.isSharingScreen}`);
@@ -1935,7 +1935,9 @@ export default {
             .then(() => {
                 this.videoSwitchInProgress = false;
                 if (config.enableScreenshotCapture) {
-                    APP.store.dispatch(toggleScreenshotCaptureSummary(true));
+                    if (getActiveSession(APP.store.getState(), JitsiRecordingConstants.mode.FILE)) {
+                        APP.store.dispatch(toggleScreenshotCaptureSummary(true));
+                    }
                 }
                 sendAnalytics(createScreenSharingEvent('started'));
                 logger.log('Screen sharing started');
@@ -2133,6 +2135,8 @@ export default {
             }
         });
 
+        room.on(JitsiConferenceEvents.TRACK_UNMUTE_REJECTED, track => APP.store.dispatch(destroyLocalTracks(track)));
+
         room.on(JitsiConferenceEvents.SUBJECT_CHANGED,
             subject => APP.store.dispatch(conferenceSubjectChanged(subject)));
 
@@ -2264,22 +2268,12 @@ export default {
         room.on(
             JitsiConferenceEvents.AUDIO_UNMUTE_PERMISSIONS_CHANGED,
             disableAudioMuteChange => {
-                const muted = isAudioMuted(APP.store.getState());
-
-                // Disable the mute button only if its muted.
-                if (!disableAudioMuteChange || (disableAudioMuteChange && muted)) {
-                    APP.store.dispatch(setAudioUnmutePermissions(disableAudioMuteChange));
-                }
+                APP.store.dispatch(setAudioUnmutePermissions(disableAudioMuteChange));
             });
         room.on(
             JitsiConferenceEvents.VIDEO_UNMUTE_PERMISSIONS_CHANGED,
             disableVideoMuteChange => {
-                const muted = isVideoMuted(APP.store.getState());
-
-                // Disable the mute button only if its muted.
-                if (!disableVideoMuteChange || (disableVideoMuteChange && muted)) {
-                    APP.store.dispatch(setVideoUnmutePermissions(disableVideoMuteChange));
-                }
+                APP.store.dispatch(setVideoUnmutePermissions(disableVideoMuteChange));
             });
 
         APP.UI.addListener(UIEvents.AUDIO_MUTED, muted => {

config.js

@@ -74,15 +74,30 @@ var config = {
         // callStatsThreshold: 5 // enable callstats for 5% of the users.
     },
 
+    // Feature Flags.
+    flags: {
+        // Enables source names in the signaling.
+        // sourceNameSignaling: false,
+    },
+
     // Disables moderator indicators.
     // disableModeratorIndicator: false,
 
     // Disables the reactions feature.
     // disableReactions: true,
 
+    // Disables the reactions moderation feature.
+    // disableReactionsModeration: false,
+
     // Disables polls feature.
     // disablePolls: false,
 
+    // Disables self-view tile. (hides it from tile view and from filmstrip)
+    // disableSelfView: false,
+
+    // Disables self-view settings in UI
+    // disableSelfViewSettings: false,
+
     // Disables ICE/UDP by filtering out local and remote UDP candidates in
     // signalling.
     // webrtcIceUdpDisable: false,
@@ -475,12 +490,18 @@ var config = {
     // Default remote name to be displayed
     // defaultRemoteDisplayName: 'Fellow Jitster',
 
+    // Hides the display name from the participant thumbnail
+    // hideDisplayName: false
+
     // Default language for the user interface.
     // defaultLanguage: 'en',
 
     // Disables profile and the edit of all fields from the profile settings (display name and email)
     // disableProfile: false,
 
+    // Hides the email section under profile settings.
+    // hideEmailInSettings: false,
+
     // Whether or not some features are checked based on token.
     // enableFeaturesBasedOnToken: false,
 
@@ -496,8 +517,14 @@ var config = {
     // and microsoftApiApplicationClientID
     // enableCalendarIntegration: false,
 
-    // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    // prejoinPageEnabled: false,
+    // Configs for prejoin page.
+    // prejoinConfig: {
+    //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
+    //     // This replaces `prejoinPageEnabled`.
+    //     enabled: true,
+    //     // List of buttons to hide from the extra join options dropdown.
+    //     hideExtraJoinButtons: ['no-audio', 'by-phone']
+    // },
 
     // When 'true', the user cannot edit the display name.
     // (Mainly useful when used in conjuction with the JWT so the JWT name becomes read only.)
@@ -519,6 +546,9 @@ var config = {
     // Document should be focused for this option to work
     // enableAutomaticUrlCopy: false,
 
+    // Array with avatar URL prefixes that need to use CORS.
+    // corsAvatarURLs: [ 'https://www.gravatar.com/avatar/' ],
+
     // Base URL for a Gravatar-compatible service. Defaults to libravatar.
     // gravatarBaseURL: 'https://seccdn.libravatar.org/avatar/',
 
@@ -585,41 +615,61 @@ var config = {
     //     alwaysVisible: false
     // },
 
-    // Toolbar buttons which have their click event exposed through the API on
-    // `toolbarButtonClicked` event instead of executing the normal click routine.
+    // Toolbar buttons which have their click/tap event exposed through the API on
+    // `toolbarButtonClicked`. Passing a string for the button key will
+    // prevent execution of the click/tap routine; passing an object with `key` and
+    // `preventExecution` flag on false will not prevent execution of the click/tap
+    // routine. Below array with mixed mode for passing the buttons.
     // buttonsWithNotifyClick: [
-    //    'camera',
-    //    'chat',
-    //    'closedcaptions',
-    //    'desktop',
-    //    'download',
-    //    'embedmeeting',
-    //    'etherpad',
-    //    'feedback',
-    //    'filmstrip',
-    //    'fullscreen',
-    //    'hangup',
-    //    'help',
-    //    'invite',
-    //    'livestreaming',
-    //    'microphone',
-    //    'mute-everyone',
-    //    'mute-video-everyone',
-    //    'participants-pane',
-    //    'profile',
-    //    'raisehand',
-    //    'recording',
-    //    'security',
-    //    'select-background',
-    //    'settings',
-    //    'shareaudio',
-    //    'sharedvideo',
-    //    'shortcuts',
-    //    'stats',
-    //    'tileview',
-    //    'toggle-camera',
-    //    'videoquality',
-    //    '__end'
+    //     'camera',
+    //     {
+    //         key: 'chat',
+    //         preventExecution: false
+    //     },
+    //     {
+    //         key: 'closedcaptions',
+    //         preventExecution: true
+    //     },
+    //     'desktop',
+    //     'download',
+    //     'embedmeeting',
+    //     'etherpad',
+    //     'feedback',
+    //     'filmstrip',
+    //     'fullscreen',
+    //     'hangup',
+    //     'help',
+    //     {
+    //         key: 'invite',
+    //         preventExecution: false
+    //     },
+    //     'livestreaming',
+    //     'microphone',
+    //     'mute-everyone',
+    //     'mute-video-everyone',
+    //     'participants-pane',
+    //     'profile',
+    //     {
+    //         key: 'raisehand',
+    //         preventExecution: true
+    //     },
+    //     'recording',
+    //     'security',
+    //     'select-background',
+    //     'settings',
+    //     'shareaudio',
+    //     'sharedvideo',
+    //     'shortcuts',
+    //     'stats',
+    //     'tileview',
+    //     'toggle-camera',
+    //     'videoquality',
+    //     // The add passcode button from the security dialog.
+    //     {
+    //         key: 'add-passcode',
+    //         preventExecution: false
+    //     }
+    //     '__end'
     // ],
 
     // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
@@ -1002,7 +1052,7 @@ var config = {
     // If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
     // conferenceInfo: {
     //     // those labels will not be hidden in tandem with the toolbox.
-    //     alwaysVisible: ['recording', 'local-recording'],
+    //     alwaysVisible: ['recording', 'local-recording', 'raised-hands-count'],
     //     // those labels will be auto-hidden in tandem with the toolbox buttons.
     //     autoHide: [
     //         'subject',
@@ -1016,10 +1066,10 @@ var config = {
     // },
 
     // Hides the conference subject
-    // hideConferenceSubject: true,
+    // hideConferenceSubject: false,
 
     // Hides the conference timer.
-    // hideConferenceTimer: true,
+    // hideConferenceTimer: false,
 
     // Hides the recording label
     // hideRecordingLabel: false,
@@ -1030,6 +1080,9 @@ var config = {
     // Sets the conference subject
     // subject: 'Conference Subject',
 
+    // Sets the conference local subject
+    // localSubject: 'Conference Local Subject',
+
     // This property is related to the use case when jitsi-meet is used via the IFrame API. When the property is true
     // jitsi-meet will use the local storage of the host page instead of its own. This option is useful if the browser
     // is not persisting the local storage inside the iframe.
@@ -1134,10 +1187,14 @@ var config = {
     //     'lobby.joinRejectedMessage', // shown when while in a lobby, user's request to join is rejected
     //     'lobby.notificationTitle', // shown when lobby is toggled and when join requests are allowed / denied
     //     'localRecording.localRecording', // shown when a local recording is started
+    //     'notify.chatMessages', // shown when receiving chat messages while the chat window is closed
     //     'notify.disconnected', // shown when a participant has left
     //     'notify.connectedOneMember', // show when a participant joined
     //     'notify.connectedTwoMembers', // show when two participants joined simultaneously
     //     'notify.connectedThreePlusMembers', // show when more than 2 participants joined simultaneously
+    //     'notify.leftOneMember', // show when a participant left
+    //     'notify.leftTwoMembers', // show when two participants left simultaneously
+    //     'notify.leftThreePlusMembers', // show when more than 2 participants left simultaneously
     //     'notify.grantedTo', // shown when moderator rights were granted to a participant
     //     'notify.invitedOneMember', // shown when 1 participant has been invited
     //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited

css/_atlaskit_overrides.scss

@@ -24,14 +24,6 @@
     bottom: calc(#{$newToolbarSizeWithPadding}) !important;
 }
 
-/**
- * Override @atlaskit/theme styling for the top toolbar so it displays over
- * the video thumbnail while obscuring as little as possible.
- */
-.videocontainer__toptoolbar > div > div {
-    background: none;
-}
-
 
 /**
  * Keep overflow menu within screen vertical bounds and make it scrollable.

css/_base.scss

@@ -6,6 +6,10 @@
 * {
     -webkit-user-select: none;
     user-select: none;
+
+    // Firefox only
+    scrollbar-width: thin;
+    scrollbar-color: rgba(0, 0, 0, .5) transparent;
 }
 
 input,

css/_drawer.scss

@@ -24,10 +24,9 @@
 }
 
 .drawer-menu {
-    max-height: calc(80vh - 64px);
     background: #242528;
     border-radius: 16px 16px 0 0;
-    overflow-y: scroll;
+    overflow-y: auto;
     margin-bottom: env(safe-area-inset-bottom, 0);
     width: 100%;
 
@@ -43,15 +42,6 @@
         }
     }
 
-    .popupmenu {
-        margin: auto;
-        width: 100%;
-    }
-
-    .popupmenu__item {
-        height: 48px;
-    }
-
     &#{&} .overflow-menu {
         margin: auto;
         font-size: 1.2em;

css/_popover.scss

@@ -43,10 +43,5 @@
 
 .popover {
     margin: -16px -24px;
-    padding: 16px 24px;
     z-index: $popoverZ;
 }
-
-.padded-content {
-    padding: 4px 8px;
-}

css/_popup_menu.scss

@@ -2,122 +2,18 @@
 * Initialize
 **/
 
-.popupmenu {
-    background-color: $menuBG;
-    border-radius: 3px;
-    list-style-type: none;
-    min-width: 150px;
-    text-align: left;
-    padding: 0px;
-    white-space: nowrap;
+.popupmenu__contents {
+    .popupmenu__volume-slider {
+            &::-webkit-slider-runnable-track {
+                background-color: $popupSliderColor;
+            }
 
-    &__item {
-        list-style-type: none;
-        height: 35px;
-    }
+            &::-moz-range-track {
+                background-color: $popupSliderColor;
+            }
 
-    // Link Appearance
-    &__link,
-    &__contents {
-        display: block;
-        box-sizing: border-box;
-        text-decoration: none;
-        height: 100%;
-        font-size: 9pt;
-        width: 100%;
-        cursor: pointer;
-        padding: 0 5px;
-        color: $popupMenuColor;
-
-        &:hover {
-            background-color: $popupMenuHoverBackground;
-            color: $popupMenuHoverColor;
-        }
-
-        &.disabled {
-            pointer-events: none;
-        }
-    }
-
-    &__list {
-        margin: 0;
-        padding: 0;
-    }
-
-    &__text {
-        display: inline-block;
-        margin-left: 8px;
-        vertical-align: middle;
-    }
-
-    &__link {
-        i {
-            cursor: pointer;
-        }
-    }
-
-    &__contents {
-        display: flex;
-
-        /**
-         * Positioning styles on the slider and its container are used to make
-         * the container fit the popup width, by removing the slider from the
-         * page flow, and then making the slider fit the container.
-         */
-        .popupmenu__slider_container {
-            position: relative;
-            width: 100%;
-
-            .popupmenu__slider {
-                position: absolute;
-                top: 50%;
-                transform: translate(0, -50%);
-                width: 100%;
-
-                &::-webkit-slider-runnable-track {
-                    background-color: $popupSliderColor;
-                }
-
-                &::-moz-range-track {
-                    background-color: $popupSliderColor;
-                }
-
-                &::-ms-fill-lower {
-                    background-color: $popupSliderColor;
-                }
+            &::-ms-fill-lower {
+                background-color: $popupSliderColor;
             }
         }
-    }
-
-    &__icon {
-        vertical-align: middle;
-        position: relative;
-        display: inline-block;
-        min-width: 20px;
-        height: 100%;
-        padding-right: 10px;
-
-        > * {
-            @include absoluteAligning();
-        }
-    }
-
-    .icon-kick,
-    .icon-play,
-    .icon-stop {
-        font-size: 8pt;
-    }
-}
-
-/**
- * Override reset css styling modifying all lists and set negative margin to
- * reduce the visibility of padding on AtlasKit
- * InlineDialogs.
- */
-ul.popupmenu {
-    margin: -16px -24px;
-}
-
-span.localvideomenu:hover ul.popupmenu, span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
-    display:block !important;
 }

css/_reactions-menu.scss

@@ -8,12 +8,6 @@
 	padding: 16px;
 
 	&.overflow {
-		width: auto;
-		padding-bottom: max(env(safe-area-inset-bottom, 0), 16px);
-		background-color: #141414;
-		box-shadow: none;
-		border-radius: 0;
-		position: relative;
 
 		.toolbox-icon {
 			width: 48px;

css/_subject.scss

@@ -1,11 +1,25 @@
 .subject {
     color: #fff;
-    margin-top: -120px;
-    transition: margin-top .3s ease-in;
+    transition: opacity .6s ease-in-out;
     z-index: $zindex3;
+    margin-top: 20px;
+    opacity: 0;
 
     &.visible {
-        margin-top: 20px;
+        opacity: 1;
+    }
+
+    &#autoHide.with-always-on {
+        overflow: hidden;
+        animation: hideSubject forwards .6s ease-out;
+
+        & > .subject-info-container {
+            justify-content: flex-start;
+        }
+
+        &.visible {
+            animation: showSubject forwards .6s ease-out;
+        }
     }
 }
 
@@ -36,10 +50,7 @@
     line-height: 28px;
     padding: 0 16px;
     height: 28px;
-
-    @media (max-width: 700px) {
-        max-width: 100px;
-    }
+    max-width: 324px;
 
     @media (max-width: 300px) {
         display: none;
@@ -74,8 +85,29 @@
     position: absolute;
     top: 0;
     height: 48px;
+    max-width: calc(100% - 24px);
 }
 
 .shift-right .details-container {
     margin-left: calc(#{$sidebarWidth} / 2);
 }
+
+@keyframes hideSubject {
+    0% {
+        max-width: 100%;
+    }
+
+    100% {
+        max-width: 0;
+    }
+}
+
+@keyframes showSubject {
+    0% {
+        max-width: 0%;
+    }
+
+    100% {
+        max-width: 100%;
+    }
+}

css/_variables.scss

@@ -13,9 +13,6 @@ $hangupFontSize: 2em;
  */
 
 // Video layout.
-$thumbnailToolbarHeight: 22px;
-$thumbnailIndicatorBorder: 2px;
-$thumbnailIndicatorSize: $thumbnailToolbarHeight;
 $thumbnailVideoMargin: 2px;
 $thumbnailsBorder: 2px;
 $thumbnailVideoBorder: 2px;
@@ -56,19 +53,12 @@ $overflowMenuItemBackground: #36383C;
 /**
  * Video layout
  */
-$videoThumbnailHovered: rgba(22, 94, 204, .4);
-$videoThumbnailSelected: #165ECC;
 $participantNameColor: #fff;
-$thumbnailPictogramColor: #fff;
-$dominantSpeakerBg: #165ecc;
-$raiseHandBg: #F8AE1A;
 $audioLevelBg: #44A5FF;
-$connectionIndicatorBg: #165ecc;
 $audioLevelShadow: rgba(9, 36, 77, 0.9);
 $videoStateIndicatorColor: $defaultColor;
 $videoStateIndicatorBackground: $toolbarBackground;
 $videoStateIndicatorSize: 40px;
-$remoteVideoMenuIconMargin: initial;
 
 /**
  * Feedback Modal
@@ -102,7 +92,6 @@ $sidebarWidth: 315px;
  * Misc.
  */
 $borderRadius: 4px;
-$popoverMenuPadding: 13px;
 $happySoftwareBackground: transparent;
 $desktopAppDragBarHeight: 25px;
 $scrollHeight: 7px;
@@ -118,7 +107,6 @@ $toolbarBackgroundZ: 4;
 $labelsZ: 5;
 $subtitlesZ: 7;
 $popoverZ: 8;
-$zindex10: 10;
 $reloadZ: 20;
 $poweredByZ: 100;
 $ringingZ: 300;

css/_videolayout_default.scss

@@ -43,165 +43,7 @@
 .videocontainer {
     position: relative;
     text-align: center;
-
-    &__background {
-        @include topLeft();
-        background-color: black;
-        border-radius: $borderRadius;
-        width: 100%;
-        height: 100%;
-    }
-
-    /**
-     * The toolbar of the video thumbnail.
-     */
-    &__toolbar,
-    &__toptoolbar {
-        position: absolute;
-        left: 0;
-        pointer-events: none;
-        z-index: $zindex10;
-        width: 100%;
-        box-sizing: border-box; // Includes the padding in the 100% width.
-
-        /**
-         * FIXME (lenny): Disabling pointer-events is a pretty big sin that
-         * sidesteps the problems. There are z-index wars occurring within
-         * videocontainer and AtlasKit Tooltips rely on their parent z-indexe
-         * being higher than whatever they need to appear over. So set a higher
-         * z-index for the tooltip containers but make any empty space not block
-         * mouse overs for various mouseover triggers.
-         */
-        pointer-events: none;
-
-        * {
-            pointer-events: auto;
-        }
-
-        .indicator-container {
-            display: inline-block;
-            float: left;
-            pointer-events: all;
-        }
-    }
-
-    &__toolbar {
-        bottom: 0;
-        padding: 0 5px 0 5px;
-    }
-
-    &__toptoolbar {
-        $toolbarIconMargin: 5px;
-        top: 0;
-        padding-bottom: 0;
-        /**
-         * Override text-align center as icons need to be left justified.
-         */
-        text-align: left;
-
-        /**
-         * Intentionally use margin on the icon itself as AtlasKit InlineDialog
-         * positioning depends on the trigger (indicator icon).
-         */
-        .indicator {
-            margin-left: 5px;
-            margin-top: $toolbarIconMargin;
-        }
-
-        .indicator-container:nth-child(1) .indicator {
-            margin-left: $toolbarIconMargin;
-        }
-
-        .indicator-container {
-            display: inline-block;
-            vertical-align: top;
-
-            .popover-trigger {
-                display: inline-block;
-            }
-        }
-
-        .connection-indicator,
-        .indicator {
-            position: relative;
-            font-size: 8px;
-            text-align: center;
-            line-height: $thumbnailIndicatorSize;
-            padding: 0;
-            @include circle($thumbnailIndicatorSize);
-            box-sizing: border-box;
-            z-index: $zindex3;
-            background: $dominantSpeakerBg;
-            color: $thumbnailPictogramColor;
-            border: $thumbnailIndicatorBorder solid $thumbnailPictogramColor;
-
-            .indicatoricon {
-                @include absoluteAligning();
-            }
-
-            .connection {
-                position: relative;
-                display: inline-block;
-                margin: 0 auto;
-                left: 0;
-                @include transform(translate(0, -50%));
-
-                &_empty,
-                &_lost
-                {
-                    color: #8B8B8B;/*#FFFFFF*/
-                    overflow: hidden;
-                }
-
-                &_full
-                {
-                    @include topLeft();
-                    color: #FFFFFF;/*#15A1ED*/
-                    overflow: hidden;
-                }
-
-                &_ninja
-                {
-                    font-size: 1.5em;
-                }
-            }
-
-            .icon-gsm-bars {
-                cursor: pointer;
-                font-size: 1em;
-            }
-        }
-
-        .hide-connection-indicator {
-            display: none;
-        }
-    }
-
-    &__hoverOverlay {
-        background: rgba(0,0,0,.6);
-        border-radius: $borderRadius;
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        height: 100%;
-        visibility: hidden;
-        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;
-    }
+    overflow: 'hidden';
 
     @media (min-width: 581px) {
         &.shift-right {
@@ -288,16 +130,6 @@
     z-index: $zindex0;
 }
 
-/**
- * Positions video thumbnail display name and editor.
- */
-#alwaysOnTop .displayname,
-.videocontainer .displayname,
-.videocontainer .editdisplayname {
-    font-weight: 100;
-    color: $participantNameColor;
-}
-
 #alwaysOnTop .displayname {
     font-size: 15px;
     position: inherit;
@@ -307,146 +139,6 @@
     margin-top: 10px;
 }
 
-/**
- * Positions video thumbnail display name editor.
- */
-.videocontainer .editdisplayname {
-    outline: none;
-    border: none;
-    background: none;
-    box-shadow: none;
-    padding: 0;
-}
-
-#localVideoContainer .displayname:hover {
-    cursor: text;
-}
-
-.videocontainer .displayname {
-    pointer-events: none;
-    padding: 0 3px 0 3px;
-}
-
-.videocontainer .editdisplayname {
-    height: auto;
-}
-
-#localDisplayName {
-    pointer-events: auto !important;
-}
-
-.videocontainer>a.displayname {
-    display: inline-block;
-    position: absolute;
-    color: #FFFFFF;
-    bottom: 0;
-    right: 0;
-    padding: 3px 5px;
-    font-size: 9pt;
-    cursor: pointer;
-    z-index: $zindex2;
-}
-
-/**
- * Video thumbnail toolbar icon.
- */
-.videocontainer .toolbar-icon {
-    font-size: 8pt;
-    text-align: center;
-    text-shadow: 0px 1px 0px rgba(255,255,255,.3), 0px -1px 0px rgba(0,0,0,.7);
-    color: #FFFFFF;
-    width: 12px;
-    line-height: $thumbnailToolbarHeight;
-    height: $thumbnailToolbarHeight;
-    padding: 0;
-    border: 0;
-    margin: 0px 5px 0px 0px;
-}
-
-/**
- * Toolbar icon internal i elements (font icons).
- */
-.toolbar-icon>div {
-    height: $thumbnailToolbarHeight;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-}
-
-/**
- * Toolbar icons positioned on the right.
- */
-.moderator-icon {
-    display: inline-block;
-
-    &.right {
-        float: right;
-        margin: 0px 0px 0px 5px;
-    }
-
-    .toolbar-icon {
-        margin: 0;
-    }
-}
-
-.raisehandindicator {
-  background: $raiseHandBg !important;
-}
-
-.connection-indicator {
-    background: $connectionIndicatorBg;
-
-    &.status-high {
-        background: green;
-    }
-
-    &.status-med {
-        background: #FFD740;
-    }
-
-    &.status-lost {
-        background: gray;
-    }
-
-    &.status-low {
-        background: #BF2117;
-    }
-
-    &.status-other {
-        background: $connectionIndicatorBg;
-    }
-
-    &.status-disabled {
-        background: transparent;
-        border: none
-    }
-}
-
-.local-video-menu-trigger,
-.remote-video-menu-trigger,
-.localvideomenu,
-.remotevideomenu
-{
-    display: inline-block;
-    position: absolute;
-    top: 0px;
-    right: 0;
-    z-index: $zindex2;
-    width: 18px;
-    height: 18px;
-    color: #FFF;
-    font-size: 10pt;
-    margin-right: $remoteVideoMenuIconMargin;
-
-    >i{
-        cursor: hand;
-    }
-}
-.local-video-menu-trigger,
-.remote-video-menu-trigger {
-    margin-top: 7px;
-}
-
 /**
  * Audio indicator on video thumbnails.
  */
@@ -623,74 +315,11 @@
     display: none;
 }
 
-.display-avatar-with-name {
-    .avatar-container {
-        visibility: visible;
-    }
-
-    .displayNameContainer {
-        visibility: visible;
-    }
-
-    .videocontainer__hoverOverlay {
-        visibility: visible;
-    }
-
-    video {
-        visibility: hidden;
-    }
-}
-
-.display-name-on-black {
-    .avatar-container {
-        visibility: hidden;
-    }
-
-    .displayNameContainer {
-        visibility: visible;
-    }
-
-    .videocontainer__hoverOverlay {
-        visibility: hidden;
-    }
-
-    video {
-        opacity: 0.2;
-        visibility: visible;
-    }
-}
-
 .display-video {
     .avatar-container {
         visibility: hidden;
     }
 
-    .displayNameContainer {
-        visibility: hidden;
-    }
-
-    .videocontainer__hoverOverlay {
-        visibility: hidden;
-    }
-
-    video {
-        visibility: visible;
-    }
-}
-
-.display-name-on-video {
-    .avatar-container {
-        visibility: hidden;
-    }
-
-    .displayNameContainer {
-        visibility: visible;
-    }
-
-    .videocontainer__hoverOverlay {
-        visibility: visible;
-    }
-
     video {
         visibility: visible;
     }
@@ -701,14 +330,6 @@
         visibility: visible;
     }
 
-    .displayNameContainer {
-        visibility: hidden;
-    }
-
-    .videocontainer__hoverOverlay {
-        visibility: hidden;
-    }
-
     video {
         visibility: hidden;
     }

css/filmstrip/_small_video.scss

@@ -6,37 +6,10 @@
     border-radius: $borderRadius;
     margin: 0 $thumbnailVideoMargin;
 
-    &.videoContainerFocused, &:hover {
+    &:hover {
         cursor: hand;
     }
 
-    /**
-     * Focused video thumbnail.
-     */
-    &.videoContainerFocused {
-        border: $thumbnailVideoBorder solid $videoThumbnailSelected;
-        box-shadow: inset 0 0 3px $videoThumbnailSelected,
-        0 0 3px $videoThumbnailSelected;
-    }
-
-    .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
-        display: none;
-    }
-
-    /**
-     * Hovered video thumbnail.
-     */
-    &:hover:not(.videoContainerFocused):not(.active-speaker) {
-        cursor: hand;
-        border: $thumbnailVideoBorder solid $videoThumbnailHovered;
-        box-shadow: inset 0 0 3px $videoThumbnailHovered,
-        0 0 3px $videoThumbnailHovered;
-
-        .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
-            display: inline-block;
-        }
-    }
-
     & > video {
         cursor: hand;
         border-radius: $borderRadius;

css/filmstrip/_tile_view.scss

@@ -2,13 +2,6 @@
  * CSS styles that are specific to the filmstrip that shows the thumbnail tiles.
  */
 .tile-view {
-    /**
-     * Add a border around the active speaker to make the thumbnail easier to
-     * see.
-     */
-    .active-speaker {
-        box-shadow: 0px 0px 1px 1.5px black, 0px 0px 1.3px 4px $videoThumbnailSelected;
-    }
 
     .remote-videos {
         align-items: center;
@@ -106,19 +99,6 @@
                 display: block;
                 margin: 2px;
             }
-
-            video {
-                object-fit: contain;
-            }
-
-            /**
-            * Max-width corresponding to the ASPECT_RATIO_BREAKPOINT from features/filmstrip/constants.
-            */
-            @media only screen and (max-width: 500px) {
-                video {
-                    object-fit: cover;
-                }
-            }
         }
     }
 }
@@ -134,7 +114,3 @@
         }
     }
 }
-
-.indicator-icon-container {
-    display: inline-block;
-}

css/filmstrip/_tile_view_overrides.scss

@@ -35,16 +35,4 @@
     #remotePresenceMessage {
         display: none !important;
     }
-
-    /**
-     * Thumbnail popover menus can overlap other thumbnails. Setting an auto
-     * z-index will allow AtlasKit InlineDialog's large z-index to be
-     * respected and thereby display over elements in other thumbnails,
-     * specifically the various status icons.
-     */
-    .remotevideomenu,
-    .localvideomenu,
-    .videocontainer__toptoolbar {
-        z-index: auto;
-    }
 }

css/filmstrip/_vertical_filmstrip_overrides.scss

@@ -19,72 +19,6 @@
  * Overrides for small videos in vertical filmstrip mode.
  */
 .vertical-filmstrip .filmstrip__videos .videocontainer {
-    /**
-     * Move status icons to the bottom right of the thumbnail.
-     */
-    .videocontainer__toolbar {
-        /**
-         * FIXME: disable pointer to allow any elements moved below to still
-         * be clickable. The real fix would to make sure those moved elements
-         * are actually part of the toolbar instead of positioning being faked.
-         */
-        pointer-events: none;
-        text-align: right;
-
-        > div {
-            pointer-events: none;
-        }
-
-        .right {
-            float: none;
-            margin: auto;
-        }
-
-        .toolbar-icon {
-            pointer-events: all;
-        }
-    }
-
-    /**
-     * Apply hardware acceleration to prevent flickering on scroll. The
-     * selectors are specific to icon wrappers to prevent fixed position dialogs
-     * and tooltips from getting a new location context due to translate3d.
-     */
-    .connection-indicator,
-    .local-video-menu-trigger,
-    .remote-video-menu-trigger,
-    .indicator-icon-container {
-        transform: translate3d(0, 0, 0);
-    }
-
-    .indicator-icon-container {
-        display: inline-block;
-    }
-
-    .indicator-container {
-        float: none;
-    }
-
-    /**
-     * Move the remote video menu trigger to the bottom left of the video
-     * thumbnail.
-     */
-    .localvideomenu,
-    .remotevideomenu,
-    .local-video-menu-trigger,
-    .remote-video-menu-trigger {
-        bottom: 0;
-        left: 0;
-        top: auto;
-        right: auto;
-    }
-
-    .local-video-menu-trigger,
-    .remote-video-menu-trigger {
-        margin-bottom: 3px;
-        margin-left: $remoteVideoMenuIconMargin;
-    }
-
     .self-view-mobile-portrait video {
         object-fit: contain;
     }

css/modals/settings/_settings.scss

@@ -48,7 +48,7 @@
     }
 
     .profile-edit-field {
-        flex: 1;
+        flex: .5;
     }
     .settings-sub-pane {
         flex: 1;
@@ -65,6 +65,11 @@
         text-align: left;
         flex: 1;
     }
+
+    .moderator-settings-wrapper {
+        padding-top: 20px;
+    }
+
     .profile-edit-field {
         margin-right: 20px;
     }

css/themes/_light.scss

@@ -75,11 +75,7 @@ $errorColor: #c61600;
 $feedbackCancelFontColor: #333;
 
 // Popover colors
-$popoverBg: initial;
 $popoverFontColor: #ffffff !important;
-$popupMenuColor: #ffffff !important;
-$popupMenuHoverColor: #ffffff !important;
-$popupMenuHoverBackground: rgba(255, 255, 255, 0.1);
 $popupSliderColor: #0376da;
 
 // Toolbar

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

@@ -124,4 +124,5 @@ Component "lobby.jitmeet.example.com" "muc"
     muc_room_default_public_jids = true
     modules_enabled = {
         "muc_rate_limit";
+        "polls";
     }

doc/debian/jitsi-meet-turn/turnserver.conf

@@ -32,4 +32,12 @@ denied-peer-ip=198.18.0.0-198.19.255.255
 denied-peer-ip=198.51.100.0-198.51.100.255
 denied-peer-ip=203.0.113.0-203.0.113.255
 denied-peer-ip=240.0.0.0-255.255.255.255
+denied-peer-ip=::1
+denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
+denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
+denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
+denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
+denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
 syslog

index.html

@@ -9,6 +9,7 @@
 
     <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
     <link rel="stylesheet" href="css/all.css">
+    <!--#include virtual="fonts.html"-->
     <link rel="manifest" id="manifest-placeholder">
 
     <script>

interface_config.js

@@ -26,7 +26,7 @@ var interfaceConfig = {
 
     CLOSE_PAGE_GUEST_HINT: false, // A html text to be shown to guests on the close page, false disables it
 
-    DEFAULT_BACKGROUND: '#474747',
+    DEFAULT_BACKGROUND: '#040404',
     DEFAULT_LOGO_URL: 'images/watermark.svg',
     DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.svg',
 

ios/Podfile

@@ -61,23 +61,24 @@ target 'JitsiMeetSDK' do
   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'
+  pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
   pod 'react-native-slider', :path => '../node_modules/@react-native-community/slider'
   pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
   pod 'react-native-video', :path => '../node_modules/react-native-video/react-native-video.podspec'
   pod 'react-native-webview', :path => '../node_modules/react-native-webview'
   pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
   pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'
+  pod 'RNCClipboard', :path => '../node_modules/@react-native-community/clipboard'
+  pod 'RNCMaskedView', :path => '../node_modules/@react-native-masked-view/masked-view'
+  pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
   pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
+  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
   pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'
+  pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
+  pod 'RNScreens', :path => '../node_modules/react-native-screens'
   pod 'RNSound', :path => '../node_modules/react-native-sound'
   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

@@ -303,7 +303,7 @@ PODS:
     - react-native-video/Video (= 5.1.1)
   - react-native-video/Video (5.1.1):
     - React-Core
-  - react-native-webrtc (1.94.0):
+  - react-native-webrtc (1.94.1):
     - React-Core
   - react-native-webview (11.0.2):
     - React-Core
@@ -363,6 +363,8 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
   - RNCAsyncStorage (1.15.5):
     - React-Core
+  - RNCClipboard (1.5.1):
+    - React-Core
   - RNCMaskedView (0.2.6):
     - React-Core
   - RNDefaultPreference (1.4.2):
@@ -435,6 +437,7 @@ 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`)"
+  - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
   - "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`)
@@ -547,6 +550,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
+  RNCClipboard:
+    :path: "../node_modules/@react-native-community/clipboard"
   RNCMaskedView:
     :path: "../node_modules/@react-native-masked-view/masked-view"
   RNDefaultPreference:
@@ -616,7 +621,7 @@ SPEC CHECKSUMS:
   react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
   react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
-  react-native-webrtc: e22646adc86f2009328b21eb0e40ca404c77258c
+  react-native-webrtc: 2f20515f3ebb9dbf1f2aad638cc7573396cf948f
   react-native-webview: dfd7202ff115c44d3ea401c2f36122fb3ac79f07
   React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
   React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
@@ -629,6 +634,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
   ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
   RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
+  RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
   RNDefaultPreference: 1f8133ec0bc0f9453cdada578564ba1ef551fb44
   RNDeviceInfo: 87d2d175c760f6bcf58acd036f887e8b2392802c
@@ -641,6 +647,6 @@ SPEC CHECKSUMS:
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 836d4804218c0608e1326471ec83fe31cfa9c86d
+PODFILE CHECKSUM: 0cfc1f35e2872ceb0a86252e14e226bd489a2602
 
 COCOAPODS: 1.11.2

ios/app/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.5.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.5.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.5.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.5.0</string>
+	<string>21.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0</string>
+	<string>4.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

lang/languages-pl.json

@@ -1,33 +1,55 @@
 {
     "en": "angielski",
-    "af": "afrykanerski",
+    "af": "Afrikaans",
+    "ar": "arabski",
     "bg": "bułgarski",
     "ca": "kataloński",
     "cs": "czeski",
+    "da": "duński",
     "de": "niemiecki",
     "el": "grecki",
-    "enGB": "angielski (Zjednoczone Królestwo)",
+    "enGB": "Angielski (Zjednoczone Królestwo)",
     "eo": "esperanto",
     "es": "hiszpański",
     "esUS": "hiszpański (Ameryka Łacińska)",
+    "et": "estoński",
+    "eu": "baskijski",
     "fi": "fiński",
     "fr": "francuski",
     "frCA": "francuski (kanadyjski)",
+    "he": "hebrajski",
+    "hi": "hindi",
+    "mr":"Marathi",
     "hr": "chorwacki",
     "hu": "węgierski",
     "hy": "ormiański",
+    "id": "indonezyjski",
     "it": "włoski",
     "ja": "japoński",
+    "kab": "Kabyle",
     "ko": "koreański",
+    "lt": "litewski",
+    "ml": "malajalam",
+    "lv": "łotewski",
     "nl": "holenderski",
-    "oc": "oksytański",
+    "oc": "prowansalski",
+    "fa": "perski",
     "pl": "polski",
-    "ptBR": "portugalski (brazylijski)",
+    "pt": "portugalski",
+    "ptBR": "portugalski (Brazylia)",
     "ru": "rosyjski",
+    "ro": "rumuński",
+    "sc": "sardyński",
     "sk": "słowacki",
+    "sl": "słoweński",
+    "sr": "serbski",
+    "sq": "albański",
     "sv": "szwedzki",
+    "te": "telugu",
+    "th": "tajski",
     "tr": "turecki",
+    "uk": "ukraiński",
     "vi": "wietnamski",
     "zhCN": "chiński (Chiny)",
     "zhTW": "chiński (Tajwan)"
-}
+}

lang/main-ar.json

@@ -39,6 +39,9 @@
     "audioOnly": {
         "audioOnly": "معدل تبادل البيانات منخفض"
     },
+    "blankPage": {
+        "meetingEnded": "انتهى الاجتماع."
+    },
     "breakoutRooms": {
         "defaultName": "غرفة الاجتماعات الفرعية رقم {{index}}",
         "mainRoom": "الغرفة الرئيسية",
@@ -51,6 +54,11 @@
             "more": "أكثر",
             "remove": "إزالة",
             "sendToBreakoutRoom": "أرسل المشارك إلى:"
+        },
+        "notifications": {
+            "joinedTitle": "غرف جانبية",
+            "joined": " الغرفة الجانبيةالانضمام إلى {{index}}",
+            "joinedMainRoom": "الانضمام للغرفة الرئيسية"
         }
     },
     "calendarSync": {
@@ -172,10 +180,11 @@
         "joinInApp": "انضم للاجتماع عبر تطبيق الجوال",
         "launchWebButton": "افتح تطبيق الويب",
         "title": "قيد عقد اجتماعك في {{app}}...",
-        "tryAgainButton": "جرب مرة أخرى في تطبيق الحاسوب"
+        "tryAgainButton": "جرب مرة أخرى في تطبيق الحاسوب",
+        "unsupportedBrowser": "يبدو أنك تستخدم متصفحًا لا ندعمه."
     },
     "defaultLink": "{{url}} مثلًا",
-    "defaultNickname": "محمد عمر مثلًا",
+    "defaultNickname": "محمد علي مثلًا",
     "deviceError": {
         "cameraError": "فشل الوصول إلى كاميرتك",
         "cameraPermission": "خطأ في تحصيل إذن استخدام كاميرتك",
@@ -410,6 +419,7 @@
         "desktopShareError": "تعذر إنشاء مشاركة سطح المكتب",
         "desktopShare": "مشاركة سطح المكتب",
         "webAssemblyWarning": "WebAssembly غير مدعوم",
+        "webAssemblyWarningDescription": "تم تعطيل WebAssembly أو عدم دعمه بواسطة هذا المستعرض",
         "backgroundEffectError": "فشل تطبيق تأثير الخلفية."
     },
     "feedback": {
@@ -569,10 +579,14 @@
     "notify": {
         "allowAction": "يسمح",
         "allowedUnmute": "يمكنك إعادة صوت الميكروفون و بدء تشغيل الكاميرا أو مشاركة شاشتك.",
+        "audioUnmuteBlockedTitle": "تم حظر إعادة صوت الميكروفون!",
+        "audioUnmuteBlockedDescription": "تم حظر عملية إلغاء كتم صوت الميكروفون مؤقتًا بسبب قيود النظام.",
+        "chatMessages": "رسائل الدردشة",
         "connectedOneMember": "انضم {{name}} للاجتماع",
         "connectedThreePlusMembers": "انضم {{name}} وعدد {{count}} غيره إلى الاجتماع",
         "connectedTwoMembers": "انضم {{first}} و {{second}} إلى الاجتماع",
         "disconnected": "انقطع الاتصال",
+        "displayNotifications": "عرض الإخطارات لـ",
         "focus": "التركيز على المؤتمر",
         "focusFail": "إنَّ {{component}} غير متاح. ستعاد المحاولة مرة أخرى خلال {{ms}} ثانية.",
         "hostAskedUnmute": "The moderator would like you to speak",
@@ -580,6 +594,9 @@
         "invitedThreePlusMembers": "دُعِي {{name}} وعدد {{count}} آخرين",
         "invitedTwoMembers": "دُعِي {{first}} و {{second}}",
         "kickParticipant": "طرد {{kicked}} المشارك {{kicker}}",
+        "leftOneMember": "{{name}} غادر الاجتماع",
+        "leftThreePlusMembers": "غادر {{name}} والعديد من الأشخاص الآخرين الاجتماع",
+        "leftTwoMembers": "غادر {{first}} و {{second}} الاجتماع",
         "me": "أنا",
         "moderator": "مُنحَت صلاحية رئيس الجلسة!",
         "muted": "بدأ المحادثة مكتوب الصوت.",
@@ -591,8 +608,10 @@
         "passwordRemovedRemotely": "أزال أحد المشاركين {{participantDisplayName}}",
         "passwordSetRemotely": "ضبط أحد المشاركين $t(lockRoomPasswordUppercase)",
         "raisedHand": "يريد {{name}} التحدث",
+        "raisedHands": "{{participantName}} و {{raisedHands}}المزيد من الناس",
         "screenShareNoAudio": "لم يتم تحديد مربع مشاركة الصوت في شاشة تحديد النافذة.",
         "screenShareNoAudioTitle": "تعذرت مشاركة صوت النظام!",
+        "selfViewTitle": "يمكنك دائمًا إلغاء إخفاء العرض الذاتي من الإعدادات",
         "somebody": "شخص ما",
         "startSilentTitle": "انضممت دون مخرج للصوت!",
         "startSilentDescription": "أنضم مجدَّدًا للاجتماع لتفعيل الصوت",
@@ -619,7 +638,10 @@
         "moderationToggleDescription": "من {{participantDisplayName}}",
         "raiseHandAction": "رفع اليد",
         "reactionSounds": "تعطيل الأصوات",
-        "groupTitle": "إشعارات"
+        "reactionSoundsForAll": "تعطيل الأصوات للجميع",
+        "groupTitle": "إشعارات",
+        "videoUnmuteBlockedTitle": "تم حظر إعادة الكاميرا!",
+        "videoUnmuteBlockedDescription": "تم حظر عملية إلغاء كتم الكاميرا مؤقتًا بسبب قيود النظام."
     },
     "participantsPane": {
         "close": "غلق",
@@ -644,7 +666,8 @@
             "stopEveryonesVideo": "أوقف فيديو الجميع",
             "stopVideo": "أوقف الفيديو",
             "unblockEveryoneMicCamera": "قم بإلغاء حظر ميكروفون وكاميرا الجميع",
-            "videoModeration": "ابدأ الفيديو الخاص بهم"
+            "videoModeration": "ابدأ الفيديو الخاص بهم",
+            "moreModerationControls": "المزيد من ضوابط الاشراف"
         },
         "search": "بحث"
     },
@@ -803,8 +826,8 @@
     "security": {
         "about": "يمكنك إضافة $t(lockRoomPassword) إلى الاجتماع. سيتوجب على المشاركين إدخال $t(lockRoomPassword) قبل السماح لهم بالانضمام إلى الاجتماع.",
         "aboutReadOnly": "المشاركون بصفة رئيس الجلسة يمكنهم إضافة $t(lockRoomPassword) إلى الاجتماع. سيتوجب على المشاركين إدخال $t(lockRoomPassword) قبل السماح لهم بالانضمام إلى الاجتماع.",
-        "insecureRoomNameWarning": "اسم الغرفة غير آمن، فقد ينضم عبره مشاركون غرباء إلى الاجتماع. ننصحك بتأمين الاجتماع عبر  وسائل الحماية التي يوفرها زر الحماية.",
-        "securityOptions": "خيارات الحماية"
+        "header": "خيارات الأمان",
+        "insecureRoomNameWarning": "اسم الغرفة غير آمن، فقد ينضم عبره مشاركون غرباء إلى الاجتماع. ننصحك بتأمين الاجتماع عبر  وسائل الحماية التي يوفرها زر الحماية."
     },
     "settings": {
         "calendar": {
@@ -836,9 +859,11 @@
         "selectAudioOutput": "خرج الصوت",
         "selectCamera": "الكاميرا",
         "selectMic": "المجهار (المايكروفون)",
+        "selfView": "عرض ذاتي",
         "sounds": "اصوات",
         "speakers": "المذياع (مكبر الصوت)",
         "startAudioMuted": "بدء الجميع مكتومي الصوت",
+        "startReactionsMuted": "كتم رد فعل الصوت للجميع",
         "startVideoMuted": "بدء الجميع دون فيديو",
         "talkWhileMuted": "تحدث أثناء كتم الصوت",
         "title": "الإعدادات"
@@ -871,20 +896,20 @@
     },
     "speaker": "المتحدث",
     "speakerStats": {
-        "search": "بحث",
+        "angry": "غاضب",
+        "disgusted": "مشمئز",
+        "fearful": "خائف",
+        "happy": "سعيد",
         "hours": "{{count}}س",
         "minutes": "{{count}}د",
         "name": "الاسم",
-        "seconds": "{{count}}ثا",
-        "speakerStats": "حالة المتحدث",
-        "speakerTime": "وقت المتحدث",
-        "happy": "سعيد",
         "neutral": "حيادي",
         "sad": "حزين",
-        "surprised": "مندهش",
-        "angry": "غاضب",
-        "fearful": "خائف",
-        "disgusted": "مشمئز"
+        "search": "بحث",
+        "seconds": "{{count}}ثا",
+        "speakerTime": "وقت المتحدث",
+        "speakerStats": "حالة المتحدث",
+        "surprised": "مندهش"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -927,8 +952,8 @@
             "mute": "اظهِر/اخفِ كتم الصوت",
             "muteEveryone": "كتم الجميع",
             "muteEveryoneElse": "كتم صوت الآخرين",
-            "muteEveryonesVideo": "تعطيل كاميرا الجميع",
-            "muteEveryoneElsesVideo": "تعطيل كاميرا الآخرين",
+            "muteEveryonesVideoStream": "وقّف فيديو الجميع",
+            "muteEveryoneElsesVideoStream": "وقّف فيديو أي شخص آخر",
             "participants": "مشاركون",
             "pip": "استعمل/اخرج من وضع صورة-في-صورة",
             "privateMessage": "أرسل رسالة خاصة",
@@ -1104,6 +1129,7 @@
         "domuteVideoOfOthers": "تعطيل الكاميرا للآخرين",
         "flip": "قلب",
         "grantModerator": "امنح صلاحيات رئيس الجلسة",
+        "hideSelfView": "إخفاء المنظر الذاتي",
         "kick": "طرد خارجًا",
         "moderator": "رئيس الجلسة",
         "mute": "المشارك مكتوم الصوت",
@@ -1155,7 +1181,7 @@
         "logo": {
             "calendar": "شعار التقويم",
             "microsoftLogo": "شعار مايكروسوفت",
-            "logoDeepLinking": "شعار jitsi",
+            "logoDeepLinking": "شعار جيتسي",
             "desktopPreviewThumbnail": "صورة مصغرة لمعاينة سطح المكتب",
             "googleLogo": "شعار كوكل",
             "policyLogo": "شعار السياسة"

lang/main-ca.json

@@ -292,6 +292,29 @@
     "documentSharing": {
         "title": "Document compartit"
     },
+    "virtualBackground": {
+        "apply": "Aplicar",
+        "title": "Fons Virtuals",
+        "blur": "Difuminos",
+        "slightBlur": "Lleu Difuminos",
+        "removeBackground": "Elimina el Fons",
+        "addBackground": "Afegeix fons",
+        "pleaseWait": "Si us plau, espereu...",
+        "none": "Cap",
+        "uploadedImage": "Imatge carregada {{index}}",
+        "deleteImage": "Esborra la imatge",
+        "image1" : "Platja",
+        "image2" : "Paret blanca neutra",
+        "image3" : "Habitació blanca buida",
+        "image4" : "Llum de peu negre",
+        "image5" : "Muntanya",
+        "image6" : "Bosc ",
+        "image7" : "Sortida del sol",
+        "desktopShareError": "No s'ha pogut crear l'escriptori compartit",
+        "desktopShare":"Compartir escriptori",
+        "webAssemblyWarning": "no compatible",
+        "backgroundEffectError": "No s'ha pogut aplicar l'efecte de fons."
+    },
     "feedback": {
         "average": "Mitjana",
         "bad": "Dolenta",
@@ -654,6 +677,9 @@
             "toggleCamera": "Activa o desactiva la càmera",
             "videomute": "Activa o desactiva el vídeo",
             "videoblur": "Activa o desactiva el difuminat",
+            "selectBackground": "Seleccioneu Fons",
+            "expand": "Ampliar",
+            "collapse": "Col·lapse",
             "toggleFilmstrip": "Activa o desactiva la tira"
         },
         "addPeople": "Afegeix persones a la trucada",

lang/main-de.json

@@ -54,6 +54,11 @@
             "more": "Mehr",
             "remove": "Entfernen",
             "sendToBreakoutRoom": "Anwesende in Breakout-Raum verschieben:"
+        },
+        "notifications": {
+            "joinedTitle": "Breakout-Räume",
+            "joined": "Breakout-Raum \"{{name}}\" betreten",
+            "joinedMainRoom": "Hauptraum betreten"
         }
     },
     "calendarSync": {
@@ -175,7 +180,8 @@
         "joinInApp": "Mit der App am Meeting teilnehmen",
         "launchWebButton": "Im Web öffnen",
         "title": "Die Konferenz wird in {{app}} geöffnet …",
-        "tryAgainButton": "Erneut mit der nativen Applikation versuchen"
+        "tryAgainButton": "Erneut mit der nativen Applikation versuchen",
+        "unsupportedBrowser": "Sie verwenden einen Browser, der noch nicht unterstützt wird."
     },
     "defaultLink": "Bsp.: {{url}}",
     "defaultNickname": "Z. B. Jane Pink",
@@ -413,7 +419,8 @@
         "desktopShareError": "Desktop konnte nicht freigegeben werden",
         "desktopShare": "Desktopfreigabe",
         "webAssemblyWarning": "WebAssembly wird nicht unterstützt",
-        "backgroundEffectError": "Failed to apply background effect."
+        "webAssemblyWarningDescription": "WebAssembly ist deaktiviert oder wird in diesem Browser nicht unterstützt",
+        "backgroundEffectError": "Hintergrund konnte nicht aktiviert werden."
     },
     "feedback": {
         "average": "Durchschnittlich",
@@ -574,10 +581,12 @@
         "allowedUnmute": "Sie können die Stummschaltung aufheben, Ihre Kamera einschalten oder Ihren Bildschirm teilen.",
         "audioUnmuteBlockedTitle": "Stummschaltung kann nicht aufgehoben werden!",
         "audioUnmuteBlockedDescription": "Díe Stummschaltung kann aus Überlastungsschutzgründen temporär nicht aufgehoben werden.",
+        "chatMessages": "Chatnachrichten",
         "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",
+        "displayNotifications": "Benachrichtigungen anzeigen für",
         "focus": "Konferenzleitung",
         "focusFail": "{{component}} ist im Moment nicht verfügbar – wiederholen in {{ms}} Sekunden",
         "hostAskedUnmute": "Die Moderation bittet Sie, das Mikrofon zu aktivieren",
@@ -585,6 +594,9 @@
         "invitedThreePlusMembers": "{{name}} und {{count}} andere wurden eingeladen",
         "invitedTwoMembers": "{{first}} und {{second}} wurden eingeladen",
         "kickParticipant": "{{kicked}} wurde von {{kicker}} ausgewiesen",
+        "leftOneMember": "{{name}} hat die Konferenz verlassen",
+        "leftThreePlusMembers": "{{name}} und Weitere haben die Konferenz verlassen",
+        "leftTwoMembers": "{{first}} und {{second}} haben die Konferenz verlassen",
         "me": "Ich",
         "moderator": "Moderationsrechte vergeben!",
         "muted": "Der Konferenz wurde stumm beigetreten.",
@@ -596,8 +608,10 @@
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person entfernt",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person gesetzt",
         "raisedHand": "{{name}} möchte sprechen.",
+        "raisedHands": "{{participantName}} und {{raisedHands}} weitere möchten sprechen",
         "screenShareNoAudio": "Die Option \"Audio freigeben\" wurde bei der Auswahl des Fensters nicht ausgewählt.",
         "screenShareNoAudioTitle": "Share audio was not checked",
+        "selfViewTitle": "Sie können die eigene Ansicht immer in den Einstellungen reaktivieren",
         "somebody": "Jemand",
         "startSilentTitle": "Sie sind ohne Audioausgabe beigetreten!",
         "startSilentDescription": "Treten Sie dem Meeting noch einmal bei, um Ihr Audio zu aktivieren",
@@ -624,9 +638,10 @@
         "moderationToggleDescription": "von {{participantDisplayName}}",
         "raiseHandAction": "Melden",
         "reactionSounds": "Interaktionstöne deaktivieren",
+        "reactionSoundsForAll": "Interaktionstöne für alle deaktivieren",
         "groupTitle": "Benachrichtigungen",
-        "videoUnmuteBlockedTitle": "Kamera kann nicht aktiviert werden!",
-        "videoUnmuteBlockedDescription": "Die Kamera kann aus Überlastungsschutzgründen temporär nicht eingeschaltet werden."
+        "videoUnmuteBlockedTitle": "Kamera und Bildschirmfreigabe kann nicht aktiviert werden!",
+        "videoUnmuteBlockedDescription": "Die Kamera und Bildschirmfreigabe kann aus Überlastungsschutzgründen temporär nicht eingeschaltet werden."
     },
     "participantsPane": {
         "close": "Schließen",
@@ -651,7 +666,8 @@
             "stopEveryonesVideo": "Alle Kameras ausschalten",
             "stopVideo": "Kamera ausschalten",
             "unblockEveryoneMicCamera": "Kamera und Mikrofon von allen entsperren",
-            "videoModeration": "Kamera einschalten"
+            "videoModeration": "Kamera einschalten",
+            "moreModerationControls": "Weitere Moderationsoptionen"
         },
         "search": "Suche Anwesende"
     },
@@ -768,6 +784,7 @@
         "title": "Profil"
     },
     "raisedHand": "Ich möchte sprechen",
+    "raisedHandsLabel": "Anzahl gehobener Hände",
     "recording": {
         "limitNotificationDescriptionWeb": "Wegen hoher Nachfrage ist Ihre Aufnahme auf {{limit}} Min. begrenzt. Für unlimitierte Aufnahmen nutzen Sie bitte <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "limitNotificationDescriptionNative": "Wegen hoher Nachfrage ist Ihre Aufnahme auf {{limit}} Min. begrenzt. Für unlimitierte Aufnahmen nutzen Sie bitte <3>{{app}}</3>.",
@@ -810,8 +827,8 @@
     "security": {
         "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Teilnehmer müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
         "aboutReadOnly": "Mit Moderationsrechten kann die Konferenz mit einem Passwort gesichert werden. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
-        "insecureRoomNameWarning": "Der Raumname ist unsicher. Unerwünschte Teilnehmer könnten Ihrer Konferenz beitreten",
-        "securityOptions": "Sicherheitsoptionen"
+        "header": "Sicherheitsoptionen",
+        "insecureRoomNameWarning": "Der Raumname ist unsicher. Unerwünschte Teilnehmer könnten Ihrer Konferenz beitreten"
     },
     "settings": {
         "calendar": {
@@ -843,9 +860,11 @@
         "selectAudioOutput": "Audioausgabe",
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
+        "selfView": "Eigene Ansicht",
         "sounds": "Hinweistöne",
         "speakers": "Lautsprecher",
         "startAudioMuted": "Alle Personen treten stummgeschaltet bei",
+        "startReactionsMuted": "Interaktionstöne für alle deaktivieren",
         "startVideoMuted": "Alle Personen treten ohne Video bei",
         "talkWhileMuted": "Wenn bei Stummschaltung gesprochen wird",
         "title": "Einstellungen"
@@ -878,20 +897,20 @@
     },
     "speaker": "Sprecher/-in",
     "speakerStats": {
-        "search": "Suche",
+        "angry": "Sauer",
+        "disgusted": "Angeekelt",
+        "fearful": "Ängstlich",
+        "happy": "Fröhlich",
         "hours": "{{count}} Std. ",
         "minutes": "{{count}} Min. ",
         "name": "Name",
-        "seconds": "{{count}} Sek.",
-        "speakerStats": "Sprechstatistik",
-        "speakerTime": "Sprechzeit",
-        "happy": "Fröhlich",
         "neutral": "Neutral",
         "sad": "Traurig",
-        "surprised": "Überrascht",
-        "angry": "Sauer",
-        "fearful": "Ängstlich",
-        "disgusted": "Angeekelt"
+        "search": "Suche",
+        "seconds": "{{count}} Sek.",
+        "speakerTime": "Sprechzeit",
+        "speakerStats": "Sprechstatistik",
+        "surprised": "Überrascht"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -1111,6 +1130,7 @@
         "domuteVideoOfOthers": "Alle anderen Kameras auschalten",
         "flip": "Spiegeln",
         "grantModerator": "Moderationsrechte vergeben",
+        "hideSelfView": "Eigene Ansicht ausblenden",
         "kick": "Hinauswerfen",
         "moderator": "Moderation",
         "mute": "Person ist stumm geschaltet",

lang/main-es.json

@@ -1005,7 +1005,7 @@
         "surprised": "Compartir audio",
         "talkWhileMutedPopup": "¿Intentas hablar? Estás silenciado.",
         "tileViewToggle": "Activar o desactivar vista en cuadrícula",
-        "toggleCamera": "Activar o desactivar cámara",
+        "toggleCamera": "Alternar cámara",
         "videomute": "Iniciar o detener cámara",
         "selectBackground": "Seleccionar fondo"
     },
@@ -1169,4 +1169,4 @@
         "rejectAll": "Rechazar todo",
         "toggleLabel": "Activar sala de espera"
     }
-}
+}

lang/main-fr.json

@@ -40,20 +40,25 @@
     "audioOnly": "Bande passante faible"
   },
   "blankPage": {
-     "meetingEnded": "Réunion terminée."
+    "meetingEnded": "Réunion terminée."
   },
   "breakoutRooms": {
     "defaultName": "Salle annexe #{{index}}",
     "mainRoom": "Salle principale",
     "actions": {
-        "add": "Ajouter salle annexe",
-        "autoAssign": "Assigner automatiquement aux salles annexes",
-        "close": "Fermer",
-        "join": "Rejoindre",
-        "leaveBreakoutRoom": "Quitter la salle annexe",
-        "more": "Plus",
-        "remove": "Supprimer",
-        "sendToBreakoutRoom": "Envoyer le participant dans:"
+      "add": "Ajouter salle annexe",
+      "autoAssign": "Assigner automatiquement aux salles annexes",
+      "close": "Fermer",
+      "join": "Rejoindre",
+      "leaveBreakoutRoom": "Quitter la salle annexe",
+      "more": "Plus",
+      "remove": "Supprimer",
+      "sendToBreakoutRoom": "Envoyer le participant dans:"
+    },
+    "notifications": {
+      "joinedTitle": "Salles annexes",
+      "joined": "Entrée en salle annexe \"{{name}}\"",
+      "joinedMainRoom": "Retour à la salle principalem"
     }
   },
   "calendarSync": {
@@ -175,7 +180,8 @@
     "joinInApp": "Rejoindre la réunion en utilisant l'application",
     "launchWebButton": "Lancer dans le navigateur",
     "title": "Lancement de votre réunion dans {{app}} en cours ...",
-    "tryAgainButton": "Réessayez sur le bureau"
+    "tryAgainButton": "Réessayez sur le bureau",
+    "unsupportedBrowser": "Il semble que vous utilisez un navigateur non supporté."
   },
   "defaultLink": "ex. {{url}}",
   "defaultNickname": "ex. Jean Dupont",
@@ -239,8 +245,8 @@
     "gracefulShutdown": "Notre service est actuellement en maintenance. Veuillez réessayer plus tard.",
     "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",
+    "IamHost": "Je suis l'hôte",
     "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}}",
@@ -256,8 +262,8 @@
     "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 ?",
+    "login": "Connexion",
     "logoutTitle": "Déconnexion",
     "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",
@@ -335,7 +341,7 @@
     "sessionRestarted": "L'appel est relancé par la passerelle",
     "Share": "Partager",
     "shareAudio": "Continuer",
-    "shareAudioTitle" : "Comment partager le son",
+    "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.",
@@ -403,16 +409,17 @@
     "none": "Rien",
     "uploadedImage": "Image téléversée {{index}}",
     "deleteImage": "Supprimer l'image",
-    "image1" : "Plage",
-    "image2" : "Mur blanc neutre",
-    "image3" : "Pièce vide blanche",
-    "image4" : "Lampadaire noir",
-    "image5" : "Montagne",
-    "image6" : "Forêt ",
-    "image7" : "Lever de soleil",
+    "image1": "Plage",
+    "image2": "Mur blanc neutre",
+    "image3": "Pièce vide blanche",
+    "image4": "Lampadaire noir",
+    "image5": "Montagne",
+    "image6": "Forêt ",
+    "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é",
+    "webAssemblyWarningDescription": "WebAssembly invalidé ou non supporté par ce navigateur",
     "backgroundEffectError": "Erreur dans l'application de l'effet d'arrière-plan."
   },
   "feedback": {
@@ -440,7 +447,7 @@
     "country": "Pays",
     "dialANumber": "Pour rejoindre votre réunion, composez l'un de ces numéros, puis saisissez le code confidentiel.",
     "dialInConferenceID": "PIN :",
-    "copyNumber":"Copier le numéro",
+    "copyNumber": "Copier le numéro",
     "dialInNotSupported": "Désolé, l'accès par téléphone n'est pas pris en charge pour l'instant.",
     "dialInNumber": "Composer :",
     "dialInSummaryError": "Erreur lors de la récupération des informations de numérotation. Veuillez réessayer plus tard.",
@@ -574,10 +581,12 @@
     "allowedUnmute": "Vous pouvez réactiver votre écran, votre caméra ou partager votre écran.",
     "audioUnmuteBlockedTitle": "Rétablissement du son bloqué !",
     "audioUnmuteBlockedDescription": "Le rétablissement du son a été bloqué temporairement en raison de limites système.",
+    "chatMessages": "Messages de chat",
     "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é",
+    "displayNotifications": "Afficher les notifications pour",
     "focus": "Focus de conférence",
     "focusFail": "{{component}} n'est pas disponible - réessayez dans {{ms}} sec",
     "hostAskedUnmute": "Le modérateur souhaite vous donner la parole",
@@ -585,6 +594,9 @@
     "invitedThreePlusMembers": "{{name}} et {{count}} autres ont été invités",
     "invitedTwoMembers": "{{first}} et {{second}} ont été invités",
     "kickParticipant": "{{kicked}} a été expulsé par {{kicker}}",
+    "leftOneMember": "{{name}} a quitté la réunion",
+    "leftThreePlusMembers": "{{name}} et beaucoup d'autres ont quitté la réunion",
+    "leftTwoMembers": "{{first}} et {{second}} ont quitté la réunion",
     "me": "Moi",
     "moderator": "Droits modérateur accordés !",
     "muted": "Vous avez commencé la conversation en muet.",
@@ -596,8 +608,10 @@
     "passwordRemovedRemotely": "Le $t(lockRoomPassword) a été supprimé par un autre participant",
     "passwordSetRemotely": "Un $t(lockRoomPassword) a été défini par un autre participant",
     "raisedHand": "{{name}} aimerait prendre la parole.",
+    "raisedHands": "{{participantName}} et {{raisedHands}} autres personnes",
     "screenShareNoAudio": " La case Partager l'audio n'a pas été cochée dans l'écran de sélection de la fenêtre.",
     "screenShareNoAudioTitle": "La case Partager l'audio n'a pas été cochée",
+    "selfViewTitle": "Vous pouvez toujours rétablir l'affichage de votre propre vidéo dans les paramètres",
     "somebody": "Quelqu'un",
     "startSilentTitle": "Vous avez rejoint sans sortie audio !",
     "startSilentDescription": "Rejoignez la réunion de nouveau pour activer l'audio",
@@ -624,6 +638,7 @@
     "moderationToggleDescription": "par {{participantDisplayName}}",
     "raiseHandAction": "Lever la main",
     "reactionSounds": "Bloquer les réactions sonores",
+    "reactionSoundsForAll": "Bloquer les réactions sonores pour tous",
     "groupTitle": "Notifications",
     "videoUnmuteBlockedTitle": "Rétablissement de la caméra bloqué !",
     "videoUnmuteBlockedDescription": "Le rétablissement de la vidéo a été bloqué temporairement en raison de limites système."
@@ -639,7 +654,7 @@
     "actions": {
       "allow": "Autoriser les participants à:",
       "allowVideo": "permettre la vidéo",
-      "audioModeration": "réouvrir leur micro",
+      "audioModeration": "Rouvrir leur micro",
       "blockEveryoneMicCamera": "Bloquer tous les micros et caméras",
       "invite": "Inviter quelqu'un",
       "askUnmute": "Demander de réactiver le micro",
@@ -651,7 +666,8 @@
       "stopEveryonesVideo": "Couper toutes les caméras",
       "stopVideo": "Couper la vidéo",
       "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras",
-      "videoModeration": "Démarrer leur vidéo"
+      "videoModeration": "Démarrer leur vidéo",
+      "moreModerationControls": "Options de modération supplémentaires"
     },
     "search": "Rechercher des participants"
   },
@@ -664,8 +680,8 @@
       "answerPlaceholder": "Option {{index}}",
       "create": "Créer un sondage",
       "cancel": "Annuler",
-      "pollOption" : "Option {{index}}",
-      "pollQuestion" : "Question du sondage",
+      "pollOption": "Option {{index}}",
+      "pollQuestion": "Question du sondage",
       "questionPlaceholder": "Poser une question",
       "removeOption": "Supprimer l'option",
       "send": "Envoyer"
@@ -739,8 +755,8 @@
     "or": "ou",
     "premeeting": "Pré-séance",
     "showScreen": "Activer l'écran de pré-séance",
+    "keyboardShortcuts": "Activer les raccourcis clavier",
     "startWithPhone": "Commencez avec l'audio du téléphone",
-    "keyboardShortcuts" : "Activer les raccourcis clavier",
     "screenSharingError": "Erreur de partage d'écran:",
     "videoOnlyError": "Erreur vidéo:",
     "videoTrackError": "Impossible de créer une piste vidéo.",
@@ -768,6 +784,7 @@
     "title": "Profil"
   },
   "raisedHand": "Aimerait prendre la parole",
+  "raisedHandsLabel": "Nombre de mains levées",
   "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>.",
@@ -810,8 +827,8 @@
   "security": {
     "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é"
+    "header": "Options de sécurité",
+    "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é."
   },
   "settings": {
     "calendar": {
@@ -843,9 +860,11 @@
     "selectAudioOutput": "Sortie audio",
     "selectCamera": "Caméra",
     "selectMic": "Microphone",
+    "selfView": "Affichage de votre propre vidéo",
     "sounds": "Sons",
     "speakers": "Haut-parleurs",
     "startAudioMuted": "Tout le monde commence en muet",
+    "startReactionsMuted": "Tout le monde commence avec les réactions sonores bloquées",
     "startVideoMuted": "Tout le monde commence sans vidéo",
     "talkWhileMuted": "vous parlez en étant muet",
     "title": "Paramètres"
@@ -878,20 +897,20 @@
   },
   "speaker": "Haut-parleur",
   "speakerStats": {
-    "search": "Recherche",
+    "angry": "En colère",
+    "disgusted": "Dégoûté",
+    "fearful": "Effrayé",
+    "happy": "Content",
     "hours": "{{count}}h",
     "minutes": "{{count}}m",
     "name": "Nom",
-    "seconds": "{{count}}s",
-    "speakerStats": "Statistiques de l'interlocuteur",
-    "speakerTime": "Temps de l'interlocuteur",
-    "happy": "Content",
     "neutral": "Indifférent",
     "sad": "Triste",
-    "surprised": "Surpris",
-    "angry": "En colère",
-    "fearful": "Effrayé",
-    "disgusted": "Dégoûté"
+    "search": "Recherche",
+    "seconds": "{{count}}s",
+    "speakerTime": "Temps de l'interlocuteur",
+    "speakerStats": "Statistiques de l'interlocuteur",
+    "surprised": "Surpris"
   },
   "startupoverlay": {
     "policyText": " ",
@@ -934,8 +953,8 @@
       "mute": "Activer / Désactiver l'audio",
       "muteEveryone": "Couper le micro de tout le monde",
       "muteEveryoneElse": "Couper le micro de tous les autres",
-      "muteEveryonesVideo": "Couper la caméra de tout le monde",
-      "muteEveryoneElsesVideo": "Couper la caméra de tout les autres",
+      "muteEveryonesVideoStream": "Couper la caméra de tout le monde",
+      "muteEveryoneElsesVideoStream": "Couper la caméra de tous les autres",
       "participants": "Participants",
       "pip": "Activer / Désactiver le mode Picture in Picture",
       "privateMessage": "Envoyer un message privé",
@@ -1111,6 +1130,7 @@
     "domuteVideoOfOthers": "Couper la caméra des autres",
     "flip": "Balancer",
     "grantModerator": "Donner des droits de modérateur",
+    "hideSelfView": "Cacher l'affichage de votre propre vidéo",
     "kick": "Exclure",
     "moderator": "Modérateur",
     "mute": "Un participant a coupé son micro",
@@ -1159,13 +1179,13 @@
     "startMeeting": "Démarrer la conférence",
     "terms": "Termes",
     "title": "Système de vidéoconférence sécurisé, riche en fonctionnalités et gratuit",
-    "logo":{
-      "calendar":"Logo Calendar",
-      "microsoftLogo":"Logo Microsoft",
-      "logoDeepLinking":"Logo Jitsi meet",
-      "desktopPreviewThumbnail":"Miniature d'aperçu du bureau",
-      "googleLogo":"Logo Google",
-      "policyLogo":"Logo de la politique"
+    "logo": {
+      "calendar": "Logo Calendar",
+      "microsoftLogo": "Logo Microsoft",
+      "logoDeepLinking": "Logo Jitsi meet",
+      "desktopPreviewThumbnail": "Miniature d'aperçu du bureau",
+      "googleLogo": "Logo Google",
+      "policyLogo": "Logo de la politique"
     }
   },
   "lonelyMeetingExperience": {

lang/main-nl.json

@@ -7,11 +7,11 @@
         "copyStream": "Link naar livestream kopiëren",
         "countryNotSupported": "Deze bestemming wordt nog niet ondersteund.",
         "countryReminder": "Belt u buiten de Verenigde Staten? Vergeet dan niet met de landcode te beginnen.",
-        "defaultEmail": "Uw Standaard Email",
+        "defaultEmail": "Uw standaard e-mail",
         "disabled": "U kunt geen personen uitnodigen.",
         "failedToAdd": "Het toevoegen van deelnemers is mislukt",
         "footerText": "Uitgaande oproepen zijn uitgeschakeld.",
-        "googleEmail": "Google Email",
+        "googleEmail": "Google e-mail",
         "inviteMoreHeader": "U bent de enige in de vergadering",
         "inviteMoreMailSubject": "Deelnemen aan {{appName}}-vergadering",
         "inviteMorePrompt": "Nodig meer personen uit",
@@ -21,7 +21,7 @@
         "loadingPeople": "Personen om uit te nodigen aan het zoeken",
         "noResults": "Geen resultaten die overeenkomen met de zoekopdracht",
         "noValidNumbers": "Voer een telefoonnummer in",
-        "outlookEmail": "Outlook Email",
+        "outlookEmail": "Outlook e-mail",
         "searchNumbers": "Telefoonnummers toevoegen",
         "searchPeople": "Personen zoeken",
         "searchPeopleAndNumbers": "Personen zoeken of hun telefoonnummers toevoegen",
@@ -30,7 +30,7 @@
         "shareStream": "Deel de link naar de livestream",
         "telephone": "Telefoon: {{number}}",
         "title": "Personen uitnodigen voor deze vergadering",
-        "yahooEmail": "Yahoo Email"
+        "yahooEmail": "Yahoo e-mail"
     },
     "audioDevices": {
         "bluetooth": "Bluetooth",
@@ -73,9 +73,17 @@
             "titleWithPolls": "Voer een bijnaam in om chat te gebruiken"
         },
         "privateNotice": "Privébericht aan {{recipient}}",
-        "title": "Chat",
-        "titleWithPolls": "Chat",
-        "you": "u"
+        "message": "Bericht",
+        "messageAccessibleTitle": "{{user}} zegt:",
+        "messageAccessibleTitleMe": "ik zeg:",
+        "smileysPanel": "Smiley paneel",
+        "tabs": {
+            "chat": "Gesprek",
+            "polls": "Peilingen"
+        },
+        "title": "Gesprek",
+        "titleWithPolls": "Gesprek",
+        "you": "U"
     },
     "chromeExtensionBanner": {
         "installExtensionText": "Installeer de extensie voor Google Calendar en Office 365 integratie",
@@ -526,6 +534,35 @@
     },
     "passwordSetRemotely": "ingesteld door een andere deelnemer",
     "passwordDigitsOnly": "Maximaal {{number}} cijfers",
+    "polls": {
+        "by": "Door {{ name }}",
+        "create": {
+            "addOption": "Voeg optie toe",
+            "answerPlaceholder": "Optie {{index}}",
+            "create": "Creeër een peiling",
+            "cancel": "Annuleer",
+            "pollOption" : "Peiling optie {{index}}",
+            "pollQuestion" : "Peiling vraag",
+            "questionPlaceholder": "Stel een vraag",
+            "removeOption": "Verwijder optie",
+            "send": "Verstuur"
+        },
+        "answer": {
+            "skip": "Sla over",
+            "submit": "Verzend"
+        },
+        "results": {
+            "vote": "Stem",
+            "changeVote": "Verander stem",
+            "empty": "Er zijn nog geen peilingen in deze vergadering. Start hier een peiling!",
+            "hideDetailedResults": "Verberg details",
+            "showDetailedResults": "Toon details"
+        },
+        "notification": {
+            "title": "Een nieuwe peiling is aangemaakt in deze vergadering",
+            "description": "Open het peilingen tabblad om te stemmen"
+        }
+    },
     "poweredby": "mogelijk gemaakt door",
     "prejoin": {
         "audioAndVideoError": "Audio- en videofout:",
@@ -586,8 +623,8 @@
     },
     "profile": {
         "setDisplayNameLabel": "Uw weergavenaam instellen",
-        "setEmailInput": "Voer emailadres in",
-        "setEmailLabel": "Uw Gravatar email instellen",
+        "setEmailInput": "Voer e-mailadres in",
+        "setEmailLabel": "Uw Gravatar e-mail instellen",
         "title": "Profiel"
     },
     "raisedHand": "Zou graag willen spreken",
@@ -849,17 +886,21 @@
         "pending": "{{displayName}} is uitgenodigd"
     },
     "videoStatus": {
+        "adjustFor": "Aanpassen voor:",
         "audioOnly": "AUD",
         "audioOnlyExpanded": "U bent in lage bandbreedte-modus. In deze modus ontvangt u alleen audio en schermdeling.",
+        "bestPerformance": "Beste prestatie",
         "callQuality": "Videokwaliteit",
         "hd": "HD",
         "hdTooltip": "U bekijkt video in hoge resolutie",
         "highDefinition": "Hoge resolutie",
+        "highestQuality": "Hoogste kwaliteit",
         "labelTooiltipNoVideo": "Geen video",
         "labelTooltipAudioOnly": "Lage bandbreedte-modus ingeschakeld",
         "ld": "LD",
         "ldTooltip": "U bekijkt video in lage resolutie",
         "lowDefinition": "Lage resolutie",
+        "performanceSettings": "Prestatie instellingen",
         "sd": "SD",
         "sdTooltip": "U bekijkt video in standaard resolutie",
         "standardDefinition": "Standaard resolutie"
@@ -931,7 +972,7 @@
         "dialogTitle": "Lobby-modus",
         "disableDialogContent": "Lobby-modus is momenteel ingeschakeld. Deze functie zorgt ervoor dat ongewenste deelnemers niet aan uw vergadering kunnen deelnemen. Wilt u het uitschakelen?",
         "disableDialogSubmit": "Uitschakelen",
-        "emailField": "Voer uw emailadres in",
+        "emailField": "Voer uw e-mailadres in",
         "enableDialogPasswordField": "Stel wachtwoord in (optioneel)",
         "enableDialogSubmit": "Inschakelen",
         "enableDialogText": "Met de lobby-modus kunt u uw vergadering beveiligen, door deelnemers alleen toe te laten na een formele goedkeuring van een moderator.",

lang/main-oc.json

@@ -158,7 +158,8 @@
         "joinInApp": "Rejónher la conferéncia en utilizant l’aplicacion",
         "launchWebButton": "Lançar del navigador",
         "title": "Aviada de vòstra conferéncia dins {{app}}…",
-        "tryAgainButton": "Tornar ensajar del burèu"
+        "tryAgainButton": "Tornar ensajar del burèu",
+        "unsupportedBrowser": "Sembla qu’utilizatz un navigador que prenèm pas en carga."
     },
     "defaultLink": "ex. {{url}}",
     "defaultNickname": "ex. Joan Delpuèch",
@@ -421,7 +422,7 @@
         "noPassword": "Pas cap",
         "noRoom": "Cap de sala pas donada per la jónher.",
         "numbers": "Sonar de numèros",
-        "password": "$t(lockRoomPasswordUppercase) :",
+        "password": "$t(lockRoomPasswordUppercase): ",
         "title": "Partejar",
         "tooltip": "Partejar lo ligam e las informacions d’aquesta conferéncia",
         "copyNumber": "Copiar lo numèro",
@@ -627,9 +628,17 @@
         "moderationInEffectCSDescription": "Volgatz levar la man se volètz partejar vòstre ecran.",
         "moderationInEffectVideoDescription": "Volgatz levar la man se volètz aviar vòstra camèra.",
         "audioUnmuteBlockedTitle": "Restabliment del son del microfòn blocat !",
-        "videoUnmuteBlockedTitle": "Restabliment de la camèra blocat !",
+        "videoUnmuteBlockedTitle": "Restabliment de la camèra e del partiment de burèu blocat  !",
         "audioUnmuteBlockedDescription": "Las operacion de restabliment del son microfòn son estadas blocadas pel moment a causa de limitas sistèma.",
-        "videoUnmuteBlockedDescription": "Las operacion de restabliment de la camèra son estadas blocadas pel moment a causa de limitas sistèma."
+        "videoUnmuteBlockedDescription": "Las operacion de restabliment de la camèra e del partiment del burèu son estadas blocadas pel moment a causa de limitas sistèma.",
+        "chatMessages": "Messatges del chat",
+        "displayNotifications": "Afichar las notificacions per",
+        "leftOneMember": "{{name}} a quitat la conferéncia",
+        "leftThreePlusMembers": "{{name}} e un molon d’autres an quitat la conferéncia",
+        "leftTwoMembers": "{{first}} e {{second}} an quitat la conferéncia",
+        "raisedHands": "{{participantName}} e {{raisedHands}} autres",
+        "selfViewTitle": "Podètz totjorn quitar d’amagar vòstra pròpria vista a partir dels paramètres",
+        "reactionSoundsForAll": "Desactivar los sons per totes"
     },
     "passwordDigitsOnly": "Fins a {{number}} chifras",
     "passwordSetRemotely": "causit per qualqu'un mai",
@@ -758,7 +767,7 @@
         "about": "Podètz ajustar un $t(lockRoomPassword) per rejónher una conferéncia. Los participants deuràn fornir lo $t(lockRoomPassword) abans d’obténer l’autorizacion de dintrar dins la conferéncia.",
         "aboutReadOnly": "Los participants que son moderators pòdon ajustar un $t(lockRoomPassword) a la conferéncia. Los participants deuràn fornir lo $t(lockRoomPassword) abans d’aver l’autorizacion de rejónher la conferéncia.",
         "insecureRoomNameWarning": "Lo nom de la sala es pas segur. De monde indesirables poirián rejónher vòstra conferéncia.",
-        "securityOptions": "Opcions de seguretat"
+        "header": "Opcions de seguretat"
     },
     "settings": {
         "calendar": {
@@ -795,7 +804,9 @@
         "talkWhileMuted": "Parlar en mut",
         "desktopShareHighFpsWarning": "Una frequéncia d’imatge mai nauta pel partiment burèu pòt afectar la benda passanta. Devètz reaviar lo partiment d’ecran per aplicar los paramètres novèls.",
         "desktopShareWarning": "Devètz reaviar lo partiment d’ecran per prendre en compte las modificacions.",
-        "incomingMessage": "Messatge dintrant"
+        "incomingMessage": "Messatge dintrant",
+        "selfView": "Vista de se",
+        "startReactionsMuted": "Començan totes amb las reaccions sonòras amudidas"
     },
     "settingsView": {
         "advanced": "Avançat",
@@ -898,7 +909,6 @@
             "clap": "Picar de las mans",
             "laugh": "Rire",
             "like": "Levar lo det gròs",
-            "muteEveryonesVideo": "Copar la vidèo del monde",
             "muteEveryoneElsesVideo": "Copar la vidèo de los demai",
             "participants": "Participants",
             "remoteVideoMute": "Copar la camèra del participant",
@@ -910,7 +920,9 @@
             "collapse": "Plegar",
             "muteEveryoneElse": "Copar lo microfòn dels autres",
             "reactionsMenu": "Dobrir / Tampar lo menú de reaccions",
-            "breakoutRoom": "Rejónher/quitar la sala de reünion"
+            "breakoutRoom": "Rejónher/quitar la sala de reünion",
+            "muteEveryoneElsesVideoStream": "Arrestar la vidèo de totes los autres",
+            "muteEveryonesVideoStream": "Arrestar la vidèo de tot lo monde"
         },
         "addPeople": "Ajustar de monde a vòstra sonada",
         "audioOnlyOff": "Desactivar lo mòde connexion febla",
@@ -1064,7 +1076,8 @@
         "videomute": "Lo participant a arrestat la camèra",
         "domuteVideo": "Desactivar la camèra",
         "domuteVideoOfOthers": "Desactivar la camèra dels demai",
-        "videoMuted": "Camèra desactivada"
+        "videoMuted": "Camèra desactivada",
+        "hideSelfView": "Amagar pròpria vista"
     },
     "welcomepage": {
         "accessibilityLabel": {
@@ -1135,7 +1148,8 @@
         "image6": "Forèst ",
         "desktopShareError": "Creacion impossibla d’un partiment de burèu",
         "desktopShare": "Partiment de burèu",
-        "webAssemblyWarning": "WebAssembly pas pres en carga"
+        "webAssemblyWarning": "WebAssembly pas pres en carga",
+        "webAssemblyWarningDescription": "WebAssembly es desactivat o pas pres en carga per aqueste navigador"
     },
     "participantsPane": {
         "headings": {
@@ -1160,7 +1174,8 @@
             "videoModeration": "Aviar lor vidèo",
             "allowVideo": "Autorizar la vidèo",
             "moreModerationActions": "Mai d’opcions de moderacion",
-            "moreParticipantOptions": "Mai d’opcions de participant"
+            "moreParticipantOptions": "Mai d’opcions de participant",
+            "moreModerationControls": "Opcions de moderacion suplementàrias"
         },
         "search": "Cercar participants"
     },
@@ -1207,7 +1222,12 @@
             "autoAssign": "Atribucion auto a las salas de reünion"
         },
         "defaultName": "Sala de reünion #{{index}}",
-        "mainRoom": "Sala principala"
+        "mainRoom": "Sala principala",
+        "notifications": {
+            "joinedMainRoom": "Retorn a la sala principala",
+            "joinedTitle": "Salas suplementàrias",
+            "joined": "Dintrada a la sala suplementària « {{name}} »"
+        }
     },
     "privacyView": {
         "header": "Confidencialitat"
@@ -1217,5 +1237,6 @@
     },
     "blankPage": {
         "meetingEnded": "Conferéncia acabada."
-    }
+    },
+    "raisedHandsLabel": "Nombre de mans levadas"
 }

lang/main-pl.json

@@ -39,6 +39,28 @@
     "audioOnly": {
         "audioOnly": "Niska przepustowość"
     },
+    "blankPage": {
+        "meetingEnded": "Spotkanie zakończone."
+    },
+    "breakoutRooms": {
+        "defaultName": "Pokój podgrupy #{{index}}",
+        "mainRoom": "Główny pokój",
+        "actions": {
+            "add": "Dodaj pokój podgrupy",
+            "autoAssign": "Automatycznie przypisuj do pokoi podgrup",
+            "close": "Blisko",
+            "join": "Dołącz",
+            "leaveBreakoutRoom": "Opuść pokój spotkań",
+            "more": "Więcej",
+            "remove": "Usuń",
+            "sendToBreakoutRoom": "Wyślij uczestnika do:"
+        },
+        "notifications": {
+            "joinedTitle": "Pokoje podgrup",
+            "joined": "Dołączanie do pokoju podgrup \"{{name}}\" ",
+            "joinedMainRoom": "Dołączanie do głównego pokoju"
+        }
+    },
     "calendarSync": {
         "addMeetingURL": "Dodaj odnośnik do spotkania",
         "confirmAddLink": "Czy chcesz dodać odnośnik Jitsi do tego wydarzenia?",
@@ -158,7 +180,8 @@
         "joinInApp": "Dołącz do spotkania używając aplikacji",
         "launchWebButton": "Uruchom przez przeglądarkę",
         "title": "Trwa uruchamianie Twojego spotkania w {{app}}…",
-        "tryAgainButton": "Spróbuj ponownie w aplikacji stacjonarnej"
+        "tryAgainButton": "Spróbuj ponownie w aplikacji stacjonarnej",
+        "unsupportedBrowser": "Wygląda na to, że używasz przeglądarki, której nie wspieramy."
     },
     "defaultLink": "np. {{url}}",
     "defaultNickname": "np. Jan Kowalski",
@@ -206,14 +229,16 @@
         "connectErrorWithMsg": "Upsss! Coś poszło nie tak i nie możemy podłączyć się do tej konferencji: {{msg}}",
         "connecting": "Nawiązywanie połączenia",
         "contactSupport": "Skontaktuj się ze wsparciem",
-        "copy": "Kopiuj",
         "copied": "Skopiowano",
+        "copy": "Kopiuj",
         "dismiss": "Odrzuć",
         "displayNameRequired": "Cześć! Jak się nazywasz?",
         "done": "Zrobione",
         "e2eeDescription": "Szyfrowanie End-to-End jest aktualnie w fazie EKSPERYMENTALNEJ. Proszę mieć na uwadze fakt, że szyfrowanie end-to-end wyłączy oferowane przez serwer usługi takie jak: nagrywanie, streaming na żywo i dołączanie uczestników przez telefon. Proszę mieć również na uwadze fakt, że takie spotkanie będą działać tylko dla uczestników korzystających z przeglądarek wspierających wstawiane strumienie.",
-        "e2eeLabel": "Klucz E2EE",
+        "e2eeLabel": "Włącz szyfrowanie E2EE",
+        "e2eeDisabledDueToMaxModeDescription": "Nie można włączyć szyfrowania End-to-End z powodu dużej liczby uczestników konferencji.",
         "e2eeWarning": "UWAGA: Niektórzy uczestnicy tego spotkania nie mają włączonej obsługi szyfrowania E2EE. Jeśli włączysz tą funkcję ci uczestnicy nie będą mieli z tobą kontaktu.",
+        "e2eeWillDisableDueToMaxModeDescription": "UWAGA: Szyfrowanie typu end-to-end zostanie automatycznie wyłączone, jeśli do konferencji dołączy więcej uczestników.",
         "enterDisplayName": "Wpisz tutaj swoje imię",
         "embedMeeting": "Osadź spotkanie",
         "error": "Błąd",
@@ -249,25 +274,29 @@
         "micPermissionDeniedError": "Nie udzieliłeś pozwolenia na użycie twojego mikrofonu. Nadal możesz uczestniczyc w konferencji ale inni nie będą cię słyszeli. Użyj przycisku kamera aby to naprawić.",
         "micTimeoutError": "Nie udało się uruchomić źródła dźwięku. Przekroczono limit czasu",
         "micUnknownError": "Z nieznanej przyczyny nie można użyć mikrofonu.",
+        "moderationAudioLabel": "Zezwalaj uczestnikom na wyłączanie wyciszenia",
+        "moderationVideoLabel": "Zezwalaj uczestnikom na rozpoczęcie wideo",
         "muteEveryoneElseDialog": "Gdy wyciszysz wszystkich nie będziesz miał możliwości wyłączyć ich wyciszenia, ale oni będą mogli samodzielnie wyłączyć wyciszenie w dowolnym momencie.",
         "muteEveryoneElseTitle": "Wyciszyć wszystkich za wyjątkiem {{whom}}?",
-        "muteEveryoneElsesVideoDialog": "Po dezaktywacji kamery nie można jej ponownie aktywować, ale uczestnicy mogą to zmienić samodzielnie w dowolnym momencie.",
+        "muteEveryoneDialog": "Uczestnicy mogą w dowolnym momencie wyłączyć wyciszenie.",
+        "muteEveryoneDialogModerationOn": "Uczestnicy mogą w każdej chwili wysłać prośbę o zabranie głosu.",
+        "muteEveryoneTitle": "Wyciszyć wszystkich?",
+        "muteEveryoneElsesVideoDialog": "Po wyłączeniu kamery nie będzie można go ponownie włączyć, ale można go ponownie włączyć w dowolnym momencie.",
         "muteEveryoneElsesVideoTitle": "Wyłączyć kamerę wszystkim oprócz {{whom}}?",
-        "muteEveryonesVideoDialog": "Czy na pewno chcesz wyłączyć kamery wszystkich uczestników? Nie możesz ponownie włączyć kamer, ale uczestnicy mogą to zmienić samodzielnie w dowolnym momencie.",
+        "muteEveryonesVideoDialog": "Uczestnicy mogą w każdej chwili włączyć swoje wideo.",
+        "muteEveryonesVideoDialogModerationOn": "Uczestnicy mogą w dowolnym momencie wysłać prośbę o włączenie ich wideo.",
         "muteEveryonesVideoDialogOk": "Wyłącz",
         "muteEveryonesVideoTitle": "Wyłączyć kamery pozostałych uczestników?",
-        "muteEveryoneDialog": "Czy na pewno wyciszyć wszystkich? Nie będziesz miał możliwości wyłączyć ich wyciszenia, ale oni będą mogli samodzielnie wyłączyć wyciszenie w dowolnym momencie.",
-        "muteEveryoneTitle": "Wyciszyć wszystkich?",
         "muteEveryoneSelf": "siebie",
         "muteEveryoneStartMuted": "Od tego momentu wszyscy są wyciszeni",
         "muteParticipantBody": "Nie możesz wyłączyć ich wyciszenia, ale oni mogą samodzielnie wyłączyć wyciszenie w dowolnym momencie.",
         "muteParticipantButton": "Wycisz",
-        "muteParticipantDialog": "Czy na pewno wyciszyć tego uczestnika? Nie będziesz mógł wyłączyć wyciszenia uczestników, ale oni mogą samodzielnie wyłączyć wyciszenie w dowolnym momencie.",
         "muteParticipantsVideoDialog": "Czy na pewno chcesz wyłączyć kamerę tego uczestnika? Nie będziesz mógł ponownie włączyć jego kamery, ale będzie on mógł samodzielnie włączyć kamerę w dowolnym momencie.",
-        "muteParticipantTitle": "Wyciszyć tego uczestnika?",
+        "muteParticipantsVideoDialogModerationOn": "Czy na pewno chcesz wyłączyć kamerę tego uczestnika? Nie będziesz w stanie ponownie włączyć aparatu i oni też nie.",
         "muteParticipantsVideoButton": "Wyłącz kamerę",
         "muteParticipantsVideoTitle": "Wyłączyć kamerę tego uczestnika?",
         "muteParticipantsVideoBody": "Nie będziesz mógł włączyć jego kamery ponownie, ale uczestnik samodzielnie może włączyć kamerę w dowolnym momencie.",
+        "muteParticipantsVideoBodyModerationOn": "Nie będziesz w stanie ponownie włączyć kamery i oni też nie.",
         "noDropboxToken": "Brak poprawnego tokenu Dropbox",
         "Ok": "OK",
         "password": "$t(lockRoomPasswordUppercase)",
@@ -329,6 +358,7 @@
         "shareScreenWarningH1": "Kiedy chcesz udostępniać wyłącznie swój ekran:",
         "shareScreenWarningD1": "musisz zatrzymać udostępnianie dźwięku przed udostępnieniem ekranu.",
         "shareScreenWarningD2": "musisz zatrzymać udostępnianie dźwięku, rozpocząć udostępnianie ekranu i zaznaczyć opcję \"udostępnij dźwięk\".",
+        "sharedVideoLinkPlaceholder": "Link do YouTube lub bezpośredni link do wideo",
         "stopLiveStreaming": "Zatrzymaj transmisję na żywo",
         "stopRecording": "Zatrzymaj nagrywanie",
         "stopRecordingWarning": "Naprawdę chcesz zatrzymać nagrywanie?",
@@ -388,7 +418,9 @@
         "image7": "Wschód słońca",
         "desktopShareError": "Nie można udostępnić pulpitu",
         "desktopShare": "Udostępnianie pulpitu",
-        "webAssemblyWarning": "WebAssembly nie jest obsługiwany"
+        "webAssemblyWarning": "WebAssembly nie jest obsługiwany",
+        "webAssemblyWarningDescription": "WebAssembly wyłączony lub nieobsługiwany przez tę przeglądarkę",
+        "backgroundEffectError": "Nie udało się zastosować efektu tła."
     },
     "feedback": {
         "average": "Średnio",
@@ -493,6 +525,7 @@
         "expandedPending": "Transmisja na żywo rozpoczyna się…",
         "failedToStart": "Transmitowanie na żywo nie uruchomiło się",
         "getStreamKeyManually": "Nie byliśmy w stanie pobrać żadnych transmisji na żywo. Spróbuj uzyskać klucz do transmisji na żywo z YouTube.",
+        "inProgress": "Trwa nagrywanie lub transmisja na żywo",
         "invalidStreamKey": "Klucz transmisji na żywo może być nieprawidłowy.",
         "off": "Transmitowanie na żywo zostało zatrzymane",
         "offBy": "{{name}} zatrzymał transmisję na żywo",
@@ -500,6 +533,7 @@
         "onBy": "{{name}} rozpoczął transmisję na żywo",
         "pending": "Start strumieniowania live…",
         "serviceName": "Usługa transmisji na żywo",
+        "sessionAlreadyActive": "Ta sesja jest już nagrywana lub transmitowana na żywo.",
         "signedInAs": "Jesteś obecnie zalogowany jako:",
         "signIn": "Zaloguj się z Google",
         "signInCTA": "Zaloguj się lub wpisz swój klucz do transmisji na żywo YouTube.",
@@ -543,18 +577,24 @@
     "lockRoomPasswordUppercase": "Hasło",
     "me": "to ja",
     "notify": {
+        "allowAction": "Zezwól",
+        "allowedUnmute": "Możesz wyłączyć wyciszenie mikrofonu, uruchomić aparat lub udostępnić ekran.",
+        "audioUnmuteBlockedTitle": "Zablokowano wyciszenie mikrofonu!",
+        "audioUnmuteBlockedDescription": "Operacja wyłączania wyciszenia mikrofonu została tymczasowo zablokowana z powodu ograniczeń systemu.",
         "connectedOneMember": "{{name}} dołączył do spotkania",
         "connectedThreePlusMembers": "{{name}} i {{count}} innych osób dołączyło do spotkania",
         "connectedTwoMembers": "{{first}} i {{second}} dołączyli do spotkania",
         "disconnected": "Rozłączono",
         "focus": "Fokus konferencji",
         "focusFail": "{{component}} jest niedostępny - ponowienie w ciągu {{ms}} sec",
-        "grantedTo": "Prawa moderatora przyznane dla {{to}}!",
         "hostAskedUnmute": "Gospodarz prosi Cię o wyłączenie wyciszenia",
         "invitedOneMember": "{{name}} został zaproszony",
         "invitedThreePlusMembers": "{{name}} i {{count}} innych osób zostało zaproszone",
         "invitedTwoMembers": "{{first}} i {{second}} zostali zaproszeni",
         "kickParticipant": "{{kicked}} został usunięty przez {{kicker}}",
+        "leftOneMember": "{{name}} opuścił spotkanie",
+        "leftThreePlusMembers": "{{name}} i wielu innych opuściło spotkanie",
+        "leftTwoMembers": "{{first}} i {{second}} opuścił spotkanie",
         "me": "To ja",
         "moderator": "Prawa moderatora przydzielone!",
         "muted": "Rozpoczęto wyciszenie konwersacji.",
@@ -566,8 +606,10 @@
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) usunięte przez innego uczestnika",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) ustawiony przez innego uczestnika",
         "raisedHand": "{{name}} chce mówić.",
+        "raisedHands": "{{participantName}} i {{raisedHands}} więcej osób",
         "screenShareNoAudio": "Opcja \"Udostępnij dźwięk\" nie została zaznaczona podczas wyboru okna.",
         "screenShareNoAudioTitle": "Nie można udostępnić dźwięku",
+        "selfViewTitle": "Zawsze możesz odkryć własny podgląd w ustawieniach",
         "somebody": "Ktoś",
         "startSilentTitle": "Dołączyłeś bez wyjścia dźwiękowego!",
         "startSilentDescription": "Ponownie dołącz do spotkania, aby włączyć dźwięk",
@@ -594,7 +636,10 @@
         "moderationToggleDescription": "przez {{participantDisplayName}}",
         "raiseHandAction": "Podnieś rękę",
         "reactionSounds": "Wyłącz dźwięki",
-        "groupTitle": "Powiadomienia"
+        "reactionSoundsForAll": "Wyłącz dźwięki dla wszystkich",
+        "groupTitle": "Powiadomienia",
+        "videoUnmuteBlockedTitle": "Wyłączenie wyciszenia kamery i udostępnianie pulpitu zablokowane!",
+        "videoUnmuteBlockedDescription": "Operacje wyłączania wyciszenia kamery i udostępniania pulpitu zostały tymczasowo zablokowane z powodu ograniczeń systemu."
     },
     "participantsPane": {
         "close": "Zamknij",
@@ -606,21 +651,28 @@
         },
         "actions": {
             "allow": "Zezwól uczestnikom na:",
+            "allowVideo": "Zezwól na wideo",
+            "audioModeration": "Wyłącz wyciszenie",
             "blockEveryoneMicCamera": "Zablokuj wszystkim kamerę i mikrofon",
             "invite": "Zaproś",
             "askUnmute": "Poproś o wyłączenie wyciszenia",
+            "moreModerationActions": "Więcej opcji moderatora",
+            "moreParticipantOptions": "Więcej opcji dla uczestników",
             "mute": "Wycisz",
             "muteAll": "Wycisz wszystkich",
             "muteEveryoneElse": "Wycisz pozostałych",
-            "startModeration": "Wyłącz wyciszenie lub rozpocznij wideo",
             "stopEveryonesVideo": "Wyłącz wszystkie kamery",
             "stopVideo": "Wyłącz kamerę",
-            "unblockEveryoneMicCamera": "Odblokuj wszystkim kamerę i mikrofon"
-        }
+            "unblockEveryoneMicCamera": "Odblokuj wszystkim kamerę i mikrofon",
+            "videoModeration": "Włącz kamerę",
+            "moreModerationControls": "Więcej kontroli moderacji"
+        },
+        "search": "Wyszukaj uczestników"
     },
-    "passwordSetRemotely": "wybrane przez innego uczestnika",
+    "passwordSetRemotely": "Ustawione przez innego uczestnika",
     "passwordDigitsOnly": "Do {{number}} cyfr",
     "polls": {
+        "by": "Przez {{ name }}",
         "create": {
             "addOption": "Dodaj opcję",
             "answerPlaceholder": "Opcja {{index}}",
@@ -688,6 +740,7 @@
         "errorDialOutFailed": "Nie udało się wybrać numeru. Połączenie nieudane",
         "errorDialOutStatus": "Błąd podczas uzyskiwania stanu połączenia",
         "errorMissingName": "Podaj imię, aby dołączyć do spotkania",
+        "errorNoPermissions": "Musisz włączyć dostęp do mikrofonu i kamery",
         "errorStatusCode": "Błąd wybierania, kod statusu: {{status}}",
         "errorValidation": "Weryfikacja numeru zakończona niepowodzeniem",
         "iWantToDialIn": "Chcę się wdzwonić",
@@ -745,6 +798,7 @@
         "expandedPending": "Nagrywanie się rozpoczyna…",
         "failedToStart": "Nagrywanie nie jest możliwe",
         "fileSharingdescription": "Udostępnij nagranie uczestnikom spotkania",
+        "inProgress": "Trwa nagrywanie lub transmisja na żywo",
         "linkGenerated": "Wygenerowano link do nagrania.",
         "live": "NA ŻYWO",
         "loggedIn": "Zalogowano jako {{userName}}",
@@ -757,6 +811,7 @@
         "serviceDescription": "Twoje nagranie zostanie zapisane przez usługę nagrywania",
         "serviceDescriptionCloud": "Nagrywanie w chmurze",
         "serviceName": "Usługa nagrywania",
+        "sessionAlreadyActive": "Ta sesja jest już nagrywana lub transmitowana na żywo.",
         "signIn": "Zaloguj się",
         "signOut": "Wyloguj się",
         "unavailable": "Ups! {{serviceName}} w tej chwili niedostępny. Próbujemy rozwiązać ten problem. Spróbuj ponownie później.",
@@ -769,8 +824,8 @@
     "security": {
         "about": "Możesz dodać $t(lockRoomPassword) do spotkania. Uczestnicy będą musieli wprowadzić $t(lockRoomPassword) przed dołączeniem do spotkania.",
         "aboutReadOnly": "Uczestnicy posiadający uprawnienia do moderacji mogą ustawić $t(lockRoomPassword) do spotkania. Uczestnicy będą musieli wprowadzić $t(lockRoomPassword) zanim zostaną dołączeni do spotkania.",
-        "insecureRoomNameWarning": "Nazwa pokoju nie jest bezpieczna. Niepowołaniu uczestnicy mogą dołączyć do spotkania. Proszę rozważyć ustawienie hasła spotkania używając przycisku Opcje zabezpieczeń.",
-        "securityOptions": "Opcje zabezpieczeń"
+        "header": "Opcje zabezpieczeń",
+        "insecureRoomNameWarning": "Nazwa pokoju nie jest bezpieczna. Niepowołaniu uczestnicy mogą dołączyć do spotkania. Proszę rozważyć ustawienie hasła spotkania używając przycisku Opcje zabezpieczeń."
     },
     "settings": {
         "calendar": {
@@ -790,7 +845,6 @@
         "language": "Język",
         "loggedIn": "Zalogowano jako {{name}}",
         "microphones": "Mikrofony",
-        "sounds": "Dźwięki",
         "moderator": "Moderacja",
         "more": "Więcej",
         "name": "Nazwa",
@@ -803,8 +857,11 @@
         "selectAudioOutput": "Wyjście audio",
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
+        "selfView": "Własnego podgląd",
+        "sounds": "Dźwięki",
         "speakers": "Głośniki",
         "startAudioMuted": "Wycisz wszystkich dołączających",
+        "startReactionsMuted": "Wycisz dźwięki reakcji dla wszystkich",
         "startVideoMuted": "Ukryj wszystkich dołączających",
         "talkWhileMuted": "Jesteś wyciszony",
         "title": "Ustawienia"
@@ -837,13 +894,20 @@
     },
     "speaker": "Mówca",
     "speakerStats": {
-        "search": "Wyszukaj",
+        "angry": "Zły",
+        "disgusted": "Oburzony",
+        "fearful": "Przerażony",
+        "happy": "Szczęśliwy",
         "hours": "{{count}} godz.",
         "minutes": "{{count}} min.",
         "name": "Nazwa",
+        "neutral": "Neutralny",
+        "sad": "Smutny",
+        "search": "Wyszukaj",
         "seconds": "{{count}} sek.",
+        "speakerTime": "Czas mówcy",
         "speakerStats": "Statystyki mówców",
-        "speakerTime": "Czas mówcy"
+        "surprised": "Zdziwiony"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -860,6 +924,7 @@
             "audioOnly": "Przełączanie tylko audio",
             "audioRoute": "Wybierz urządzenie dźwiękowe",
             "boo": "Buczenie",
+            "breakoutRoom": "Dołącz/opuść pokój podgrupy",
             "callQuality": "Zarządzanie jakością obrazu",
             "cc": "Przełączanie napisów",
             "chat": "Przełączanie okna rozmowy",
@@ -943,7 +1008,9 @@
         "hangup": "Opuść spotkanie",
         "help": "Pomoc",
         "invite": "Zaproś uczestników",
+        "joinBreakoutRoom": "Dołącz do pokoju podgrupy",
         "laugh": "Śmiech",
+        "leaveBreakoutRoom": "Opuść pokój spotkań",
         "like": "Kciuk w górę",
         "lobbyButtonDisable": "Wyłącz tryb lobby",
         "lobbyButtonEnable": "Włącz tryb lobby",
@@ -1033,7 +1100,10 @@
         "pending": "{{displayName}} został zaproszony"
     },
     "videoStatus": {
+        "adjustFor": "Dostosuj do:",
         "audioOnly": "DŹW",
+        "bestPerformance": "Najlepsza wydajność",
+        "highestQuality": "Najwyższa jakość",
         "audioOnlyExpanded": "Jesteś w trybie słabego łącza. W tym trybie będziesz otrzymywać tylko dźwięk i udostępnianie ekranu.",
         "callQuality": "Jakość obrazu",
         "hd": "HD",
@@ -1044,6 +1114,7 @@
         "ld": "LD",
         "ldTooltip": "Podgląd obrazu w niskiej rozdzielczości",
         "lowDefinition": "Niska rozdzielczość",
+        "performanceSettings": "Ustawienia wydajności",
         "sd": "SD",
         "sdTooltip": "Podgląd obrazu w standardowej rozdzielczości",
         "standardDefinition": "Standardowa rozdzielczość"
@@ -1056,14 +1127,15 @@
         "domuteVideoOfOthers": "Wyłącz kamerę pozostałym",
         "flip": "Odwrócenie",
         "grantModerator": "Przyznaj prawa moderatora",
+        "hideSelfView": "Ukryj widok własnego podglądu",
         "kick": "Wyrzuć",
         "moderator": "Moderator",
         "mute": "Uczestnik ma wyciszone audio",
         "muted": "Wyciszony",
+        "videoMuted": "Kamera wyłączona",
         "remoteControl": "Kontrola zdalna",
         "show": "Pokaż na scenie",
-        "videomute": "Uczestnik zatrzymał kamerę",
-        "videoMuted": "Kamera wyłączona"
+        "videomute": "Uczestnik zatrzymał kamerę"
     },
     "welcomepage": {
         "addMeetingName": "Dodaj nazwę spotkania",

lang/main-pt.json

@@ -13,7 +13,7 @@
         "failedToAdd": "Falha ao adicionar participantes",
         "footerText": "A marcação está desactivada.",
         "googleEmail": "Email do Google",
-        "inviteMoreHeader": "Você é o único na reunião",
+        "inviteMoreHeader": "É o único na reunião",
         "inviteMoreMailSubject": "Participar na reunião {{appName}}",
         "inviteMorePrompt": "Convidar mais pessoas",
         "linkCopied": "Link copiado para a área de transferência",
@@ -39,6 +39,28 @@
     "audioOnly": {
         "audioOnly": "Largura de banda baixa"
     },
+    "blankPage": {
+        "meetingEnded": "A reunião terminou."
+    },
+    "breakoutRooms": {
+        "defaultName": "Sala #{{index}}",
+        "mainRoom": "Sala principal",
+        "actions": {
+            "add": "Adicionar salas simultâneas",
+            "autoAssign": "Atribuição automática de salas simultâneas",
+            "close": "Fechar",
+            "join": "Entrar na sala",
+            "leaveBreakoutRoom": "Sair da sala",
+            "more": "Mais",
+            "remove": "Eliminar sala",
+            "sendToBreakoutRoom": "Enviar participante para:"
+        },
+        "notifications": {
+            "joinedTitle": "Salas simultâneas",
+            "joined": "Entrada na sala \"{{name}}\"",
+            "joinedMainRoom": "Entrada na sala principal"
+        }
+    },
     "calendarSync": {
         "addMeetingURL": "Adicionar um link da reunião",
         "confirmAddLink": "Gostaria de adicionar um link do Jitsi a esse evento?",
@@ -72,7 +94,7 @@
         "privateNotice": "Mensagem privada para {{recipient}}",
         "message": "Mensagem",
         "messageAccessibleTitle": "{{user}} disse:",
-        "messageAccessibleTitleMe": "Você disse:",
+        "messageAccessibleTitleMe": "Eu disse:",
         "smileysPanel": "Painel de Emojis",
         "tabs": {
             "chat": "Chat",
@@ -158,7 +180,8 @@
         "joinInApp": "Participe nesta reunião utilizando a aplicação",
         "launchWebButton": "Iniciar na web",
         "title": "A iniciar a sua reunião na {{app}}...",
-        "tryAgainButton": "Tente novamente no desktop"
+        "tryAgainButton": "Tente novamente no desktop",
+        "unsupportedBrowser": "Parece que está a usar um browser que não suportamos."
     },
     "defaultLink": "ex.: {{url}}",
     "defaultNickname": "ex.: João Pedro",
@@ -396,6 +419,7 @@
         "desktopShareError": "Não foi possível partilhar a área de trabalho",
         "desktopShare":"Partilhar área de trabalho",
         "webAssemblyWarning": "WebAssembly não suportado",
+        "webAssemblyWarningDescription": "WebAssembly desactivado ou não suportado por este navegador",
         "backgroundEffectError": "Falha ao aplicar efeito de fundo."
     },
     "feedback": {
@@ -446,7 +470,7 @@
         "noPassword": "Nenhum",
         "noRoom": "Não foi especificado nenhuma sala para ligar.",
         "numbers": "Números para entrar por chamada telefónica",
-        "password": "$t(lockRoomPasswordUppercase):",
+        "password": "$t(lockRoomPasswordUppercase): ",
         "sip": "Endereços SIP",
         "title": "Partilhar",
         "tooltip": "Partilhar link e acesso telefónico para esta reunião",
@@ -491,7 +515,7 @@
         "busyTitle": "Todas as transmissões estão atualmente ocupadas",
         "changeSignIn": "Alternar contas.",
         "choose": "Escolha uma transmissão em direto",
-        "chooseCTA": "Escolha uma opção de transmissão. Você está conectado atualmente como {{email}}.",
+        "chooseCTA": "Escolha uma opção de transmissão. Está conectado atualmente como {{email}}.",
         "enterStreamKey": "Insira sua chave de transmissão em direto do YouTube aqui.",
         "error": "Falha na transmissão em direto. Tente de novo.",
         "errorAPI": "Ocorreu um erro ao acessar suas transmissões do YouTube. Por favor tente logar novamente.",
@@ -501,6 +525,7 @@
         "expandedPending": "Iniciando a transmissão em direto...",
         "failedToStart": "Falha ao iniciar a transmissão em direto",
         "getStreamKeyManually": "Não conseguimos buscar nenhuma transmissão em direto. Tente obter sua chave de transmissão em direto no YouTube.",
+        "inProgress": "Gravação ou transmissão em direto em curso",
         "invalidStreamKey": "A senha para transmissão em direto pode estar incorreta.",
         "off": "Transmissão em direto encerrada",
         "offBy": "{{name}} parou a transmissão em direto",
@@ -508,7 +533,8 @@
         "onBy": "{{name}} iniciou a transmissão em direto",
         "pending": "Iniciando Transmissão em Direto...",
         "serviceName": "Serviço de Transmissão em Direto",
-        "signedInAs": "Você está conectado como:",
+        "sessionAlreadyActive": "Esta sessão já está a ser gravada ou transmitida em direto.",
+        "signedInAs": "Está conectado como:",
         "signIn": "Faça login no Google",
         "signInCTA": "Faça login ou insira sua chave de transmissão em Direto do YouTube.",
         "signOut": "Sair",
@@ -536,7 +562,7 @@
             "engaged": "Gravação local iniciada.",
             "finished": "Sessão de gravação {{token}} terminada. Por favor, envie o arquivo gravado para o moderador.",
             "finishedModerator": "Sessão de gravação {{token}} terminada. A gravação da faixa local foi salva. Por favor, peça aos outros participantes para enviar suas gravações.",
-            "notModerator": "Você não é o moderador. Você não pode iniciar ou parar a gravação local."
+            "notModerator": "Não é o moderador. Não pode iniciar ou parar a gravação local."
         },
         "moderator": "Moderador",
         "no": "Não",
@@ -553,10 +579,14 @@
     "notify": {
         "allowAction": "Permitir",
         "allowedUnmute": "Pode ligar o seu microfone, ligar a sua câmara ou partilhar o seu ecrã.",
+        "audioUnmuteBlockedTitle": "Ligar microfone bloqueado!",
+        "audioUnmuteBlockedDescription": "A operação de ligar o microfone foi temporariamente bloqueada devido aos limites do sistema.",
+        "chatMessages": "Mensagens de chat",
         "connectedOneMember": "{{name}} entrou na reunião",
         "connectedThreePlusMembers": "{{name}} e muitos outros entraram na reunião",
         "connectedTwoMembers": "{{first}} e {{second}} entraram na reunião",
         "disconnected": "desconectado",
+        "displayNotifications": "Mostrar notificações para",
         "focus": "Foco da conferência",
         "focusFail": "{{component}} não disponĩvel - tente em {{ms}} seg.",
         "hostAskedUnmute": "O moderador gostaria que você falasse",
@@ -564,10 +594,13 @@
         "invitedThreePlusMembers": "{{name}} e {{count}} outros foram convidados",
         "invitedTwoMembers": "{{first}} e {{second}} foram convidados",
         "kickParticipant": "{{kicked}} foi expulso por {{kicker}}",
+        "leftOneMember": "{{name}} deixou a reunião",
+        "leftThreePlusMembers": "{{name}} e muitos outros deixaram a reunião",
+        "leftTwoMembers": "{{first}} e {{second}} deixaram a reunião",
         "me": "Eu",
         "moderator": "É agora um moderador",
-        "muted": "Você iniciou uma conversa com o microfone desativado.",
-        "mutedTitle": "Você está silenciado!",
+        "muted": "Iniciou uma conversa com o microfone desativado.",
+        "mutedTitle": "Está silenciado!",
         "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 {{participantDisplayName}}.",
@@ -575,10 +608,12 @@
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) removido por outro participante",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) definido por outro participante",
         "raisedHand": "Gostaria de falar.",
+        "raisedHands": "{{participantName}} e mais {{raisedHands}} pessoas",
         "screenShareNoAudio": " A caixa de compartilhar áudio não foi marcada no ecrã de seleção da janela.",
         "screenShareNoAudioTitle": "Não foi possível partilhar o áudio do sistema!",
+        "selfViewTitle": "Pode sempre reexibir a autovisualização a partir das definições",
         "somebody": "Alguém",
-        "startSilentTitle": "Você entrou sem saída de áudio!",
+        "startSilentTitle": "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",
@@ -603,7 +638,10 @@
         "moderationToggleDescription": "pelo {{participantDisplayName}}",
         "raiseHandAction": "Levantar a mão",
         "reactionSounds": "Desactivar sons",
-        "groupTitle": "Notificações"
+        "reactionSoundsForAll": "Desativar sons para todos",
+        "groupTitle": "Notificações",
+        "videoUnmuteBlockedTitle": "Está bloqueado ligar a câmara e partilhar o ambiente de trabalho!",
+        "videoUnmuteBlockedDescription": "A operação de ligar a câmara e partilhar o ambiente de trabalho foi temporariamente bloqueada devido aos limites do sistema."
     },
     "participantsPane": {
         "close": "Fechar",
@@ -616,18 +654,20 @@
         "actions": {
             "allow": "Permitir aos participantes:",
             "allowVideo": "Permitir vídeo",
-            "audioModeration": "Ativarem o microfone deles",
+            "audioModeration": "Ativar 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",
+            "moreParticipantOptions": "Mais opções de participantes",
             "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": "Ligarem a câmara deles"
+            "videoModeration": "Ligar a câmara deles",
+            "moreModerationControls": "Mais controlos de moderação"
         },
         "search": "Pesquisar participantes"
     },
@@ -744,6 +784,7 @@
         "title": "Perfil"
     },
     "raisedHand": "Gostaria de falar",
+    "raisedHandsLabel": "Número de mãos levantadas",
     "recording": {
         "limitNotificationDescriptionWeb": "Devido à grande procura, a sua gravação será limitada a {{limit}} min. For unlimited recordings try <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "limitNotificationDescriptionNative": "Due to high demand your recording will be limited to {{limit}} min. Para gravações ilimitadas tente <3>{{app}}</3>.",
@@ -760,6 +801,7 @@
         "expandedPending": "Iniciando gravação...",
         "failedToStart": "Falha ao iniciar a gravação",
         "fileSharingdescription": "Compartilhar gravação com participantes da reunião",
+        "inProgress": "Gravação ou transmissão em direto em curso",
         "linkGenerated": "Gerámos um link para a sua gravação.",
         "live": "DIRETO",
         "loggedIn": "Conectado como {{userName}}",
@@ -772,6 +814,7 @@
         "serviceDescription": "Sua gravação será salva pelo serviço de gravação",
         "serviceDescriptionCloud": "Gravação na nuvem",
         "serviceName": "Serviço de gravação",
+        "sessionAlreadyActive": "Esta sessão já está a ser gravada ou transmitida em direto.",
         "signIn": "Entrar",
         "signOut": "Sair",
         "unavailable": "Oops! O {{serviceName}} está indisponível. Estamos trabalhando para resolver o problema. Por favor, tente mais tarde.",
@@ -784,8 +827,8 @@
     "security": {
         "about": "Pode adicionar uma $t(lockRoomPassword) à sua reunião. Os participantes terão de fornecer a $t(lockRoomPassword) antes de serem autorizados a participar na reunião.",
         "aboutReadOnly": "Os participantes moderadores podem acrescentar uma $t(lockRoomPassword) à reunião. Os participantes terão de fornecer a $t(lockRoomPassword) antes de serem autorizados a participar na reunião.",
-        "insecureRoomNameWarning": "O nome da sala é inseguro. Participantes indesejados podem juntar-se à sua conferência. Considere proteger a sua reunião utilizando o botão de segurança.",
-        "securityOptions": "Opções de segurança"
+        "header": "Opções de segurança",
+        "insecureRoomNameWarning": "O nome da sala é inseguro. Participantes indesejados podem juntar-se à sua conferência. Considere proteger a sua reunião utilizando o botão de segurança."
     },
     "settings": {
         "calendar": {
@@ -817,9 +860,11 @@
         "selectAudioOutput": "Saída de áudio",
         "selectCamera": "Câmara",
         "selectMic": "Microfone",
+        "selfView": "Autovisualização",
         "sounds": "Sons",
         "speakers": "Participantes",
         "startAudioMuted": "Todos começam com microfone desligado",
+        "startReactionsMuted": "Sons de reação silenciados para todos",
         "startVideoMuted": "Todos começam com câmara desligada",
         "talkWhileMuted": "Se fala e está com microfone desligado",
         "title": "Definições"
@@ -852,13 +897,20 @@
     },
     "speaker": "Participante",
     "speakerStats": {
-        "search": "Pesquisar",
+        "angry": "Zangado",
+        "disgusted": "Desgostoso",
+        "fearful": "Temeroso",
+        "happy": "Feliz",
         "hours": "{{count}}h",
         "minutes": "{{count}}m",
         "name": "Nome",
+        "neutral": "Neutro",
+        "sad": "Triste",
+        "search": "Pesquisar",
         "seconds": "{{count}}s",
+        "speakerTime": "Tempo do Participante",
         "speakerStats": "Estatísticas dos Participantes",
-        "speakerTime": "Tempo do Participante"
+        "surprised": "Surpreendido"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -875,6 +927,7 @@
             "audioOnly": "Mudar para apenas áudio",
             "audioRoute": "Selecionar o dispositivo de som",
             "boo": "Vaia",
+            "breakoutRoom": "Entrar/Sair salas instantâneas",
             "callQuality": "Gerir a qualidade do vídeo",
             "cc": "Mudar legendas",
             "chat": "Abrir / Fechar chat",
@@ -900,8 +953,8 @@
             "mute": "Ativar / Desativar microfone",
             "muteEveryone": "Silenciar a todos",
             "muteEveryoneElse": "Silenciar todos os outros",
-            "muteEveryonesVideo": "Desativar o vídeo de todos",
-            "muteEveryoneElsesVideo": "Desativar o vídeo de todos os outros",
+            "muteEveryonesVideo": "Parar o vídeo de todos",
+            "muteEveryoneElsesVideo": "Parar o vídeo de todos os outros",
             "participants": "Participantes",
             "pip": "Mudar para o modo Picture-in-Picture",
             "privateMessage": "Enviar mensagem privada",
@@ -958,7 +1011,9 @@
         "hangup": "Sair da reunião",
         "help": "Ajuda",
         "invite": "Convidar pessoas",
+        "joinBreakoutRoom": "Entrar na sala",
         "laugh": "Risos",
+        "leaveBreakoutRoom": "Sair da sala",
         "like": "Aprovado",
         "lobbyButtonDisable": "Desativar sala de espera",
         "lobbyButtonEnable": "Ativar sala de espera",
@@ -1075,6 +1130,7 @@
         "domuteVideoOfOthers": "Desactivar a câmara de todos os outros",
         "flip": "Inverter",
         "grantModerator": "Conceder direitos de moderador",
+        "hideSelfView": "Ocultar a autovisualização",
         "kick": "Expulsar",
         "moderator": "Moderador",
         "mute": "Participante está sem som",
@@ -1090,7 +1146,7 @@
             "join": "Toque para entrar",
             "roomname": "Digite o nome da sala"
         },
-        "appDescription": "Vá em frente, converse por vídeo com toda a equipa. Na verdade, convide todos os que 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.",
+        "appDescription": "Vá em frente, converse por vídeo com toda a equipa. Na verdade, convide todos os que conhece. {{app}} é uma solução de videoconferência totalmente criptografada e 100% de código aberto que pode usar todos os dias, a cada dia, gratuitamente — sem necessidade de conta.",
         "audioVideoSwitch": {
             "audio": "Voz",
             "video": "Vídeo"
@@ -1114,7 +1170,7 @@
         "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.",
+        "recentListEmpty": "A sua lista recente está atualmente vazia. Converse com a sua equipa e encontrará aqui todas as suas reuniões recentes.",
         "reducedUIText": "Bem-vindo ao {{app}}!",
         "roomNameAllowedChars": "Nome da reunião não deve conter qualquer um destes caracteres: ?. &, :, ', \", %, #.",
         "roomname": "Digite o nome da sala",
@@ -1136,6 +1192,12 @@
         "button": "Convidar outros",
         "youAreAlone": "É o único na reunião"
     },
+    "termsView": {
+        "header": "Termos"
+    },
+    "privacyView": {
+        "header": "Privacidade"
+    },
     "helpView": {
         "header": "Centro de ajuda"
     },

lang/main-ru.json

@@ -102,10 +102,13 @@
     },
     "connectionindicator": {
         "address": "Адрес:",
+        "audio_ssrc": "Аудио SSRC:",
         "bandwidth": "Средняя скорость:",
         "bitrate": "Битрейт:",
         "bridgeCount": "Количество серверов: ",
+        "codecs": "Кодеки (A/V): ",
         "connectedTo": "Подключен к:",
+        "e2e_rtt": "E2E RTT:",
         "framerate": "Частота кадров:",
         "less": "Краткая информация",
         "localaddress_0": "Локальный адрес:",
@@ -114,6 +117,7 @@
         "localport_0": "Локальный порт:",
         "localport_1": "Локальных порта:",
         "localport_2": "Локальных портов:",
+        "maxEnabledResolution": "Максимальное разрешение",
         "more": "Подробная информация",
         "packetloss": "Потери пакетов:",
         "quality": {
@@ -130,10 +134,13 @@
         "remoteport_1": "Удаленных порта:",
         "remoteport_2": "Удаленных портов:",
         "resolution": "Разрешение:",
+        "savelogs": "Сохранить логи",
+        "participant_id": "id участника:",
         "status": "Связь:",
         "transport_0": "Метод отправки:",
         "transport_1": "Метода отправки:",
-        "transport_2": "Методов отправки:"
+        "transport_2": "Методов отправки:",
+        "video_ssrc": "Видео SSRC:"
     },
     "dateUtils": {
         "earlier": "Ранее",
@@ -559,6 +566,30 @@
         "suboptimalExperienceTitle": "Предупреждение браузера",
         "unmute": "Включить микрофон"
     },
+    "participantsPane": {
+        "close": "Закрыть",
+        "header": "Участники",
+        "headings": {
+            "lobby": "Лобби ({{count}})",
+            "participantsList": "Список участников ({{count}})",
+            "waitingLobby": "Ожидают в лобби ({{count}})"
+        },
+        "actions": {
+            "allow": "Разрешить",
+            "allowVideo": "Разрешить видео",
+            "audioModeration": "Разрешить выключить микрофон",
+            "blockEveryoneMicCamera": "Заблокировать у всех микрофон и камеру",
+            "invite": "Пригласить",
+            "askUnmute": "Попросить разрешение включить микрофон",
+            "mute": "Выключить звук",
+            "muteAll": "Выключить звук у всех",
+            "muteEveryoneElse": "Выключить микрофон у остальных",
+            "stopEveryonesVideo": "Выключить у всех камеру",
+            "stopVideo": "Остановить видео",
+            "unblockEveryoneMicCamera": "Разблокировать у всех микрофон и камеру",
+            "videoModeration": "Разрешить видео"
+        }
+    },
     "passwordDigitsOnly": "До {{number}} цифр",
     "passwordSetRemotely": "установлен другим участником",
     "poweredby": "работает на",
@@ -744,7 +775,7 @@
             "hangup": "Завершить звонок",
             "help": "Справка",
             "invite": "Пригласить",
-            "kick": "Выкинуть участника",
+            "kick": "Отключить участника",
             "lobbyButton": "Вкл/Выкл режим лобби",
             "localRecording": "Вкл/Выкл кнопки записи",
             "lockRoom": "Установить пароль",
@@ -774,13 +805,18 @@
             "videomute": "Вкл/Выкл видео"
         },
         "addPeople": "Добавить людей к вашему сеансу связи",
+        "audioSettings": "Настройка звука",
+        "videoSettings": "Настройка видео",
         "audioOnlyOff": "Отключить режим экономии пропускной способности",
         "audioOnlyOn": "Включить режим экономии пропускной способности",
         "audioRoute": "Выбрать аудиоустройство",
         "authenticate": "Аутентифицировать",
+        "boo": "Освистывать",
         "callQuality": "Качество связи",
         "chat": "Чат",
+        "clap": "Аплодисменты",
         "closeChat": "Закрыть чат",
+        "closeReactionsMenu": "Закрыть меню реакций",
         "documentClose": "Закрыть общий документ",
         "documentOpen": "Открыть общий документ",
         "download": "Скачать приложение",
@@ -794,6 +830,8 @@
         "hangup": "Выход",
         "help": "Справка",
         "invite": "Пригласить",
+        "laugh": "Смеяться",
+        "like": "Мне нравится",
         "lobbyButtonDisable": "Отключить режим лобби",
         "lobbyButtonEnable": "Включить режим лобби",
         "login": "Войти",
@@ -812,6 +850,7 @@
         "noisyAudioInputTitle": "Похоже, ваш микрофон создает шум!",
         "noisyAudioInputDesc": "Возможно, ваш микрофон создает шум. Вы можете выключить его или смените устройство.",
         "openChat": "Открыть чат",
+        "openReactionsMenu": "Открыть меню реакций",
         "participants": "Участники",
         "pip": "Вкл режим Картинка-в-картинке",
         "privateMessage": "Отправить личное сообщение",
@@ -819,9 +858,12 @@
         "raiseHand": "Хочу говорить",
         "raiseYourHand": "Поднять руку",
         "security": "Настройки безопасности",
+        "selectBackground": "Выбрать фоновое изображение",
         "shareRoom": "Отправить приглашение",
+        "shareaudio": "Предоставить доступ к звуку",
         "sharedvideo": "Видео YouTube",
         "shortcuts": "Комбинации клавиш",
+        "silence": "Молчание",
         "speakerStats": "Статистика",
         "startScreenSharing": "Начать трансляцию с экрана",
         "startSubtitles": "Включить субтитры",
@@ -830,6 +872,7 @@
         "stopSharedVideo": "Остановить видео на YouTube",
         "stopSubtitles": "Отключить субтитры",
         "stopvideoblur": "Отключить размытие фона",
+        "surprised": "Удивиться",
         "talkWhileMutedPopup": "Пытаетесь говорить? У вас отключен звук.",
         "tileViewToggle": "Вкл/выкл плитку",
         "toggleCamera": "Переключить камеру",
@@ -887,17 +930,21 @@
         "standardDefinition": "Стандартное качество (SD)"
     },
     "videothumbnail": {
+        "connectionInfo": "Информация о соединении",
         "domute": "Выключить звук",
-        "domuteOthers": "Выключить остальных",
+        "domuteVideo": "Выключить видео",
+        "domuteOthers": "Выключить звук остальным",
+        "domuteVideoOfOthers": "Выключить видео остальным",
         "flip": "Отразить",
         "grantModerator": "Сделать модератором",
-        "kick": "Выкинуть",
+        "kick": "Отключить",
         "moderator": "Модератор",
         "mute": "Без звука",
         "muted": "Звук выключен",
+        "videoMuted": "Камера выключена",
         "remoteControl": "Начать / Остановить дистанционный контроль",
         "show": "Показать крупным планом",
-        "videomute": "Участник отключил камеру"
+        "videomute": "Участник выключил камеру"
     },
     "welcomepage": {
         "accessibilityLabel": {
@@ -934,4 +981,4 @@
         "terms": "Условия",
         "title": "Защищенная, полнофункциональная и совершенно бесплатная система видеоконференций"
     }
-}
+}

lang/main-sv.json

@@ -1079,7 +1079,7 @@
         "title": "Delade dokument"
     },
     "e2ee": {
-        "labelToolTip": "jud- och videokommunikation för detta samtal är krypterad från dator till dator"
+        "labelToolTip": "Ljud- och videokommunikation för detta samtal är krypterad från dator till dator"
     },
     "embedMeeting": {
         "title": "Bädda in möte"
@@ -1165,8 +1165,8 @@
             "send": "Skicka"
         },
         "answer": {
-            "skip": "Skicka",
-            "submit": "Skippa"
+            "skip": "Skippa",
+            "submit": "Skicka"
         },
         "results": {
             "vote": "Rösta",

lang/main-zhTW.json

@@ -39,6 +39,28 @@
     "audioOnly": {
         "audioOnly": "低頻寬"
     },
+    "blankPage": {
+        "meetingEnded": "會議已結束。"
+    },
+    "breakoutRooms": {
+        "defaultName": "分組討論室 #{{index}}",
+        "mainRoom": "主會議室",
+        "actions": {
+            "add": "新增討論室",
+            "autoAssign": "自動分配至討論室",
+            "close": "關閉",
+            "join": "加入",
+            "leaveBreakoutRoom": "離開討論室",
+            "more": "更多",
+            "remove": "移除",
+            "sendToBreakoutRoom": "將參與者移至："
+        },
+        "notifications": {
+            "joinedTitle": "分組討論室",
+            "joined": "正在加入 \"{{name}}\" 分組討論室",
+            "joinedMainRoom": "正在加入主會議室"
+        }
+    },
     "calendarSync": {
         "addMeetingURL": "增加會議連結",
         "confirmAddLink": "您要為此活動加入 Jitsi 連結嗎？",
@@ -70,13 +92,17 @@
             "titleWithPolls": "輸入名稱來使用交談"
         },
         "privateNotice": "私人訊息傳送至 {{recipient}}",
-        "title": "對話",
-        "titleWithPolls": "對話",
-        "you": "您",
         "message": "訊息",
         "messageAccessibleTitle": "{{user}} 說：",
         "messageAccessibleTitleMe": "您說：",
-        "smileysPanel": "表情符號面板"
+        "smileysPanel": "表情符號面板",
+        "tabs": {
+            "chat": "聊天",
+            "polls": "投票"
+        },
+        "title": "對話",
+        "titleWithPolls": "對話",
+        "you": "您"
     },
     "chromeExtensionBanner": {
         "installExtensionText": "安裝適用於 Google 行事曆及 Office 365 整合的擴充功能",
@@ -209,7 +235,9 @@
         "done": "完成",
         "e2eeDescription": "端對端加密目前是實驗性功能。請注意：啟用端對端加密將停用伺服器端提供的服務，例如：錄影、直播、及電話參與。且會議將只適用於支援 Insertable Streams 的瀏覽器。",
         "e2eeLabel": "啟用端對端加密",
+        "e2eeDisabledDueToMaxModeDescription": "由於會議中的人數過多，故無法啟用端對端加密。",
         "e2eeWarning": "警告：看來不是每位此會議的參與者都有啟用端對端加密，如果您啟用了，他們可能無法看/聽到您。",
+        "e2eeWillDisableDueToMaxModeDescription": "警告：如果有更多參與者加入會議，端對端加密將被自動停用。",
         "enterDisplayName": "請在此輸入您自己的名字",
         "embedMeeting": "嵌入會議",
         "error": "錯誤",
@@ -245,24 +273,30 @@
         "micPermissionDeniedError": "您未取得權限使用麥克風。您仍然可參加會議，但是其他人無法聽到您。可以利用位址欄中的攝影裝置按鈕來修正。",
         "micTimeoutError": "無法啟動音訊裝置。連線逾時！",
         "micUnknownError": "不明原因造成麥克風無法使用。",
+        "moderationAudioLabel": "允許參與者自我解除靜音",
+        "moderationVideoLabel": "允許參與者開啟視訊",
         "muteEveryoneElseDialog": "靜音後，你就不能再解除對方的靜音，但對方可以隨時解除自己的靜音狀態。",
         "muteEveryoneElseTitle": "是否要讓除了 {{whom}} 以外的人靜音？",
         "muteEveryoneDialog": "是否要靜音所有人？靜音後，你就不能再解除對方的靜音，但對方可以隨時解除自己的靜音狀態。",
+        "muteEveryoneDialogModerationOn": "參與者可以隨時傳送說話請求。",
         "muteEveryoneTitle": "靜音所有人？",
         "muteEveryoneElsesVideoDialog": "一旦停用，您就不能再重新開啟對方的攝影機，但對方隨時能重新開啟自己的攝影機。",
         "muteEveryoneElsesVideoTitle": "是否要關閉除了 {{whom}} 以外的人的攝影機？",
         "muteEveryonesVideoDialog": "您確定要停用所有人的攝影機嗎？停用後，您就無法再重新開啟，只有對方能自己重新開啟。",
+        "muteEveryonesVideoDialogModerationOn": "參與者可以隨時傳送開啟視訊請求。",
         "muteEveryonesVideoDialogOk": "停用",
         "muteEveryonesVideoTitle": "關閉所有人的攝影機？",
         "muteEveryoneSelf": "您自己",
         "muteEveryoneStartMuted": "現在所有人皆已靜音",
         "muteParticipantBody": "您無法對他們解除靜音，但是他們自己隨時可以解除靜音。",
         "muteParticipantButton": "靜音",
-        "muteParticipantDialog": "確定要將這位參與者設為靜音？您無法為他們解除，但他們可以隨時自行解除靜音。",
-        "muteParticipantTitle": "將這位參與者設為靜音？",
+        "muteParticipantsVideoDialog": "確定要將這位參與者設為靜音？您無法為他們解除，但他們可以隨時自行解除靜音。",
+        "muteParticipantsVideoDialogModerationOn": "您確定要關閉此參與者的視訊鏡頭嗎？您和他都無法再將視訊重新開啟。",
         "muteParticipantsVideoButton": "停用攝影機",
         "muteParticipantsVideoTitle": "停用此參與者的攝影機？",
         "muteParticipantsVideoBody": "您無法重新開啟，只有對方能自己重新開啟。",
+        "muteParticipantsVideoBodyModerationOn": "您和他都無法再將視訊重新開啟。",
+        "noDropboxToken": "沒有有效的 Dropbox 權杖",
         "Ok": "確定",
         "password": "密碼",
         "passwordLabel": "會議已被參與者鎖定。請輸入 $t(lockRoomPassword) 以加入。",
@@ -323,6 +357,7 @@
         "shareScreenWarningH1": "如果您只要分享畫面：",
         "shareScreenWarningD1": "您必須先停止分享音訊才能分享畫面。",
         "shareScreenWarningD2": "您必須先停止分享音訊，啟動畫面分享，然後勾選 \"分享音訊\" 選項。",
+        "sharedVideoLinkPlaceholder": "YouTube 或影片連結",
         "stopLiveStreaming": "停止直播串流",
         "stopRecording": "停止錄影",
         "stopRecordingWarning": "確定要停止錄影嗎？",
@@ -382,7 +417,8 @@
         "image7" : "日出",
         "desktopShareError": "無法建立桌面分享",
         "desktopShare":"桌面分享",
-        "webAssemblyWarning": "不支援 WebAssembly"
+        "webAssemblyWarning": "不支援 WebAssembly",
+        "backgroundEffectError": "無法套用背景效果。"
     },
     "feedback": {
         "average": "普通",
@@ -419,6 +455,10 @@
         "invitePhone": "要用電話參加會議，請使用：{{number}},,{{conferenceID}}#\n",
         "invitePhoneAlternatives": "要找另一組撥入號碼？\n請見會議撥入號碼：{{url}}\n\n\n如果也要用室內電話撥打，不用連接語音進行加入：{{silentUrl}}",
         "inviteSipEndpoint": "如果要透過 SIP 地址加入，請輸入：{{sipUri}}",
+        "inviteTextiOSPersonal": "{{name}} 邀請您加入會議。",
+        "inviteTextiOSJoinSilent": "如果您使用了市內電話撥入，請使用此連結來停用音訊：{{silentUrl}}。",
+        "inviteTextiOSInviteUrl": "點擊此連結以加入：{{inviteUrl}}。",
+        "inviteTextiOSPhone": "若要透過電話加入，請使用此號碼：{{number}},,{{conferenceID}}#。如果您需要其他號碼，點擊此連結以檢視完整列表：{{didUrl}}。",
         "inviteURLFirstPartGeneral": "您受邀參加會議。",
         "inviteURLFirstPartPersonal": "{{name}} 正在邀請您加入會議。\n",
         "inviteURLSecondPart": "\n加入會議：\n{{url}}\n",
@@ -483,6 +523,7 @@
         "expandedPending": "直播串流正被啟動...",
         "failedToStart": "直播串流啟動失敗",
         "getStreamKeyManually": "我們無法解析任何直播串流，請從 YouTube 取得您的直播串流金鑰。",
+        "inProgress": "正在錄製或直播",
         "invalidStreamKey": "直播串流金鑰可能不正確。",
         "off": "直播串流已經停止",
         "offBy": "{{name}} 停止了直播串流",
@@ -490,6 +531,7 @@
         "onBy": "{{name}} 啟動了直播串流",
         "pending": "啟動直播串流...",
         "serviceName": "直播串流服務",
+        "sessionAlreadyActive": "已在錄製或直播此工作階段。",
         "signedInAs": "您目前登入名稱為：",
         "signIn": "使用 Google 帳戶登入",
         "signInCTA": "輸入 YouTube 直播串流密鑰，或登入 YouTube 帳號。",
@@ -533,6 +575,10 @@
     "lockRoomPasswordUppercase": "密碼",
     "me": "我",
     "notify": {
+        "allowAction": "允許",
+        "allowedUnmute": "您可以將麥克風解除靜音、開啟視訊，或是分享您的畫面。",
+        "audioUnmuteBlockedTitle": "麥克風解除靜音遭封鎖！",
+        "audioUnmuteBlockedDescription": "麥克風解除靜音操作由於系統限制而被暫時封鎖。",
         "connectedOneMember": "{{name}} 加入了會議",
         "connectedThreePlusMembers": "{{name}} 及 {{count}} 位人員加入了會議",
         "connectedTwoMembers": "{{first}} 及 {{second}} 加入了會議",
@@ -545,6 +591,9 @@
         "invitedThreePlusMembers": "{{name}} 及 {{count}} 位人員已受邀請",
         "invitedTwoMembers": "{{first}} 及 {{second}} 已受邀請",
         "kickParticipant": "{{kicked}} 已被 {{kicker}} 踢出會議",
+        "leftOneMember": "{{name}} 已離開會議",
+        "leftThreePlusMembers": "{{name}} 和其他人已離開會議",
+        "leftTwoMembers": "{{first}} 和 {{second}} 已離開會議",
         "me": "自己",
         "moderator": "主持人權限已經取得！",
         "muted": "您已經啟動通話，處於靜音。",
@@ -583,26 +632,71 @@
         "moderationStoppedTitle": "停止管理",
         "moderationToggleDescription": "由 {{participantDisplayName}}",
         "raiseHandAction": "舉手",
-        "groupTitle": "通知"
+        "reactionSounds": "停用音效",
+        "reactionSoundsForAll": "為所有人停用音效",
+        "groupTitle": "通知",
+        "videoUnmuteBlockedTitle": "視訊鏡頭解除靜音遭封鎖！",
+        "videoUnmuteBlockedDescription": "視訊鏡頭解除靜音操作由於系統限制而被暫時封鎖。"
     },
     "participantsPane": {
         "close": "關閉",
+        "header": "參與者",
         "headings": {
             "lobby": "大廳 ({{count}})",
-            "participantsList": "會議參與者 ({{count}})"
+            "participantsList": "會議參與者 ({{count}})",
+            "waitingLobby": "於大廳等待 ({{count}})"
         },
         "actions": {
             "allow": "允許參與者能夠：",
+            "allowVideo": "允許視訊",
+            "audioModeration": "自我解除靜音",
+            "blockEveryoneMicCamera": "封鎖所有人的麥克風和視訊鏡頭",
             "invite": "邀請他人",
             "askUnmute": "要求解除靜音",
+            "moreModerationActions": "更多管理選項",
+            "moreParticipantOptions": "更多參與者選項",
+            "mute": "靜音",
             "muteAll": "靜音所有人",
-            "startModeration": "將他們解除靜音或開始視訊",
+            "muteEveryoneElse": "靜音其他人",
             "stopEveryonesVideo": "停止所有人的視訊",
-            "stopVideo": "停止影片"
-        }
+            "stopVideo": "停止影片",
+            "unblockEveryoneMicCamera": "解除封鎖所有人的麥克風及視訊鏡頭",
+            "videoModeration": "開啟視訊",
+            "moreModerationControls": "更多管理控制項"
+        },
+        "search": "搜尋參與者"
     },
     "passwordSetRemotely": "由其他參與者設定",
     "passwordDigitsOnly": "上限為 {{number}} 位數",
+    "polls": {
+        "by": "由 {{ name }}",
+        "create": {
+            "addOption": "新增選項",
+            "answerPlaceholder": "選項 {{index}}",
+            "create": "建立投票",
+            "cancel": "取消",
+            "pollOption" : "投票選項 {{index}}",
+            "pollQuestion" : "投票問題",
+            "questionPlaceholder": "詢問問題",
+            "removeOption": "移除選項",
+            "send": "傳送"
+        },
+        "answer": {
+            "skip": "跳過",
+            "submit": "提交"
+        },
+        "results": {
+            "vote": "投票",
+            "changeVote": "修改投票",
+            "empty": "目前會議中沒有任何投票。在這裡建立您的投票吧！",
+            "hideDetailedResults": "隱藏詳細資訊",
+            "showDetailedResults": "顯示詳細資訊"
+        },
+        "notification": {
+            "title": "此會議有一項新投票",
+            "description": "開啟投票分頁以參與投票"
+        }
+    },
     "poweredby": "技術支援",
     "prejoin": {
         "audioAndVideoError": "音訊及視訊錯誤：",
@@ -643,6 +737,7 @@
         "errorDialOutFailed": "因通話失敗而無法撥出。",
         "errorDialOutStatus": "取得撥出狀態時發生錯誤",
         "errorMissingName": "請輸入您的名字以加入會議",
+        "errorNoPermissions": "您必須啟用麥克風及視訊鏡頭存取權限",
         "errorStatusCode": "撥出失敗，狀態代碼：{{status}}",
         "errorValidation": "號碼驗證失敗",
         "iWantToDialIn": "我想要撥入",
@@ -700,6 +795,7 @@
         "expandedPending": "錄影正在啟動...",
         "failedToStart": "錄影啟動失敗",
         "fileSharingdescription": "分享錄影給會議參與者",
+        "inProgress": "正在錄製或直播",
         "linkGenerated": "我們建立了您的錄影檔的連結。",
         "live": "直播",
         "loggedIn": "以 {{userName}} 登入",
@@ -712,6 +808,7 @@
         "serviceDescription": "您的錄影會由錄影服務儲存",
         "serviceDescriptionCloud": "雲端錄製",
         "serviceName": "錄影服務",
+        "sessionAlreadyActive": "已在錄製或直播此工作階段。",
         "signIn": "登入",
         "signOut": "登出",
         "unavailable": "喔哦！{{serviceName}} 目前無法使用。我們正在解決此問題，請稍後再試。",
@@ -741,6 +838,7 @@
         "devices": "裝置",
         "followMe": "全部人跟隨我",
         "framesPerSecond": "幀數",
+        "incomingMessage": "新訊息",
         "language": "語言",
         "loggedIn": "以 {{name}} 登入",
         "microphones": "麥克風",
@@ -748,13 +846,20 @@
         "more": "更多",
         "name": "名稱",
         "noDevice": "無",
+        "participantJoined": "參與者已加入",
+        "participantLeft": "參與者已離開",
+        "playSounds": "播放音效",
+        "reactions": "會議反應",
         "sameAsSystem": "系統預設 ({{label}})",
         "selectAudioOutput": "音訊輸出",
         "selectCamera": "攝影裝置",
         "selectMic": "麥克風",
+        "sounds": "音效",
         "speakers": "喇叭",
         "startAudioMuted": "全部人啟動時處於靜音",
+        "startReactionsMuted": "為所有人關閉反應音效",
         "startVideoMuted": "全部人啟動時處於隱藏",
+        "talkWhileMuted": "靜音時說話",
         "title": "設定"
     },
     "settingsView": {
@@ -785,12 +890,20 @@
     },
     "speaker": "喇叭",
     "speakerStats": {
+        "search": "搜尋",
         "hours": "{{count}}時",
         "minutes": "{{count}}分",
         "name": "名稱",
         "seconds": "{{count}}秒",
         "speakerStats": "聲音輸出數據",
-        "speakerTime": "聲音輸出時間"
+        "speakerTime": "聲音輸出時間",
+        "happy": "開心",
+        "neutral": "中立",
+        "sad": "悲傷",
+        "surprised": "驚訝",
+        "angry": "憤怒",
+        "fearful": "害怕",
+        "disgusted": "作嘔"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -806,6 +919,7 @@
         "accessibilityLabel": {
             "audioOnly": "切換僅聲音",
             "audioRoute": "選擇音訊裝置",
+            "boo": "喝倒彩",
             "callQuality": "管理影像品質",
             "cc": "切換字幕",
             "chat": "切換聊天視窗",
@@ -870,11 +984,13 @@
         "audioOnlyOn": "啟用低頻寬模式",
         "audioRoute": "選擇音訊裝置",
         "authenticate": "認證",
+        "boo": "喝倒彩",
         "callQuality": "管理影像品質",
         "chat": "開啟/關閉聊天欄",
         "clap": "鼓掌",
         "closeChat": "關閉聊天欄",
         "closeReactionsMenu": "關閉反應選單",
+        "disableReactionSounds": "您可以停用此會議的反應音效",
         "documentClose": "關閉分享檔案欄",
         "documentOpen": "開啟分享檔案欄",
         "download": "下載我們的應用程式",
@@ -888,7 +1004,9 @@
         "hangup": "離開",
         "help": "說明",
         "invite": "邀請人員",
-        "joy": "高興",
+        "joinBreakoutRoom": "加入分組討論室",
+        "laugh": "大笑",
+        "leaveBreakoutRoom": "離開分組討論室",
         "like": "比讚",
         "lobbyButtonDisable": "停用大廳模式",
         "lobbyButtonEnable": "啟用大廳模式",
@@ -910,17 +1028,16 @@
         "openChat": "開啟聊天欄",
         "openReactionsMenu": "開啟反應選單",
         "participants": "參與者",
-        "party": "慶祝",
         "pip": "進入子母畫面模式",
-        "privateMessage": "發送私人訊息",
+        "privateMessage": "傳送私人訊息",
         "profile": "編輯您的簡介",
-        "raiseHand": "舉手/取消請求發言",
-        "raiseYourHand": "舉手發言",
+        "raiseHand": "舉手/放下",
+        "raiseYourHand": "舉手",
+        "reactionBoo": "傳送喝倒彩反應",
         "reactionClap": "傳送鼓掌反應",
-        "reactionJoy": "傳送高興反應",
+        "reactionLaugh": "傳送大笑反應",
         "reactionLike": "傳送比讚反應",
-        "reactionParty": "傳送拉炮反應",
-        "reactionSmile": "傳送微笑反應",
+        "reactionSilence": "傳送靜默反應",
         "reactionSurprised": "傳送驚訝反應",
         "security": "安全性選項",
         "Settings": "設定",
@@ -979,7 +1096,10 @@
         "pending": "已向 {{displayName}} 發送邀請"
     },
     "videoStatus": {
+        "adjustFor": "調整：",
         "audioOnly": "僅聲音",
+        "bestPerformance": "最佳效能",
+        "highestQuality": "最佳品質",
         "audioOnlyExpanded": "您目前處於低頻寬模式。在此模式下您僅會收到語音及螢幕分享。",
         "callQuality": "影像品質",
         "hd": "HD",
@@ -990,6 +1110,7 @@
         "ld": "LD",
         "ldTooltip": "觀看低解析度影像",
         "lowDefinition": "低解析度",
+        "performanceSettings": "效能設定",
         "sd": "SD",
         "sdTooltip": "觀看標準解析度影像",
         "standardDefinition": "標準解析度"
@@ -1063,6 +1184,12 @@
         "button": "邀請其他人",
         "youAreAlone": "您是會議中的唯一一個人"
     },
+    "termsView": {
+        "header": "條款"
+    },
+    "privacyView": {
+        "header": "隱私權"
+    },
     "helpView": {
         "header": "說明中心"
     },
@@ -1081,6 +1208,7 @@
         "enableDialogText": "大廳模式能夠保護您的會議，只有被管理員認可後才能加入會議。",
         "enterPasswordButton": "輸入會議密碼",
         "enterPasswordTitle": "輸入密碼以加入會議",
+        "errorMissingPassword": "請輸入會議密碼",
         "invalidPassword": "密碼錯誤",
         "joiningMessage": "一旦他人接受您的請求，即可加入會議",
         "joinWithPasswordMessage": "正在嘗試透過密碼加入，請稍候...",
@@ -1099,6 +1227,7 @@
         "passwordField": "輸入會議密碼",
         "passwordJoinButton": "加入",
         "reject": "拒絕",
+        "rejectAll": "拒絕所有人",
         "toggleLabel": "啟用大廳"
     }
 }

lang/main.json

@@ -54,6 +54,11 @@
             "more": "More",
             "remove": "Remove",
             "sendToBreakoutRoom": "Send participant to:"
+        },
+        "notifications": {
+            "joinedTitle": "Breakout Rooms",
+            "joined": "Joining the \"{{name}}\" breakout room",
+            "joinedMainRoom": "Joining the main room"
         }
     },
     "calendarSync": {
@@ -175,7 +180,8 @@
         "joinInApp": "Join this meeting using the app",
         "launchWebButton": "Launch in web",
         "title": "Launching your meeting in {{app}}...",
-        "tryAgainButton": "Try again in desktop"
+        "tryAgainButton": "Try again in desktop",
+        "unsupportedBrowser": "It looks like you're using a browser we don't support."
     },
     "defaultLink": "e.g. {{url}}",
     "defaultNickname": "ex. Jane Pink",
@@ -413,6 +419,7 @@
         "desktopShareError": "Could not create desktop share",
         "desktopShare":"Desktop share",
         "webAssemblyWarning": "WebAssembly not supported",
+        "webAssemblyWarningDescription": "WebAssembly disabled or not supported by this browser",
         "backgroundEffectError": "Failed to apply background effect."
     },
     "feedback": {
@@ -463,7 +470,7 @@
         "noPassword": "None",
         "noRoom": "No room was specified to dial-in into.",
         "numbers": "Dial-in Numbers",
-        "password": "$t(lockRoomPasswordUppercase):",
+        "password": "$t(lockRoomPasswordUppercase): ",
         "sip": "SIP address",
         "title": "Share",
         "tooltip": "Share link and dial-in info for this meeting",
@@ -574,10 +581,12 @@
         "allowedUnmute": "You can unmute your microphone, start your camera or share your screen.",
         "audioUnmuteBlockedTitle": "Mic unmute blocked!",
         "audioUnmuteBlockedDescription": "Mic unmute operation has been temporarily blocked because of system limits.",
+        "chatMessages": "Chat messages",
         "connectedOneMember": "{{name}} joined the meeting",
         "connectedThreePlusMembers": "{{name}} and many others joined the meeting",
         "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
         "disconnected": "disconnected",
+        "displayNotifications": "Display notifications for",
         "focus": "Conference focus",
         "focusFail": "{{component}} not available - retry in {{ms}} sec",
         "hostAskedUnmute": "The moderator would like you to speak",
@@ -602,6 +611,7 @@
         "raisedHands": "{{participantName}} and {{raisedHands}} more people",
         "screenShareNoAudio": " Share audio box was not checked in the window selection screen.",
         "screenShareNoAudioTitle": "Couldn't share system audio!",
+        "selfViewTitle": "You can always un-hide the self-view from settings",
         "somebody": "Somebody",
         "startSilentTitle": "You joined with no audio output!",
         "startSilentDescription": "Rejoin the meeting to enable audio",
@@ -628,9 +638,10 @@
         "moderationToggleDescription": "by {{participantDisplayName}}",
         "raiseHandAction": "Raise hand",
         "reactionSounds": "Disable sounds",
+        "reactionSoundsForAll": "Disable sounds for all",
         "groupTitle": "Notifications",
-        "videoUnmuteBlockedTitle": "Camera unmute blocked!",
-        "videoUnmuteBlockedDescription": "Camera unmute operation has been temporarily blocked because of system limits."
+        "videoUnmuteBlockedTitle": "Camera unmute and desktop sharing blocked!",
+        "videoUnmuteBlockedDescription": "Camera unmute and desktop sharing operation have been temporarily blocked because of system limits."
     },
     "participantsPane": {
         "close": "Close",
@@ -655,7 +666,8 @@
             "stopEveryonesVideo": "Stop everyone's video",
             "stopVideo": "Stop video",
             "unblockEveryoneMicCamera": "Unblock everyone's mic and camera",
-            "videoModeration": "Start their video"
+            "videoModeration": "Start their video",
+            "moreModerationControls": "More moderation controls"
         },
         "search": "Search participants"
     },
@@ -772,6 +784,7 @@
         "title": "Profile"
     },
     "raisedHand": "Would like to speak",
+    "raisedHandsLabel": "Number of raised hands",
     "recording": {
         "limitNotificationDescriptionWeb": "Due to high demand your recording will be limited to {{limit}} min. For unlimited recordings try <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "limitNotificationDescriptionNative": "Due to high demand your recording will be limited to {{limit}} min. For unlimited recordings try <3>{{app}}</3>.",
@@ -814,8 +827,8 @@
     "security": {
         "about": "You can add a $t(lockRoomPassword) to your meeting. Participants will need to provide the $t(lockRoomPassword) before they are allowed to join the meeting.",
         "aboutReadOnly": "Moderator participants can add a $t(lockRoomPassword) to the meeting. Participants will need to provide the $t(lockRoomPassword) before they are allowed to join the meeting.",
-        "insecureRoomNameWarning": "The room name is unsafe. Unwanted participants may join your conference. Consider securing your meeting using the security button.",
-        "securityOptions": "Security options"
+        "header": "Security Options",
+        "insecureRoomNameWarning": "The room name is unsafe. Unwanted participants may join your conference. Consider securing your meeting using the security button."
     },
     "settings": {
         "calendar": {
@@ -847,9 +860,11 @@
         "selectAudioOutput": "Audio output",
         "selectCamera": "Camera",
         "selectMic": "Microphone",
+        "selfView": "Self view",
         "sounds": "Sounds",
         "speakers": "Speakers",
         "startAudioMuted": "Everyone starts muted",
+        "startReactionsMuted": "Mute reaction sounds for everyone",
         "startVideoMuted": "Everyone starts hidden",
         "talkWhileMuted": "Talk while muted",
         "title": "Settings"
@@ -882,20 +897,20 @@
     },
     "speaker": "Speaker",
     "speakerStats": {
-        "search": "Search",
+        "angry": "Angry",
+        "disgusted": "Disgusted",
+        "fearful": "Fearful",
+        "happy": "Happy",
         "hours": "{{count}}h",
         "minutes": "{{count}}m",
         "name": "Name",
-        "seconds": "{{count}}s",
-        "speakerStats": "Speaker Stats",
-        "speakerTime": "Speaker Time",
-        "happy": "Happy",
         "neutral": "Neutral",
         "sad": "Sad",
-        "surprised": "Surprised",
-        "angry": "Angry",
-        "fearful": "Fearful",
-        "disgusted": "Disgusted"
+        "search": "Search",
+        "seconds": "{{count}}s",
+        "speakerTime": "Speaker Time",
+        "speakerStats": "Speaker Stats",
+        "surprised": "Surprised"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -938,8 +953,8 @@
             "mute": "Mute / Unmute",
             "muteEveryone": "Mute everyone",
             "muteEveryoneElse": "Mute everyone else",
-            "muteEveryonesVideo": "Disable everyone's video",
-            "muteEveryoneElsesVideo": "Disable everyone else's video",
+            "muteEveryonesVideoStream": "Stop everyone's video",
+            "muteEveryoneElsesVideoStream": "Stop everyone else's video",
             "participants": "Participants",
             "pip": "Toggle Picture-in-Picture mode",
             "privateMessage": "Send private message",
@@ -1115,6 +1130,7 @@
         "domuteVideoOfOthers": "Disable camera of everyone else",
         "flip": "Flip",
         "grantModerator": "Grant Moderator Rights",
+        "hideSelfView": "Hide self view",
         "kick": "Kick out",
         "moderator": "Moderator",
         "mute": "Participant is muted",

modules/API/API.js

@@ -21,6 +21,7 @@ import {
     getCurrentConference,
     sendTones,
     setFollowMe,
+    setLocalSubject,
     setPassword,
     setSubject
 } from '../../react/features/base/conference';
@@ -66,8 +67,9 @@ import { toggleLobbyMode, setKnockingParticipantApproval } from '../../react/fea
 import { isForceMuted } from '../../react/features/participants-pane/functions';
 import { RECORDING_TYPES } from '../../react/features/recording/constants';
 import { getActiveSession } from '../../react/features/recording/functions';
-import { isScreenAudioSupported } from '../../react/features/screen-share';
+import { isScreenAudioSupported, isScreenVideoShared } from '../../react/features/screen-share';
 import { startScreenShareFlow, startAudioScreenShareFlow } from '../../react/features/screen-share/actions';
+import { toggleScreenshotCaptureSummary } from '../../react/features/screenshot-capture';
 import { playSharedVideo, stopSharedVideo } from '../../react/features/shared-video/actions.any';
 import { toggleTileView, setTileView } from '../../react/features/video-layout';
 import { muteAllParticipants } from '../../react/features/video-menu/actions';
@@ -135,6 +137,10 @@ function initCommands() {
             sendAnalytics(createApiEvent('display.name.changed'));
             APP.conference.changeLocalDisplayName(displayName);
         },
+        'local-subject': localSubject => {
+            sendAnalytics(createApiEvent('local.subject.changed'));
+            APP.store.dispatch(setLocalSubject(localSubject));
+        },
         'mute-everyone': mediaType => {
             const muteMediaType = mediaType ? mediaType : MEDIA_TYPE.AUDIO;
 
@@ -470,6 +476,9 @@ function initCommands() {
                 return;
             }
 
+            if (isScreenVideoShared(APP.store.getState())) {
+                APP.store.dispatch(toggleScreenshotCaptureSummary(true));
+            }
             conference.startRecording(recordingConfig);
         },
 
@@ -498,6 +507,7 @@ function initCommands() {
             const activeSession = getActiveSession(state, mode);
 
             if (activeSession && activeSession.id) {
+                APP.store.dispatch(toggleScreenshotCaptureSummary(false));
                 conference.stopRecording(activeSession.id);
             } else {
                 logger.error('No recording or streaming session found');
@@ -1470,12 +1480,14 @@ class API {
      * available.
      *
      * @param {string} link - The recording download link.
+     * @param {number} ttl - The recording download link time to live.
      * @returns {void}
      */
-    notifyRecordingLinkAvailable(link: string) {
+    notifyRecordingLinkAvailable(link: string, ttl: number) {
         this._sendEvent({
             name: 'recording-link-available',
-            link
+            link,
+            ttl
         });
     }
 
@@ -1509,12 +1521,14 @@ class API {
      * Notify external application ( if API is enabled) that a toolbar button was clicked.
      *
      * @param {string} key - The key of the toolbar button.
+     * @param {boolean} preventExecution - Whether execution of the button click was prevented or not.
      * @returns {void}
      */
-    notifyToolbarButtonClicked(key: string) {
+    notifyToolbarButtonClicked(key: string, preventExecution: boolean) {
         this._sendEvent({
             name: 'toolbar-button-clicked',
-            key
+            key,
+            preventExecution
         });
     }
 

modules/API/external/external_api.js

@@ -38,6 +38,7 @@ const commands = {
     toggleLobby: 'toggle-lobby',
     hangup: 'video-hangup',
     initiatePrivateChat: 'initiate-private-chat',
+    localSubject: 'local-subject',
     kickParticipant: 'kick-participant',
     muteEveryone: 'mute-everyone',
     overwriteConfig: 'overwrite-config',

package-lock.json

@@ -36,6 +36,7 @@
         "@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",
         "@react-native-async-storage/async-storage": "1.15.5",
+        "@react-native-community/clipboard": "1.5.1",
         "@react-native-community/google-signin": "3.0.1",
         "@react-native-community/netinfo": "4.1.5",
         "@react-native-community/slider": "3.0.3",
@@ -65,7 +66,7 @@
         "jquery-i18next": "1.2.1",
         "js-md5": "0.6.1",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#9e5d83f4aceb9f922583c871d933e97ee2b05753",
+        "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#55a03ac1b52f85dcbd9bfe339690ad88436ac029",
         "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
         "lodash": "4.17.21",
         "moment": "2.29.1",
@@ -103,7 +104,7 @@
         "react-native-url-polyfill": "1.2.0",
         "react-native-video": "5.1.1",
         "react-native-watch-connectivity": "0.4.3",
-        "react-native-webrtc": "1.94.0",
+        "react-native-webrtc": "1.94.1",
         "react-native-webview": "11.0.2",
         "react-native-youtube-iframe": "2.1.1",
         "react-redux": "7.1.0",
@@ -4097,6 +4098,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/@react-native-community/clipboard": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@react-native-community/clipboard/-/clipboard-1.5.1.tgz",
+      "integrity": "sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA==",
+      "peerDependencies": {
+        "react": ">=16.0",
+        "react-native": ">=0.57.0"
+      }
+    },
     "node_modules/@react-native-community/google-signin": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@react-native-community/google-signin/-/google-signin-3.0.1.tgz",
@@ -12509,8 +12519,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#9e5d83f4aceb9f922583c871d933e97ee2b05753",
-      "integrity": "sha512-qqRAIX1bgqHo1EaaOpsycQ5t7ReBFu1drb6ZKh/MC5fzF3Bov3JSxSlZegYJ7d9ly8e9hAeIaGey6qqObNiLaA==",
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#55a03ac1b52f85dcbd9bfe339690ad88436ac029",
+      "integrity": "sha512-0ZNhG4ZPzcH+2R7K5xa5tSNVK8CKrKVCGP/bjr07XtiV3pcY65OWI2mH+QzlMIMDOXqgqQtry9RHv4vmzy5pIg==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -16126,9 +16136,9 @@
       }
     },
     "node_modules/react-native-webrtc": {
-      "version": "1.94.0",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.94.0.tgz",
-      "integrity": "sha512-VmkKCwMYL/ZsLqNFX+Rqxwf3ZfHuJRfF2AZ+dQ1ZZ8O1Pg4LeZNisZo6djl9bze0fNhj7eMJTwnzk/kK2mW0hg==",
+      "version": "1.94.1",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.94.1.tgz",
+      "integrity": "sha512-S+qU2i0PY2QfWzh8choBlVzUF6I6DVKhrUFbGrriuffieMu+/sR40pPTNCCFEXo4USNZAAM8osBgn6E/aZsJbg==",
       "hasInstallScript": true,
       "dependencies": {
         "base64-js": "1.5.1",
@@ -23388,6 +23398,11 @@
       "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-3.0.0.tgz",
       "integrity": "sha512-ng6Tm537E/M42GjE4TRUxQyL8sRfClcL7bQWblOCoxPZzJ2J3bdALsjeG3vDnVCIfI/R0AeFalN9KjMt0+Z/Zg=="
     },
+    "@react-native-community/clipboard": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@react-native-community/clipboard/-/clipboard-1.5.1.tgz",
+      "integrity": "sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA=="
+    },
     "@react-native-community/google-signin": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@react-native-community/google-signin/-/google-signin-3.0.1.tgz",
@@ -29978,9 +29993,9 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#9e5d83f4aceb9f922583c871d933e97ee2b05753",
-      "integrity": "sha512-qqRAIX1bgqHo1EaaOpsycQ5t7ReBFu1drb6ZKh/MC5fzF3Bov3JSxSlZegYJ7d9ly8e9hAeIaGey6qqObNiLaA==",
-      "from": "lib-jitsi-meet@github:jitsi/lib-jitsi-meet#9e5d83f4aceb9f922583c871d933e97ee2b05753",
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#55a03ac1b52f85dcbd9bfe339690ad88436ac029",
+      "integrity": "sha512-0ZNhG4ZPzcH+2R7K5xa5tSNVK8CKrKVCGP/bjr07XtiV3pcY65OWI2mH+QzlMIMDOXqgqQtry9RHv4vmzy5pIg==",
+      "from": "lib-jitsi-meet@github:jitsi/lib-jitsi-meet#55a03ac1b52f85dcbd9bfe339690ad88436ac029",
       "requires": {
         "@jitsi/js-utils": "2.0.0",
         "@jitsi/logger": "2.0.0",
@@ -32893,9 +32908,9 @@
       "integrity": "sha512-iqdJ1KpZbR4XGahgVmaeibB7kDhyMT7wrylINgJaYBY38IAiI0LF32VX1umO4pko6n21YF5I/kSeNQ+OXGqqow=="
     },
     "react-native-webrtc": {
-      "version": "1.94.0",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.94.0.tgz",
-      "integrity": "sha512-VmkKCwMYL/ZsLqNFX+Rqxwf3ZfHuJRfF2AZ+dQ1ZZ8O1Pg4LeZNisZo6djl9bze0fNhj7eMJTwnzk/kK2mW0hg==",
+      "version": "1.94.1",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.94.1.tgz",
+      "integrity": "sha512-S+qU2i0PY2QfWzh8choBlVzUF6I6DVKhrUFbGrriuffieMu+/sR40pPTNCCFEXo4USNZAAM8osBgn6E/aZsJbg==",
       "requires": {
         "base64-js": "1.5.1",
         "event-target-shim": "6.0.2",

package.json

@@ -41,6 +41,7 @@
     "@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",
     "@react-native-async-storage/async-storage": "1.15.5",
+    "@react-native-community/clipboard": "1.5.1",
     "@react-native-community/google-signin": "3.0.1",
     "@react-native-community/netinfo": "4.1.5",
     "@react-native-community/slider": "3.0.3",
@@ -70,7 +71,7 @@
     "jquery-i18next": "1.2.1",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#9e5d83f4aceb9f922583c871d933e97ee2b05753",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#55a03ac1b52f85dcbd9bfe339690ad88436ac029",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.21",
     "moment": "2.29.1",
@@ -108,7 +109,7 @@
     "react-native-url-polyfill": "1.2.0",
     "react-native-video": "5.1.1",
     "react-native-watch-connectivity": "0.4.3",
-    "react-native-webrtc": "1.94.0",
+    "react-native-webrtc": "1.94.1",
     "react-native-webview": "11.0.2",
     "react-native-youtube-iframe": "2.1.1",
     "react-redux": "7.1.0",

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

@@ -23,6 +23,5 @@ export default class HangupButton extends AbstractHangupButton<Props, *> {
      */
     _doHangup() {
         api.executeCommand('hangup');
-        window.close();
     }
 }

react/features/app/middlewares.web.js

@@ -1,6 +1,7 @@
 // @flow
 
 import '../authentication/middleware';
+import '../base/i18n/middleware';
 import '../base/devices/middleware';
 import '../dynamic-branding/middleware';
 import '../e2ee/middleware';
@@ -8,6 +9,7 @@ import '../external-api/middleware';
 import '../keyboard-shortcuts/middleware';
 import '../local-recording/middleware';
 import '../no-audio-signal/middleware';
+import '../notifications/middleware';
 import '../noise-detection/middleware';
 import '../old-client-notification/middleware';
 import '../power-monitor/middleware';
@@ -15,6 +17,7 @@ import '../prejoin/middleware';
 import '../remote-control/middleware';
 import '../screen-share/middleware';
 import '../shared-video/middleware';
+import '../settings/middleware';
 import '../talk-while-muted/middleware';
 import '../virtual-background/middleware';
 import '../facial-recognition/middleware';

react/features/av-moderation/middleware.js

@@ -98,11 +98,11 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
         }
 
         dispatch(showNotification({
-            customActionNameKey: 'notify.raiseHandAction',
-            customActionHandler: () => batch(() => {
+            customActionNameKey: [ 'notify.raiseHandAction' ],
+            customActionHandler: [ () => batch(() => {
                 dispatch(raiseHand(true));
                 dispatch(hideNotification(uid));
-            }),
+            }) ],
             descriptionKey,
             sticky: true,
             titleKey,
@@ -221,8 +221,8 @@ StateListenerRegistry.register(
                     dispatch(showNotification({
                         titleKey: 'notify.hostAskedUnmute',
                         sticky: true,
-                        customActionNameKey: 'notify.unmute',
-                        customActionHandler: () => dispatch(muteLocal(false, MEDIA_TYPE.AUDIO))
+                        customActionNameKey: [ 'notify.unmute' ],
+                        customActionHandler: [ () => dispatch(muteLocal(false, MEDIA_TYPE.AUDIO)) ]
                     }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
                     dispatch(playSound(ASKED_TO_UNMUTE_SOUND_ID));
                 }

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

@@ -19,6 +19,11 @@ export type Props = {
      */
     onAvatarLoadError?: Function,
 
+    /**
+     * Additional parameters to be passed to onAvatarLoadError function.
+     */
+    onAvatarLoadErrorParams?: Object,
+
     /**
      * Expected size of the avatar.
      */

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

@@ -4,12 +4,17 @@ import React, { PureComponent } from 'react';
 
 import { getParticipantById } from '../../participants';
 import { connect } from '../../redux';
-import { getAvatarColor, getInitials } from '../functions';
+import { getAvatarColor, getInitials, isCORSAvatarURL } from '../functions';
 
 import { StatelessAvatar } from '.';
 
 export type Props = {
 
+    /**
+     * The URL patterns for URLs that needs to be handled with CORS.
+     */
+    _corsAvatarURLs: Array<string>,
+
     /**
      * Custom avatar backgrounds from branding.
      */
@@ -25,6 +30,11 @@ export type Props = {
      */
     _loadableAvatarUrl: ?string,
 
+    /**
+     * Indicates whether _loadableAvatarUrl should use CORS or not.
+     */
+    _loadableAvatarUrlUseCORS: ?boolean,
+
     /**
      * A prop to maintain compatibility with web.
      */
@@ -76,10 +86,16 @@ export type Props = {
      * URL of the avatar, if any.
      */
     url: ?string,
+
+    /**
+     * Indicates whether to load the avatar using CORS or not.
+     */
+    useCORS?: ?boolean
 }
 
 type State = {
-    avatarFailed: boolean
+    avatarFailed: boolean,
+    isUsingCORS: boolean
 }
 
 export const DEFAULT_SIZE = 65;
@@ -105,8 +121,15 @@ class Avatar<P: Props> extends PureComponent<P, State> {
     constructor(props: P) {
         super(props);
 
+        const {
+            _corsAvatarURLs,
+            url,
+            useCORS
+        } = props;
+
         this.state = {
-            avatarFailed: false
+            avatarFailed: false,
+            isUsingCORS: Boolean(useCORS) || Boolean(url && isCORSAvatarURL(url, _corsAvatarURLs))
         };
 
         this._onAvatarLoadError = this._onAvatarLoadError.bind(this);
@@ -118,7 +141,9 @@ class Avatar<P: Props> extends PureComponent<P, State> {
      * @inheritdoc
      */
     componentDidUpdate(prevProps: P) {
-        if (prevProps.url !== this.props.url) {
+        const { _corsAvatarURLs, url } = this.props;
+
+        if (prevProps.url !== url) {
 
             // URI changed, so we need to try to fetch it again.
             // Eslint doesn't like this statement, but based on the React doc, it's safe if it's
@@ -126,7 +151,8 @@ class Avatar<P: Props> extends PureComponent<P, State> {
 
             // eslint-disable-next-line react/no-did-update-set-state
             this.setState({
-                avatarFailed: false
+                avatarFailed: false,
+                isUsingCORS: Boolean(this.props.useCORS) || Boolean(url && isCORSAvatarURL(url, _corsAvatarURLs))
             });
         }
     }
@@ -141,6 +167,7 @@ class Avatar<P: Props> extends PureComponent<P, State> {
             _customAvatarBackgrounds,
             _initialsBase,
             _loadableAvatarUrl,
+            _loadableAvatarUrlUseCORS,
             className,
             colorBase,
             dynamicColor,
@@ -150,7 +177,7 @@ class Avatar<P: Props> extends PureComponent<P, State> {
             testId,
             url
         } = this.props;
-        const { avatarFailed } = this.state;
+        const { avatarFailed, isUsingCORS } = this.state;
 
         const avatarProps = {
             className,
@@ -158,19 +185,26 @@ class Avatar<P: Props> extends PureComponent<P, State> {
             id,
             initials: undefined,
             onAvatarLoadError: undefined,
+            onAvatarLoadErrorParams: undefined,
             size,
             status,
             testId,
-            url: undefined
+            url: undefined,
+            useCORS: isUsingCORS
         };
 
         // _loadableAvatarUrl is validated that it can be loaded, but uri (if present) is not, so
         // we still need to do a check for that. And an explicitly provided URI is higher priority than
         // an avatar URL anyhow.
-        const effectiveURL = (!avatarFailed && url) || _loadableAvatarUrl;
+        const useReduxLoadableAvatarURL = avatarFailed || !url;
+        const effectiveURL = useReduxLoadableAvatarURL ? _loadableAvatarUrl : url;
 
         if (effectiveURL) {
             avatarProps.onAvatarLoadError = this._onAvatarLoadError;
+            if (useReduxLoadableAvatarURL) {
+                avatarProps.onAvatarLoadErrorParams = { dontRetry: true };
+                avatarProps.useCORS = _loadableAvatarUrlUseCORS;
+            }
             avatarProps.url = effectiveURL;
         }
 
@@ -195,12 +229,24 @@ class Avatar<P: Props> extends PureComponent<P, State> {
     /**
      * Callback to handle the error while loading of the avatar URI.
      *
+     * @param {Object} params - An object with parameters.
+     * @param {boolean} params.dontRetry - If false we will retry to load the Avatar with different CORS mode.
      * @returns {void}
      */
-    _onAvatarLoadError() {
-        this.setState({
-            avatarFailed: true
-        });
+    _onAvatarLoadError(params = {}) {
+        const { dontRetry = false } = params;
+
+        if (Boolean(this.props.useCORS) === this.state.isUsingCORS && !dontRetry) {
+            // try different mode of loading the avatar.
+            this.setState({
+                isUsingCORS: !this.state.isUsingCORS
+            });
+        } else {
+            // we already have tried loading the avatar with and without CORS and it failed.
+            this.setState({
+                avatarFailed: true
+            });
+        }
     }
 }
 
@@ -215,11 +261,14 @@ export function _mapStateToProps(state: Object, ownProps: Props) {
     const { colorBase, displayName, participantId } = ownProps;
     const _participant: ?Object = participantId && getParticipantById(state, participantId);
     const _initialsBase = _participant?.name ?? displayName;
+    const { corsAvatarURLs } = state['features/base/config'];
 
     return {
         _customAvatarBackgrounds: state['features/dynamic-branding'].avatarBackgrounds,
+        _corsAvatarURLs: corsAvatarURLs,
         _initialsBase,
         _loadableAvatarUrl: _participant?.loadableAvatarUrl,
+        _loadableAvatarUrlUseCORS: _participant?.loadableAvatarUrlUseCORS,
         colorBase
     };
 }

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

@@ -29,6 +29,18 @@ type Props = AbstractProps & {
  * props.
  */
 export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
+
+    /**
+     * Instantiates a new {@code Component}.
+     *
+     * @inheritdoc
+     */
+    constructor(props: Props) {
+        super(props);
+
+        this._onAvatarLoadError = this._onAvatarLoadError.bind(this);
+    }
+
     /**
      * Implements {@code Component#render}.
      *
@@ -164,4 +176,22 @@ export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
                 style = { styles.avatarContent(size) } />
         );
     }
+
+    _onAvatarLoadError: () => void;
+
+    /**
+     * Handles avatar load errors.
+     *
+     * @returns {void}
+     */
+    _onAvatarLoadError() {
+        const { onAvatarLoadError, onAvatarLoadErrorParams = {} } = this.props;
+
+        if (onAvatarLoadError) {
+            onAvatarLoadError({
+                ...onAvatarLoadErrorParams,
+                dontRetry: true
+            });
+        }
+    }
 }

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

@@ -3,7 +3,6 @@
 import React from 'react';
 
 import { Icon } from '../../../icons';
-import { isGravatarURL } from '../../functions';
 import AbstractStatelessAvatar, { type Props as AbstractProps } from '../AbstractStatelessAvatar';
 
 type Props = AbstractProps & {
@@ -31,7 +30,12 @@ type Props = AbstractProps & {
     /**
      * TestId of the element, if any.
      */
-    testId?: string
+    testId?: string,
+
+    /**
+     * Indicates whether to load the avatar using CORS or not.
+     */
+    useCORS?: ?boolean
 };
 
 /**
@@ -39,13 +43,25 @@ type Props = AbstractProps & {
  * props.
  */
 export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
+
+    /**
+     * Instantiates a new {@code Component}.
+     *
+     * @inheritdoc
+     */
+    constructor(props: Props) {
+        super(props);
+
+        this._onAvatarLoadError = this._onAvatarLoadError.bind(this);
+    }
+
     /**
      * Implements {@code Component#render}.
      *
      * @inheritdoc
      */
     render() {
-        const { initials, url } = this.props;
+        const { initials, url, useCORS } = this.props;
 
         if (this._isIcon(url)) {
             return (
@@ -67,10 +83,10 @@ export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
                     <img
                         alt = 'avatar'
                         className = { this._getAvatarClassName() }
-                        crossOrigin = { isGravatarURL(url) ? '' : undefined }
+                        crossOrigin = { useCORS ? '' : undefined }
                         data-testid = { this.props.testId }
                         id = { this.props.id }
-                        onError = { this.props.onAvatarLoadError }
+                        onError = { this._onAvatarLoadError }
                         src = { url }
                         style = { this._getAvatarStyle() } />
                 </div>
@@ -160,4 +176,19 @@ export default class StatelessAvatar extends AbstractStatelessAvatar<Props> {
     }
 
     _isIcon: (?string | ?Object) => boolean;
+
+    _onAvatarLoadError: () => void;
+
+    /**
+     * Handles avatar load errors.
+     *
+     * @returns {void}
+     */
+    _onAvatarLoadError() {
+        const { onAvatarLoadError, onAvatarLoadErrorParams } = this.props;
+
+        if (typeof onAvatarLoadError === 'function') {
+            onAvatarLoadError(onAvatarLoadErrorParams);
+        }
+    }
 }

react/features/base/avatar/functions.js

@@ -3,8 +3,6 @@
 import GraphemeSplitter from 'grapheme-splitter';
 import _ from 'lodash';
 
-import { GRAVATAR_BASE_URL } from './constants';
-
 const AVATAR_COLORS = [
     '#6A50D3',
     '#FF9B42',
@@ -16,7 +14,7 @@ const AVATAR_COLORS = [
     '#2AA076',
     '#00A8B3'
 ];
-const wordSplitRegex = (/\s+|\.+|_+|;+|-+|,+|\|+|\/+|\\+/);
+const wordSplitRegex = (/\s+|\.+|_+|;+|-+|,+|\|+|\/+|\\+|"+|'+|\(+|\)+|#+|&+/);
 const splitter = new GraphemeSplitter();
 
 /**
@@ -68,17 +66,18 @@ function getFirstGraphemeUpper(word) {
 export function getInitials(s: ?string) {
     // We don't want to use the domain part of an email address, if it is one
     const initialsBasis = _.split(s, '@')[0];
-    const [ firstWord, secondWord ] = initialsBasis.split(wordSplitRegex);
+    const [ firstWord, secondWord ] = initialsBasis.split(wordSplitRegex).filter(Boolean);
 
     return getFirstGraphemeUpper(firstWord) + getFirstGraphemeUpper(secondWord);
 }
 
 /**
- * Checks if the passed URL is pointing to the gravatar service.
+ * Checks if the passed URL should be loaded with CORS.
  *
  * @param {string} url - The URL.
+ * @param {Array<string>} corsURLs - The URL pattern that matches a URL that needs to be handled with CORS.
  * @returns {void}
  */
-export function isGravatarURL(url: string = '') {
-    return url.startsWith(GRAVATAR_BASE_URL);
+export function isCORSAvatarURL(url: string | any = '', corsURLs: Array<string> = []) {
+    return corsURLs.some(pattern => url.startsWith(pattern));
 }

react/features/base/buttons/CopyButton.js

@@ -45,7 +45,7 @@ const styles = theme => {
             textOverflow: 'ellipsis',
             whiteSpace: 'nowrap',
             maxWidth: 292,
-            marginRight: 16,
+            marginRight: theme.spacing(3),
 
             '&.selected': {
                 fontWeight: 600
@@ -186,8 +186,8 @@ function CopyButton({ classes, className, displayedText, textToCopy, textOnHover
 
         return (
             <>
-                <div className = { `${classes.copyButton}-content` }>
-                    { isHovered ? textOnHover : displayedText }
+                <div className = { clsx(classes.content) }>
+                    <span> { isHovered ? textOnHover : displayedText } </span>
                 </div>
                 <Icon src = { IconCopy } />
             </>

react/features/base/components/context-menu/ContextMenu.js

@@ -19,7 +19,7 @@ type Props = {
     /**
      * Class name for context menu. Used to overwrite default styles.
      */
-    className?: string,
+    className?: ?string,
 
     /**
      * The entity for which the context menu is displayed.
@@ -31,10 +31,15 @@ type Props = {
      */
     hidden?: boolean,
 
+    /**
+     * Whether or not the menu is already in a drawer.
+     */
+    inDrawer?: ?boolean,
+
     /**
      * Whether or not drawer should be open.
      */
-    isDrawerOpen: boolean,
+    isDrawerOpen?: boolean,
 
     /**
      * Target elements against which positioning calculations are made.
@@ -49,7 +54,7 @@ type Props = {
     /**
      * Callback for drawer close.
      */
-    onDrawerClose: Function,
+    onDrawerClose?: Function,
 
     /**
      * Callback for the mouse entering the component.
@@ -59,7 +64,7 @@ type Props = {
     /**
      * Callback for the mouse leaving the component.
      */
-    onMouseLeave: Function
+    onMouseLeave?: Function
 };
 
 const useStyles = makeStyles(theme => {
@@ -106,6 +111,7 @@ const ContextMenu = ({
     className,
     entity,
     hidden,
+    inDrawer,
     isDrawerOpen,
     offsetTarget,
     onClick,
@@ -147,6 +153,14 @@ const ContextMenu = ({
         }
     }, [ hidden ]);
 
+    if (_overflowDrawer && inDrawer) {
+        return (<div
+            className = { styles.drawer }
+            onClick = { onDrawerClose }>
+            {children}
+        </div>);
+    }
+
     return _overflowDrawer
         ? <JitsiPortal>
             <Drawer

react/features/base/components/context-menu/ContextMenuItem.js

@@ -0,0 +1,129 @@
+// @flow
+
+import { makeStyles } from '@material-ui/styles';
+import clsx from 'clsx';
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import { showOverflowDrawer } from '../../../toolbox/functions.web';
+import { Icon } from '../../icons';
+
+export type Props = {
+
+    /**
+     * Label used for accessibility.
+     */
+    accessibilityLabel: string,
+
+    /**
+     * CSS class name used for custom styles.
+     */
+    className?: string,
+
+    /**
+     * Custom icon. If used, the icon prop is ignored.
+     * Used to allow custom children instead of just the default icons.
+     */
+    customIcon?: React$Node,
+
+    /**
+     * Whether or not the action is disabled.
+     */
+    disabled?: boolean,
+
+    /**
+     * Id of the action container.
+     */
+    id?: string,
+
+    /**
+     * Default icon for action.
+     */
+    icon?: Function,
+
+    /**
+     * Click handler.
+     */
+    onClick?: Function,
+
+    /**
+     * Action text.
+     */
+    text: string,
+
+    /**
+     * Class name for the text.
+     */
+    textClassName?: string
+}
+
+const useStyles = makeStyles(theme => {
+    return {
+        contextMenuItem: {
+            alignItems: 'center',
+            cursor: 'pointer',
+            display: 'flex',
+            minHeight: '40px',
+            padding: '10px 16px',
+            boxSizing: 'border-box',
+
+            '& > *:not(:last-child)': {
+                marginRight: `${theme.spacing(3)}px`
+            },
+
+            '&:hover': {
+                backgroundColor: theme.palette.ui04
+            }
+        },
+
+        contextMenuItemDisabled: {
+            pointerEvents: 'none'
+        },
+
+        contextMenuItemDrawer: {
+            padding: '12px 16px'
+        },
+
+        contextMenuItemIcon: {
+            '& svg': {
+                fill: theme.palette.icon01
+            }
+        }
+    };
+});
+
+const ContextMenuItem = ({
+    accessibilityLabel,
+    className,
+    customIcon,
+    disabled,
+    id,
+    icon,
+    onClick,
+    text,
+    textClassName }: Props) => {
+    const styles = useStyles();
+    const _overflowDrawer = useSelector(showOverflowDrawer);
+
+    return (
+        <div
+            aria-label = { accessibilityLabel }
+            className = { clsx(styles.contextMenuItem,
+                    _overflowDrawer && styles.contextMenuItemDrawer,
+                    disabled && styles.contextMenuItemDisabled,
+                    className
+            ) }
+            id = { id }
+            key = { text }
+            onClick = { onClick }>
+            {customIcon ? customIcon
+                : icon && <Icon
+                    className = { styles.contextMenuItemIcon }
+                    size = { 20 }
+                    src = { icon } />}
+            <span className = { textClassName ?? '' }>{text}</span>
+        </div>
+    );
+};
+
+export default ContextMenuItem;

react/features/base/components/context-menu/ContextMenuItemGroup.js

@@ -1,50 +1,8 @@
 // @flow
 import { makeStyles } from '@material-ui/core';
-import clsx from 'clsx';
 import React from 'react';
-import { useSelector } from 'react-redux';
 
-import { showOverflowDrawer } from '../../../toolbox/functions.web';
-import { Icon } from '../../icons';
-
-export type Action = {
-
-    /**
-     * Label used for accessibility.
-     */
-    accessibilityLabel: string,
-
-    /**
-     * CSS class name used for custom styles.
-     */
-    className?: string,
-
-    /**
-     * Custom icon. If used, the icon prop is ignored.
-     * Used to allow custom children instead of just the default icons.
-     */
-    customIcon?: React$Node,
-
-    /**
-     * Id of the action container.
-     */
-    id?: string,
-
-    /**
-     * Default icon for action.
-     */
-    icon?: Function,
-
-    /**
-     * Click handler.
-     */
-    onClick?: Function,
-
-    /**
-     * Action text.
-     */
-    text: string
-}
+import ContextMenuItem, { type Props as Action } from './ContextMenuItem';
 
 type Props = {
 
@@ -59,7 +17,6 @@ type Props = {
     children?: React$Node,
 };
 
-
 const useStyles = makeStyles(theme => {
     return {
         contextMenuItemGroup: {
@@ -70,33 +27,6 @@ const useStyles = makeStyles(theme => {
             '& + &:not(:empty)': {
                 borderTop: `1px solid ${theme.palette.ui04}`
             }
-        },
-
-        contextMenuItem: {
-            alignItems: 'center',
-            cursor: 'pointer',
-            display: 'flex',
-            minHeight: '40px',
-            padding: '10px 16px',
-            boxSizing: 'border-box',
-
-            '& > *:not(:last-child)': {
-                marginRight: `${theme.spacing(3)}px`
-            },
-
-            '&:hover': {
-                backgroundColor: theme.palette.ui04
-            }
-        },
-
-        contextMenuItemDrawer: {
-            padding: '12px 16px'
-        },
-
-        contextMenuItemIcon: {
-            '& svg': {
-                fill: theme.palette.icon01
-            }
         }
     };
 });
@@ -106,28 +36,14 @@ const ContextMenuItemGroup = ({
     children
 }: Props) => {
     const styles = useStyles();
-    const _overflowDrawer = useSelector(showOverflowDrawer);
 
     return (
         <div className = { styles.contextMenuItemGroup }>
             {children}
-            {actions && actions.map(({ accessibilityLabel, className, customIcon, id, icon, onClick, text }) => (
-                <div
-                    aria-label = { accessibilityLabel }
-                    className = { clsx(styles.contextMenuItem,
-                        _overflowDrawer && styles.contextMenuItemDrawer,
-                        className
-                    ) }
-                    id = { id }
-                    key = { text }
-                    onClick = { onClick }>
-                    {customIcon ? customIcon
-                        : icon && <Icon
-                            className = { styles.contextMenuItemIcon }
-                            size = { 20 }
-                            src = { icon } />}
-                    <span>{text}</span>
-                </div>
+            {actions && actions.map(actionProps => (
+                <ContextMenuItem
+                    key = { actionProps.text }
+                    { ...actionProps } />
             ))}
         </div>
     );

react/features/base/conference/actionTypes.js

@@ -43,6 +43,16 @@ export const CONFERENCE_JOINED = 'CONFERENCE_JOINED';
 export const CONFERENCE_LEFT = 'CONFERENCE_LEFT';
 
 /**
+ * The type of (redux) action, which indicates conference local subject changes.
+ *
+ * {
+ *     type: CONFERENCE_LOCAL_SUBJECT_CHANGED
+ *     subject: string
+ * }
+ */
+ export const CONFERENCE_LOCAL_SUBJECT_CHANGED = 'CONFERENCE_LOCAL_SUBJECT_CHANGED';
+
+ /**
  * The type of (redux) action, which indicates conference subject changes.
  *
  * {
@@ -172,6 +182,17 @@ export const SEND_TONES = 'SEND_TONES';
  */
 export const SET_FOLLOW_ME = 'SET_FOLLOW_ME';
 
+/**
+ * The type of (redux) action which updates the current known status of the
+ * Mute Reactions Sound feature.
+ *
+ * {
+ *     type: SET_START_REACTIONS_MUTED,
+ *     enabled: boolean
+ * }
+ */
+export const SET_START_REACTIONS_MUTED = 'SET_START_REACTIONS_MUTED';
+
 /**
  * The type of (redux) action which sets the password to join or lock a specific
  * {@code JitsiConference}.

react/features/base/conference/actions.js

@@ -12,8 +12,6 @@ import { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection';
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
 import {
     MEDIA_TYPE,
-    isAudioMuted,
-    isVideoMuted,
     setAudioMuted,
     setAudioUnmutePermissions,
     setVideoMuted,
@@ -29,7 +27,13 @@ import {
     participantRoleChanged,
     participantUpdated
 } from '../participants';
-import { getLocalTracks, replaceLocalTrack, trackAdded, trackRemoved } from '../tracks';
+import {
+    destroyLocalTracks,
+    getLocalTracks,
+    replaceLocalTrack,
+    trackAdded,
+    trackRemoved
+} from '../tracks';
 import { getBackendSafeRoomName } from '../util';
 
 import {
@@ -37,6 +41,7 @@ import {
     CONFERENCE_FAILED,
     CONFERENCE_JOINED,
     CONFERENCE_LEFT,
+    CONFERENCE_LOCAL_SUBJECT_CHANGED,
     CONFERENCE_SUBJECT_CHANGED,
     CONFERENCE_TIMESTAMP_CHANGED,
     CONFERENCE_UNIQUE_ID_SET,
@@ -53,7 +58,8 @@ import {
     SET_PASSWORD_FAILED,
     SET_ROOM,
     SET_PENDING_SUBJECT_CHANGE,
-    SET_START_MUTED_POLICY
+    SET_START_MUTED_POLICY,
+    SET_START_REACTIONS_MUTED
 } from './actionTypes';
 import {
     AVATAR_URL_COMMAND,
@@ -157,22 +163,12 @@ function _addConferenceListeners(conference, dispatch, state) {
     conference.on(
         JitsiConferenceEvents.AUDIO_UNMUTE_PERMISSIONS_CHANGED,
         disableAudioMuteChange => {
-            const muted = isAudioMuted(state);
-
-            // Disable the mute button only if its muted.
-            if (!disableAudioMuteChange || (disableAudioMuteChange && muted)) {
-                dispatch(setAudioUnmutePermissions(disableAudioMuteChange));
-            }
+            dispatch(setAudioUnmutePermissions(disableAudioMuteChange));
         });
     conference.on(
         JitsiConferenceEvents.VIDEO_UNMUTE_PERMISSIONS_CHANGED,
         disableVideoMuteChange => {
-            const muted = isVideoMuted(state);
-
-            // Disable the mute button only if its muted.
-            if (!disableVideoMuteChange || (disableVideoMuteChange && muted)) {
-                dispatch(setVideoUnmutePermissions(disableVideoMuteChange));
-            }
+            dispatch(setVideoUnmutePermissions(disableVideoMuteChange));
         });
 
     // Dispatches into features/base/tracks follow:
@@ -192,6 +188,8 @@ function _addConferenceListeners(conference, dispatch, state) {
             }
         });
 
+    conference.on(JitsiConferenceEvents.TRACK_UNMUTE_REJECTED, track => dispatch(destroyLocalTracks(track)));
+
     // Dispatches into features/base/participants follow:
     conference.on(
         JitsiConferenceEvents.DISPLAY_NAME_CHANGED,
@@ -512,7 +510,7 @@ export function checkIfCanJoin() {
         const { authRequired, password }
             = getState()['features/base/conference'];
 
-        const replaceParticipant = getReplaceParticipant(APP.store.getState());
+        const replaceParticipant = getReplaceParticipant(getState());
 
         authRequired && dispatch(_conferenceWillJoin(authRequired));
         authRequired && authRequired.join(password, replaceParticipant);
@@ -669,6 +667,24 @@ export function setFollowMe(enabled: boolean) {
     };
 }
 
+/**
+ * Enables or disables the Mute reaction sounds feature.
+ *
+ * @param {boolean} muted - Whether or not reaction sounds should be muted for all participants.
+ * @param {boolean} updateBackend - Whether or not the moderator should notify all participants for the new setting.
+ * @returns {{
+ *     type: SET_START_REACTIONS_MUTED,
+ *     muted: boolean
+ * }}
+ */
+export function setStartReactionsMuted(muted: boolean, updateBackend: boolean = false) {
+    return {
+        type: SET_START_REACTIONS_MUTED,
+        muted,
+        updateBackend
+    };
+}
+
 /**
  * Sets the password to join or lock a specific JitsiConference.
  *
@@ -777,7 +793,7 @@ export function setStartMutedPolicy(
 }
 
 /**
- * Changing conference subject.
+ * Sets the conference subject.
  *
  * @param {string} subject - The new subject.
  * @returns {void}
@@ -796,3 +812,19 @@ export function setSubject(subject: string) {
         }
     };
 }
+
+/**
+ * Sets the conference local subject.
+ *
+ * @param {string} localSubject - The new local subject.
+ * @returns {{
+ *     type: CONFERENCE_LOCAL_SUBJECT_CHANGED,
+ *     localSubject: string
+ * }}
+ */
+export function setLocalSubject(localSubject: string) {
+    return {
+        type: CONFERENCE_LOCAL_SUBJECT_CHANGED,
+        localSubject
+    };
+}

react/features/base/conference/constants.js

@@ -27,3 +27,7 @@ export const EMAIL_COMMAND = 'email';
  * from the outside is not cool but it should suffice for now.
  */
 export const JITSI_CONFERENCE_URL_KEY = Symbol('url');
+
+export const TRIGGER_READY_TO_CLOSE_REASONS = [
+    'The meeting has been terminated'
+];

react/features/base/conference/functions.js

@@ -180,9 +180,9 @@ export function getConferenceName(stateful: Function | Object): string {
     const state = toState(stateful);
     const { callee } = state['features/base/jwt'];
     const { callDisplayName } = state['features/base/config'];
-    const { pendingSubjectChange, room, subject } = getConferenceState(state);
+    const { localSubject, room, subject } = getConferenceState(state);
 
-    return pendingSubjectChange
+    return localSubject
         || subject
         || callDisplayName
         || (callee && callee.name)

react/features/base/conference/middleware.any.js

@@ -1,5 +1,6 @@
 // @flow
 
+import { readyToClose } from '../../../features/mobile/external-api/actions';
 import {
     ACTION_PINNED,
     ACTION_UNPINNED,
@@ -38,8 +39,10 @@ import {
     conferenceFailed,
     conferenceWillLeave,
     createConference,
+    setLocalSubject,
     setSubject
 } from './actions';
+import { TRIGGER_READY_TO_CLOSE_REASONS } from './constants';
 import {
     _addLocalTracksToConference,
     _removeLocalTracksFromConference,
@@ -130,6 +133,14 @@ function _conferenceFailed({ dispatch, getState }, next, action) {
             titleKey: 'dialog.sessTerminated'
         }, NOTIFICATION_TIMEOUT_TYPE.LONG));
 
+        if (TRIGGER_READY_TO_CLOSE_REASONS.includes(reason)) {
+            if (typeof APP === undefined) {
+                dispatch(readyToClose());
+            } else {
+                APP.API.notifyReadyToClose();
+            }
+        }
+
         break;
     }
     case JitsiConferenceErrors.CONFERENCE_RESTARTED: {
@@ -474,11 +485,12 @@ function _sendTones({ getState }, next, action) {
  */
 function _setRoom({ dispatch, getState }, next, action) {
     const state = getState();
-    const { subject } = state['features/base/config'];
+    const { localSubject, subject } = state['features/base/config'];
     const { room } = action;
 
     if (room) {
         // Set the stored subject.
+        dispatch(setLocalSubject(localSubject));
         dispatch(setSubject(subject));
     }
 

react/features/base/conference/middleware.native.js

@@ -41,6 +41,7 @@ function _toggleScreenSharing(enabled, store) {
         }
     } else {
         dispatch(destroyLocalDesktopTrackIfExists());
+        setPictureInPictureDisabled(false);
     }
 }
 

react/features/base/conference/reducer.js

@@ -10,6 +10,7 @@ import {
     CONFERENCE_FAILED,
     CONFERENCE_JOINED,
     CONFERENCE_LEFT,
+    CONFERENCE_LOCAL_SUBJECT_CHANGED,
     CONFERENCE_SUBJECT_CHANGED,
     CONFERENCE_TIMESTAMP_CHANGED,
     CONFERENCE_WILL_JOIN,
@@ -20,7 +21,8 @@ import {
     SET_PASSWORD,
     SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM,
-    SET_START_MUTED_POLICY
+    SET_START_MUTED_POLICY,
+    SET_START_REACTIONS_MUTED
 } from './actionTypes';
 import { isRoomValid } from './functions';
 
@@ -55,6 +57,9 @@ ReducerRegistry.register(
         case CONFERENCE_SUBJECT_CHANGED:
             return set(state, 'subject', action.subject);
 
+        case CONFERENCE_LOCAL_SUBJECT_CHANGED:
+            return set(state, 'localSubject', action.localSubject);
+
         case CONFERENCE_TIMESTAMP_CHANGED:
             return set(state, 'conferenceTimestamp', action.conferenceTimestamp);
 
@@ -77,6 +82,9 @@ ReducerRegistry.register(
         case SET_FOLLOW_ME:
             return set(state, 'followMeEnabled', action.enabled);
 
+        case SET_START_REACTIONS_MUTED:
+            return set(state, 'startReactionsMuted', action.muted);
+
         case SET_LOCATION_URL:
             return set(state, 'room', undefined);
 

react/features/base/config/configWhitelist.js

@@ -108,11 +108,14 @@ export default [
     'disablePolls',
     'disableProfile',
     'disableReactions',
+    'disableReactionsModeration',
     'disableRecordAudioNotification',
     'disableRemoteControl',
     'disableRemoteMute',
     'disableResponsiveTiles',
     'disableRtx',
+    'disableSelfView',
+    'disableSelfViewSettings',
     'disableScreensharingVirtualBackground',
     'disableShortcuts',
     'disableShowMoreStats',
@@ -159,11 +162,13 @@ export default [
     'googleApiApplicationClientID',
     'hiddenPremeetingButtons',
     'hideConferenceSubject',
+    'hideDisplayName',
     'hideRecordingLabel',
     'hideParticipantsStats',
     'hideConferenceTimer',
     'hiddenDomain',
     'hideAddRoomButton',
+    'hideEmailInSettings',
     'hideLobbyButton',
     'hosts',
     'iAmRecorder',
@@ -173,6 +178,7 @@ export default [
     'inviteAppName',
     'liveStreamingEnabled',
     'localRecording',
+    'localSubject',
     'maxFullResolutionParticipants',
     'mouseMoveCallbackInterval',
     'notifications',
@@ -183,6 +189,7 @@ export default [
     'pcStatsInterval',
     'preferH264',
     'preferredCodec',
+    'prejoinConfig',
     'prejoinPageEnabled',
     'requireDisplayName',
     'remoteVideoMenu',

react/features/base/config/constants.js

@@ -56,3 +56,14 @@ export const PREMEETING_BUTTONS = [ 'microphone', 'camera', 'select-background',
   * The toolbar buttons to show on 3rdParty prejoin screen.
   */
 export const THIRD_PARTY_PREJOIN_BUTTONS = [ 'microphone', 'camera', 'select-background' ];
+
+
+/**
+ * The set of feature flags.
+ *
+ * @enum {string}
+ */
+
+export const FEATURE_FLAGS = {
+    SOURCE_NAME_SIGNALING: 'sourceNameSignaling'
+};

react/features/base/config/functions.any.js

@@ -7,7 +7,7 @@ import _ from 'lodash';
 import { parseURLParams } from '../util';
 
 import CONFIG_WHITELIST from './configWhitelist';
-import { _CONFIG_STORE_PREFIX } from './constants';
+import { _CONFIG_STORE_PREFIX, FEATURE_FLAGS } from './constants';
 import INTERFACE_CONFIG_WHITELIST from './interfaceConfigWhitelist';
 import logger from './logger';
 
@@ -49,6 +49,29 @@ export function getMeetingRegion(state: Object) {
     return state['features/base/config']?.deploymentInfo?.region || '';
 }
 
+/**
+ * Selector used to get the sourceNameSignaling feature flag.
+ *
+ * @param {Object} state - The global state.
+ * @returns {boolean}
+ */
+export function getSourceNameSignalingFeatureFlag(state: Object) {
+    return getFeatureFlag(state, FEATURE_FLAGS.SOURCE_NAME_SIGNALING);
+}
+
+/**
+ * Selector used to get a feature flag.
+ *
+ * @param {Object} state - The global state.
+ * @param {string} featureFlag - The name of the feature flag.
+ * @returns {boolean}
+ */
+export function getFeatureFlag(state: Object, featureFlag: string) {
+    const featureFlags = state['features/base/config']?.flags || {};
+
+    return Boolean(featureFlags[featureFlag]);
+}
+
 /**
  * Selector used to get the disableRemoveRaisedHandOnFocus.
  *

react/features/base/config/index.js

@@ -1,4 +1,5 @@
 export * from './actions';
 export * from './actionTypes';
 export { default as CONFIG_WHITELIST } from './configWhitelist';
+export * from './constants';
 export * from './functions';

react/features/base/config/reducer.js

@@ -282,6 +282,13 @@ function _translateLegacyConfig(oldValue: Object) {
         };
     }
 
+    newValue.prejoinConfig = oldValue.prejoinConfig || {};
+    if (oldValue.hasOwnProperty('prejoinPageEnabled')
+        && !newValue.prejoinConfig.hasOwnProperty('enabled')
+    ) {
+        newValue.prejoinConfig.enabled = oldValue.prejoinPageEnabled;
+    }
+
     newValue.disabledSounds = newValue.disabledSounds || [];
 
     if (oldValue.disableJoinLeaveSounds) {

react/features/base/devices/middleware.js

@@ -2,7 +2,11 @@
 
 import UIEvents from '../../../../service/UI/UIEvents';
 import { processExternalDeviceRequest } from '../../device-selection';
-import { NOTIFICATION_TIMEOUT_TYPE, showNotification, showWarningNotification } from '../../notifications';
+import {
+    NOTIFICATION_TIMEOUT_TYPE,
+    showNotification,
+    showWarningNotification
+} from '../../notifications';
 import { replaceAudioTrackById, replaceVideoTrackById, setDeviceStatusWarning } from '../../prejoin/actions';
 import { isPrejoinPageVisible } from '../../prejoin/functions';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../app';
@@ -294,8 +298,8 @@ function _checkAndNotifyForNewDevice(store, newDevices, oldDevices) {
             dispatch(showNotification({
                 description,
                 titleKey,
-                customActionNameKey: 'notify.newDeviceAction',
-                customActionHandler: _useDevice.bind(undefined, store, devicesArray)
+                customActionNameKey: [ 'notify.newDeviceAction' ],
+                customActionHandler: [ _useDevice.bind(undefined, store, devicesArray) ]
             }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
         }
     });

react/features/base/environment/environment.js

@@ -94,11 +94,7 @@ export function isSupportedBrowser() {
         return false;
     }
 
-    // We are intentionally allow mobile browsers because:
-    // - the WelcomePage is mobile ready;
-    // - if the URL points to a conference then deep-linking will take
-    //   care of it.
-    return isMobileBrowser() || JitsiMeetJS.isWebRtcSupported();
+    return isMobileBrowser() ? isSupportedMobileBrowser() : JitsiMeetJS.isWebRtcSupported();
 }
 
 /**
@@ -108,9 +104,8 @@ export function isSupportedBrowser() {
  * @returns {boolean}
  */
 export function isSupportedMobileBrowser() {
-    return (Platform.OS === 'android' && browser.isChromiumBased())
-        || (Platform.OS === 'android' && browser.isFirefox())
-        || (Platform.OS === 'ios' && browser.isWebKitBased());
+    return (Platform.OS === 'android' && browser.isSupportedAndroidBrowser())
+        || (Platform.OS === 'ios' && browser.isSupportedIOSBrowser());
 }
 
 /**

react/features/base/i18n/actionTypes.js

@@ -0,0 +1,11 @@
+// @flow
+
+/**
+ * The type of (redux) action which signals that i18next has been initialized.
+ */
+export const I18NEXT_INITIALIZED = 'I18NEXT_INITIALIZED';
+
+/**
+ * The type of (redux) action which signals that language has been changed.
+ */
+export const LANGUAGE_CHANGED = 'LANGUAGE_CHANGED';

react/features/base/i18n/functions.js

@@ -1,6 +1,24 @@
+// @flow
+
 import React from 'react';
 import { withTranslation } from 'react-i18next';
 
+import i18next from './i18next';
+
+/**
+ * Changes the main translation bundle.
+ *
+ * @param {string} language - The language e.g. 'en', 'fr'.
+ * @param {string} url - The url of the translation bundle.
+ * @returns {void}
+ */
+export async function changeLanguageBundle(language: string, url: string) {
+    const res = await fetch(url);
+    const bundle = await res.json();
+
+    i18next.addResourceBundle(language, 'main', bundle, true, true);
+}
+
 /**
  * Wraps a specific React Component in order to enable translations in it.
  *
@@ -8,7 +26,7 @@ import { withTranslation } from 'react-i18next';
  * @returns {Component} The React Component which wraps {@link component} and
  * enables translations in it.
  */
-export function translate(component) {
+export function translate(component: any) {
     // Use the default list of namespaces.
     return withTranslation([ 'main', 'languages', 'countries' ])(component);
 }
@@ -23,7 +41,7 @@ export function translate(component) {
  * @returns {ReactElement} A ReactElement which depicts the translated HTML
  * text.
  */
-export function translateToHTML(t, key, options = {}) {
+export function translateToHTML(t: Function, key: string, options: Object = {}) {
     // eslint-disable-next-line react/no-danger
     return <span dangerouslySetInnerHTML = {{ __html: t(key, options) }} />;
 }

react/features/base/i18n/i18next.js

@@ -1,5 +1,7 @@
 // @flow
 
+declare var APP: Object;
+
 import COUNTRIES_RESOURCES from 'i18n-iso-countries/langs/en.json';
 import i18next from 'i18next';
 import I18nextXHRBackend from 'i18next-xhr-backend';
@@ -7,6 +9,7 @@ import I18nextXHRBackend from 'i18next-xhr-backend';
 import LANGUAGES_RESOURCES from '../../../../lang/languages.json';
 import MAIN_RESOURCES from '../../../../lang/main.json';
 
+import { I18NEXT_INITIALIZED, LANGUAGE_CHANGED } from './actionTypes';
 import languageDetector from './languageDetector';
 
 /**
@@ -46,6 +49,8 @@ const options = {
     load: 'languageOnly',
     ns: [ 'main', 'languages', 'countries' ],
     react: {
+        // re-render when a new resource bundle is added
+        bindI18nStore: 'added',
         useSuspense: false
     },
     returnEmptyString: false,
@@ -87,4 +92,15 @@ i18next.addResourceBundle(
 // since i18next is not yet initialized at that point.
 require('./BuiltinLanguages');
 
+// Label change through dynamic branding is available only for web
+if (typeof APP !== 'undefined') {
+    i18next.on('initialized', () => {
+        APP.store.dispatch({ type: I18NEXT_INITIALIZED });
+    });
+
+    i18next.on('languageChanged', () => {
+        APP.store.dispatch({ type: LANGUAGE_CHANGED });
+    });
+}
+
 export default i18next;

react/features/base/i18n/logger.js

@@ -0,0 +1,5 @@
+// @flow
+
+import { getLogger } from '../logging/functions';
+
+export default getLogger('features/base/i18n');

react/features/base/i18n/middleware.js

@@ -0,0 +1,39 @@
+// @flow
+
+import { SET_DYNAMIC_BRANDING_DATA } from '../../dynamic-branding/actionTypes';
+import { MiddlewareRegistry } from '../redux';
+
+import { I18NEXT_INITIALIZED, LANGUAGE_CHANGED } from './actionTypes';
+import { changeLanguageBundle } from './functions';
+import i18next from './i18next';
+import logger from './logger';
+
+/**
+ * Implements the entry point of the middleware of the feature base/i18n.
+ *
+ * @param {Store} store - The redux store.
+ * @returns {Function}
+ */
+MiddlewareRegistry.register(store => next => async action => {
+    switch (action.type) {
+    case I18NEXT_INITIALIZED:
+    case LANGUAGE_CHANGED:
+    case SET_DYNAMIC_BRANDING_DATA: {
+        const { language } = i18next;
+        const { labels } = action.type === SET_DYNAMIC_BRANDING_DATA
+            ? action.value
+            : store.getState()['features/dynamic-branding'];
+
+        if (language && labels && labels[language]) {
+            try {
+                await changeLanguageBundle(language, labels[language]);
+            } catch (err) {
+                logger.log('Error setting dynamic language bundle', err);
+            }
+        }
+        break;
+    }
+    }
+
+    return next(action);
+});

react/features/base/icons/components/Icon.js

@@ -15,7 +15,7 @@ type Props = {
     /**
      * Color of the icon (if not provided by the style object).
      */
-    color?: string,
+    color?: ?string,
 
     /**
      * Id prop (mainly for autotests).
@@ -35,7 +35,7 @@ type Props = {
     /**
      * The size of the icon (if not provided by the style object).
      */
-    size?: number | string,
+    size?: ?number | string,
 
     /**
      * The preloaded icon component to render.

react/features/base/icons/svg/crown.svg

@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 4C14 4.85739 13.4605 5.58876 12.7024 5.87317L14.2286 9.94296L14.9455 11.8546C15.0074 11.9292 15.0708 11.9292 15.1098 11.8902L16.5535 10.4465L18.5858 8.41421C18.2239 8.05228 18 7.55228 18 7C18 5.89543 18.8954 5 20 5C21.1046 5 22 5.89543 22 7C22 8.10457 21.1046 9 20 9C19.9441 9 19.8887 8.9977 19.8339 8.9932L19 19C19 20.1046 18.1046 21 17 21H7C5.89543 21 5 20.1046 5 19L4.1661 8.9932C4.11133 8.9977 4.05593 9 4 9C2.89543 9 2 8.10457 2 7C2 5.89543 2.89543 5 4 5C5.10457 5 6 5.89543 6 7C6 7.55228 5.77614 8.05228 5.41421 8.41421L7.44654 10.4465L8.89019 11.8902C8.9775 11.9325 9.03514 11.9063 9.05453 11.8546L9.77139 9.94296L11.2976 5.87317C10.5395 5.58876 10 4.85739 10 4C10 2.89543 10.8954 2 12 2C13.1046 2 14 2.89543 14 4ZM6.84027 17L6.44651 12.2749L7.47597 13.3044C7.68795 13.5164 7.94285 13.6805 8.22354 13.7858C9.30949 14.193 10.52 13.6428 10.9272 12.5568L12 9.696L13.0728 12.5568C13.1781 12.8375 13.3422 13.0924 13.5542 13.3044C14.3743 14.1245 15.7039 14.1245 16.524 13.3044L17.5535 12.2749L17.1597 17H6.84027Z"/>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.75 2.5C8.75 3.03587 8.41281 3.49298 7.93902 3.67073L8.89288 6.21435L9.34092 7.40912C9.37965 7.45577 9.41923 7.45577 9.44363 7.43137L10.3459 6.52909L11.6161 5.25888C11.3899 5.03268 11.25 4.72018 11.25 4.375C11.25 3.68464 11.8096 3.125 12.5 3.125C13.1904 3.125 13.75 3.68464 13.75 4.375C13.75 5.06536 13.1904 5.625 12.5 5.625C12.465 5.625 12.4304 5.62356 12.3962 5.62075L11.875 11.875C11.875 12.5654 11.3154 13.125 10.625 13.125H4.375C3.68464 13.125 3.125 12.5654 3.125 11.875L2.60381 5.62075C2.56958 5.62356 2.53496 5.625 2.5 5.625C1.80964 5.625 1.25 5.06536 1.25 4.375C1.25 3.68464 1.80964 3.125 2.5 3.125C3.19036 3.125 3.75 3.68464 3.75 4.375C3.75 4.72018 3.61009 5.03268 3.38388 5.25888L4.65409 6.52909L5.55637 7.43137C5.61094 7.45781 5.64696 7.44144 5.65908 7.40912L6.10712 6.21435L7.06098 3.67073C6.58719 3.49298 6.25 3.03587 6.25 2.5C6.25 1.80964 6.80964 1.25 7.5 1.25C8.19036 1.25 8.75 1.80964 8.75 2.5ZM4.27517 10.625L4.02907 7.67184L4.67248 8.31525C4.80497 8.44773 4.96428 8.55032 5.13971 8.6161C5.81843 8.87063 6.57497 8.52674 6.82949 7.84802L7.5 6.06L8.17051 7.84802C8.23629 8.02345 8.33888 8.18277 8.47136 8.31525C8.98392 8.82781 9.81495 8.82781 10.3275 8.31525L10.9709 7.67184L10.7248 10.625H4.27517Z" fill="white"/>
 </svg>

react/features/base/icons/svg/mute-everyone-else.svg

@@ -1,11 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 13.078V15C6 16.3999 6.9589 17.5759 8.25572 17.907C8.25195 17.9374 8.25 17.9685 8.25 18V19.4378C6.12171 19.0807 4.5 17.2297 4.5 15C4.5 14.5858 4.16421 14.25 3.75 14.25C3.33579 14.25 3 14.5858 3 15C3 18.0597 5.29027 20.5845 8.25 20.9536V21.75C8.25 22.1642 8.58579 22.5 9 22.5C9.41421 22.5 9.75 22.1642 9.75 21.75V20.9536C10.8412 20.8175 11.8415 20.3884 12.6694 19.7475L15.1986 22.2766C15.4964 22.5744 15.9791 22.5745 16.2768 22.2768C16.5745 21.9791 16.5744 21.4964 16.2766 21.1986L13.7475 18.6694C13.7502 18.6659 13.753 18.6623 13.7557 18.6588L12.6831 17.5861C12.6805 17.5898 12.6779 17.5935 12.6753 17.5972L11.5911 16.513C11.5934 16.5091 11.5957 16.5051 11.598 16.5011L10.4566 15.3596C10.4554 15.3647 10.4541 15.3697 10.4528 15.3748L7.5 12.422V12.403L6 10.903V10.922L2.80143 7.72339C2.50364 7.4256 2.02091 7.42553 1.72322 7.72322C1.42553 8.02091 1.4256 8.50364 1.72339 8.80143L6 13.078ZM7.5 14.578V15C7.5 15.8284 8.17157 16.5 9 16.5C9.1294 16.5 9.25498 16.4836 9.37476 16.4528L7.5 14.578ZM10.513 17.5911C10.2756 17.73 10.0175 17.8372 9.74428 17.907C9.74805 17.9374 9.75 17.9685 9.75 18V19.4378C10.4295 19.3238 11.0573 19.0575 11.5972 18.6753L10.513 17.5911ZM12 14.747L10.5 13.247V10.5C10.5 9.67157 9.82843 9 9 9C8.25144 9 7.63095 9.54832 7.51827 10.2652L6.34845 9.09541C6.85223 8.14635 7.85064 7.5 9 7.5C10.6569 7.5 12 8.84315 12 10.5V14.747ZM13.3623 16.1092L14.5462 17.2932C14.8386 16.5867 15 15.8122 15 15C15 14.5858 14.6642 14.25 14.25 14.25C13.8358 14.25 13.5 14.5858 13.5 15C13.5 15.3828 13.4522 15.7544 13.3623 16.1092Z" />
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4.71869V6C16 6.93329 16.6393 7.71727 17.5038 7.93797C17.5013 7.95829 17.5 7.97899 17.5 8V8.95852C16.0811 8.72048 15 7.4865 15 6C15 5.72386 14.7761 5.5 14.5 5.5C14.2239 5.5 14 5.72386 14 6C14 8.03981 15.5268 9.723 17.5 9.96905V10.5C17.5 10.7761 17.7239 11 18 11C18.2761 11 18.5 10.7761 18.5 10.5V9.96905C19.2275 9.87834 19.8943 9.59227 20.4463 9.16499L22.1324 10.8511C22.3309 11.0496 22.6527 11.0496 22.8512 10.8512C23.0496 10.6527 23.0496 10.3309 22.8511 10.1324L21.165 8.4463C21.1668 8.44393 21.1687 8.44155 21.1705 8.43918L20.4554 7.7241C20.4537 7.72656 20.4519 7.72903 20.4502 7.73149L19.7274 7.00869C19.7289 7.00603 19.7305 7.00338 19.732 7.00072L18.9711 6.23977C18.9702 6.24313 18.9694 6.24649 18.9685 6.24984L17 4.28131V4.26869L16 3.26869V3.28131L13.8676 1.14893C13.6691 0.950402 13.3473 0.950351 13.1488 1.14881C12.9504 1.34727 12.9504 1.6691 13.1489 1.86762L16 4.71869ZM17 5.71869V6C17 6.55228 17.4477 7 18 7C18.0863 7 18.17 6.98908 18.2498 6.96854L17 5.71869ZM19.0087 7.72738C18.8504 7.81999 18.6783 7.89148 18.4962 7.93797C18.4987 7.95829 18.5 7.97899 18.5 8V8.95852C18.953 8.88252 19.3715 8.70502 19.7315 8.45019L19.0087 7.72738ZM20 5.83131L19 4.83131V3C19 2.44772 18.5523 2 18 2C17.501 2 17.0873 2.36555 17.0122 2.84348L16.2323 2.06361C16.5682 1.4309 17.2338 1 18 1C19.1046 1 20 1.89543 20 3V5.83131ZM20.9082 6.73948L21.6975 7.52877C21.8924 7.05778 22 6.54145 22 6C22 5.72386 21.7761 5.5 21.5 5.5C21.2239 5.5 21 5.72386 21 6C21 6.25519 20.9681 6.50294 20.9082 6.73948Z" />
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="24" height="24"/>
-</clipPath>
-</defs>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 10.8984V12.5C5 13.6666 5.79908 14.6466 6.87977 14.9225C6.87662 14.9479 6.875 14.9737 6.875 15V16.1982C5.10143 15.9006 3.75 14.3581 3.75 12.5C3.75 12.1548 3.47018 11.875 3.125 11.875C2.77982 11.875 2.5 12.1548 2.5 12.5C2.5 15.0498 4.40856 17.1538 6.875 17.4613V18.125C6.875 18.4702 7.15482 18.75 7.5 18.75C7.84518 18.75 8.125 18.4702 8.125 18.125V17.4613C9.03436 17.3479 9.86788 16.9903 10.5579 16.4562L12.6655 18.5638C12.9136 18.812 13.3159 18.8121 13.564 18.564C13.8121 18.3159 13.812 17.9136 13.5638 17.6655L11.4562 15.5579C11.4585 15.5549 11.4608 15.5519 11.4631 15.549L10.5693 14.6551C10.5671 14.6582 10.5649 14.6613 10.5627 14.6644L9.65923 13.7609C9.66117 13.7575 9.6631 13.7542 9.66503 13.7509L8.71384 12.7997C8.7128 12.8039 8.71175 12.8081 8.71067 12.8123L6.25 10.3516V10.3359L5 9.08587V9.10163L2.33453 6.43616C2.08637 6.188 1.68409 6.18794 1.43602 6.43602C1.18794 6.68409 1.188 7.08637 1.43616 7.33453L5 10.8984ZM6.25 12.1484V12.5C6.25 13.1904 6.80964 13.75 7.5 13.75C7.60783 13.75 7.71248 13.7363 7.8123 13.7107L6.25 12.1484ZM8.76086 14.6592C8.56304 14.775 8.34788 14.8643 8.12023 14.9225C8.12338 14.9479 8.125 14.9737 8.125 15V16.1982C8.69123 16.1032 9.21443 15.8813 9.66436 15.5627L8.76086 14.6592ZM10 12.2891L8.75 11.0391V8.75C8.75 8.05964 8.19036 7.5 7.5 7.5C6.8762 7.5 6.35913 7.95693 6.26522 8.55435L5.29038 7.57951C5.71019 6.78863 6.5422 6.25 7.5 6.25C8.88071 6.25 10 7.36929 10 8.75V12.2891ZM11.1352 13.4243L12.1218 14.411C12.3655 13.8222 12.5 13.1768 12.5 12.5C12.5 12.1548 12.2202 11.875 11.875 11.875C11.5298 11.875 11.25 12.1548 11.25 12.5C11.25 12.819 11.2102 13.1287 11.1352 13.4243Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3333 3.93224V5C13.3333 5.77774 13.8661 6.43106 14.5865 6.61497C14.5844 6.63191 14.5833 6.64916 14.5833 6.66666V7.46543C13.401 7.26706 12.5 6.23874 12.5 4.99999C12.5 4.76988 12.3135 4.58333 12.0833 4.58333C11.8532 4.58333 11.6667 4.76988 11.6667 4.99999C11.6667 6.69984 12.939 8.1025 14.5833 8.30754V8.74999C14.5833 8.98011 14.7699 9.16666 15 9.16666C15.2301 9.16666 15.4167 8.98011 15.4167 8.74999V8.30754C16.0229 8.23194 16.5786 7.99355 17.0386 7.63749L18.4437 9.04256C18.6091 9.20799 18.8773 9.20804 19.0427 9.04265C19.2081 8.87727 19.208 8.60908 19.0426 8.44364L17.6375 7.03857C17.639 7.0366 17.6406 7.03462 17.6421 7.03264L17.0462 6.43674C17.0447 6.4388 17.0433 6.44085 17.0418 6.4429L16.4395 5.84057C16.4408 5.83836 16.4421 5.83614 16.4434 5.83392L15.8092 5.1998C15.8085 5.2026 15.8078 5.2054 15.8071 5.2082L14.1667 3.56775V3.55724L13.3333 2.72391V2.73442L11.5564 0.957435C11.3909 0.791997 11.1227 0.791954 10.9574 0.957339C10.792 1.12272 10.792 1.39091 10.9574 1.55635L13.3333 3.93224ZM14.1667 4.76557V4.99999C14.1667 5.46023 14.5398 5.83333 15 5.83333C15.0719 5.83333 15.1417 5.82422 15.2082 5.80711L14.1667 4.76557ZM15.8406 6.43948C15.7087 6.51666 15.5653 6.57623 15.4135 6.61497C15.4156 6.63191 15.4167 6.64916 15.4167 6.66666V7.46543C15.7942 7.4021 16.143 7.25417 16.4429 7.04182L15.8406 6.43948ZM16.6667 4.85942L15.8333 4.02608V2.49999C15.8333 2.03976 15.4602 1.66666 15 1.66666C14.5841 1.66666 14.2394 1.97128 14.1768 2.36956L13.5269 1.71967C13.8068 1.19241 14.3615 0.833328 15 0.833328C15.9205 0.833328 16.6667 1.57952 16.6667 2.49999V4.85942ZM17.4235 5.61623L18.0812 6.27397C18.2437 5.88148 18.3333 5.45121 18.3333 4.99999C18.3333 4.76988 18.1468 4.58333 17.9167 4.58333C17.6866 4.58333 17.5 4.76988 17.5 4.99999C17.5 5.21265 17.4735 5.41911 17.4235 5.61623Z" fill="white"/>
 </svg>

react/features/base/icons/svg/raised-hand.svg

@@ -1,3 +1,3 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M11.9167 3.20834L11.9167 4.83334L11.9167 11L11.9167 11.9167C11.9167 12.4229 12.3271 12.8333 12.8333 12.8333C13.3396 12.8333 13.75 12.4229 13.75 11.9167V11V4.83334C13.75 4.73632 13.9183 4.58334 14.2083 4.58334C14.4984 4.58334 14.6667 4.73632 14.6667 4.83334L14.6667 6.875L14.6667 11.9167C14.6667 12.4229 15.0771 12.8333 15.5833 12.8333C16.0896 12.8333 16.5 12.4229 16.5 11.9167L16.5 6.875C16.5 6.62187 16.7052 6.41667 16.9583 6.41667C17.2115 6.41667 17.4167 6.62187 17.4167 6.875V13.788C17.1671 16.3395 14.9919 18.3333 12.375 18.3333C10.6569 18.3333 9.09297 17.4675 8.17032 16.0753L8.16703 16.0762L4.67206 10.8208C4.50437 10.5805 4.55476 10.2948 4.76211 10.1496C4.96947 10.0044 5.25526 10.0548 5.40045 10.2621L6.57295 12.015L6.57177 12.0158C6.85487 12.4355 7.42461 12.5463 7.84432 12.2632C8.09767 12.0923 8.23844 11.8169 8.24797 11.5332L8.25 11.5338V5.04167C8.25 4.78854 8.4552 4.58334 8.70833 4.58334C8.96124 4.58334 9.1663 4.78818 9.16667 5.041L9.16667 5.04167L9.16667 11L9.16667 11.9167C9.16667 12.4229 9.57707 12.8333 10.0833 12.8333C10.5896 12.8333 11 12.4229 11 11.9167V11V5.04167V3.20834C11 2.95521 11.2052 2.75001 11.4583 2.75001C11.7115 2.75001 11.9167 2.95521 11.9167 3.20834ZM19.2337 13.7686L19.25 13.7605V13.2917V6.875C19.25 5.60935 18.224 4.58334 16.9583 4.58334C16.7976 4.58334 16.6408 4.59988 16.4894 4.63136C16.3776 3.57554 15.399 2.75001 14.2083 2.75001C14.0384 2.75001 13.8729 2.76681 13.7135 2.7987C13.5204 1.72851 12.5842 0.916672 11.4583 0.916672C10.3309 0.916672 9.39356 1.73088 9.20233 2.80339C9.04323 2.76843 8.87793 2.75001 8.70833 2.75001C7.44268 2.75001 6.41667 3.77602 6.41667 5.04167V8.70352C5.64445 8.11321 4.54919 8.06056 3.71056 8.64778C2.67379 9.37373 2.42183 10.8027 3.14778 11.8395L6.44893 16.7791C7.64459 18.8065 9.85095 20.1667 12.375 20.1667C16.0117 20.1667 18.9888 17.3431 19.2337 13.7686Z" />
 </svg>

react/features/base/icons/svg/share-desktop.svg

@@ -1,3 +1,3 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.66671 2.75H18.3334C19.3459 2.75 20.1667 3.57081 20.1667 4.58333V15.5833C20.1667 16.5959 19.3459 17.4167 18.3334 17.4167H15.5834C16.0896 17.4167 16.5 17.8271 16.5 18.3333C16.5 18.8396 16.0896 19.25 15.5834 19.25H6.41671C5.91045 19.25 5.50004 18.8396 5.50004 18.3333C5.50004 17.8271 5.91045 17.4167 6.41671 17.4167H3.66671C2.65419 17.4167 1.83337 16.5959 1.83337 15.5833V4.58333C1.83337 3.57081 2.65419 2.75 3.66671 2.75ZM3.66671 4.58333V15.5833H18.3334V4.58333H3.66671ZM11.9167 8.25C8.16671 8.25 6.41671 9.85417 6.41671 14.6667C8.41671 10.7708 11.9167 11 11.9167 11V12.274C11.9167 12.6941 12.4034 12.9269 12.7305 12.6633L16.017 10.0143C16.2654 9.81413 16.2654 9.43582 16.017 9.23568L12.7305 6.5867C12.4034 6.32307 11.9167 6.55589 11.9167 6.97599V8.25Z" />
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.5 1.875H12.5C13.1904 1.875 13.75 2.43464 13.75 3.125V10.625C13.75 11.3154 13.1904 11.875 12.5 11.875H10.625C10.9702 11.875 11.25 12.1548 11.25 12.5C11.25 12.8452 10.9702 13.125 10.625 13.125H4.375C4.02982 13.125 3.75 12.8452 3.75 12.5C3.75 12.1548 4.02982 11.875 4.375 11.875H2.5C1.80964 11.875 1.25 11.3154 1.25 10.625V3.125C1.25 2.43464 1.80964 1.875 2.5 1.875ZM2.5 3.125V10.625H12.5V3.125H2.5ZM8.125 5.625C5.56818 5.625 4.375 6.71875 4.375 10C5.73864 7.34375 8.125 7.5 8.125 7.5V8.03605C8.125 8.45615 8.61169 8.68897 8.93877 8.42534L10.767 6.95178C11.0153 6.75164 11.0153 6.37333 10.767 6.17319L8.93877 4.69963C8.61169 4.436 8.125 4.66882 8.125 5.08892V5.625Z" fill="white"/>
 </svg>

react/features/base/label/components/Label.web.js

@@ -34,6 +34,11 @@ type Props = AbstractProps & {
      */
     id: string,
 
+    /**
+     * Color for the icon.
+     */
+    iconColor?: string,
+
     /**
      * Click handler if any.
      */
@@ -103,6 +108,7 @@ class Label extends AbstractLabel<Props, *> {
             className,
             color,
             icon,
+            iconColor,
             id,
             onClick,
             text
@@ -120,6 +126,7 @@ class Label extends AbstractLabel<Props, *> {
                 id = { id }
                 onClick = { onClick }>
                 { icon && <Icon
+                    color = { iconColor }
                     size = '16'
                     src = { icon } /> }
                 { text && <span className = { icon && classes.withIcon }>{text}</span> }

react/features/base/media/middleware.js

@@ -13,6 +13,7 @@ import {
     showWarningNotification
 } from '../../notifications';
 import { isForceMuted } from '../../participants-pane/functions';
+import { isScreenMediaShared } from '../../screen-share/functions';
 import { SET_AUDIO_ONLY, setAudioOnly } from '../audio-only';
 import { isRoomValid, SET_ROOM } from '../conference';
 import { getLocalParticipant } from '../participants';
@@ -20,6 +21,7 @@ import { MiddlewareRegistry } from '../redux';
 import { getPropertyValue } from '../settings';
 import {
     destroyLocalTracks,
+    isLocalTrackMuted,
     isLocalVideoTrackDesktop,
     setTrackMuted,
     TRACK_ADDED
@@ -85,12 +87,15 @@ MiddlewareRegistry.register(store => next => action => {
 
     case SET_AUDIO_UNMUTE_PERMISSIONS: {
         const { blocked } = action;
+        const state = store.getState();
+        const tracks = state['features/base/tracks'];
+        const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO);
 
-        if (blocked) {
+        if (blocked && isAudioMuted) {
             store.dispatch(showWarningNotification({
                 descriptionKey: 'notify.audioUnmuteBlockedDescription',
                 titleKey: 'notify.audioUnmuteBlockedTitle'
-            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+            }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
         }
         break;
     }
@@ -107,12 +112,16 @@ MiddlewareRegistry.register(store => next => action => {
 
     case SET_VIDEO_UNMUTE_PERMISSIONS: {
         const { blocked } = action;
+        const state = store.getState();
+        const tracks = state['features/base/tracks'];
+        const isVideoMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.VIDEO);
+        const isMediaShared = isScreenMediaShared(state);
 
-        if (blocked) {
+        if (blocked && isVideoMuted && !isMediaShared) {
             store.dispatch(showWarningNotification({
                 descriptionKey: 'notify.videoUnmuteBlockedDescription',
                 titleKey: 'notify.videoUnmuteBlockedTitle'
-            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+            }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
         }
         break;
     }

react/features/base/media/reducer.js

@@ -35,7 +35,7 @@ import { CAMERA_FACING_MODE } from './constants';
  */
 export const _AUDIO_INITIAL_MEDIA_STATE = {
     available: true,
-    blocked: false,
+    unmuteBlocked: false,
     muted: false
 };
 
@@ -65,7 +65,7 @@ function _audio(state = _AUDIO_INITIAL_MEDIA_STATE, action) {
     case SET_AUDIO_UNMUTE_PERMISSIONS:
         return {
             ...state,
-            blocked: action.blocked
+            unmuteBlocked: action.blocked
         };
 
     default:
@@ -92,7 +92,7 @@ function _audio(state = _AUDIO_INITIAL_MEDIA_STATE, action) {
  */
 export const _VIDEO_INITIAL_MEDIA_STATE = {
     available: true,
-    blocked: false,
+    unmuteBlocked: false,
     facingMode: CAMERA_FACING_MODE.USER,
     muted: 0,
 
@@ -139,7 +139,7 @@ function _video(state = _VIDEO_INITIAL_MEDIA_STATE, action) {
     case SET_VIDEO_UNMUTE_PERMISSIONS:
         return {
             ...state,
-            blocked: action.blocked
+            unmuteBlocked: action.blocked
         };
 
     case STORE_VIDEO_TRANSFORM:

react/features/base/modal/components/JitsiKeyboardAvoidingView.js

@@ -4,7 +4,8 @@ import { useHeaderHeight } from '@react-navigation/stack';
 import React, { useEffect, useState } from 'react';
 import {
     KeyboardAvoidingView,
-    Platform
+    Platform,
+    StatusBar
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
@@ -22,6 +23,11 @@ type Props = {
      */
     contentContainerStyle?: StyleType,
 
+    /**
+     * Is a text input rendered at the bottom of the screen?
+     */
+    hasBottomTextInput: boolean,
+
     /**
      * Is the screen rendering a tab navigator?
      */
@@ -38,6 +44,7 @@ const JitsiKeyboardAvoidingView = (
             children,
             contentContainerStyle,
             hasTabNavigator,
+            hasBottomTextInput,
             style
         }: Props) => {
     const headerHeight = useHeaderHeight();
@@ -54,8 +61,10 @@ const JitsiKeyboardAvoidingView = (
     const tabNavigatorPadding
         = hasTabNavigator ? headerHeight : 0;
     const noNotchDevicePadding = bottomPadding || 10;
-    const iosVerticalOffset = headerHeight + noNotchDevicePadding + tabNavigatorPadding;
-    const androidVerticalOffset = headerHeight;
+    const iosVerticalOffset
+        = headerHeight + noNotchDevicePadding + tabNavigatorPadding;
+    const androidVerticalOffset = hasBottomTextInput
+        ? headerHeight + StatusBar.currentHeight : headerHeight;
 
     return (
         <KeyboardAvoidingView

react/features/base/modal/components/JitsiScreen.js

@@ -27,6 +27,11 @@ type Props = {
      */
     footerComponent?: Function,
 
+    /**
+     * Is a text input rendered at the bottom of the screen?
+     */
+    hasBottomTextInput?: boolean,
+
     /**
      * Is the screen rendering a tab navigator?
      */
@@ -43,12 +48,14 @@ const JitsiScreen = ({
     children,
     footerComponent,
     hasTabNavigator = false,
+    hasBottomTextInput = false,
     style
 }: Props) => (
     <View
         style = { styles.jitsiScreenContainer }>
         <JitsiKeyboardAvoidingView
             contentContainerStyle = { contentContainerStyle }
+            hasBottomTextInput = { hasBottomTextInput }
             hasTabNavigator = { hasTabNavigator }
             style = { style }>
             <SafeAreaView

react/features/base/participants/actions.js

@@ -540,20 +540,23 @@ export function pinParticipant(id) {
  *
  * @param {string} participantId - The ID of the participant.
  * @param {string} url - The new URL.
+ * @param {boolean} useCORS - Indicates whether we need to use CORS for this URL.
  * @returns {{
  *     type: SET_LOADABLE_AVATAR_URL,
  *     participant: {
  *         id: string,
- *         loadableAvatarUrl: string
+ *         loadableAvatarUrl: string,
+ *         loadableAvatarUrlUseCORS: boolean
  *     }
  * }}
 */
-export function setLoadableAvatarUrl(participantId, url) {
+export function setLoadableAvatarUrl(participantId, url, useCORS) {
     return {
         type: SET_LOADABLE_AVATAR_URL,
         participant: {
             id: participantId,
-            loadableAvatarUrl: url
+            loadableAvatarUrl: url,
+            loadableAvatarUrlUseCORS: useCORS
         }
     };
 }

react/features/base/participants/functions.js

@@ -3,7 +3,7 @@
 import { getGravatarURL } from '@jitsi/js-utils/avatar';
 import type { Store } from 'redux';
 
-import { GRAVATAR_BASE_URL } from '../avatar';
+import { GRAVATAR_BASE_URL, isCORSAvatarURL } from '../avatar';
 import { JitsiParticipantConnectionStatus } from '../lib-jitsi-meet';
 import { MEDIA_TYPE, shouldRenderVideoTrack } from '../media';
 import { toState } from '../redux';
@@ -56,7 +56,7 @@ export function getFirstLoadableAvatarUrl(participant: Object, store: Store<any,
     const deferred = createDeferred();
     const fullPromise = deferred.promise
         .then(() => _getFirstLoadableAvatarUrl(participant, store))
-        .then(src => {
+        .then(result => {
 
             if (AVATAR_QUEUE.length) {
                 const next = AVATAR_QUEUE.shift();
@@ -64,7 +64,7 @@ export function getFirstLoadableAvatarUrl(participant: Object, store: Store<any,
                 next.resolve();
             }
 
-            return src;
+            return result;
         });
 
     if (AVATAR_QUEUE.length) {
@@ -432,18 +432,33 @@ async function _getFirstLoadableAvatarUrl(participant, store) {
 
         if (url !== null) {
             if (AVATAR_CHECKED_URLS.has(url)) {
-                if (AVATAR_CHECKED_URLS.get(url)) {
-                    return url;
+                const { isLoadable, isUsingCORS } = AVATAR_CHECKED_URLS.get(url) || {};
+
+                if (isLoadable) {
+                    return {
+                        isUsingCORS,
+                        src: url
+                    };
                 }
             } else {
                 try {
-                    const finalUrl = await preloadImage(url);
+                    const { corsAvatarURLs } = store.getState()['features/base/config'];
+                    const { isUsingCORS, src } = await preloadImage(url, isCORSAvatarURL(url, corsAvatarURLs));
 
-                    AVATAR_CHECKED_URLS.set(finalUrl, true);
+                    AVATAR_CHECKED_URLS.set(src, {
+                        isLoadable: true,
+                        isUsingCORS
+                    });
 
-                    return finalUrl;
+                    return {
+                        isUsingCORS,
+                        src
+                    };
                 } catch (e) {
-                    AVATAR_CHECKED_URLS.set(url, false);
+                    AVATAR_CHECKED_URLS.set(url, {
+                        isLoadable: false,
+                        isUsingCORS: false
+                    });
                 }
             }
         }

react/features/base/participants/middleware.js

@@ -289,6 +289,12 @@ StateListenerRegistry.register(
                     })),
                 'raisedHand': (participant, value) =>
                     _raiseHandUpdated(store, conference, participant.getId(), value),
+                'region': (participant, value) =>
+                    store.dispatch(participantUpdated({
+                        conference,
+                        id: participant.getId(),
+                        region: value
+                    })),
                 'remoteControlSessionStatus': (participant, value) =>
                     store.dispatch(participantUpdated({
                         conference,
@@ -488,8 +494,8 @@ function _participantJoinedOrUpdated(store, next, action) {
             const updatedParticipant = getParticipantById(getState(), participantId);
 
             getFirstLoadableAvatarUrl(updatedParticipant, store)
-                .then(url => {
-                    dispatch(setLoadableAvatarUrl(participantId, url));
+                .then(urlData => {
+                    dispatch(setLoadableAvatarUrl(participantId, urlData?.src, urlData?.isUsingCORS));
                 });
         }
     }
@@ -555,8 +561,8 @@ function _raiseHandUpdated({ dispatch, getState }, conference, participantId, ne
     }
 
     const action = shouldDisplayAllowAction ? {
-        customActionNameKey: 'notify.allowAction',
-        customActionHandler: () => dispatch(approveParticipant(participantId))
+        customActionNameKey: [ 'notify.allowAction' ],
+        customActionHandler: [ () => dispatch(approveParticipant(participantId)) ]
     } : {};
 
     if (raisedHandTimestamp) {

react/features/base/participants/preloadImage.native.js

@@ -11,12 +11,17 @@ import { isIconUrl } from './functions';
  * @param {string | Object} src - Source of the avatar.
  * @returns {Promise}
  */
-export function preloadImage(src: string | Object): Promise<string> {
+export function preloadImage(src: string | Object): Promise<Object> {
     if (isIconUrl(src)) {
         return Promise.resolve(src);
     }
 
     return new Promise((resolve, reject) => {
-        Image.prefetch(src).then(() => resolve(src), reject);
+        Image.prefetch(src).then(
+            () => resolve({
+                src,
+                isUsingCORS: false
+            }),
+            reject);
     });
 }

react/features/base/participants/preloadImage.web.js

@@ -1,29 +1,45 @@
 
 // @flow
 
-import { isGravatarURL } from '../avatar';
-
 import { isIconUrl } from './functions';
 
 /**
  * Tries to preload an image.
  *
  * @param {string | Object} src - Source of the avatar.
+ * @param {boolean} useCORS - Whether to use CORS or not.
+ * @param {boolean} tryOnce - If true we try to load the image only using the specified CORS mode. Otherwise both modes
+ * (CORS and no CORS) will be used to load the image if the first atempt fails.
  * @returns {Promise}
  */
-export function preloadImage(src: string | Object): Promise<string> {
+export function preloadImage(
+        src: string | Object,
+        useCORS: ?boolean = false,
+        tryOnce: ?boolean = false
+): Promise<Object> {
     if (isIconUrl(src)) {
-        return Promise.resolve(src);
+        return Promise.resolve({ src });
     }
 
     return new Promise((resolve, reject) => {
         const image = document.createElement('img');
 
-        if (isGravatarURL(src)) {
+        if (useCORS) {
             image.setAttribute('crossOrigin', '');
         }
-        image.onload = () => resolve(src);
-        image.onerror = reject;
+        image.onload = () => resolve({
+            src,
+            isUsingCORS: useCORS
+        });
+        image.onerror = error => {
+            if (tryOnce) {
+                reject(error);
+            } else {
+                preloadImage(src, !useCORS, true)
+                    .then(resolve)
+                    .catch(reject);
+            }
+        };
 
         // $FlowExpectedError
         image.referrerPolicy = 'no-referrer';

react/features/base/popover/components/Popover.web.js

@@ -1,5 +1,4 @@
 /* @flow */
-import clsx from 'clsx';
 import React, { Component } from 'react';
 
 import { Drawer, JitsiPortal, DialogPortal } from '../../../toolbox/components/web';
@@ -60,11 +59,6 @@ type Props = {
      */
     position: string,
 
-    /**
-     * Whether the content show have some padding.
-     */
-    paddedContent: ?boolean,
-
     /**
      * Whether the popover is visible or not.
      */
@@ -79,7 +73,7 @@ type State = {
     /**
      * The style to apply to the context menu in order to position it correctly.
      */
-     contextMenuStyle: Object
+    contextMenuStyle: Object
 };
 
 /**
@@ -364,15 +358,11 @@ class Popover extends Component<Props, State> {
      * @returns {ReactElement}
      */
     _renderContent() {
-        const { content, paddedContent } = this.props;
-        const className = clsx(
-            'popover popupmenu',
-            paddedContent && 'padded-content'
-        );
+        const { content } = this.props;
 
         return (
             <div
-                className = { className }
+                className = 'popover'
                 onKeyDown = { this._onEscKey }>
                 { content }
                 {!isMobileBrowser() && (

react/features/base/react/components/native/BaseIndicator.js

@@ -26,6 +26,11 @@ type Props = {
      */
     icon: string,
 
+    /**
+     * Size of icon.
+     */
+    iconSize: ?number,
+
     /**
      * Additional style to be applied to the icon element.
      */
@@ -43,7 +48,7 @@ export default class BaseIndicator extends Component<Props> {
      * @inheritdoc
      */
     render() {
-        const { highlight, icon, iconStyle, backgroundColor } = this.props;
+        const { highlight, icon, iconStyle, backgroundColor, iconSize } = this.props;
         const highlightedIndicator = { ...styles.highlightedIndicator };
 
         if (backgroundColor) {
@@ -55,6 +60,7 @@ export default class BaseIndicator extends Component<Props> {
                 style = { [ BASE_INDICATOR,
                     highlight ? highlightedIndicator : null ] }>
                 <Icon
+                    size = { iconSize }
                     src = { icon }
                     style = { [
                         styles.indicator,