deps: replace node-sass with sass

The former is no longer actively maintained.

Fixes: https://github.com/jitsi/jitsi-meet/issues/6427

.gitignore

@@ -84,3 +84,4 @@ android/app/google-services.json
 ios/app/dropbox.key
 ios/app/GoogleService-Info.plist
 
+.vscode

Makefile

@@ -3,8 +3,9 @@ CLEANCSS = ./node_modules/.bin/cleancss
 DEPLOY_DIR = libs
 LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/
 LIBFLAC_DIR = node_modules/libflacjs/dist/min/
+OLM_DIR = node_modules/olm
 RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/
-NODE_SASS = ./node_modules/.bin/node-sass
+NODE_SASS = ./node_modules/.bin/sass
 NPM = npm
 OUTPUT_DIR = .
 STYLES_BUNDLE = css/all.bundle.css
@@ -22,7 +23,7 @@ clean:
 	rm -fr $(BUILD_DIR)
 
 .NOTPARALLEL:
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-css deploy-local
+deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-css deploy-local
 
 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -51,12 +52,15 @@ deploy-appbundle:
 		$(BUILD_DIR)/video-blur-effect.min.map \
 		$(BUILD_DIR)/rnnoise-processor.min.js \
 		$(BUILD_DIR)/rnnoise-processor.min.map \
+		$(BUILD_DIR)/close3.min.js \
+		$(BUILD_DIR)/close3.min.map \
 		$(DEPLOY_DIR)
 
 deploy-lib-jitsi-meet:
 	cp \
 		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.js \
 		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.map \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.e2ee-worker.js \
 		$(LIBJITSIMEET_DIR)/connection_optimization/external_connect.js \
 		$(LIBJITSIMEET_DIR)/modules/browser/capabilities.json \
 		$(DEPLOY_DIR)
@@ -67,6 +71,11 @@ deploy-libflac:
 		$(LIBFLAC_DIR)/libflac4-1.3.2.min.js.mem \
 		$(DEPLOY_DIR)
 
+deploy-olm:
+	cp \
+		$(OLM_DIR)/olm.wasm \
+		$(DEPLOY_DIR)
+
 deploy-rnnoise-binary:
 	cp \
 		$(RNNOISE_WASM_DIR)/rnnoise.wasm \
@@ -81,7 +90,7 @@ deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
 
 .NOTPARALLEL:
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac
+dev: deploy-init deploy-css deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-libflac deploy-olm
 	$(WEBPACK_DEV_SERVER) --detect-circular-deps
 
 source-package:

android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 // Crashlytics integration is done as part of Firebase now, so it gets
 // automagically activated with google-services.json
 if (googleServicesEnabled) {
-    apply plugin: 'io.fabric'
+    apply plugin: 'com.google.firebase.crashlytics'
 }
 
 // Use the number of seconds/10 since Jan 1 2019 as the versionCode.
@@ -70,14 +70,9 @@ android {
     }
 }
 
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-5'
 
@@ -87,9 +82,8 @@ dependencies {
         // Firebase
         //  - Crashlytics
         //  - Dynamic Links
-        implementation 'com.google.firebase:firebase-core:16.0.6'
-        implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
-        implementation 'com.google.firebase:firebase-dynamic-links:16.1.5'
+        implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+        implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
     }
 
     implementation project(':sdk')

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jitsi.meet">
+    package="org.jitsi.meet"
+    android:installLocation="auto">
   <application
       android:allowBackup="true"
       android:icon="@mipmap/ic_launcher"

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

@@ -3,9 +3,8 @@ package org.jitsi.meet;
 import android.net.Uri;
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
-import io.fabric.sdk.android.Fabric;
 
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
@@ -22,10 +21,7 @@ final class GoogleServicesHelper {
         if (BuildConfig.GOOGLE_SERVICES_ENABLED) {
             Log.d(activity.getClass().getSimpleName(), "Initializing Google Services");
 
-            if (!JitsiMeet.isCrashReportingDisabled(activity)) {
-                Fabric.with(activity, new Crashlytics());
-            }
-
+            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!JitsiMeet.isCrashReportingDisabled(activity));
             FirebaseDynamicLinks.getInstance().getDynamicLink(activity.getIntent())
                 .addOnSuccessListener(activity, pendingDynamicLinkData -> {
                     Uri dynamicLink = null;

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

@@ -23,7 +23,6 @@ import android.content.IntentFilter;
 import android.content.RestrictionEntry;
 import android.content.RestrictionsManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
@@ -96,7 +95,7 @@ public class MainActivity extends JitsiMeetActivity {
         // In Debug builds React needs permission to write over other apps in
         // order to display the warning and error overlays.
         if (BuildConfig.DEBUG) {
-            if (canRequestOverlayPermission() && !Settings.canDrawOverlays(this)) {
+            if (!Settings.canDrawOverlays(this)) {
                 Intent intent
                     = new Intent(
                     Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
@@ -186,8 +185,7 @@ public class MainActivity extends JitsiMeetActivity {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
-                && canRequestOverlayPermission()) {
+        if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE) {
             if (Settings.canDrawOverlays(this)) {
                 initialize();
                 return;
@@ -210,6 +208,18 @@ public class MainActivity extends JitsiMeetActivity {
         return super.onKeyUp(keyCode, event);
     }
 
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode);
+
+        Log.d(TAG, "Is in picture-in-picture mode: " + isInPictureInPictureMode);
+
+        if (!isInPictureInPictureMode) {
+            this.startActivity(new Intent(this, getClass())
+                .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
+        }
+    }
+
     // Helper methods
     //
 
@@ -220,10 +230,4 @@ public class MainActivity extends JitsiMeetActivity {
             return null;
         }
     }
-
-    private boolean canRequestOverlayPermission() {
-        return
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.M;
-    }
 }

android/build.gradle

@@ -7,17 +7,11 @@ buildscript {
     repositories {
         google()
         jcenter()
-        repositories {
-            maven { url 'https://maven.fabric.io/public' }
-        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.28.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files.
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     }
 }
 
@@ -142,10 +136,10 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "28.0.3"
-    compileSdkVersion = 28
-    minSdkVersion    = 21
-    targetSdkVersion = 28
+    buildToolsVersion = "29.0.3"
+    compileSdkVersion = 29
+    minSdkVersion    = 23
+    targetSdkVersion = 29
     supportLibVersion = "28.0.0"
 
     // The Maven artifact groupdId of the third-party react-native modules which

android/scripts/run-packager-helper.command

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
+exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache

android/scripts/run-packager.sh

@@ -8,7 +8,7 @@ THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOUR
 export RCT_METRO_PORT="${RCT_METRO_PORT:=8081}"
 echo "export RCT_METRO_PORT=${RCT_METRO_PORT}" > "${THIS_DIR}/../../node_modules/react-native/scripts/.packager.env"
 
-adb reverse tcp:8081 tcp:8081
+adb reverse tcp:$RCT_METRO_PORT tcp:$RCT_METRO_PORT
 
 if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
   if ! curl -s "http://localhost:${RCT_METRO_PORT}/status" | grep -q "packager-status:running" ; then
@@ -16,11 +16,10 @@ if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
     exit 2
   fi
 else
-    CMD="${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command"
+    CMD="$THIS_DIR/run-packager-helper.command"
     if [[ `uname` == "Darwin"  ]]; then
         open -g "${CMD}" || echo "Can't start packager automatically"
     else
         xdg-open "${CMD}" || echo "Can't start packager automatically"
     fi
 fi
-

android/sdk/build.gradle

@@ -44,9 +44,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.fragment:fragment:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.fragment:fragment:1.2.5'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'

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

@@ -16,11 +16,8 @@
 
 package org.jitsi.meet.sdk;
 
-import android.content.Context;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -34,7 +31,6 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
  * default it's only used on versions < O, since versions >= O use ConnectionService, but it
  * can be disabled.
  */
-@RequiresApi(Build.VERSION_CODES.M)
 class AudioDeviceHandlerGeneric implements
         AudioModeModule.AudioDeviceHandlerInterface,
         AudioManager.OnAudioFocusChangeListener {

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

@@ -1,230 +0,0 @@
-/*
- * Copyright @ 2017-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.media.AudioManager;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-
-/**
- * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
- * legacy (pre-M) Android versions.
- */
-class AudioDeviceHandlerLegacy implements
-        AudioModeModule.AudioDeviceHandlerInterface,
-        AudioManager.OnAudioFocusChangeListener,
-        BluetoothHeadsetMonitor.Listener {
-
-    private final static String TAG = AudioDeviceHandlerLegacy.class.getSimpleName();
-
-    /**
-     * Reference to the main {@code AudioModeModule}.
-     */
-    private AudioModeModule module;
-
-    /**
-     * Indicator that we have lost audio focus.
-     */
-    private boolean audioFocusLost = false;
-
-    /**
-     * {@link AudioManager} instance used to interact with the Android audio
-     * subsystem.
-     */
-    private AudioManager audioManager;
-
-    /**
-     * {@link BluetoothHeadsetMonitor} for detecting Bluetooth device changes in
-     * old (< M) Android versions.
-     */
-    private BluetoothHeadsetMonitor bluetoothHeadsetMonitor;
-
-    public AudioDeviceHandlerLegacy(AudioManager audioManager) {
-        this.audioManager = audioManager;
-    }
-
-    /**
-     * Helper method to trigger an audio route update when Bluetooth devices are
-     * connected / disconnected.
-     */
-    @Override
-    public void onBluetoothDeviceChange(final boolean deviceAvailable) {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                if (deviceAvailable) {
-                    module.addDevice(AudioModeModule.DEVICE_BLUETOOTH);
-                } else {
-                    module.removeDevice(AudioModeModule.DEVICE_BLUETOOTH);
-                }
-
-                module.updateAudioRoute();
-            }
-        });
-    }
-
-    /**
-     * Helper method to trigger an audio route update when a headset is plugged
-     * or unplugged.
-     */
-    private void onHeadsetDeviceChange() {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                // XXX: isWiredHeadsetOn is not deprecated when used just for
-                // knowing if there is a wired headset connected, regardless of
-                // audio being routed to it.
-                //noinspection deprecation
-                if (audioManager.isWiredHeadsetOn()) {
-                    module.addDevice(AudioModeModule.DEVICE_HEADPHONES);
-                } else {
-                    module.removeDevice(AudioModeModule.DEVICE_HEADPHONES);
-                }
-
-                module.updateAudioRoute();
-            }
-        });
-    }
-
-    /**
-     * {@link AudioManager.OnAudioFocusChangeListener} interface method. Called
-     * when the audio focus of the system is updated.
-     *
-     * @param focusChange - The type of focus change.
-     */
-    @Override
-    public void onAudioFocusChange(final int focusChange) {
-        module.runInAudioThread(new Runnable() {
-            @Override
-            public void run() {
-                switch (focusChange) {
-                    case AudioManager.AUDIOFOCUS_GAIN: {
-                        JitsiMeetLogger.d(TAG + " Audio focus gained");
-                        // Some other application potentially stole our audio focus
-                        // temporarily. Restore our mode.
-                        if (audioFocusLost) {
-                            module.updateAudioRoute();
-                        }
-                        audioFocusLost = false;
-                        break;
-                    }
-                    case AudioManager.AUDIOFOCUS_LOSS:
-                    case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
-                    case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK: {
-                        JitsiMeetLogger.d(TAG + " Audio focus lost");
-                        audioFocusLost = true;
-                        break;
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Helper method to set the output route to a Bluetooth device.
-     *
-     * @param enabled true if Bluetooth should use used, false otherwise.
-     */
-    private void setBluetoothAudioRoute(boolean enabled) {
-        if (enabled) {
-            audioManager.startBluetoothSco();
-            audioManager.setBluetoothScoOn(true);
-        } else {
-            audioManager.setBluetoothScoOn(false);
-            audioManager.stopBluetoothSco();
-        }
-    }
-
-    @Override
-    public void start(AudioModeModule audioModeModule) {
-        JitsiMeetLogger.i("Using " + TAG + " as the audio device handler");
-
-        module = audioModeModule;
-        Context context = module.getContext();
-
-        // Setup runtime device change detection.
-        //
-
-        // Detect changes in wired headset connections.
-        IntentFilter wiredHeadSetFilter = new IntentFilter(AudioManager.ACTION_HEADSET_PLUG);
-        BroadcastReceiver wiredHeadsetReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                JitsiMeetLogger.d(TAG + " Wired headset added / removed");
-                onHeadsetDeviceChange();
-            }
-        };
-        context.registerReceiver(wiredHeadsetReceiver, wiredHeadSetFilter);
-
-        // Detect Bluetooth device changes.
-        bluetoothHeadsetMonitor = new BluetoothHeadsetMonitor(context, this);
-
-        // On Android < M, detect if we have an earpiece.
-        PackageManager pm = context.getPackageManager();
-        if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            module.addDevice(AudioModeModule.DEVICE_EARPIECE);
-        }
-
-        // Always assume there is a speaker.
-        module.addDevice(AudioModeModule.DEVICE_SPEAKER);
-    }
-
-    @Override
-    public void stop() {
-        bluetoothHeadsetMonitor.stop();
-        bluetoothHeadsetMonitor = null;
-    }
-
-    @Override
-    public void setAudioRoute(String device) {
-        // Turn speaker on / off
-        audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
-
-        // Turn bluetooth on / off
-        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
-    }
-
-    @Override
-    public boolean setMode(int mode) {
-        if (mode == AudioModeModule.DEFAULT) {
-            audioFocusLost = false;
-            audioManager.setMode(AudioManager.MODE_NORMAL);
-            audioManager.abandonAudioFocus(this);
-            audioManager.setSpeakerphoneOn(false);
-            setBluetoothAudioRoute(false);
-
-            return true;
-        }
-
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        audioManager.setMicrophoneMute(false);
-
-        if (audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN)
-                == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-            JitsiMeetLogger.w(TAG + " Audio focus request failed");
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -222,10 +222,8 @@ class AudioModeModule extends ReactContextBaseJavaModule {
 
         if (useConnectionService()) {
             audioDeviceHandler = new AudioDeviceHandlerConnectionService(audioManager);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            audioDeviceHandler = new AudioDeviceHandlerGeneric(audioManager);
         } else {
-            audioDeviceHandler = new AudioDeviceHandlerLegacy(audioManager);
+            audioDeviceHandler = new AudioDeviceHandlerGeneric(audioManager);
         }
 
         audioDeviceHandler.start(this);
@@ -427,15 +425,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
         }
     }
 
-    /**
-     * Needed on the legacy handler...
-     *
-     * @return Context for the application.
-     */
-    Context getContext() {
-        return getReactApplicationContext();
-    }
-
     /**
      * Interface for the modules implementing the actual audio device management.
      */

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

@@ -1,191 +0,0 @@
-/*
- * Copyright @ 2017-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothProfile;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioManager;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-/**
- * Helper class to detect and handle Bluetooth device changes.  It monitors
- * Bluetooth headsets being connected / disconnected and notifies the module
- * about device changes when this occurs.
- */
-class BluetoothHeadsetMonitor {
-    private final static String TAG = BluetoothHeadsetMonitor.class.getSimpleName();
-
-    /**
-     * The {@link Context} in which this module executes.
-     */
-    private final Context context;
-
-    /**
-     * Reference to the {@link BluetoothAdapter} object, used to access Bluetooth functionality.
-     */
-    private BluetoothAdapter adapter;
-
-    /**
-     * Reference to a proxy object which allows us to query connected devices.
-     */
-    private BluetoothHeadset headset;
-
-    /**
-     * receiver registered for receiving Bluetooth connection state changes.
-     */
-    private BroadcastReceiver receiver;
-
-    /**
-     * Listener for receiving Bluetooth device change events.
-     */
-    private Listener listener;
-
-    public BluetoothHeadsetMonitor(Context context, Listener listener) {
-        this.context = context;
-        this.listener = listener;
-    }
-
-    private boolean getBluetoothHeadsetProfileProxy() {
-        adapter = BluetoothAdapter.getDefaultAdapter();
-
-        if (adapter == null) {
-            JitsiMeetLogger.w(TAG + " Device doesn't support Bluetooth");
-            return false;
-        }
-
-        // XXX: The profile listener listens for system services of the given
-        // type being available to the application. That is, if our Bluetooth
-        // adapter has the "headset" profile.
-        BluetoothProfile.ServiceListener listener
-            = new BluetoothProfile.ServiceListener() {
-                @Override
-                public void onServiceConnected(int profile, BluetoothProfile proxy) {
-                    if (profile == BluetoothProfile.HEADSET) {
-                        headset = (BluetoothHeadset) proxy;
-                        updateDevices();
-                    }
-                }
-
-                @Override
-                public void onServiceDisconnected(int profile) {
-                    // The logic is the same as the logic of onServiceConnected.
-                    onServiceConnected(profile, /* proxy */ null);
-                }
-            };
-
-        return adapter.getProfileProxy(context, listener, BluetoothProfile.HEADSET);
-    }
-
-    private void onBluetoothReceiverReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-
-        if (action.equals(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)) {
-            // XXX: This action will be fired when a Bluetooth headset is
-            // connected or disconnected to the system. This is not related to
-            // audio routing.
-            int state = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE, -99);
-
-            switch (state) {
-            case BluetoothHeadset.STATE_CONNECTED:
-            case BluetoothHeadset.STATE_DISCONNECTED:
-                JitsiMeetLogger.d(TAG + " BT headset connection state changed: " + state);
-                updateDevices();
-                break;
-            }
-        } else if (action.equals(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)) {
-            // XXX: This action will be fired when the connection established
-            // with a Bluetooth headset (called a SCO connection) changes state.
-            // When the SCO connection is active we route audio to it.
-            int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -99);
-
-            switch (state) {
-            case AudioManager.SCO_AUDIO_STATE_CONNECTED:
-            case AudioManager.SCO_AUDIO_STATE_DISCONNECTED:
-                JitsiMeetLogger.d(TAG + " BT SCO connection state changed: " + state);
-                updateDevices();
-                break;
-            }
-        }
-    }
-
-    private void registerBluetoothReceiver() {
-        receiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                onBluetoothReceiverReceive(context, intent);
-            }
-        };
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED);
-        filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
-
-        context.registerReceiver(receiver, filter);
-    }
-
-    /**
-     * Detects if there are new devices connected / disconnected and fires the
-     * {@link Listener} registered event.
-     */
-    private void updateDevices() {
-        boolean headsetAvailable = (headset != null) && !headset.getConnectedDevices().isEmpty();
-        listener.onBluetoothDeviceChange(headsetAvailable);
-    }
-
-    public void start() {
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-
-        if (!audioManager.isBluetoothScoAvailableOffCall()) {
-            JitsiMeetLogger.w(TAG + " Bluetooth SCO is not available");
-            return;
-        }
-
-        if (!getBluetoothHeadsetProfileProxy()) {
-            JitsiMeetLogger.w(TAG + " Couldn't get BT profile proxy");
-            return;
-        }
-
-        registerBluetoothReceiver();
-
-        // Initial detection.
-        updateDevices();
-    }
-
-    public void stop() {
-        if (receiver != null) {
-            context.unregisterReceiver(receiver);
-        }
-
-        if (adapter != null && headset != null) {
-            adapter.closeProfileProxy(BluetoothProfile.HEADSET, headset);
-        }
-
-        receiver = null;
-        headset = null;
-        adapter = null;
-    }
-
-    interface Listener {
-        void onBluetoothDeviceChange(boolean deviceAvailable);
-    }
-}

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

@@ -1,6 +1,5 @@
 /*
- * Copyright @ 2019-present 8x8, Inc.
- * Copyright @ 2018 Atlassian Pty Ltd
+ * Copyright @ 2018-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +16,16 @@
 
 package org.jitsi.meet.sdk;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.PermissionListener;
 
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+
 /**
  * Helper class to encapsulate the work which needs to be done on
  * {@link Activity} lifecycle methods in order for the React side to be aware of
@@ -178,9 +177,18 @@ public class JitsiMeetActivityDelegate {
         };
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     public static void requestPermissions(Activity activity, String[] permissions, int requestCode, PermissionListener listener) {
         permissionListener = listener;
-        activity.requestPermissions(permissions, requestCode);
+
+        // The RN Permissions module calls this in a non-UI thread. What we observe is a crash in ViewGroup.dispatchCancelPendingInputEvents,
+        // which is called on the calling (ie, non-UI) thread. This doesn't look very safe, so try to avoid a crash by pretending the permission
+        // was denied.
+
+        try {
+            activity.requestPermissions(permissions, requestCode);
+        } catch (Exception e) {
+            JitsiMeetLogger.e(e, "Error requesting permissions");
+            onRequestPermissionsResult(requestCode, permissions, new int[0]);
+        }
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,21 +33,10 @@ import com.facebook.react.module.annotations.ReactModule;
  * is used with the conference audio-only mode.
  */
 @ReactModule(name = ProximityModule.NAME)
-class ProximityModule
-    extends ReactContextBaseJavaModule {
+class ProximityModule extends ReactContextBaseJavaModule {
 
     public static final String NAME = "Proximity";
 
-    /**
-     * This type of wake lock (the one activated by the proximity sensor) has
-     * been available for a while, but the constant was only exported in API
-     * level 21 (Android Marshmallow) so make no assumptions and use its value
-     * directly.
-     *
-     * TODO: Remove when we bump the API level to 21.
-     */
-    private static final int PROXIMITY_SCREEN_OFF_WAKE_LOCK = 32;
-
     /**
      * {@link WakeLock} instance.
      */
@@ -71,7 +60,7 @@ class ProximityModule
         try {
             wakeLock
                 = powerManager.newWakeLock(
-                        PROXIMITY_SCREEN_OFF_WAKE_LOCK,
+                        PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
                         "jitsi:"+NAME);
         } catch (Throwable ignored) {
             wakeLock = null;

app.js

@@ -4,6 +4,8 @@ import 'jquery';
 import 'jquery-contextmenu';
 import 'jQuery-Impromptu';
 
+import 'olm';
+
 import conference from './conference';
 import API from './modules/API';
 import UI from './modules/UI/UI';
@@ -11,6 +13,11 @@ import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
 import remoteControl from './modules/remotecontrol/RemoteControl';
 import translation from './modules/translation/translation';
 
+// Initialize Olm as early as possible.
+if (window.Olm) {
+    window.Olm.init();
+}
+
 window.APP = {
     API,
     conference,

conference.js

@@ -110,7 +110,6 @@ import {
 } from './react/features/base/util';
 import { showDesktopPicker } from './react/features/desktop-picker';
 import { appendSuffix } from './react/features/display-name';
-import { setE2EEKey } from './react/features/e2ee';
 import {
     maybeOpenFeedbackDialog,
     submitFeedback
@@ -121,7 +120,8 @@ import { suspendDetected } from './react/features/power-monitor';
 import {
     initPrejoin,
     isPrejoinPageEnabled,
-    isPrejoinPageVisible
+    isPrejoinPageVisible,
+    makePrecallTest
 } from './react/features/prejoin';
 import { createRnnoiseProcessorPromise } from './react/features/rnnoise';
 import { toggleScreenshotCaptureEffect } from './react/features/screenshot-capture';
@@ -745,8 +745,6 @@ export default {
 
         this.roomName = roomName;
 
-        window.addEventListener('hashchange', this.onHashChange.bind(this), false);
-
         try {
             // Initialize the device list first. This way, when creating tracks
             // based on preferred devices, loose label matching can be done in
@@ -759,7 +757,15 @@ export default {
         }
 
         if (isPrejoinPageEnabled(APP.store.getState())) {
-            _connectionPromise = connect(roomName);
+            _connectionPromise = connect(roomName).then(c => {
+                // we want to initialize it early, in case of errors to be able
+                // to gather logs
+                APP.connection = c;
+
+                return c;
+            });
+
+            APP.store.dispatch(makePrecallTest(this._getConferenceOptions()));
 
             const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(initialOptions);
             const tracks = await tryCreateLocalTracks;
@@ -1206,10 +1212,6 @@ export default {
 
     // end used by torture
 
-    getLogs() {
-        return room.getLogs();
-    },
-
     /**
      * Download logs, a function that can be called from console while
      * debugging.
@@ -1218,7 +1220,7 @@ export default {
     saveLogs(filename = 'meetlog.json') {
         // this can be called from console and will not have reference to this
         // that's why we reference the global var
-        const logs = APP.conference.getLogs();
+        const logs = APP.connection.getLogs();
         const data = encodeURIComponent(JSON.stringify(logs, null, '  '));
 
         const elem = document.createElement('a');
@@ -1234,34 +1236,6 @@ export default {
         }));
     },
 
-    /**
-     * Handled location hash change events.
-     */
-    onHashChange() {
-        const items = {};
-        const parts = window.location.hash.substr(1).split('&');
-
-        for (const part of parts) {
-            const param = part.split('=');
-            const key = param[0];
-
-            if (!key) {
-                continue; // eslint-disable-line no-continue
-            }
-
-            items[key] = param[1];
-        }
-
-        if (typeof items.e2eekey !== 'undefined') {
-            APP.store.dispatch(setE2EEKey(items.e2eekey));
-
-            // Clean URL in browser history.
-            const cleanUrl = window.location.href.split('#')[0];
-
-            history.replaceState(history.state, document.title, cleanUrl);
-        }
-    },
-
     /**
      * Exposes a Command(s) API on this instance. It is necessitated by (1) the
      * desire to keep room private to this instance and (2) the need of other
@@ -1588,10 +1562,6 @@ export default {
         if (didHaveVideo) {
             promise = promise.then(() => createLocalTracksF({ devices: [ 'video' ] }))
                 .then(([ stream ]) => this.useVideoStream(stream))
-                .then(() => {
-                    sendAnalytics(createScreenSharingEvent('stopped'));
-                    logger.log('Screen sharing stopped.');
-                })
                 .catch(error => {
                     logger.error('failed to switch back to local video', error);
 
@@ -1608,6 +1578,8 @@ export default {
         return promise.then(
             () => {
                 this.videoSwitchInProgress = false;
+                sendAnalytics(createScreenSharingEvent('stopped'));
+                logger.info('Screen sharing stopped.');
             },
             error => {
                 this.videoSwitchInProgress = false;
@@ -2858,7 +2830,14 @@ export default {
             this._room = undefined;
             room = undefined;
 
-            APP.API.notifyReadyToClose();
+            /**
+             * Don't call {@code notifyReadyToClose} if the promotional page flag is set
+             * and let the page take care of sending the message, since there will be
+             * a redirect to the page regardlessly.
+             */
+            if (!interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
+                APP.API.notifyReadyToClose();
+            }
             APP.store.dispatch(maybeRedirectToWelcomePage(values[0]));
         });
     },

config.js

@@ -118,11 +118,18 @@ var config = {
     // Valid values are in the range 6000 to 510000
     // opusMaxAverageBitrate: 20000,
 
+    // Enables redundancy for Opus
+    // enableOpusRed: false
+
     // Video
 
     // Sets the preferred resolution (height) for local video. Defaults to 720.
     // resolution: 720,
 
+    // How many participants while in the tile view mode, before the receiving video quality is reduced from HD to SD.
+    // Use -1 to disable.
+    // maxFullResolutionParticipants: 2,
+
     // w3c spec-compliant video constraints to use for video capture. Currently
     // used by browsers that return true from lib-jitsi-meet's
     // util#browser#usesNewGumFlow. The constraints are independent from
@@ -157,6 +164,7 @@ var config = {
     // Note that it's not recommended to do this because simulcast is not
     // supported when  using H.264. For 1-to-1 calls this setting is enabled by
     // default and can be toggled in the p2p section.
+    // This option has been deprecated, use preferredCodec under videoQuality section instead.
     // preferH264: true,
 
     // If set to true, disable H.264 video codec by stripping it out of the
@@ -212,6 +220,64 @@ var config = {
     // Default value for the channel "last N" attribute. -1 for unlimited.
     channelLastN: -1,
 
+    // Provides a way to use different "last N" values based on the number of participants in the conference.
+    // The keys in an Object represent number of participants and the values are "last N" to be used when number of
+    // participants gets to or above the number.
+    //
+    // For the given example mapping, "last N" will be set to 20 as long as there are at least 5, but less than
+    // 29 participants in the call and it will be lowered to 15 when the 30th participant joins. The 'channelLastN'
+    // will be used as default until the first threshold is reached.
+    //
+    // lastNLimits: {
+    //     5: 20,
+    //     30: 15,
+    //     50: 10,
+    //     70: 5,
+    //     90: 2
+    // },
+
+    // Specify the settings for video quality optimizations on the client.
+    // videoQuality: {
+    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
+    //    // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
+    //    // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
+    //    // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
+    //    disabledCodec: 'H264',
+    //
+    //    // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
+    //    // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
+    //    // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
+    //    // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
+    //    // to take effect.
+    //    preferredCodec: 'VP8',
+    //
+    //    // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
+    //    // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
+    //    // are the max.bitrates to be set on that particular type of stream. The actual send may vary based on
+    //    // the available bandwidth calculated by the browser, but it will be capped by the values specified here.
+    //    // This is currently not implemented on app based clients on mobile.
+    //    maxBitratesVideo: {
+    //        low: 200000,
+    //        standard: 500000,
+    //        high: 1500000
+    //    },
+    //
+    //    // The options can be used to override default thresholds of video thumbnail heights corresponding to
+    //    // the video quality levels used in the application. At the time of this writing the allowed levels are:
+    //    //     'low' - for the low quality level (180p at the time of this writing)
+    //    //     'standard' - for the medium quality level (360p)
+    //    //     'high' - for the high quality level (720p)
+    //    // The keys should be positive numbers which represent the minimal thumbnail height for the quality level.
+    //    //
+    //    // With the default config value below the application will use 'low' quality until the thumbnails are
+    //    // at least 360 pixels tall. If the thumbnail height reaches 720 pixels then the application will switch to
+    //    // the high quality.
+    //    minHeightForQualityLvl: {
+    //        360: 'standard,
+    //        720: 'high'
+    //    }
+    // },
+
     // // Options for the recording limit notification.
     // recordingLimit: {
     //
@@ -274,6 +340,9 @@ var config = {
     // UI
     //
 
+    // Hides lobby button
+    // hideLobbyButton: false,
+
     // Require users to always specify a display name.
     // requireDisplayName: true,
 
@@ -322,6 +391,10 @@ var config = {
     // set or the lobby is not enabled.
     // enableInsecureRoomNameWarning: false,
 
+    // Whether to automatically copy invitation URL after creating a room.
+    // Document should be focused for this option to work
+    // enableAutomaticUrlCopy: false,
+
     // Stats
     //
 
@@ -385,13 +458,20 @@ var config = {
         // iceTransportPolicy: 'all',
 
         // If set to true, it will prefer to use H.264 for P2P calls (if H.264
-        // is supported).
+        // is supported). This setting is deprecated, use preferredCodec instead.
         // preferH264: true
 
+        // Provides a way to set the video codec preference on the p2p connection. Acceptable
+        // codec values are 'VP8', 'VP9' and 'H264'.
+        // preferredCodec: 'H264',
+
         // If set to true, disable H.264 video codec by stripping it out of the
-        // SDP.
+        // SDP. This setting is deprecated, use disabledCodec instead.
         // disableH264: false,
 
+        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
+        // disabledCodec: '',
+
         // How long we're going to wait, before going back to P2P after the 3rd
         // participant has left the conference (to filter out page reload).
         // backToP2PDelay: 5
@@ -409,6 +489,12 @@ var config = {
         // amplitudeAPPKey: '<APP_KEY>'
 
         // Configuration for the rtcstats server:
+        // By enabling rtcstats server every time a conference is joined the rtcstats
+        // module connects to the provided rtcstatsEndpoint and sends statistics regarding
+        // PeerConnection states along with getStats metrics polled at the specified
+        // interval.
+        // rtcstatsEnabled: true,
+
         // In order to enable rtcstats one needs to provide a endpoint url.
         // rtcstatsEndpoint: wss://rtcstats-server-pilot.jitsi.net/,
 
@@ -424,6 +510,9 @@ var config = {
         // ],
     },
 
+    // Logs that should go be passed through the 'log' event if a handler is defined for it
+    // apiLogLevels: ['warn', 'log', 'error', 'info', 'debug'],
+
     // Information about the jitsi-meet instance we are connecting to, including
     // the user region as seen by the server.
     deploymentInfo: {
@@ -570,6 +659,13 @@ var config = {
      tokenAuthUrl
      */
 
+    /**
+     * This property can be used to alter the generated meeting invite links (in combination with a branding domain
+     * which is retrieved internally by jitsi meet) (e.g. https://meet.jit.si/someMeeting
+     * can become https://brandedDomain/roomAlias)
+     */
+    // brandingRoomAlias: null,
+
     // List of undocumented settings used in lib-jitsi-meet
     /**
      _peerConnStatusOutOfLastNTimeout

connection.js

@@ -82,7 +82,7 @@ function checkForAttachParametersAndConnect(id, password, connection) {
  */
 function connect(id, password, roomName) {
     const connectionConfig = Object.assign({}, config);
-    const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
+    const { jwt } = APP.store.getState()['features/base/jwt'];
 
     // Use Websocket URL for the web app if configured. Note that there is no 'isWeb' check, because there's assumption
     // that this code executes only on web browsers/electron. This needs to be changed when mobile and web are unified.
@@ -94,11 +94,7 @@ function connect(id, password, roomName) {
     //  in future). It's included for the time being for Jitsi Meet and lib-jitsi-meet versions interoperability.
     connectionConfig.serviceUrl = connectionConfig.bosh = serviceUrl;
 
-    const connection
-        = new JitsiMeetJS.JitsiConnection(
-            null,
-            jwt && issuer && issuer !== 'anonymous' ? jwt : undefined,
-            connectionConfig);
+    const connection = new JitsiMeetJS.JitsiConnection(null, jwt, connectionConfig);
 
     if (config.iAmRecorder) {
         connection.addFeature(DISCO_JIBRI_FEATURE);
@@ -211,10 +207,9 @@ export function openConnection({ id, password, retry, roomName }) {
 
     return connect(id, password, roomName).catch(err => {
         if (retry) {
-            const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
+            const { jwt } = APP.store.getState()['features/base/jwt'];
 
-            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED
-                    && (!jwt || issuer === 'anonymous')) {
+            if (err === JitsiConnectionErrors.PASSWORD_REQUIRED && !jwt) {
                 return AuthHandler.requestAuth(roomName, connect);
             }
         }

css/_connection-status.scss

@@ -0,0 +1,60 @@
+.con-status {
+    position: absolute;
+    top: 40px;
+    width: 100%;
+    z-index: $toolbarZ + 3;
+
+    &-container {
+        background: rgba(28, 32, 37, .5);
+        border-radius: 3px;
+        color: #fff;
+        font-size: 13px;
+        line-height: 20px;
+        margin: 0 auto;
+        width: 304px;
+    }
+
+    &-header {
+        align-items: center;
+        display: flex;
+        justify-content: space-between;
+        padding: 8px;
+    }
+
+    &-circle {
+        border-radius: 50%;
+        display: inline-block;
+        padding: 4px;
+    }
+
+    &--good {
+        background: #31B76A;
+    }
+
+    &--poor {
+        background: #E12D2D;
+    }
+
+    &--non-optimal {
+        background: #E39623;
+    }
+
+    &-arrow {
+        &--up {
+            transform: rotate(180deg);
+        }
+
+        &>svg {
+            cursor: pointer;
+        }
+    }
+
+    &-text {
+        text-align: center;
+    }
+
+    &-details {
+        border-top: 1px solid #5E6D7A;
+        padding: 16px;
+    }
+}

css/_e2ee.scss

@@ -1,7 +1,6 @@
 #e2ee-section {
-    .title {
-        font-weight: 700;
-    }
+    display: flex;
+    flex-direction: column;
 
     .description {
         font-size: 13px;
@@ -13,29 +12,15 @@
         }
     }
 
-    .key-field {
-        align-items: center;
+    .control-row {
         display: flex;
         flex-direction: row;
+        justify-content: space-between;
+        margin-top: 15px;
 
         label {
             font-size: 14px;
-            font-weight: 700;
-        }
-
-        input {
-            background-color: inherit;
-            border: none;
-            color: inherit;
-            flex: 1;
-            padding: 0 5px;
-        }
-
-        a {
-            color: #6FB1EA;
-            cursor: pointer;
-            font-size: 14px;
-            text-decoration: none;
+            font-weight: bold;
         }
     }
 }

css/_prejoin.scss

@@ -39,6 +39,16 @@
         margin-bottom: 14px;
         width: 100%;
     }
+
+    &-error {
+        color: white;
+        background-color: rgba(229, 75, 75, 0.5);
+        width: 100%;
+        padding: 3px;
+        margin-top: 4px;
+        font-size: 13px;
+        text-align: center;
+    }
 }
 
 @mixin name-placeholder {

css/_premeeting-screens.scss

@@ -197,16 +197,9 @@
         text-align: center;
     }
 
-    .preview-avatar-container {
-        width: 100%;
-        height: 80%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-
     .avatar {
         background: #A4B8D1;
+        margin: 0 auto;
     }
 
     video {

css/_responsive.scss

@@ -0,0 +1,70 @@
+@media only screen and (max-width: $smallScreen) {
+    .watermark {
+        width: 20%;
+        height: 20%;
+    }
+
+    .new-toolbox {
+        .toolbox-content {
+            .button-group-center, .button-group-left, .button-group-right {
+                .toolbox-button {
+                    .toolbox-icon {
+                        width: 28px;
+                        height: 28px;
+                        svg {
+                            width: 18px;
+                            height: 18px;
+                        }
+                    }
+
+                    &:nth-child(2) {
+                        .toolbox-icon {
+                            width: 30px;
+                            height: 30px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@media only screen and (max-width: $verySmallScreen) {
+    #videoResolutionLabel {
+        display: none;
+    }
+    .desktop-browser {
+        .vertical-filmstrip .filmstrip {
+            display: none;
+        }
+    }
+    .new-toolbox {
+        .toolbox-content {
+            .button-group-center, .button-group-left, .button-group-right {
+                .settings-button-small-icon {
+                    display: none;
+                }
+                .toolbox-button {
+                    .toolbox-icon {
+                        width: 18px;
+                        height: 18px;
+                        svg {
+                            width: 12px;
+                            height: 12px;
+                        }
+                    }
+
+                    &:nth-child(2) {
+                        .toolbox-icon {
+                            width: 20px;
+                            height: 20px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .chrome-extension-banner {
+        display: none;
+    }
+}

css/_variables.scss

@@ -164,6 +164,9 @@ $unsupportedDesktopBrowserTextFontSize: 21px;
 $watermarkWidth: 186px;
 $watermarkHeight: 74px;
 
+$welcomePageWatermarkWidth: 186px;
+$welcomePageWatermarkHeight: 74px;
+
 /**
  * Welcome page variables.
  */
@@ -178,9 +181,12 @@ $welcomePageHeaderBackgroundPosition: none;
 $welcomePageHeaderBackgroundRepeat: none;
 $welcomePageHeaderBackgroundSize: none;
 $welcomePageHeaderPaddingBottom: 0px;
+$welcomePageHeaderMinHeight: fit-content;
 
 $welcomePageHeaderTextMarginTop: 35px;
 $welcomePageHeaderTextMarginBottom: 35px;
+$welcomePageHeaderTextDisplay: flex;
+$welcomePageHeaderTextWidth: 650px;
 
 $welcomePageHeaderTextTitleMarginBottom: 16px;
 $welcomePageHeaderTextTitleFontSize: 2.5rem;
@@ -195,6 +201,7 @@ $welcomePageHeaderTextDescriptionLineHeight: 24px;
 $welcomePageHeaderTextDescriptionMarginBottom: 20px;
 $welcomePageHeaderTextDescriptionAlignSelf: inherit;
 
+$welcomePageEnterRoomDisplay: flex;
 $welcomePageEnterRoomWidth: 680px;
 $welcomePageEnterRoomPadding: 25px 30px;
 $welcomePageEnterRoomBorderRadius: 0px;
@@ -269,3 +276,9 @@ $chromeExtensionBannerTop: 80px;
 $chromeExtensionBannerRight: 16px;
 $chromeExtensionBannerTopInMeeting: 10px;
 $chromeExtensionBannerRightInMeeeting: 10px;
+
+/**
+* media type thresholds
+*/
+$smallScreen: 700px;
+$verySmallScreen: 500px;

css/_welcome_page.scss

@@ -21,18 +21,18 @@ body.welcome-page {
         align-items: center;
         display: flex;
         flex-direction: column;
-        min-height: fit-content;
+        min-height: $welcomePageHeaderMinHeight;
         overflow: hidden;
         position: relative;
         text-align: center;
 
         .header-text {
-            display: flex;
+            display: $welcomePageHeaderTextDisplay;
             flex-direction: column;
             margin-top: $watermarkHeight + $welcomePageHeaderTextMarginTop;
             margin-bottom: $welcomePageHeaderTextMarginBottom;
             max-width: calc(100% - 40px);
-            width: 650px;
+            width: $welcomePageHeaderTextWidth;
             z-index: $zindex2;
         }
 
@@ -56,7 +56,7 @@ body.welcome-page {
         }
 
         #enter_room {
-            display: flex;
+            display: $welcomePageEnterRoomDisplay;
             align-items: center;
             max-width: calc(100% - 40px);
             width: $welcomePageEnterRoomWidth;
@@ -211,5 +211,10 @@ body.welcome-page {
         position: absolute;
         width: 100%;
         height: 100%;
+
+        .watermark.leftwatermark {
+            width: $welcomePageWatermarkWidth;
+            height: $welcomePageWatermarkHeight;
+        }
     }
 }

css/main.scss

@@ -101,5 +101,7 @@ $flagsImagePath: "../images/";
 @import 'modals/security/security';
 @import 'premeeting-screens';
 @import 'e2ee';
+@import 'responsive';
+@import 'connection-status';
 
 /* Modules END */

debian/control

@@ -47,7 +47,7 @@ Description: Prosody configuration for Jitsi Meet
 
 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl-dev, luarocks, jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl1.0-dev | libssl-dev, luarocks, jitsi-meet-prosody, git
 Description: Prosody token authentication plugin for Jitsi Meet
 
 Package: jitsi-meet-turnserver

debian/jitsi-meet-tokens.postinst

@@ -48,9 +48,9 @@ case "$1" in
         db_stop
 
         if [ -f "$PROSODY_HOST_CONFIG" ] ; then
-            # search for --plugin_paths, if this is not enabled this is the
+            # search for the token auth, if this is not enabled this is the
             # first time we install tokens package and needs a config change
-            if grep -q "\-\-plugin_paths" "$PROSODY_HOST_CONFIG"; then
+            if ! egrep -q '^\s*authentication\s*=\s*"token"' "$PROSODY_HOST_CONFIG"; then
                 # enable tokens in prosody host config
                 sed -i 's/--plugin_paths/plugin_paths/g' $PROSODY_HOST_CONFIG
                 sed -i 's/authentication = "anonymous"/authentication = "token"/g' $PROSODY_HOST_CONFIG
@@ -58,6 +58,7 @@ case "$1" in
                 sed -i "s/ --app_id=\"example_app_id\"/ app_id=\"$APP_ID\"/g" $PROSODY_HOST_CONFIG
                 sed -i "s/ --app_secret=\"example_app_secret\"/ app_secret=\"$APP_SECRET\"/g" $PROSODY_HOST_CONFIG
                 sed -i 's/ --modules_enabled = { "token_verification" }/ modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
+                sed -i '/^\s*--\s*"token_verification"/ s/--\s*//' $PROSODY_HOST_CONFIG
 
                 # Install luajwt
                 if ! luarocks install luajwtjitsi; then
@@ -73,9 +74,9 @@ case "$1" in
                 PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
                 PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
                 if [ "$PR10_INSTALL_CHECK" = "installed" ] \
-                    || "$PR10_INSTALL_CHECK" = "unpacked"  \
-                    || "$PRTRUNK_INSTALL_CHECK" = "installed"  \
-                    || "$PRTRUNK_INSTALL_CHECK" = "unpacked"  \
+                    || [ "$PR10_INSTALL_CHECK" = "unpacked" ] \
+                    || [ "$PRTRUNK_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PRTRUNK_INSTALL_CHECK" = "unpacked" ] \
                     || dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
                     sed -i 's/module:hook_global(/module:hook(/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
                 fi

debian/jitsi-meet-tokens.postrm

@@ -37,11 +37,10 @@ case "$1" in
             APP_SECRET=$RET
 
             # Revert prosody config
-            sed -i 's/plugin_paths/--plugin_paths/g' $PROSODY_HOST_CONFIG
             sed -i 's/authentication = "token"/authentication = "anonymous"/g' $PROSODY_HOST_CONFIG
             sed -i "s/ app_id=\"$APP_ID\"/ --app_id=\"example_app_id\"/g" $PROSODY_HOST_CONFIG
             sed -i "s/ app_secret=\"$APP_SECRET\"/ --app_secret=\"example_app_secret\"/g" $PROSODY_HOST_CONFIG
-            sed -i 's/ -- "token_verification"/   "token_verification"/g' $PROSODY_HOST_CONFIG
+            sed -i '/^\s*"token_verification"/ s/"token_verification"/-- "token_verification"/' $PROSODY_HOST_CONFIG
 
             if [ -x "/etc/init.d/prosody" ]; then
                 invoke-rc.d prosody restart || true

doc/debian/jitsi-meet/jitsi-meet.example

@@ -45,8 +45,10 @@ server {
     error_page 404 /static/404.html;
 
     gzip on;
-    gzip_types text/plain text/css application/javascript application/json;
+    gzip_types text/plain text/css application/javascript application/json image/x-icon application/octet-stream application/wasm;
     gzip_vary on;
+    gzip_proxied no-cache no-store private expired auth;
+    gzip_min_length 512;
 
     location = /config.js {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
@@ -61,6 +63,11 @@ server {
     {
         add_header 'Access-Control-Allow-Origin' '*';
         alias /usr/share/jitsi-meet/$1/$2;
+
+        # cache all versioned files
+        if ($arg_v) {
+          expires 1y;
+        }
     }
 
     # BOSH

doc/example-config-files/jitsi.example.com.example

@@ -14,6 +14,12 @@ server {
         ssi on;
     }
 
+    gzip on;
+    gzip_types text/plain text/css application/javascript application/json image/x-icon application/octet-stream application/wasm;
+    gzip_vary on;
+    gzip_proxied no-cache no-store private expired auth;
+    gzip_min_length 512;
+
     # BOSH
     location /http-bind {
         proxy_pass      http://localhost:5280/http-bind;

doc/example-config-files/multidomain/jitsi.example.com.multidomain.example

@@ -28,6 +28,12 @@ server {
         tcp_nodelay on;
     }
 
+    gzip on;
+    gzip_types text/plain text/css application/javascript application/json image/x-icon application/octet-stream application/wasm;
+    gzip_vary on;
+    gzip_proxied no-cache no-store private expired auth;
+    gzip_min_length 512;
+
     location ~ ^/([^/?&:'"]+)$ {
         try_files $uri @root_path;
     }

interface_config.js

@@ -48,6 +48,7 @@ var interfaceConfig = {
     DEFAULT_LOCAL_DISPLAY_NAME: 'me',
     DEFAULT_LOGO_URL: 'images/watermark.png',
     DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster',
+    DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.png',
 
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
 
@@ -101,6 +102,11 @@ var interfaceConfig = {
 
     GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
 
+    /**
+     * Hide the logo on the deep linking pages.
+     */
+    HIDE_DEEP_LINKING_LOGO: false,
+
     /**
      * Hide the invite prompt in the header when alone in the meeting.
      */

ios/Podfile

@@ -5,10 +5,8 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 target 'jitsi-meet' do
   project 'app/app.xcodeproj'
 
-  pod 'Crashlytics', '~> 3.14.0'
-  pod 'Fabric', '~> 1.10.2'
-  pod 'Firebase/Core', '~> 6.16.0'
-  pod 'Firebase/DynamicLinks', '~> 6.16.0'
+  pod 'Firebase/Crashlytics', '~> 6.24.0'
+  pod 'Firebase/DynamicLinks', '~> 6.24.0'
 end
 
 target 'JitsiMeet' do

ios/Podfile.lock

@@ -11,10 +11,7 @@ PODS:
   - CocoaLumberjack (3.5.3):
     - CocoaLumberjack/Core (= 3.5.3)
   - CocoaLumberjack/Core (3.5.3)
-  - Crashlytics (3.14.0):
-    - Fabric (~> 1.10.2)
   - DoubleConversion (1.1.6)
-  - Fabric (1.10.2)
   - FBLazyVector (0.61.5-jitsi.1)
   - FBReactNativeSpec (0.61.5-jitsi.1):
     - Folly (= 2018.10.22.00)
@@ -23,48 +20,43 @@ PODS:
     - React-Core (= 0.61.5-jitsi.1)
     - React-jsi (= 0.61.5-jitsi.1)
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
-  - Firebase/Core (6.16.0):
+  - Firebase/CoreOnly (6.24.0):
+    - FirebaseCore (= 6.7.0)
+  - Firebase/Crashlytics (6.24.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 6.2.2)
-  - Firebase/CoreOnly (6.16.0):
-    - FirebaseCore (= 6.6.1)
-  - Firebase/DynamicLinks (6.16.0):
+    - FirebaseCrashlytics (~> 4.1.0)
+  - Firebase/DynamicLinks (6.24.0):
     - Firebase/CoreOnly
-    - FirebaseDynamicLinks (~> 4.0.6)
-  - FirebaseAnalytics (6.2.2):
-    - FirebaseCore (~> 6.6)
-    - FirebaseInstanceID (~> 4.3)
-    - GoogleAppMeasurement (= 6.2.2)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
-    - GoogleUtilities/Network (~> 6.0)
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
-    - nanopb (= 0.3.9011)
+    - FirebaseDynamicLinks (~> 4.0.8)
   - FirebaseAnalyticsInterop (1.5.0)
-  - FirebaseCore (6.6.1):
-    - FirebaseCoreDiagnostics (~> 1.2)
+  - FirebaseCore (6.7.0):
+    - FirebaseCoreDiagnostics (~> 1.3)
     - FirebaseCoreDiagnosticsInterop (~> 1.2)
     - GoogleUtilities/Environment (~> 6.5)
     - GoogleUtilities/Logger (~> 6.5)
-  - FirebaseCoreDiagnostics (1.2.2):
+  - FirebaseCoreDiagnostics (1.3.0):
     - FirebaseCoreDiagnosticsInterop (~> 1.2)
-    - GoogleDataTransportCCTSupport (~> 2.0)
+    - GoogleDataTransportCCTSupport (~> 3.1)
     - GoogleUtilities/Environment (~> 6.5)
     - GoogleUtilities/Logger (~> 6.5)
-    - nanopb (~> 0.3.901)
+    - nanopb (~> 1.30905.0)
   - FirebaseCoreDiagnosticsInterop (1.2.0)
+  - FirebaseCrashlytics (4.1.1):
+    - FirebaseAnalyticsInterop (~> 1.2)
+    - FirebaseCore (~> 6.6)
+    - FirebaseInstallations (~> 1.1)
+    - GoogleDataTransport (~> 6.1)
+    - GoogleDataTransportCCTSupport (~> 3.1)
+    - nanopb (~> 1.30905.0)
+    - PromisesObjC (~> 1.2)
   - FirebaseDynamicLinks (4.0.8):
     - FirebaseAnalyticsInterop (~> 1.3)
     - FirebaseCore (~> 6.2)
-  - FirebaseInstallations (1.1.1):
+  - FirebaseInstallations (1.2.0):
     - FirebaseCore (~> 6.6)
-    - GoogleUtilities/UserDefaults (~> 6.5)
+    - GoogleUtilities/Environment (~> 6.6)
+    - GoogleUtilities/UserDefaults (~> 6.6)
     - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (4.3.2):
-    - FirebaseCore (~> 6.6)
-    - FirebaseInstallations (~> 1.0)
-    - GoogleUtilities/Environment (~> 6.5)
-    - GoogleUtilities/UserDefaults (~> 6.5)
   - Folly (2018.10.22.00):
     - boost-for-react-native
     - DoubleConversion
@@ -75,37 +67,19 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - GoogleAppMeasurement (6.2.2):
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
-    - GoogleUtilities/Network (~> 6.0)
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
-    - nanopb (= 0.3.9011)
-  - GoogleDataTransport (5.1.0)
-  - GoogleDataTransportCCTSupport (2.0.1):
-    - GoogleDataTransport (~> 5.1)
-    - nanopb (~> 0.3.901)
+  - GoogleDataTransport (6.1.0)
+  - GoogleDataTransportCCTSupport (3.1.0):
+    - GoogleDataTransport (~> 6.1)
+    - nanopb (~> 1.30905.0)
   - GoogleSignIn (5.0.1):
     - AppAuth (~> 1.2)
     - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
-  - GoogleUtilities/AppDelegateSwizzler (6.5.2):
+  - GoogleUtilities/Environment (6.6.0):
+    - PromisesObjC (~> 1.2)
+  - GoogleUtilities/Logger (6.6.0):
     - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.5.2)
-  - GoogleUtilities/Logger (6.5.2):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (6.5.2):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (6.5.2):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.5.2)"
-  - GoogleUtilities/Reachability (6.5.2):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.5.2):
+  - GoogleUtilities/UserDefaults (6.6.0):
     - GoogleUtilities/Logger
   - GTMAppAuth (1.0.0):
     - AppAuth/Core (~> 1.0)
@@ -115,11 +89,11 @@ PODS:
   - GTMSessionFetcher/Core (1.2.2)
   - GTMSessionFetcher/Full (1.2.2):
     - GTMSessionFetcher/Core (= 1.2.2)
-  - nanopb (0.3.9011):
-    - nanopb/decode (= 0.3.9011)
-    - nanopb/encode (= 0.3.9011)
-  - nanopb/decode (0.3.9011)
-  - nanopb/encode (0.3.9011)
+  - nanopb (1.30905.0):
+    - nanopb/decode (= 1.30905.0)
+    - nanopb/encode (= 1.30905.0)
+  - nanopb/decode (1.30905.0)
+  - nanopb/encode (1.30905.0)
   - ObjectiveDropboxOfficial (3.9.4)
   - PromisesObjC (1.2.8)
   - RCTRequired (0.61.5-jitsi.1)
@@ -285,7 +259,7 @@ PODS:
     - React-cxxreact (= 0.61.5-jitsi.1)
     - React-jsi (= 0.61.5-jitsi.1)
   - React-jsinspector (0.61.5-jitsi.1)
-  - react-native-background-timer (2.1.1):
+  - react-native-background-timer (2.4.0):
     - React
   - react-native-calendar-events (2.0.0):
     - React
@@ -373,13 +347,11 @@ DEPENDENCIES:
   - Amplitude-iOS (~> 4.0.4)
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - CocoaLumberjack (~> 3.5.3)
-  - Crashlytics (~> 3.14.0)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - Fabric (~> 1.10.2)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
-  - Firebase/Core (~> 6.16.0)
-  - Firebase/DynamicLinks (~> 6.16.0)
+  - Firebase/Crashlytics (~> 6.24.0)
+  - Firebase/DynamicLinks (~> 6.24.0)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - ObjectiveDropboxOfficial (~> 3.9.4)
@@ -424,18 +396,14 @@ SPEC REPOS:
     - AppAuth
     - boost-for-react-native
     - CocoaLumberjack
-    - Crashlytics
-    - Fabric
     - Firebase
-    - FirebaseAnalytics
     - FirebaseAnalyticsInterop
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseCoreDiagnosticsInterop
+    - FirebaseCrashlytics
     - FirebaseDynamicLinks
     - FirebaseInstallations
-    - FirebaseInstanceID
-    - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleDataTransportCCTSupport
     - GoogleSignIn
@@ -530,30 +498,26 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
-  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
   FBLazyVector: 4a5251159a3ed05dc11cc8b74cf937869935814b
   FBReactNativeSpec: 6fa602a20993212cc9877a81838578ffb0008bc9
-  Firebase: 497158b816d0a86fc31babbd05546fcd7e6083ff
-  FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
+  Firebase: b28e55c60efd98963cd9011fe2fac5a10c2ba124
   FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
-  FirebaseCore: 85064903ed6c28e47fec9c7bd149d94ba1b6b6e7
-  FirebaseCoreDiagnostics: e9b4cd8ba60dee0f2d13347332e4b7898cca5b61
+  FirebaseCore: e610482f64097b0e9f056cd97bc6b33dfabcbb6a
+  FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67
   FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
+  FirebaseCrashlytics: a87cce5746d3335995bd18b1b60d073cd05a6920
   FirebaseDynamicLinks: 417dc6dbb6013233c77558290d73296f429656a6
-  FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44
-  FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be
+  FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff
-  GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab
-  GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988
+  GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5ab
+  GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d
   GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86
-  GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
+  GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
   GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e
   GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
-  nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
+  nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
   PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
   RCTRequired: f63dd90a89a60602acdd44c42e5d2645ca60ab79
@@ -565,7 +529,7 @@ SPEC CHECKSUMS:
   React-jsi: 4f35c1a2273d193a80c1c3831c808413840c260c
   React-jsiexecutor: de1c37cf59ae9adcbf2be82eea0e090dc3f3205e
   React-jsinspector: b76c4e84a7833bb4c90549d59ed53ec299ff912b
-  react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2
+  react-native-background-timer: e0384ea2fa5a98f67f84f9c4dc274260ddd674ed
   react-native-calendar-events: 1442fad71a00388f933cfa25512588fec300fcf8
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
   react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
@@ -589,6 +553,6 @@ SPEC CHECKSUMS:
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 7b4209fda2441f99d54dd6cf4c82b094409bb68f
 
-PODFILE CHECKSUM: 082858daebbe170e7a490de433e7f2a99e0c3701
+PODFILE CHECKSUM: 7255ec38ea51a8bc10a7a582248b4eb4bbbff80c
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

ios/app/src/AppDelegate.m

@@ -20,8 +20,6 @@
 #import "Types.h"
 #import "ViewController.h"
 
-@import Crashlytics;
-@import Fabric;
 @import Firebase;
 @import JitsiMeet;
 
@@ -48,10 +46,11 @@
     }];
 
     // Initialize Crashlytics and Firebase if a valid GoogleService-Info.plist file was provided.
-    if ([FIRUtilities appContainsRealServiceInfoPlist] && ![jitsiMeet isCrashReportingDisabled]) {
-        NSLog(@"Enabling Crashlytics and Firebase");
+  if ([FIRUtilities appContainsRealServiceInfoPlist]) {
+        NSLog(@"Enabling Firebase");
         [FIRApp configure];
-        [Fabric with:@[[Crashlytics class]]];
+        // Crashlytics defaults to disabled wirth the FirebaseCrashlyticsCollectionEnabled Info.plist key.
+        [[FIRCrashlytics crashlytics] setCrashlyticsCollectionEnabled:![jitsiMeet isCrashReportingDisabled]];
     }
 
     [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];

ios/app/src/Info.plist

@@ -99,7 +99,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>firebase_crashlytics_collection_enabled</key>
+	<key>FirebaseCrashlyticsCollectionEnabled</key>
 	<string>false</string>
 </dict>
 </plist>

ios/scripts/run-packager-helper.command

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
+exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache

ios/scripts/run-packager.sh

@@ -3,6 +3,8 @@
 # This script is executed from Xcode to start the React packager for Debug
 # targets.
 
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
 export RCT_METRO_PORT="${RCT_METRO_PORT:=8081}"
 echo "export RCT_METRO_PORT=${RCT_METRO_PORT}" > "${SRCROOT}/../../node_modules/react-native/scripts/.packager.env"
 
@@ -13,7 +15,6 @@ if [[ "$CONFIGURATION" = "Debug" ]]; then
       exit 2
     fi
   else
-    open -g "$SRCROOT/../../node_modules/react-native/scripts/launchPackager.command" || echo "Can't start packager automatically"
+    open -g "$THIS_DIR/run-packager-helper.command" || echo "Can't start packager automatically"
   fi
 fi
-

lang/main-cs.json

@@ -534,7 +534,7 @@
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
         "startAudioMuted": "Při připojení všem zlumit zvuk",
-        "startVideoMuted": "Všechny připojovat jako skrýté",
+        "startVideoMuted": "Všechny připojovat jako skryté",
         "title": "Nastavení",
         "speakers": "Reproduktory",
         "microphones": "Mikrofony"
@@ -567,7 +567,7 @@
         "name": "Řečník",
         "seconds": "",
         "speakerStats": "Statistika řečníků",
-        "speakerTime": "Mluvil již"
+        "speakerTime": "Mluvil(a) již"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -638,7 +638,7 @@
         "openChat": "",
         "pip": "",
         "profile": "Upravit váš profil",
-        "raiseHand": "Příhlásit / Odhlásit se o slovo",
+        "raiseHand": "Přihlásit / Odhlásit se o slovo",
         "raiseYourHand": "",
         "Settings": "Nastavení",
         "sharedvideo": "Sdílet obraz YouTube videa",

lang/main-de.json

@@ -3,14 +3,15 @@
         "add": "Einladen",
         "addContacts": "Laden Sie Ihre Kontakte ein",
         "copyInvite": "Sitzungseinladung kopieren",
-        "copyLink": "Meeting-Link kopieren",
-        "copyStream": "Live-Streaming-Link kopieren",
+        "copyLink": "Konferenzlink kopieren",
+        "copyStream": "Livestreaminglink kopieren",
         "countryNotSupported": "Wir unterstützen dieses Land noch nicht.",
         "countryReminder": "Telefonnummer nicht in den USA? Bitte sicherstellen, dass die Telefonnummer mit dem Ländercode beginnt.",
         "defaultEmail": "Ihre Standard-E-Mail",
         "disabled": "Sie können keine Teilnehmer einladen.",
         "failedToAdd": "Fehler beim Hinzufügen von Teilnehmern",
         "footerText": "Abgehender Ruf ist deaktiviert.",
+        "googleEmail": "Google-E-Mail",
         "inviteMoreHeader": "Sie sind alleine in der Sitzung",
         "inviteMoreMailSubject": "An {{appName}} Meeting teilnehmen",
         "inviteMorePrompt": "Mehr Leute einladen",
@@ -20,14 +21,16 @@
         "loadingPeople": "Suche nach einzuladenden Teilnehmern",
         "noResults": "Keine passenden Ergebnisse",
         "noValidNumbers": "Telefonnummer eingeben",
+        "outlookEmail": "Outlook-E-Mail",
         "searchNumbers": "Telefonnummern hinzufügen",
         "searchPeople": "Nach Teilnehmern suchen",
         "searchPeopleAndNumbers": "Nach Teilnehmen suchen oder deren Telefonnummern hinzufügen",
         "shareInvite": "Einladung zur Versammlung teilen",
-        "shareLink": "Teilen Sie den Meeting-Link, um andere einzuladen",
-        "shareStream": "Den Live-Streaming-Link freigeben",
+        "shareLink": "Teilen Sie den Konferenzlink, um andere einzuladen",
+        "shareStream": "Den Livestreaminglink freigeben",
         "telephone": "Telefon: {{number}}",
-        "title": "Teilnehmer zu dieser Konferenz einladen"
+        "title": "Teilnehmer zu dieser Konferenz einladen",
+        "yahooEmail": "Yahoo-E-Mail"
     },
     "audioDevices": {
         "bluetooth": "Bluetooth",
@@ -40,7 +43,7 @@
         "audioOnly": "Geringe Bandbreite"
     },
     "calendarSync": {
-        "addMeetingURL": "Meeting-Link hinzufügen",
+        "addMeetingURL": "Konferenzlink hinzufügen",
         "confirmAddLink": "Möchten Sie einen Jitsi-Link zu diesem Termin hinzufügen?",
         "error": {
             "appConfiguration": "Kalenderintegration ist nicht richtig konfiguriert.",
@@ -89,9 +92,9 @@
         "DISCONNECTED": "Getrennt",
         "DISCONNECTING": "Verbindung wird getrennt",
         "ERROR": "Fehler",
-        "FETCH_SESSION_ID": "Sitzungs-ID erhalten...",
+        "FETCH_SESSION_ID": "Sitzungs-ID abrufen …",
         "GET_SESSION_ID_ERROR": "Sitzungs-ID-Fehler erhalten: {{code}}",
-        "GOT_SESSION_ID": "Sitzungs-ID erhalten... Beendet",
+        "GOT_SESSION_ID": "Sitzungs-ID abrufen … beendet",
         "LOW_BANDWIDTH": "Video für {{displayName}} wurde ausgeschaltet, um Bandbreite einzusparen"
     },
     "connectionindicator": {
@@ -107,6 +110,7 @@
         "localaddress_plural": "Lokale Adressen:",
         "localport": "Lokaler Port:",
         "localport_plural": "Lokale Ports:",
+        "maxEnabledResolution": "max. senden",
         "more": "Mehr anzeigen",
         "packetloss": "Paketverlust:",
         "quality": {
@@ -139,7 +143,7 @@
         "ifHaveApp": "Wenn Sie die App bereits haben:",
         "joinInApp": "An dem Meeting teilnehmen mit der App",
         "launchWebButton": "Im Web öffnen",
-        "title": "Die Konferenz wird in {{app}} geöffnet...",
+        "title": "Die Konferenz wird in {{app}} geöffnet …",
         "tryAgainButton": "Erneut mit der nativen Applikation versuchen"
     },
     "defaultLink": "Bsp.: {{url}}",
@@ -160,6 +164,7 @@
         "accessibilityLabel": {
             "liveStreaming": "Livestream"
         },
+        "add": "Hinzufügen",
         "allow": "Erlauben",
         "alreadySharedVideoMsg": "Ein anderer Teilnehmer gibt bereits ein Video weiter. Bei dieser Konferenz ist jeweils nur ein geteiltes Video möglich.",
         "alreadySharedVideoTitle": "Nur ein geteiltes Video gleichzeitig",
@@ -174,9 +179,9 @@
         "cameraUnsupportedResolutionError": "Die Kamera unterstützt die erforderliche Auflösung nicht.",
         "Cancel": "Abbrechen",
         "close": "Schließen",
-        "conferenceDisconnectMsg": "Prüfen Sie allenfalls Ihre Netzwerkverbindung. Verbinde in {{seconds}} Sekunden...",
+        "conferenceDisconnectMsg": "Prüfen Sie allenfalls Ihre Netzwerkverbindung. Verbinde in {{seconds}} Sekunden …",
         "conferenceDisconnectTitle": "Ihre Verbindung ist getrennt worden.",
-        "conferenceReloadMsg": "Wir versuchen das zu beheben. Verbinde in {{seconds}} Sekunden...",
+        "conferenceReloadMsg": "Wir versuchen das zu beheben. Verbinde in {{seconds}} Sekunden …",
         "conferenceReloadTitle": "Leider ist etwas schiefgegangen.",
         "confirm": "Bestätigen",
         "confirmNo": "Nein",
@@ -185,21 +190,25 @@
         "connectErrorWithMsg": "Oh! Es hat etwas nicht geklappt und der Konferenz konnte nicht beigetreten werden: {{msg}}",
         "connecting": "Verbindung wird hergestellt",
         "contactSupport": "Support kontaktieren",
+        "copied": "Kopiert",
         "copy": "Kopieren",
         "dismiss": "OK",
         "displayNameRequired": "Hallo! Wie ist Ihr Name?",
         "done": "Fertig",
+        "e2eeDescription": "Ende-zu-Ende-Verschlüsselung ist derzeit noch EXPERIMENTELL. Bitte beachten Sie, dass das Aktivieren der Ende-zu-Ende-Verschlüsselung diverse serverseitige Funktionen deaktiviert: Aufnahmen, Livestreaming und Telefoneinwahl. Bitte beachten Sie außerdem, dass der Konferenz dann nur noch mit Browsern beigetreten werden kann, die Insertable Streams unterstützen.",
+        "e2eeLabel": "E2EE-Schlüssel",
+        "e2eeNoKey": "Keiner",
+        "e2eeToggleSet": "Schlüssel festlegen",
+        "e2eeSet": "Setzen",
+        "e2eeWarning": "WARNUNG: Nicht alle Teilnehmer dieser Konferenz scheinen Ende-zu-Ende-Verschlüsselung zu unterstützen. Wenn Sie diese aktivieren, können die entsprechenden Teilnehmer nichts mehr sehen oder hören.",
         "enterDisplayName": "Bitte geben Sie hier Ihren Namen ein",
         "error": "Fehler",
-        "externalInstallationMsg": "Die Bildschirmfreigabe-Erweiterung muss installiert werden.",
-        "externalInstallationTitle": "Erweiterung erforderlich",
-        "goToStore": "Zum Store",
         "gracefulShutdown": "Der Dienst steht momentan wegen Wartungsarbeiten nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
+        "grantModeratorDialog": "Möchten Sie diesen Teilnehmer wirklich zum Moderator machen?",
+        "grantModeratorTitle": "Zum Moderator machen",
         "IamHost": "Ich bin der Organisator",
         "incorrectRoomLockPassword": "Falsches Passwort",
         "incorrectPassword": "Benutzername oder Passwort ungültig",
-        "inlineInstallationMsg": "Die Bildschirmfreigabe-Erweiterung muss installiert werden.",
-        "inlineInstallExtension": "Jetzt installieren",
         "internalError": "Oh! Es hat etwas nicht funktioniert. Der folgende Fehler ist aufgetreten: {{error}}",
         "internalErrorTitle": "Interner Fehler",
         "kickMessage": "Sie können sich für mehr Details an {{participantDisplayName}} wenden.",
@@ -208,10 +217,11 @@
         "kickParticipantTitle": "Teilnehmer entfernen?",
         "kickTitle": "Autsch! {{participantDisplayName}} hat Sie aus dem Meeting geworfen",
         "liveStreaming": "Livestreaming",
+        "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Während einer Aufnahme nicht möglich",
         "liveStreamingDisabledForGuestTooltip": "Gäste können kein Livestreaming starten.",
         "liveStreamingDisabledTooltip": "Starten des Livestreams deaktiviert.",
         "lockMessage": "Die Konferenz konnte nicht gesperrt werden.",
-        "lockRoom": "Meeting-$t(lockRoomPasswordUppercase) hinzufügen",
+        "lockRoom": "Konferenz$t(lockRoomPassword) hinzufügen",
         "lockTitle": "Sperren fehlgeschlagen",
         "logoutQuestion": "Sind Sie sicher, dass Sie sich abmelden und die Konferenz verlassen möchten?",
         "logoutTitle": "Abmelden",
@@ -234,13 +244,15 @@
         "muteParticipantDialog": "Wollen Sie diesen Teilnehmer wirklich stummschalten? Sie können die Stummschaltung nicht wieder aufheben, der Teilnehmer kann dies aber jederzeit selbst tun.",
         "muteParticipantTitle": "Teilnehmer stummschalten?",
         "Ok": "OK",
-        "passwordLabel": "Dieses Meeting wurde von einem Teilnehmer gesichert. Bitte geben Sie das $t(lockRoomPassword) ein, um dem Meeting beizutreten.",
-        "passwordNotSupported": "Das Festlegen von einem $t(lockRoomPassword) für das Meeting wird nicht unterstützt.",
+        "passwordLabel": "Dieses Meeting wurde von einem Teilnehmer gesichert. Bitte geben Sie das $t(lockRoomPasswordUppercase) ein, um dem Meeting beizutreten.",
+        "passwordNotSupported": "Das Festlegen eines Konferenzpassworts wird nicht unterstützt.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) nicht unterstützt",
         "passwordRequired": "$t(lockRoomPasswordUppercase) erforderlich",
         "popupError": "Ihr Browser blockiert Pop-ups von dieser Website. Bitte aktivieren Sie Pop-ups in den Sicherheitseinstellungen des Browsers und versuchen Sie es erneut.",
         "popupErrorTitle": "Pop-up blockiert",
+        "readMore": "mehr",
         "recording": "Aufnahme",
+        "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Während eines Livestreams nicht möglich",
         "recordingDisabledForGuestTooltip": "Gäste können keine Aufzeichnungen starten.",
         "recordingDisabledTooltip": "Start der Aufzeichnung deaktiviert.",
         "rejoinNow": "Jetzt erneut beitreten",
@@ -252,17 +264,16 @@
         "remoteControlStopMessage": "Die Fernsteuerung wurde beendet!",
         "remoteControlTitle": "Fernsteuerung",
         "Remove": "Entfernen",
-        "removePassword": "$t(lockRoomPassword) entfernen",
+        "removePassword": "$t(lockRoomPasswordUppercase) entfernen",
         "removeSharedVideoMsg": "Sind Sie sicher, dass Sie das geteilte Video entfernen möchten?",
         "removeSharedVideoTitle": "Freigegebenes Video entfernen",
         "reservationError": "Fehler im Reservierungssystem",
         "reservationErrorMsg": "Fehler, Nummer: {{code}}, Nachricht: {{msg}}",
         "retry": "Wiederholen",
-        "screenSharingFailedToInstall": "Oh! Die Erweiterung für die Bildschirmfreigabe konnte nicht installiert werden.",
-        "screenSharingFailedToInstallTitle": "Bildschirmfreigabe-Erweiterung konnte nicht installiert werden",
-        "screenSharingFirefoxPermissionDeniedError": "Die Bildschirmfreigabe ist leider fehlgeschlagen. Bitte stellen Sie sicher, dass die Berechtigung für die Bildschirmfreigabe im Browser erteilt wurde. ",
-        "screenSharingFirefoxPermissionDeniedTitle": "Die Bildschirmfreigabe konnte nicht gestartet werden!",
-        "screenSharingPermissionDeniedError": "Oh! Beim Anfordern der Bildschirmfreigabe-Berechtigungen hat etwas nicht funktioniert. Bitte aktualisieren und erneut versuchen.",
+        "screenSharingAudio": "Audio teilen",
+        "screenSharingFailed": "Ups! Beim Teilen des Bildschirms ist etwas schiefgegangen!",
+        "screenSharingFailedTitle": "Bildschirmfreigabe fehlgeschlagen!",
+        "screenSharingPermissionDeniedError": "Ups! Etwas stimmt nicht mit Ihren Berechtigungen zur Bildschirmfreigabe. Bitte neu laden und erneut versuchen.",
         "sendPrivateMessage": "Sie haben kürzlich eine private Nachricht erhalten. Hatten Sie die Absicht, darauf privat zu antworten, oder wollen Sie Ihre Nachricht an die Gruppe senden?",
         "sendPrivateMessageCancel": "An die Gruppe senden",
         "sendPrivateMessageOk": "Privat antworten",
@@ -275,13 +286,13 @@
         "shareYourScreen": "Bildschirm freigeben",
         "shareYourScreenDisabled": "Bildschirmfreigabe deaktiviert.",
         "shareYourScreenDisabledForGuest": "Gäste können den Bildschirm nicht freigeben.",
-        "startLiveStreaming": "Einen Livestream starten",
+        "startLiveStreaming": "Livestream starten",
         "startRecording": "Aufnahme starten",
         "startRemoteControlErrorMessage": "Beim Versuch, die Fernsteuerung zu starten, ist ein Fehler aufgetreten!",
-        "stopLiveStreaming": "Livestreaming stoppen",
+        "stopLiveStreaming": "Livestream stoppen",
         "stopRecording": "Aufnahme stoppen",
         "stopRecordingWarning": "Sind Sie sicher, dass Sie die Aufnahme stoppen möchten?",
-        "stopStreamingWarning": "Sind Sie sicher, dass Sie das Livestreaming stoppen möchten?",
+        "stopStreamingWarning": "Sind Sie sicher, dass Sie den Livestream stoppen möchten?",
         "streamKey": "Streamschlüssel",
         "Submit": "OK",
         "thankYou": "Danke für die Verwendung von {{appName}}!",
@@ -289,14 +300,13 @@
         "tokenAuthFailed": "Sie sind nicht berechtigt, dieser Konferenz beizutreten.",
         "tokenAuthFailedTitle": "Authentifizierung fehlgeschlagen",
         "transcribing": "Wird transkribiert",
-        "unlockRoom": "Meeting-$t(lockRoomPassword) entfernen",
+        "unlockRoom": "Konferenz$t(lockRoomPassword) entfernen",
         "userPassword": "Benutzerpasswort",
         "WaitForHostMsg": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Wenn Sie der Organisator sind, authentifizieren Sie sich. Warten Sie andernfalls, bis der Organisator erscheint.",
         "WaitForHostMsgWOk": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Wenn Sie der Organisator sind, drücken Sie zum Authentifizieren auf OK. Warten Sie andernfalls, bis der Organisator erscheint.",
-        "WaitingForHost": "Warten auf den Organisator...",
+        "WaitingForHost": "Warten auf den Organisator …",
         "Yes": "Ja",
-        "yourEntireScreen": "Ganzer Bildschirm",
-        "screenSharingAudio": "Audio austauschen"
+        "yourEntireScreen": "Ganzer Bildschirm"
     },
     "dialOut": {
         "statusMessage": "ist jetzt {{status}}"
@@ -304,6 +314,12 @@
     "documentSharing": {
         "title": "Freigegebenes Dokument"
     },
+    "e2ee": {
+        "labelToolTip": "Audio- und Videodaten dieser Unterhaltung sind jetzt zwischen den Teilnehmern verschlüsselt"
+    },
+    "embedMeeting": {
+        "title": "Diese Konferenz einbetten"
+    },
     "feedback": {
         "average": "Durchschnittlich",
         "bad": "Schlecht",
@@ -322,8 +338,8 @@
     },
     "info": {
         "accessibilityLabel": "Informationen anzeigen",
-        "addPassword": "$t(lockRoomPassword) hinzufügen",
-        "cancelPassword": "$t(lockRoomPassword) löschen",
+        "addPassword": "$t(lockRoomPasswordUppercase) hinzufügen",
+        "cancelPassword": "$t(lockRoomPasswordUppercase) löschen",
         "conferenceURL": "Link:",
         "country": "Land",
         "dialANumber": "Um am Meeting teilzunehmen, müssen Sie eine dieser Nummern wählen und dann die PIN eingeben.",
@@ -335,7 +351,7 @@
         "genericError": "Es ist leider etwas schiefgegangen.",
         "inviteLiveStream": "Klicken Sie auf {{url}}, um den Livestream dieser Konferenz zu öffnen",
         "invitePhone": "Wenn Sie stattdessen per Telefon beitreten möchten, wählen sie: {{number}},,{{conferenceID}}#\n",
-        "invitePhoneAlternatives": "Suchen Sie nach einer anderen Einwahlnummer ?\nMeeting-Einwahlnummern anzeigen: {{url}}\n\n\nWenn Sie sich auch über ein Raumtelefon einwählen, nehmen Sie teil, ohne sich mit dem Ton zu verbinden: {{silentUrl}}",
+        "invitePhoneAlternatives": "Suchen Sie nach einer anderen Einwahlnummer ?\nEinwahlnummern der Konferenz anzeigen: {{url}}\n\n\nWenn Sie sich auch über ein Raumtelefon einwählen, nehmen Sie teil, ohne sich mit dem Ton zu verbinden: {{silentUrl}}",
         "inviteURLFirstPartGeneral": "Sie wurden zur Teilnahme an einem Meeting eingeladen.",
         "inviteURLFirstPartPersonal": "{{name}} lädt Sie zu einem Meeting ein.\n",
         "inviteURLSecondPart": "\nAm Meeting teilnehmen:\n{{url}}\n",
@@ -348,7 +364,7 @@
         "password": "$t(lockRoomPasswordUppercase):",
         "title": "Teilen",
         "tooltip": "Freigabe-Link und Einwahlinformationen für dieses Meeting",
-        "label": "Meeting-Informationen"
+        "label": "Konferenzinformationen"
     },
     "inviteDialog": {
         "alertText": "Die Einladung einiger Teilnehmer ist fehlgeschlagen.",
@@ -382,6 +398,8 @@
         "videoQuality": "Anrufqualität verwalten"
     },
     "liveStreaming": {
+        "limitNotificationDescriptionWeb": "Wegen hoher Nachfrage ist Ihr Stream auf {{limit}} min. begrenzt. Für unlimitiertes Streaming nutzen Sie bitte <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
+        "limitNotificationDescriptionNative": "Ihr Stream ist begrenzt auf {{limit}} min. Für unlimitiertes Streaming, nutzen Sie bitte {{app}}.",
         "busy": "Es werden Ressourcen zum Streamen bereitgestellt. Bitte in ein paar Minuten erneut versuchen.",
         "busyTitle": "Alle Streaming-Instanzen sind in Gebrauch",
         "changeSignIn": "Konten wechseln.",
@@ -391,17 +409,17 @@
         "error": "Das Livestreaming ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
         "errorAPI": "Beim Abrufen der YouTube-Livestreams ist ein Fehler aufgetreten. Bitte versuchen Sie, sich erneut anzumelden.",
         "errorLiveStreamNotEnabled": "Livestreaming ist für {{email}} nicht aktiviert. Aktivieren Sie das Livestreaming oder melden Sie sich bei einem Konto mit aktiviertem Livestreaming an.",
-        "expandedOff": "Livestreaming wurde angehalten",
+        "expandedOff": "Livestream wurde angehalten",
         "expandedOn": "Das Meeting wird momentan an YouTube gestreamt.",
-        "expandedPending": "Livestreaming wird gestartet...",
-        "failedToStart": "Livestreaming konnte nicht gestartet werden",
+        "expandedPending": "Livestream wird gestartet …",
+        "failedToStart": "Livestream konnte nicht gestartet werden",
         "getStreamKeyManually": "Wir waren nicht in der Lage, Livestreams abzurufen. Versuchen Sie, Ihren Livestream-Schlüssel von YouTube zu erhalten.",
         "invalidStreamKey": "Der Livestream-Schlüssel ist u. U. falsch.",
-        "off": "Livestreaming gestoppt",
-        "offBy": "{{name}} stoppte das Livestreaming",
-        "on": "Livestreaming",
-        "onBy": "{{name}} startete das Livestreaming",
-        "pending": "Livestream wird gestartet...",
+        "off": "Livestream gestoppt",
+        "offBy": "{{name}} stoppte den Livestream",
+        "on": "Livestream",
+        "onBy": "{{name}} startete den Livestream",
+        "pending": "Livestream wird gestartet …",
         "serviceName": "Livestreaming-Dienst",
         "signedInAs": "Sie sind derzeit angemeldet als:",
         "signIn": "Mit Google anmelden",
@@ -442,7 +460,7 @@
         "stop": "Aufnahme stoppen",
         "yes": "Ja"
     },
-    "lockRoomPassword": "Passwort",
+    "lockRoomPassword": "passwort",
     "lockRoomPasswordUppercase": "Passwort",
     "me": "ich",
     "notify": {
@@ -474,11 +492,51 @@
         "unmute": "Stummschaltung aufheben",
         "newDeviceCameraTitle": "Neue Kamera erkannt",
         "newDeviceAudioTitle": "Neues Audiogerät erkannt",
-        "newDeviceAction": "Verwenden"
+        "newDeviceAction": "Verwenden",
+        "OldElectronAPPTitle": "Sicherheitslücke!",
+        "oldElectronClientDescription1": "Sie scheinen eine alte Version des Jitsi-Meet-Clients zu nutzen. Diese hat bekannte Schwachstellen. Bitte aktualisieren Sie auf unsere ",
+        "oldElectronClientDescription2": "aktuelle Version",
+        "oldElectronClientDescription3": "!"
     },
     "passwordSetRemotely": "von einem anderen Teilnehmer gesetzt",
     "passwordDigitsOnly": "Bis zu {{number}} Ziffern",
     "poweredby": "Betrieben von",
+    "prejoin": {
+        "audioAndVideoError": "Audio- und Videofehler:",
+        "audioOnlyError": "Audiofehler:",
+        "audioTrackError": "Audiotrack konnte nicht erstellt werden.",
+        "calling": "Rufaufbau",
+        "callMe": "Mich anrufen",
+        "callMeAtNumber": "Mich unter dieser Nummer anrufen:",
+        "configuringDevices": "Geräte werden eingerichtet …",
+        "connectedWithAudioQ": "Sie sind mit Audio verbunden?",
+        "copyAndShare": "Konferenzlink kopieren & teilen",
+        "dialInMeeting": "Telefoneinwahl",
+        "dialInPin": "In die Konferenz einwählen und PIN eingeben:",
+        "dialing": "Wählen",
+        "doNotShow": "Nicht mehr anzeigen",
+        "errorDialOut": "Anruf fehlgeschlagen",
+        "errorDialOutDisconnected": "Anruf fehlgeschlagen. Verbindungsabbruch",
+        "errorDialOutFailed": "Anruf fehlgeschlagen. Anruf fehlgeschlagen",
+        "errorDialOutStatus": "Fehler beim Abrufen des Anrufstatus",
+        "errorStatusCode": "Anruf fehlgeschlagen. Statuscode: {{status}}",
+        "errorValidation": "Nummerverifikation fehlgeschlagen",
+        "iWantToDialIn": "Ich möchte mich einwählen",
+        "joinAudioByPhone": "Per Telefon teilnehmen",
+        "joinMeeting": "Konferenz beitreten",
+        "joinWithoutAudio": "Ohne Ton beitreten",
+        "initiated": "Anruf gestartet",
+        "linkCopied": "Link in die Zwischenablage kopiert",
+        "lookGood": "Ihr Mikrofon scheint zu funktionieren.",
+        "or": "oder",
+        "premeeting": "Vorraum",
+        "showScreen": "Konferenzvorraum aktivieren",
+        "startWithPhone": "Mit Telefonaudio starten",
+        "screenSharingError": "Fehler bei Bildschirmfreigabe:",
+        "videoOnlyError": "Videofehler:",
+        "videoTrackError": "Videotrack konnte nicht erstellt werden.",
+        "viewAllNumbers": "alle Nummern anzeigen"
+    },
     "presenceStatus": {
         "busy": "Beschäftigt",
         "calling": "Wird angerufen …",
@@ -501,6 +559,8 @@
     },
     "raisedHand": "Ich möchte sprechen",
     "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>.",
         "authDropboxText": "In Dropbox hochladen",
         "availableSpace": "Verfügbarer Speicherplatz: {{spaceLeft}} MB (ca. {{duration}} Minuten Aufzeichnung)",
         "beta": "BETA",
@@ -511,7 +571,7 @@
         "expandedOn": "Das Meeting wird momentan aufgezeichnet.",
         "expandedPending": "Aufzeichnung wird gestartet…",
         "failedToStart": "Die Aufnahme konnte nicht gestartet werden",
-        "fileSharingdescription": "Aufzeichnung mit Meeting-Teilnehmer teilen",
+        "fileSharingdescription": "Aufzeichnung mit Konferenzteilnehmer teilen",
         "live": "LIVE",
         "loggedIn": "Als {{userName}} angemeldet",
         "off": "Aufnahme gestoppt",
@@ -531,7 +591,8 @@
         "pullToRefresh": "Ziehen, um zu aktualisieren"
     },
     "security": {
-        "about": "Sie können einen Passwort zu Ihrer Sitzung hinzufügen. Die Teilnehmer müssen dieses ebenfalls eingeben, bevor sie an der Sitzung teilnehmen dürfen",
+        "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Teilnehmer müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
+        "aboutReadOnly": "Moderatoren können die Konferenz mit einem Passwort sichern. Teilnehmer 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"
     },
@@ -563,12 +624,15 @@
     "settingsView": {
         "advanced": "Erweitert",
         "alertOk": "OK",
+        "alertCancel": "Abbrechen",
         "alertTitle": "Warnung",
         "alertURLText": "Die angegebene Server-URL ist ungültig",
         "buildInfoSection": "Build-Informationen",
         "conferenceSection": "Konferenz",
         "disableCallIntegration": "Native Anrufintegration deaktivieren",
         "disableP2P": "Ende-zu-Ende-Modus deaktivieren",
+        "disableCrashReporting": "Absturzberichte deaktivieren",
+        "disableCrashReportingWarning": "Möchten Sie die Absturzberichte wirklich deaktivieren? Diese Einstellung wird nach einem Neustart der App wirksam.",
         "displayName": "Anzeigename",
         "email": "E-Mail",
         "header": "Einstellungen",
@@ -610,14 +674,18 @@
             "chat": "Chatfenster ein-/ausblenden",
             "document": "Geteiltes Dokument schließen",
             "download": "Unsere Apps herunterladen",
+            "embedMeeting": "Konferenz einbetten",
+            "e2ee": "Ende-zu-Ende-Verschlüsselung",
             "feedback": "Feedback hinterlassen",
-            "fullScreen": "Vollbildmodus aktivieren/deaktivieren",
+            "fullScreen": "Vollbildmodus ein-/ausschalten",
+            "grantModerator": "Zum Moderator machen",
             "hangup": "Anruf beenden",
             "help": "Hilfe",
             "invite": "Teilnehmer einladen",
             "kick": "Teilnehmer entfernen",
+            "lobbyButton": "Lobbymodus ein-/ausschalten",
             "localRecording": "Lokale Aufzeichnungssteuerelemente ein-/ausschalten",
-            "lockRoom": "Meeting-Passwort ein-/auschalten",
+            "lockRoom": "Konferenzpasswort ein-/auschalten",
             "moreActions": "Menü „Weitere Aktionen“ ein-/ausschalten",
             "moreActionsMenu": "Menü „Weitere Aktionen“",
             "moreOptions": "Menü „Weitere Optionen“",
@@ -639,6 +707,7 @@
             "speakerStats": "Sprecherstatistik ein-/ausblenden",
             "tileView": "Kachelansicht ein-/ausschalten",
             "toggleCamera": "Kamera wechseln",
+            "toggleFilmstrip": "Miniaturansichten ein-/ausschalten",
             "videomute": "„Video stummschalten“ ein-/ausschalten",
             "videoblur": "Video-Unschärfe ein-/ausschalten"
         },
@@ -653,6 +722,8 @@
         "documentClose": "Geteiltes Dokument schließen",
         "documentOpen": "Geteiltes Dokument öffnen",
         "download": "Unsere Apps herunterladen",
+        "e2ee": "Ende-zu-Ende-Verschlüsselung",
+        "embedMeeting": "Konferenz einbetten",
         "enterFullScreen": "Vollbildmodus",
         "enterTileView": "Kachelansicht einschalten",
         "exitFullScreen": "Vollbildmodus verlassen",
@@ -661,6 +732,8 @@
         "hangup": "Verlassen",
         "help": "Hilfe",
         "invite": "Teilnehmer einladen",
+        "lobbyButtonDisable": "Lobbymodus deaktivieren",
+        "lobbyButtonEnable": "Lobbymodus aktivieren",
         "login": "Anmelden",
         "logout": "Abmelden",
         "lowerYourHand": "Hand senken",
@@ -755,6 +828,7 @@
         "domute": "Stummschalten",
         "domuteOthers": "Alle anderen stummschalten",
         "flip": "Spiegeln",
+        "grantModerator": "Zum Moderator machen",
         "kick": "Hinauswerfen",
         "moderator": "Moderator",
         "mute": "Teilnehmer ist stumm geschaltet",
@@ -768,7 +842,7 @@
             "join": "Zum Teilnehmen tippen",
             "roomname": "Konferenzname eingeben"
         },
-        "appDescription": "Auf geht's! Starten Sie eine Videokonferenz mit dem ganzen Team. Oder besser noch: Laden Sie alle ein, die Sie kennen. {{app}} ist eine vollständig verschlüsselte, aus 100 % Open-Source-Software bestehende Videokonferenzlösung, die Sie den ganzen Tag kostenlos verwenden können — ohne Registrierung.",
+        "appDescription": "Auf geht's! Starten Sie eine Videokonferenz mit ihrem Team oder besser noch: Laden Sie alle ein, die Sie kennen. {{app}} ist eine vollständig verschlüsselte und 100 % quelloffene Videokonferenzlösung, die Sie immer und überall kostenlos verwenden können – ohne Registrierung.",
         "audioVideoSwitch": {
             "audio": "Audio",
             "video": "Video"
@@ -777,24 +851,62 @@
         "connectCalendarButton": "Kalender verbinden",
         "connectCalendarText": "Verbinden Sie Ihren Kalender, um all Ihre Meetings in {{app}} anzuzeigen. Fügen Sie zudem {{provider}}-Meetings in Ihren Kalender ein und starten Sie sie mit nur einem Klick.",
         "enterRoomTitle": "Neues Meeting starten",
-        "roomNameAllowedChars": "Der Meeting-Name sollte keines der folgenden Zeichen enthalten: ?, &, :, ', \", %, #.",
+        "getHelp": "Hilfe",
         "go": "Los",
         "goSmall": "Los",
-        "join": "Beitreten",
         "info": "Informationen",
+        "join": "ERSTELLEN / BEITRETEN",
+        "moderatedMessage": "Oder <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservieren Sie sich eine Konferenz-URL</a>, unter der Sie der einzige Moderator sind.",
         "privacy": "Datenschutz",
-        "recentList": "Letzte",
+        "recentList": "Verlauf",
         "recentListDelete": "Löschen",
-        "recentListEmpty": "Die Liste „Letzte“ ist momentan leer. Chatten Sie mit Ihrem Team. Sie finden all Ihre letzten Meetings hier.",
+        "recentListEmpty": "Ihr Konferenzverlauf ist derzeit leer. Reden Sie mit Ihrem Team und Ihre vergangenen Konferenzen landen hier.",
         "reducedUIText": "Willkommen bei {{app}}!",
+        "roomNameAllowedChars": "Der Konferenzname sollte keines der folgenden Zeichen enthalten: ?, &, :, ', \", %, #.",
         "roomname": "Konferenzname eingeben",
         "roomnameHint": "Name oder URL der Konferenz, der Sie beitreten möchten. Sie können einen Namen erfinden, er muss nur den anderen Teilnehmern übermittelt werden, damit diese der gleichen Konferenz beitreten.",
         "sendFeedback": "Feedback senden",
         "terms": "AGB",
-        "title": "Sichere, mit umfassenden Funktionen ausgestattete und vollkommen kostenlose Videokonferenzen"
+        "title": "Sichere, voll funktionale und komplett kostenlose Videokonferenzen"
     },
     "lonelyMeetingExperience": {
         "button": "Andere einladen",
-        "youAreAlone": "Nur Sie sind in diesem Meeting"
+        "youAreAlone": "Sie sind alleine in dieser Konferenz"
+    },
+    "helpView": {
+        "header": "Hilfecenter"
+    },
+    "lobby": {
+        "knockingParticipantList": "Liste anklopfender Teilnehmer",
+        "allow": "Annehmen",
+        "backToKnockModeButton": "Kein Passwort, stattdessen Beitritt anfragen",
+        "dialogTitle": "Lobbymodus",
+        "disableDialogContent": "Lobbymodus derzeit deaktiviert. Diese Funktion stellt sicher, dass unerwünschte Personen Ihrer Konferenz nicht beitreten können. Funktion aktivieren?",
+        "disableDialogSubmit": "Deaktivieren",
+        "emailField": "E-Mail-Adresse eingeben",
+        "enableDialogPasswordField": "Passwort setzen (optional)",
+        "enableDialogSubmit": "Aktivieren",
+        "enableDialogText": "Mit dem Lobbymodus schützen Sie Ihre Konferenz, da nur von einem Moderator angenommene Teilnehmer beitreten können.",
+        "enterPasswordButton": "Konferenzpasswort eingeben",
+        "enterPasswordTitle": "Passwort zum Beitreten benutzen",
+        "invalidPassword": "Ungültiges Passwort",
+        "joiningMessage": "Sie treten der Konferenz bei, sobald jemand Ihre Anfrage annimmt.",
+        "joinWithPasswordMessage": "Beitrittsversuch mit Passwort, bitte warten …",
+        "joinRejectedMessage": "Ihr Beitrittsanfrage wurde von einem Moderator abgelehnt.",
+        "joinTitle": "Konferenz beitreten",
+        "joiningTitle": "Beitritt anfragen …",
+        "joiningWithPasswordTitle": "Mit Passwort beitreten …",
+        "knockButton": "Beitritt anfragen",
+        "knockTitle": "Jemand möchte der Konferenz beitreten",
+        "nameField": "Geben Sie Ihren Namen ein",
+        "notificationLobbyAccessDenied": "{{targetParticipantName}} wurde von {{originParticipantName}} der Zutritt verwehrt",
+        "notificationLobbyAccessGranted": "{{targetParticipantName}} wurde von {{originParticipantName}} der Zutritt gestattet",
+        "notificationLobbyDisabled": "{{originParticipantName}} hat die Lobby deaktiviert",
+        "notificationLobbyEnabled": "{{originParticipantName}} hat die Lobby aktiviert",
+        "notificationTitle": "Lobby",
+        "passwordField": "Konferenzpasswort eingeben",
+        "passwordJoinButton": "Beitreten",
+        "reject": "Ablehnen",
+        "toggleLabel": "Lobby aktivieren"
     }
 }

lang/main-es.json

@@ -580,7 +580,7 @@
     },
     "security": {
         "about": "Usted puede agregar una contraseña a la reunión. Los participantes necesitaran la contraseña para unirse a la reunión.",
-        "insecureRoomNameWarning": "El nombre de la sala es inseguro. Participantes no desseados pueden llegar a unirse a la reunión.",
+        "insecureRoomNameWarning": "El nombre de la sala es inseguro. Participantes no deseados pueden llegar a unirse a la reunión.",
         "securityOptions": "Opciones de seguridad"
     },
     "settings": {

lang/main-esUS.json

@@ -578,7 +578,7 @@
     },
     "security": {
         "about": "Usted puede agregar una contraseña a la reunión. Los participantes necesitaran la contraseña para unirse a la reunión.",
-        "insecureRoomNameWarning": "El nombre de la sala es inseguro. Participantes no desseados pueden llegar a unirse a la reunión.",
+        "insecureRoomNameWarning": "El nombre de la sala es inseguro. Participantes no deseados pueden llegar a unirse a la reunión.",
         "securityOptions": "Opciones de seguridad"
     },
     "settings": {

lang/main-fr.json

@@ -4,7 +4,7 @@
         "addContacts": "Inviter vos contacts",
         "copyInvite": "Copier l'invitation à la réunion",
         "copyLink": "Copier le lien de la réunion",
-        "copyStream": "Copier le lien de diffision en direct",
+        "copyStream": "Copier le lien de diffusion en direct",
         "countryNotSupported": "Cette destination n'est pas actuellement supportée.",
         "countryReminder": "Appel hors des États-Unis ? Veuillez débuter par le code du pays !",
         "defaultEmail": "Votre email par défaut",
@@ -194,6 +194,8 @@
         "done": "Terminé",
         "enterDisplayName": "Merci de saisir votre nom ici",
         "error": "Erreur",
+        "grantModeratorDialog": "Êtes-vous sûr de vouloir rendre ce participant modérateur?",
+        "grantModeratorTitle": "Nommer modérateur",
         "externalInstallationMsg": "Vous devez installer notre extension de partage de bureau.",
         "externalInstallationTitle": "Extension requise",
         "goToStore": "Aller sur le webstore",
@@ -228,7 +230,7 @@
         "micUnknownError": "Vous ne pouvez pas utiliser le microphone pour une raison inconnue.",
         "muteEveryoneElseDialog": "Une fois leur micro coupé, vous ne pourrez plus le réactiver, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneElseTitle": "Couper le micro de tout le monde sauf de {{whom}} ?",
-        "muteEveryoneDialog": "Etes-vous sûr de vouloir couper les micros de tout le monde ? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
+        "muteEveryoneDialog": "Êtes-vous sûr de vouloir couper les micros de tout le monde ? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneTitle": "Couper le micro de tout le monde ?",
         "muteEveryoneSelf": "vous",
         "muteEveryoneStartMuted": "Tout le monde démarre avec le micro coupé",
@@ -695,6 +697,8 @@
         "hangup": "Quitter",
         "help": "Aide",
         "invite": "Inviter des participants",
+        "lobbyButtonDisable": "Désactiver le contrôle des participant·e·s",
+        "lobbyButtonEnable": "Activer le contrôle des participant·e·s",
         "login": "Connexion",
         "logout": "Déconnexion",
         "lowerYourHand": "Baisser la main",
@@ -788,6 +792,7 @@
         "domute": "Couper le micro",
         "domuteOthers": "Couper le micro de tous les autres",
         "flip": "Balancer",
+        "grantModerator": "Nommer modérateur",
         "kick": "Exclure",
         "moderator": "Modérateur",
         "mute": "Un participant a coupé son micro",

lang/main-ja.json

@@ -325,7 +325,7 @@
         "keyboardShortcuts": "キーボードショートカット",
         "localRecording": "ローカル録画コントロールの表示／非表示",
         "mute": "マイクの消音 ( ミュート )",
-        "pushToTalk": "話すために押す",
+        "pushToTalk": "プッシュ・トゥ・トーク",
         "raiseHand": "手を上げる/下げる",
         "showSpeakerStats": "演説者のデータを表示",
         "toggleChat": "チャットを表示/非表示",
@@ -566,7 +566,7 @@
             "shortcuts": "ショートカットに切り替える",
             "show": "",
             "speakerStats": "スピーカー統計に切り替える",
-            "tileView": "",
+            "tileView": "タイルビュー",
             "toggleCamera": "カメラを切り替える",
             "videomute": "ミュートビデオに切り替える",
             "videoblur": ""
@@ -582,9 +582,9 @@
         "documentClose": "共有ドキュメントを閉じる",
         "documentOpen": "共有ドキュメントを開く",
         "enterFullScreen": "フルスクリーン表示",
-        "enterTileView": "タイトルビューを開始",
+        "enterTileView": "タイルビューを開始",
         "exitFullScreen": "フルスクリーンを終了",
-        "exitTileView": "タイトルビューを終了",
+        "exitTileView": "タイルビューを終了",
         "feedback": "フィードバックを残す",
         "hangup": "退出",
         "invite": "メンバーを招待する",
@@ -609,7 +609,7 @@
         "stopSubtitles": "字幕停止",
         "stopSharedVideo": "YouTube動画を停止する",
         "talkWhileMutedPopup": "話そうとしていますか？ あなたはミュートされています。",
-        "tileViewToggle": "",
+        "tileViewToggle": "タイルビューを切り替え",
         "toggleCamera": "カメラを切り替える",
         "videomute": "カメラの開始 / 停止",
         "startvideoblur": "",

lang/main-ko.json

@@ -1,60 +1,86 @@
 {
     "addPeople": {
         "add": "초대",
-        "countryNotSupported": "아직 해당 지역을 지원하지 않습니다",
+        "addContacts": "연락처로 초대하세요",
+        "copyInvite": "호의 초대 복사",
+        "copyLink": "회의 링크 복사",
+        "copyStream": "라이브 스트리밍 링크 복사",
+        "countryNotSupported": "아직 해당 지역을 지원하지 않습니다.",
         "countryReminder": "미국 이외의 지역으로 전화하시겠습니까? 국가 번호로 시작해야합니다!",
-        "disabled": "사람들을 초대 할 수 없습니다",
-        "failedToAdd": "",
-        "footerText": "",
+        "defaultEmail": "기본 이메일",
+        "disabled": "사람들을 초대 할 수 없습니다.",
+        "failedToAdd": "참가자를 추가하지 못했습니다.",
+        "footerText": "전화 걸기가 비활성화되었습니다.",
+        "googleEmail": "Google 이메일",
+        "inviteMoreHeader": "회의에 혼자 참여하고 있습니다.",
+        "inviteMoreMailSubject": "{{appName}} 회의에 참여하세요",
+        "inviteMorePrompt": "더 많은 사람을 초대하세요",
+        "linkCopied": "링크가 클립보드에 복사되었습니다.",
         "loading": "사람 및 전화번호 검색",
         "loadingNumber": "전화번호 확인 중",
         "loadingPeople": "초대할 사람 찾기",
         "noResults": "일치하는 검색 결과 없음",
         "noValidNumbers": "전화 번호를 입력하십시오.",
+        "outlookEmail": "Outlook 이메일",
         "searchNumbers": "전화번호 추가",
         "searchPeople": "인명 검색",
         "searchPeopleAndNumbers": "인명 검색 또는 전화번호 추가",
+        "shareInvite": "회의 초대 공유",
+        "shareLink": "다른 사람을 초대하려면 회의 링크를 공유하세요.",
+        "shareStream": "라이브 스트리밍 링크 공유",
         "telephone": "전화: {{number}}",
-        "title": "이 회의에 사람들을 초대하십시오"
+        "title": "이 회의에 사람들을 초대하십시오",
+        "yahooEmail": "Yahoo 이메일"
     },
     "audioDevices": {
         "bluetooth": "블루투스",
         "headphones": "헤드폰",
         "phone": "폰",
-        "speaker": "스피커"
+        "speaker": "스피커",
+        "none": "사용 가능한 오디오 장치가 없습니다."
     },
     "audioOnly": {
         "audioOnly": "음성 전용"
     },
     "calendarSync": {
-        "addMeetingURL": "",
-        "confirmAddLink": "",
+        "addMeetingURL": "회의 링크 추가",
+        "confirmAddLink": "이 이벤트에 Jitsi 링크를 추가 하시겠습니까?",
         "error": {
-            "appConfiguration": "",
-            "generic": "",
-            "notSignedIn": ""
+            "appConfiguration": "캘린더가 제대로 구성되지 않았습니다.",
+            "generic": "오류가 발생했습니다. 캘린더 설정을 확인하거나 캘린더를 새로 고침 해보세요.",
+            "notSignedIn": "캘린더 이벤트를 보기 위해 인증하는 동안 오류가 발생했습니다. 캘린더 설정을 확인하고 다시 로그인하십시오."
         },
-        "join": "",
-        "joinTooltip": "",
+        "join": "참여",
+        "joinTooltip": "회의에 참여하세요",
         "nextMeeting": "다음 회의",
-        "noEvents": "",
-        "ongoingMeeting": "",
+        "noEvents": "예정된 예정된 이벤트가 없습니다.",
+        "ongoingMeeting": "진행중인 회의",
         "permissionButton": "설정 열기",
         "permissionMessage": "앱에 회의를 나열하려면 캘린더 권한이 필요합니다",
-        "refresh": "",
-        "today": ""
+        "refresh": "달력 새로고침",
+        "today": "오늘"
     },
     "chat": {
-        "error": "",
-        "messagebox": "",
+        "error": "오류 : 메시지가 전송되지 않았습니다. 이유 : {{error}}",
+        "fieldPlaceHolder": "메세지를 여기에 입력하세요",
+        "messagebox": "메시지 입력",
+        "messageTo": "{{recipient}}에게 보내는 비공개 메시지",
+        "noMessagesMessage": "아직 회의에 메시지가 없습니다. 여기서 대화를 시작하세요!",
         "nickname": {
             "popover": "닉네임을 선택하세요",
-            "title": ""
+            "title": "채팅에서 사용할 닉네임을 입력하세요"
         },
-        "title": ""
+        "privateNotice": "{{recipient}}에게 보내는 비공개 메시지",
+        "title": "채팅",
+        "you": "당신"
+    },
+    "chromeExtensionBanner": {
+        "installExtensionText": "Google 캘린더 및 Office 365 확장 프로그램을 설치합니다.",
+        "buttonText": "Chrome 확장 프로그램을 설치합니다.",
+        "dontShowAgain": "다시 보지 않기"
     },
     "connectingOverlay": {
-        "joiningRoom": ""
+        "joiningRoom": "회의에 연결 중 ..."
     },
     "connection": {
         "ATTACHED": "첨부",
@@ -66,7 +92,10 @@
         "DISCONNECTED": "연결 끊김",
         "DISCONNECTING": "연결 종료 중",
         "ERROR": "에러",
-        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결 중..."
+        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결 중...",
+        "GET_SESSION_ID_ERROR": "세션 ID 가져 오기 오류 : {{code}}",
+        "GOT_SESSION_ID": "세션 ID를 가져 오는 중 ... 완료",
+        "LOW_BANDWIDTH": "대역폭을 절약하기 위해 {{displayName}}의 동영상이 중지되었습니다."
     },
     "connectionindicator": {
         "address": "주소:",
@@ -95,15 +124,18 @@
         "turn": " (turn)"
     },
     "dateUtils": {
-        "earlier": "",
-        "today": "",
-        "yesterday": ""
+        "earlier": "일찍이",
+        "today": "오늘",
+        "yesterday": "어제"
     },
     "deepLinking": {
-        "appNotInstalled": "중계 서비스에 참여하려면 모바일 앱 설치가 필요합니다",
+        "appNotInstalled": "회의에 참여하려면 모바일 앱 설치가 필요합니다",
         "description": "{{app}} 데스크톱 앱에서 회의를 시작했습니다. {{app}} 웹 응용 프로그램에서 다시 시도하거나 실행하십시오.",
         "descriptionWithoutWeb": "",
         "downloadApp": "앱 다운로드",
+        "ifDoNotHaveApp": "앱이 설치되지 않은 경우:",
+        "ifHaveApp": "앱이 설치되어 있는 경우:",
+        "joinInApp": "앱을 사용하여 회의에 참여하세요.",
         "launchWebButton": "웹에서 실행",
         "openApp": "방으로 이동하기",
         "title": "{{app}}에서 회의 시작…",
@@ -126,8 +158,9 @@
         "accessibilityLabel": {
             "liveStreaming": "실시간 스트리밍:"
         },
+        "add": "추가",
         "allow": "허락",
-        "alreadySharedVideoMsg": "",
+        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오 만 허용합니다.",
         "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오 만 허용됩니다",
         "applicationWindow": "응용 프로그램 창",
         "Back": "뒤로가기",
@@ -145,64 +178,64 @@
         "conferenceReloadMsg": "문제를 해결하려고 노력하고 있습니다. {{seconds}} 초 안에 다시 연결중입니다.",
         "conferenceReloadTitle": "불행하게도 문제가 발생했습니다",
         "confirm": "확인",
-        "confirmNo": "",
-        "confirmYes": "",
+        "confirmNo": "아니요",
+        "confirmYes": "예",
         "connectError": "죄송합니다. 문제가 발생하여 회의에 연결할 수 없습니다",
         "connectErrorWithMsg": "죄송합니다. 뭔가 잘못되어 회의에 연결할 수 없습니다: {{msg}}",
         "connecting": "연결 중",
         "contactSupport": "지원 연락처",
         "copy": "복사",
         "dismiss": "",
-        "displayNameRequired": "",
+        "displayNameRequired": "당신의 이름은 무엇입니까?",
         "done": "완료",
-        "enterDisplayName": "",
+        "enterDisplayName": "당신의 이름을 입력해주세요.",
         "error": "에러",
         "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야합니다",
         "externalInstallationTitle": "확장 프로그램이 필요합니다",
         "goToStore": "웹 스토어로 이동",
         "gracefulShutdown": "서비스는 현재 유지 관리를 위해 중단되었습니다. 나중에 다시 시도 해주십시오.",
         "IamHost": "내가 호스트",
-        "incorrectRoomLockPassword": "",
+        "incorrectRoomLockPassword": "잘못된 비밀번호",
         "incorrectPassword": "잘못된 사용자 이름 또는 비밀번호",
         "inlineInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야합니다",
         "inlineInstallExtension": "지금 설치",
         "internalError": "죄송합니다. 뭔가 잘못 됐습니다. 다음 오류가 발생했습니다: {{error}}",
         "internalErrorTitle": "내부 에러",
-        "kickMessage": "",
-        "kickParticipantButton": "",
-        "kickParticipantDialog": "",
-        "kickParticipantTitle": "",
-        "kickTitle": "",
+        "kickMessage": "자세한 내용은 {{participantDisplayName}}에 문의하세요.",
+        "kickParticipantButton": "추방",
+        "kickParticipantDialog": "이 참가자를 정말 추방 하시겠습니까?",
+        "kickParticipantTitle": "이 참가자를 추방 하시겠습니까?",
+        "kickTitle": "{{participantDisplayName}} 님이 회의에서 퇴장했습니다.",
         "liveStreaming": "실시간 스트리밍",
-        "liveStreamingDisabledForGuestTooltip": "",
-        "liveStreamingDisabledTooltip": "",
+        "liveStreamingDisabledForGuestTooltip": "게스트는 라이브 스트리밍을 시작할 수 없습니다.",
+        "liveStreamingDisabledTooltip": "라이브 스트림 시작이 비활성화되었습니다.",
         "lockMessage": "회의를 비공개하지 못했습니다",
-        "lockRoom": "",
+        "lockRoom": "회의 추가 $t(lockRoomPasswordUppercase)",
         "lockTitle": "비공개 실패",
         "logoutQuestion": "로그 아웃하고 컨퍼런스를 중지하시겠습니까?",
         "logoutTitle": "로그아웃",
-        "maxUsersLimitReached": "",
-        "maxUsersLimitReachedTitle": "",
+        "maxUsersLimitReached": "회의의 최대 참가자 수에 도달했습니다. 회의 소유자에게 연락하거나 나중에 다시 시도하십시오!",
+        "maxUsersLimitReachedTitle": "최대 참가자 수에 도달했습니다.",
         "micConstraintFailedError": "마이크가 필요한 제약 조건 중 일부를 충족하지 못합니다",
         "micNotFoundError": "마이크를 찾을 수 없습니다",
-        "micNotSendingData": "",
-        "micNotSendingDataTitle": "",
+        "micNotSendingData": "컴퓨터의 설정으로 이동하여 마이크 음소거를 해제하고 레벨을 조정하세요.",
+        "micNotSendingDataTitle": "시스템 설정에 의해 마이크가 음소거되었습니다.",
         "micPermissionDeniedError": "마이크를 사용할 수있는 권한을 부여하지 않았습니다. 회의에 계속 참여할 수는 있지만 다른 사람들은 듣지 않습니다. 검색 주소창의 카메라 버튼을 사용하여 문제를 해결하십시오.",
         "micUnknownError": "알 수 없는 이유로 마이크를 사용할 수 없습니다",
         "muteParticipantBody": "당신이 다른 사람들의 음소거를 해제 할 수는 없지만 언제든지 다른 사람들은 스스로 음소거를 해제할 수 있습니다.",
         "muteParticipantButton": "음소거",
         "muteParticipantDialog": "",
-        "muteParticipantTitle": "",
+        "muteParticipantTitle": "이 참가자를 음소거 하시겠습니까?",
         "Ok": "확인",
-        "passwordLabel": "",
-        "passwordNotSupported": "미팅 비밀번호 설정은 지원되지 않습니다",
-        "passwordNotSupportedTitle": "",
-        "passwordRequired": "",
+        "passwordLabel": "잠긴 회의 입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
+        "passwordNotSupported": "회의 비밀번호 설정은 지원되지 않습니다",
+        "passwordNotSupportedTitle": "비밀번호 미지원",
+        "passwordRequired": "비밀번호 필수",
         "popupError": "브라우저가이 사이트의 팝업 창을 차단하고 있습니다. 브라우저의 보안 설정에서 팝업을 활성화하고 다시 시도하십시오.",
         "popupErrorTitle": "팝업 차단됨",
         "recording": "레코딩",
-        "recordingDisabledForGuestTooltip": "",
-        "recordingDisabledTooltip": "",
+        "recordingDisabledForGuestTooltip": "게스트는 녹음을 시작할 수 없습니다.",
+        "recordingDisabledTooltip": "녹화이 비활성화 되었습니다.",
         "rejoinNow": "지금 재가입",
         "remoteControlAllowedMessage": "{{user}}이(가) 원격 제어 요청을 수락했습니다",
         "remoteControlDeniedMessage": "{{user}}이(가) 원격 제어 요청을 거부했습니다",
@@ -212,25 +245,30 @@
         "remoteControlStopMessage": "원격 제어 세션이 종료되었습니다",
         "remoteControlTitle": "원격 데스크탑 컨트롤",
         "Remove": "제거",
-        "removePassword": "",
+        "removePassword": "비밀번호 제거",
         "removeSharedVideoMsg": "공유한 동영상을 삭제하시겠습니까?",
         "removeSharedVideoTitle": "공유된 동영상 삭제",
         "reservationError": "예약 시스템 오류",
         "reservationErrorMsg": "오류 코드: {{code}}, 메시지: {{msg}}",
         "retry": "재시도",
+        "screenSharingAudio": "오디오 공유",
         "screenSharingFailedToInstall": "죄송합니다. 화면 공유 확장 프로그램을 설치하지 못했습니다.",
         "screenSharingFailedToInstallTitle": "화면 공유 확장 프로그램을 설치하지 못했습니다",
         "screenSharingFirefoxPermissionDeniedError": "화면을 공유하는 동안 문제가 발생했습니다. 그렇게 할 수 있는 권한을 부여했는지 확인하십시오.",
         "screenSharingFirefoxPermissionDeniedTitle": "죄송합니다. 화면 공유를 시작할 수 없었습니다!",
         "screenSharingPermissionDeniedError": "죄송합니다. 화면 공유 확장 권한으로 문제가 발생했습니다. 다시 로드하고 재시도하십시오.",
+        "sendPrivateMessage": "최근에 비공개 메시지를 받았습니다. 비공개로 답장을 보내시겠습니까, 아니면 그룹에 메시지를 보내시겠습니까?",
+        "sendPrivateMessageCancel": "그룹에 보내기",
+        "sendPrivateMessageOk": "비공개로 보내기",
+        "sendPrivateMessageTitle": "비공개로 보낼까요?",
         "serviceUnavailable": "서비스를 사용할 수 없음",
         "sessTerminated": "통화 종료",
         "Share": "공유",
         "shareVideoLinkError": "올바른 YouTube 링크를 제공하십시오",
         "shareVideoTitle": "비디오 공유",
         "shareYourScreen": "화면공유",
-        "shareYourScreenDisabled": "",
-        "shareYourScreenDisabledForGuest": "",
+        "shareYourScreenDisabled": "화면 공유가 비활성화 되었습니다.",
+        "shareYourScreenDisabledForGuest": "게스트는 화면을 공유 할 수 없습니다.",
         "startLiveStreaming": "라이브 스트리밍 시작",
         "startRecording": "레코딩 시작",
         "startRemoteControlErrorMessage": "원격 제어 세션을 시작하는 동안 오류가 발생했습니다",
@@ -245,17 +283,20 @@
         "tokenAuthFailed": "죄송합니다. 통화에 참여하실 수 없습니다.",
         "tokenAuthFailedTitle": "인증 실패",
         "transcribing": "",
-        "unlockRoom": "",
+        "unlockRoom": "회의 비밀번호 제거",
         "userPassword": "사용자 비밀번호",
-        "WaitForHostMsg": "",
-        "WaitForHostMsgWOk": "",
+        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트 인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트 인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
         "WaitingForHost": "호스트를 기다리는 중입니다…",
-        "Yes": "",
+        "Yes": "예",
         "yourEntireScreen": "전체 화면"
     },
     "dialOut": {
         "statusMessage": "지금은 {{status}}입니다"
     },
+    "documentSharing": {
+        "title": "문서 공유"
+    },
     "feedback": {
         "average": "보통",
         "bad": "나쁨",
@@ -266,49 +307,49 @@
         "veryGood": "매우 좋음"
     },
     "incomingCall": {
-        "answer": "",
-        "audioCallTitle": "",
-        "decline": "",
-        "productLabel": "",
-        "videoCallTitle": ""
+        "answer": "응답",
+        "audioCallTitle": "수신 전화",
+        "decline": "거절",
+        "productLabel": "Jitsi Meet에서",
+        "videoCallTitle": "수신 화상 전화"
     },
     "info": {
-        "accessibilityLabel": "",
-        "addPassword": "",
-        "cancelPassword": "",
+        "accessibilityLabel": "정보 보기",
+        "addPassword": "$t(lockRoomPassword) 추가",
+        "cancelPassword": "$t(lockRoomPassword) 취소",
         "conferenceURL": "링크:",
         "country": "지역",
-        "dialANumber": "",
+        "dialANumber": "회의에 참여하려면이 번호 중 하나를 누른 다음 PIN을 입력하십시오.",
         "dialInConferenceID": "PIN:",
         "dialInNotSupported": "죄송합니다. 현재 전화를 걸 수 없습니다.",
         "dialInNumber": "Dial-in:",
-        "dialInSummaryError": "",
+        "dialInSummaryError": "지금 전화 접속 정보를 가져 오는 중에 오류가 발생했습니다. 나중에 다시 시도하십시오.",
         "dialInTollFree": "",
         "genericError": "일반적인 오류가 발생했습니다",
         "inviteLiveStream": "이 회의의 실시간 스트림을 보려면이 링크를 클릭하십시오: {{url}}",
         "invitePhone": "",
         "invitePhoneAlternatives": "",
-        "inviteURLFirstPartGeneral": "",
-        "inviteURLFirstPartPersonal": "",
-        "inviteURLSecondPart": "",
+        "inviteURLFirstPartGeneral": "회의에 초대되었습니다.",
+        "inviteURLFirstPartPersonal": "{{name}}이 회의에 초대하였습니다.\n",
+        "inviteURLSecondPart": "\n회의에 참여하기:\n{{url}}\n",
         "liveStreamURL": "실시간 스트리밍:",
         "moreNumbers": "더 많은 번호",
         "noNumbers": "전화 접속 번호 없음",
         "noPassword": "없음",
         "noRoom": "전화 접속이 가능한 방을 지정하지 않았습니다",
         "numbers": "전화 접속 번호",
-        "password": "",
+        "password": "비밀번호",
         "title": "공유",
         "tooltip": "링크 공유 및 회의에 대한 정보",
-        "label": ""
+        "label": "회의 정보"
     },
     "inviteDialog": {
-        "alertText": "",
+        "alertText": "일부 참가자를 초대하지 못했습니다.",
         "header": "초대",
-        "searchCallOnlyPlaceholder": "",
-        "searchPeopleOnlyPlaceholder": "",
-        "searchPlaceholder": "",
-        "send": ""
+        "searchCallOnlyPlaceholder": "전화 번호 입력",
+        "searchPeopleOnlyPlaceholder": "참가자 검색",
+        "searchPlaceholder": "참가자 또는 전화 번호",
+        "send": "전송"
     },
     "inlineDialogFailure": {
         "msg": "약간의 문제가 있습니다",
@@ -321,7 +362,7 @@
         "focusRemote": "다른 발신자의 동영상에 포커스",
         "fullScreen": "전체화면 표시 또는 종료",
         "keyboardShortcuts": "키보드 단축키",
-        "localRecording": "",
+        "localRecording": "로컬 녹음 컨트롤 표시 또는 숨기기",
         "mute": "마이크 음소거 또는 음소거 해제",
         "pushToTalk": "대화 요청",
         "raiseHand": "말하기 요청/해제",
@@ -341,24 +382,26 @@
         "enterStreamKey": "YouTube 실시간 스트리밍 키를 입력하십시오",
         "error": "실시간 스트리밍에 실패했습니다. 다시 시도하십시오.",
         "errorAPI": "YouTube 방송에 액세스하는 중에 오류가 발생했습니다. 다시 로그인하십시오.",
-        "errorLiveStreamNotEnabled": "",
-        "expandedOff": "",
-        "expandedOn": "",
-        "expandedPending": "",
+        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화 된 계정으로 로그인하십시오.",
+        "expandedOff": "라이브 스트리밍이 중지되었습니다",
+        "expandedOn": "현재 회의가 YouTube로 스트리밍되고 있습니다.",
+        "expandedPending": "라이브 스트리밍이 시작됩니다 ...",
         "failedToStart": "실시간 스트리밍 시작 실패",
-        "getStreamKeyManually": "",
-        "invalidStreamKey": "",
+        "getStreamKeyManually": "실시간 스트림을 가져올 수 없습니다. YouTube에서 실시간 스트림 키를 받아보세요.",
+        "invalidStreamKey": "라이브 스트림 키가 잘못되었을 수 있습니다.",
         "off": "실시간 스트리밍이 중지됨",
         "on": "실시간 스트리밍",
         "pending": "실시간 스트리밍 시작…",
         "serviceName": "실시간 스트리밍 서비스",
-        "signedInAs": "",
+        "signedInAs": "현재 다음 계정으로 로그인되어 있습니다.",
         "signIn": "Google로 로그인",
         "signInCTA": "YouTube에서 로그인하거나 실시간 스트리밍 키를 입력하십시오",
-        "signOut": "",
+        "signOut": "로그아웃",
         "start": "실시간 스트리밍 시작",
         "streamIdHelp": "도움말?",
-        "unavailableTitle": "실시간 스트리밍을 사용할 수 없음"
+        "unavailableTitle": "실시간 스트리밍을 사용할 수 없음",
+        "youtubeTerms": "YouTube 서비스 약관",
+        "googlePrivacyPolicy": "Google 개인 정보 보호 정책"
     },
     "localRecording": {
         "clientState": {
@@ -381,50 +424,50 @@
             "notModerator": ""
         },
         "moderator": "",
-        "no": "",
+        "no": "아니요",
         "participant": "",
         "participantStats": "",
         "sessionToken": "",
         "start": "레코딩 시작",
         "stop": "레코딩 종료",
-        "yes": ""
+        "yes": "예"
     },
-    "lockRoomPassword": "패스워드",
-    "lockRoomPasswordUppercase": "패스워드",
-    "me": "Me",
+    "lockRoomPassword": "비밀번호",
+    "lockRoomPasswordUppercase": "비밀번호",
+    "me": "나",
     "notify": {
-        "connectedOneMember": "",
-        "connectedThreePlusMembers": "",
-        "connectedTwoMembers": "",
+        "connectedOneMember": "{{name}}님이 회의에 참여했습니다.",
+        "connectedThreePlusMembers": "{{name}}님 외 {{count}}명이 회의에 참여했습니다.",
+        "connectedTwoMembers": "{{first}}님과 {{second}}님이 회의에 참여했습니다.",
         "disconnected": "연결이 끊김",
         "focus": "컨퍼런스 포커스",
         "focusFail": "{{component}}을 사용할 수 없음 - {{ms}} 초 후에 다시 시도하십시오",
         "grantedTo": "{{to}}에게 방장 권한이 부여되었습니다!",
-        "invitedOneMember": "",
-        "invitedThreePlusMembers": "",
-        "invitedTwoMembers": "",
-        "kickParticipant": "",
-        "me": "",
+        "invitedOneMember": "{{name}}님이 초대되었습니다.",
+        "invitedThreePlusMembers": "{{name}}님 외 {{count}}명이 초대되었습니다.",
+        "invitedTwoMembers": "{{first}}님과 {{second}}님이 초대되었습니다.",
+        "kickParticipant": "{{kicker}}님이 {{kicked}}님을 추방했습니다.",
+        "me": "나",
         "moderator": "방장 권한이 부여되었습니다!",
         "muted": "음소거로 대화가 시작되었습니다",
         "mutedTitle": "음소거 상태입니다!",
-        "mutedRemotelyTitle": "",
-        "mutedRemotelyDescription": "",
-        "passwordRemovedRemotely": "",
-        "passwordSetRemotely": "",
-        "raisedHand": "",
+        "mutedRemotelyTitle": "{{participantDisplayName}}에 의해 음소거되었습니다!",
+        "mutedRemotelyDescription": "말할 준비가되면 언제든지 음소거를 해제 할 수 있습니다.",
+        "passwordRemovedRemotely": "다른 참가자가 $t(lockRoomPasswordUppercase)를 제거했습니다.",
+        "passwordSetRemotely": "다른 참가자가 $t(lockRoomPasswordUppercase)를 설정했습니다.",
+        "raisedHand": "{{name}}님이 말하고 싶어합니다.",
         "somebody": "누군가",
-        "startSilentTitle": "",
-        "startSilentDescription": "",
+        "startSilentTitle": "오디오 출력없이 참여했습니다!",
+        "startSilentDescription": "오디오를 사용하려면 회의에 다시 참여하세요.",
         "suboptimalExperienceDescription": "{{appName}}에 대한 귀하의 경험이 없으시다면 <a href='{{recommendedBrowserPageLink}}' target='_blank'>완벽하게 지원되는 브라우저</a> 중 하나를 사용해보십시오.",
         "suboptimalExperienceTitle": "브라우저 경고",
-        "unmute": "",
-        "newDeviceCameraTitle": "",
-        "newDeviceAudioTitle": "",
-        "newDeviceAction": ""
+        "unmute": "음소거 해제",
+        "newDeviceCameraTitle": "새 카메라 감지",
+        "newDeviceAudioTitle": "새 오디오 장치 감지",
+        "newDeviceAction": "사용"
     },
-    "passwordSetRemotely": "",
-    "passwordDigitsOnly": "",
+    "passwordSetRemotely": "다른 참가자가 설정",
+    "passwordDigitsOnly": "최대 {{number}} 자리",
     "poweredby": "powered by",
     "presenceStatus": {
         "busy": "바쁨",
@@ -447,27 +490,27 @@
         "title": "프로필"
     },
     "recording": {
-        "authDropboxText": "",
-        "availableSpace": "",
+        "authDropboxText": "Dropbox에 업로드",
+        "availableSpace": "사용 가능한 공간 : {{spaceLeft}}MB (약 {{duration}}분 녹화)",
         "beta": "베타",
         "busy": "레코딩 자원을 확보하고 있습니다. 몇 분 후에 다시 시도하십시오.",
         "busyTitle": "모든 레코더가 현재 사용 중입니다",
         "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
         "expandedOff": "레코딩이 중지됨",
-        "expandedOn": "",
-        "expandedPending": "",
+        "expandedOn": "회의가 현재 녹화 중입니다.",
+        "expandedPending": "녹화가 시작됩니다 ...",
         "failedToStart": "레코딩을 시작하지 못했습니다",
-        "fileSharingdescription": "",
+        "fileSharingdescription": "회의 참가자와 녹음 공유",
         "live": "라이브",
-        "loggedIn": "",
+        "loggedIn": "{{userName}}으로 로그인했습니다.",
         "off": "레코딩이 중지됨",
         "on": "레코딩",
         "pending": "참석할 멤버를 기다리는 중입니다…",
-        "rec": "REC",
-        "serviceDescription": "",
+        "rec": "녹음",
+        "serviceDescription": "녹음은 녹음 서비스에 의해 저장됩니다.",
         "serviceName": "레코딩 서비스",
-        "signIn": "",
-        "signOut": "",
+        "signIn": "로그인",
+        "signOut": "로그아웃",
         "unavailable": "죄송합니다. {{serviceName}}은 현재 사용할 수 없습니다. 저희는 문제를 해결하기 위해 노력하고 있습니다. 나중에 다시 시도 해주십시오.",
         "unavailableTitle": "레코딩을 사용할 수 없습니다"
     },
@@ -476,18 +519,18 @@
     },
     "settings": {
         "calendar": {
-            "about": "",
+            "about": "{{appName}} 캘린더 통합은 예정된 일정을 읽을 수 있도록 캘린더에 안전하게 액세스하는 데 사용됩니다.",
             "disconnect": "연결 끊김",
-            "microsoftSignIn": "",
-            "signedIn": "",
-            "title": ""
+            "microsoftSignIn": "Microsoft로 로그인",
+            "signedIn": "현재 {{email}}의 캘린더 일정에 액세스하고 있습니다. 캘린더 이벤트 액세스를 중지하려면 아래 연결 해제 버튼을 클릭하세요.",
+            "title": "캘린더"
         },
-        "devices": "",
+        "devices": "장치",
         "followMe": "모두 나와 같은 설정 상태로",
-        "language": "",
-        "loggedIn": "",
-        "moderator": "",
-        "more": "",
+        "language": "언어",
+        "loggedIn": "{{name}}으로 로그인",
+        "moderator": "마이크",
+        "more": "더보기",
         "name": "이름",
         "noDevice": "없음",
         "selectAudioOutput": "오디오 출력",
@@ -495,26 +538,28 @@
         "selectMic": "오디오",
         "startAudioMuted": "모두가 음소거를 시작합니다",
         "startVideoMuted": "모두가 비디오 비활성화로 시작합니다",
-        "title": "세티"
+        "title": "설정"
     },
     "settingsView": {
+        "advanced": "고급",
         "alertOk": "확인",
+        "alertCancel": "취소",
         "alertTitle": "경고",
         "alertURLText": "입력된 서버 URL이 잘못되었습니다",
-        "buildInfoSection": "",
+        "buildInfoSection": "빌드 정보",
         "conferenceSection": "회의",
         "displayName": "유저이름",
         "email": "이메일",
-        "header": "세티",
+        "header": "설정",
         "profileSection": "프로필",
         "serverURL": "서버 URL",
         "startWithAudioMuted": "오디오 음소거 상태로 시작",
         "startWithVideoMuted": "비디오 비활성화 상태로 시작",
-        "version": ""
+        "version": "버전"
     },
     "share": {
         "dialInfoText": "",
-        "mainText": ""
+        "mainText": "회의에 참여하려면 다음 링크를 클릭하십시오.\n{{roomUrl}}"
     },
     "speaker": "스피커",
     "speakerStats": {
@@ -561,11 +606,11 @@
             "sharedvideo": "",
             "shareRoom": "",
             "shareYourScreen": "",
-            "shortcuts": "단축키 토그",
+            "shortcuts": "단축키 전환",
             "show": "",
             "speakerStats": "",
             "tileView": "",
-            "toggleCamera": "카메라 토ㄱ",
+            "toggleCamera": "카메라 전환",
             "videomute": "",
             "videoblur": ""
         },
@@ -575,54 +620,58 @@
         "audioRoute": "음성 장비 선택하기",
         "authenticate": "인증 중",
         "callQuality": "품질 설정하기",
-        "chat": "",
-        "closeChat": "",
-        "documentClose": "",
-        "documentOpen": "",
+        "chat": "대화 열기/닫기",
+        "closeChat": "대화 닫기",
+        "documentClose": "문서 공유 닫기",
+        "documentOpen": "문서 공유 열기",
+        "download": "앱 다운로드",
         "enterFullScreen": "전체화면 보기",
-        "enterTileView": "",
+        "enterTileView": "타일보기 시작",
         "exitFullScreen": "전체화면 취소",
-        "exitTileView": "",
+        "exitTileView": "타일보기 종료",
         "feedback": "피드백 남기기",
-        "hangup": "",
-        "invite": "",
-        "login": "",
+        "hangup": "떠나기",
+        "invite": "초대",
+        "login": "로그인",
         "logout": "로그아웃",
-        "lowerYourHand": "",
+        "lowerYourHand": "손을 내려주세요",
         "moreActions": "추가 액션",
-        "mute": "마이크",
-        "openChat": "",
+        "moreOptions": "옵션 더보기",
+        "mute": "음소거 설정/해제",
+        "muteEveryone": "모두 음소거",
+        "openChat": "대화 열기",
         "pip": "",
-        "profile": "",
+        "privateMessage": "비공개 메시지 보내기",
+        "profile": "프로필 수정",
         "raiseHand": "말하기 요청/해제",
-        "raiseYourHand": "",
-        "Settings": "세티",
-        "sharedvideo": "",
-        "shareRoom": "",
-        "shortcuts": "",
+        "raiseYourHand": "손 들어주세요",
+        "Settings": "설정",
+        "sharedvideo": "YouTube 비디오 공유",
+        "shareRoom": "초대하기",
+        "shortcuts": "단축키보기",
         "speakerStats": "접속자 통계",
-        "startScreenSharing": "",
-        "startSubtitles": "",
-        "stopScreenSharing": "",
-        "stopSubtitles": "",
-        "stopSharedVideo": "",
-        "talkWhileMutedPopup": "",
-        "tileViewToggle": "",
-        "toggleCamera": "카메라 토ㄱ",
-        "videomute": "",
-        "startvideoblur": "",
-        "stopvideoblur": ""
+        "startScreenSharing": "화면 공유 시작",
+        "startSubtitles": "자막 시작",
+        "stopScreenSharing": "화면 공유 중지",
+        "stopSubtitles": "자막 중지",
+        "stopSharedVideo": "UouTube 비디오 공유 중지",
+        "talkWhileMutedPopup": "음소거 상태입니다.",
+        "tileViewToggle": "타일뷰 전환",
+        "toggleCamera": "카메라 전환",
+        "videomute": "카메라 시작/중지",
+        "startvideoblur": "내 배경을 흐리게",
+        "stopvideoblur": "배경 흐림 비활성화"
     },
     "transcribing": {
-        "ccButtonTooltip": "",
+        "ccButtonTooltip": "자막 시작/종료",
         "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
-        "expandedLabel": "",
-        "failedToStart": "",
-        "labelToolTip": "",
-        "off": "",
+        "expandedLabel": "현재 스크립트 작성 중",
+        "failedToStart": "스크립트 작성을 시작하지 못했습니다.",
+        "labelToolTip": "회의가 기록되고 있습니다.",
+        "off": "스크립트 작성이 중지되었습니다.",
         "pending": "참석할 멤버를 기다리는 중입니다…",
-        "start": "",
-        "stop": "",
+        "start": "자막 표시 시작",
+        "stop": "자막 표시 중지",
         "tr": ""
     },
     "userMedia": {
@@ -649,8 +698,8 @@
     },
     "videoStatus": {
         "audioOnly": "오디오 전용",
-        "audioOnlyExpanded": "",
-        "callQuality": "",
+        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유 만 수신합니다.",
+        "callQuality": "비디오 품질",
         "hd": "HD",
         "highDefinition": "고해상도",
         "labelTooiltipNoVideo": "비디오 없음",
@@ -666,12 +715,12 @@
         "domute": "음소거",
         "flip": "플립",
         "kick": "내보내기",
-        "moderator": "",
-        "mute": "",
+        "moderator": "중재자",
+        "mute": "참가자 음소거",
         "muted": "음소거됨",
         "remoteControl": "원격 제어",
-        "show": "",
-        "videomute": ""
+        "show": "화면에 표시",
+        "videomute": "참가자가 카메라를 중지했습니다."
     },
     "welcomepage": {
         "accessibilityLabel": {
@@ -683,22 +732,33 @@
             "audio": "음성",
             "video": "비디오"
         },
-        "calendar": "",
-        "connectCalendarButton": "",
-        "connectCalendarText": "",
-        "enterRoomTitle": "",
+        "calendar": "캘린더",
+        "connectCalendarButton": "캘린더를 연결하세요",
+        "connectCalendarText": "{{app}}에서 모든 회의를 보려면 캘린더를 연결하세요. 또한 캘린더에 {{provider}} 회의를 추가하고 클릭 한 번으로 시작하세요.",
+        "enterRoomTitle": "새 회의 시작",
+        "getHelp": "도움 받기",
+        "roomNameAllowedChars": "회의 이름은 이러한 문자를 포함 할 수 없습니다.: ?, &, :, ', \", %, #.",
         "go": "계속",
+        "goSmall": "계속",
         "join": "가입",
-        "info": "",
+        "info": "정보",
         "privacy": "개인정보",
-        "recentList": "",
-        "recentListDelete": "",
-        "recentListEmpty": "",
-        "reducedUIText": "",
+        "recentList": "최근",
+        "recentListDelete": "삭제",
+        "recentListEmpty": "최근 목록이 현재 비어 있습니다. 팀과 채팅하면 여기에서 최근 회의를 모두 찾을 수 있습니다.",
+        "reducedUIText": "{{app}}에 오신 것을 환영합니다!",
         "roomname": "방 이름 입력",
-        "roomnameHint": "",
-        "sendFeedback": "",
+        "roomnameHint": "참여하려는 방의 이름 또는 URL을 입력하십시오. 이름을 정하고 만나는 사람들에게 같은 이름을 입력하도록 알리면됩니다.",
+        "sendFeedback": "피드백 보내기",
         "terms": "이용약관",
-        "title": ""
+        "title": "안전하고 모든 기능을 갖춘 완전 무료 화상 회의"
+    },
+    "lonelyMeetingExperience": {
+        "button": "초대하기",
+        "youAreAlone": "회의에 참여자가 없습니다."
+    },
+    "helpView": {
+        "header": "지원 센터"
     }
 }
+

lang/main-ptBR.json

@@ -269,7 +269,7 @@
         "userPassword": "senha do usuário",
         "WaitForHostMsg": "A conferência <b>{{room}}</b> ainda não começou. Se você é o anfitrião, faça a autenticação. Do contrário, aguarde a chegada do anfitrião.",
         "WaitForHostMsgWOk": "A conferência <b>{{room}}</b> ainda não começou. Se você é o anfitrião, pressione Ok para autenticar. Do contrário, aguarde a chegada do anfitrião.",
-        "WaitingForHost": "Esperando o hospedeiro...",
+        "WaitingForHost": "Esperando o anfitrião...",
         "Yes": "Sim",
         "yourEntireScreen": "Toda sua tela",
         "screenSharingAudio": "Compartilhar áudio",

lang/main-ru.json

@@ -1,28 +1,43 @@
 {
     "addPeople": {
         "add": "Пригласить",
+        "addContacts": "Пригласите других людей",
+        "copyInvite": "Скопировать приглашение на встречу",
+        "copyLink": "Скопировать ссылку на встречу",
+        "copyStream": "Скопировать ссылку на прямую транасляцию",
         "countryNotSupported": "Эта страна пока не поддерживается.",
         "countryReminder": "Вызов не в США? Пожалуйста, убедитесь, что указали код страны!",
+        "defaultEmail": "Ваш адрес электронной почты",
         "disabled": "Поиск не дал результата.",
         "failedToAdd": "Не удалось добавить участников",
         "footerText": "Вызов номера отключен.",
+        "googleEmail": "Электронная почта Google",
+        "inviteMoreHeader": "Сейчас вы одни в этой встрече",
+        "inviteMoreMailSubject": "Присоединиться к встрече {{appName}} ",
+        "inviteMorePrompt": "Пригласить других людей",
+        "linkCopied": "Ссылка скопирована в буфер обмена",
         "loading": "Поиск людей и номеров телефонов",
         "loadingNumber": "Проверка номера телефона",
         "loadingPeople": "Поиск людей для приглашения",
         "noResults": "Поиск не дал результата",
         "noValidNumbers": "Пожалуйста, введите номер телефона",
+        "outlookEmail": "Электронная почта Outlook",
         "searchNumbers": "Добавить номера телефонов",
         "searchPeople": "Поиск людей",
         "searchPeopleAndNumbers": "Поиск людей или добавление их телефонов",
+        "shareInvite": "Поделиться приглашением на встречу",
+        "shareLink": "Поделиться ссылкой на встречу чтобы пригласить других",
+        "shareStream": "Поделиться ссылкой на прямую трансляцию",
         "telephone": "Номер: {{number}}",
-        "title": "Пригласить людей на эту встречу"
+        "title": "Пригласить людей на эту встречу",
+        "yahooEmail": "Электронная почта Yahoo"
     },
     "audioDevices": {
         "bluetooth": "Bluetooth",
         "headphones": "Наушники",
+        "none": "Не обнаружены звуковые устройства",
         "phone": "Телефон",
-        "speaker": "Колонка",
-        "none": "Не обнаружены звуковые устройства"
+        "speaker": "Колонка"
     },
     "audioOnly": {
         "audioOnly": "Только звук"
@@ -48,21 +63,21 @@
     "chat": {
         "error": "Ошибка: Ваше сообщение не было отправлено. Причина: {{error}}",
         "fieldPlaceHolder": "Введите здесь ваше сообщение",
-        "messagebox": "Введите сообщение",
         "messageTo": "Личное сообщение пользователю {{recipient}}",
-        "noMessagesMessage": "В конференции пока нет никаких сообщений. Начните разговор!",
+        "messagebox": "Введите сообщение",
         "nickname": {
             "popover": "Выберите имя",
             "title": "Введите имя для использования чата"
         },
+        "noMessagesMessage": "В конференции пока нет никаких сообщений. Начните разговор!",
         "privateNotice": "Личное сообщение пользователю {{recipient}}",
         "title": "Чат",
         "you": "вы"
     },
     "chromeExtensionBanner": {
-        "installExtensionText": "Установите расширение для интеграции с Google Календарь и Office 365",
         "buttonText": "Установить расширение Chrome",
-        "dontShowAgain": "Не показывай мне это снова"
+        "dontShowAgain": "Не показывай мне это снова",
+        "installExtensionText": "Установите расширение для интеграции с Google Календарь и Office 365"
     },
     "connectingOverlay": {
         "joiningRoom": "Пытаемся присоединиться к вашей конференции..."
@@ -77,10 +92,11 @@
         "DISCONNECTED": "Отключено",
         "DISCONNECTING": "Отключение",
         "ERROR": "Ошибка",
-        "RECONNECTING": "Проблема с сетью. Переподключение...",
+        "FETCH_SESSION_ID": "Получение идентификатора сеанса…",
+        "GET_SESSION_ID_ERROR": "Ошибка получения идентификатора сеанса: {{code}}",
+        "GOT_SESSION_ID": "Получение идентификатора сеанса… Готово",
         "LOW_BANDWIDTH": "Видео для {{displayName}} приостановлено из-за низкой пропускной способности",
-        "GOT_SESSION_ID": "Получение идентификатора сеанса … Готово",
-        "GET_SESSION_ID_ERROR": "Ошибка получения идентификатора сеанса: {{code}}"
+        "RECONNECTING": "Проблема с сетью. Переподключение..."
     },
     "connectionindicator": {
         "address": "Адрес:",
@@ -115,8 +131,7 @@
         "status": "Связь:",
         "transport_0": "Метод отправки:",
         "transport_1": "Метода отправки:",
-        "transport_2": "Методов отправки:",
-        "e2e_rtt": ""
+        "transport_2": "Методов отправки:"
     },
     "dateUtils": {
         "earlier": "Ранее",
@@ -128,6 +143,9 @@
         "description": "Ничего не случилось? Мы попытались запустить вашу встречу в настольном приложении {{app}}. Повторите попытку или запустите ее в веб-приложении {{app}}.",
         "descriptionWithoutWeb": "Ничего не произошло? Мы попытались запустить вашу конференцию в настольном приложении {{app}}",
         "downloadApp": "Скачать приложение",
+        "ifDoNotHaveApp": "Если у вас еще нет приложения:",
+        "ifHaveApp": "Если вы уже установили приложение:",
+        "joinInApp": "Подключиться к этой встрече используя приложение",
         "launchWebButton": "Запустить в браузере",
         "openApp": "Перейти к приложению",
         "title": "Запуск вашей встречи в {{app}}...",
@@ -147,15 +165,29 @@
         "selectADevice": "Выбор устройства",
         "testAudio": "Протестировать звук"
     },
+    "dialOut": {
+        "statusMessage": "сейчас {{status}}"
+    },
     "dialog": {
+        "Back": "Назад",
+        "Cancel": "Отмена",
+        "IamHost": "Я организатор",
+        "Ok": "Ok",
+        "Remove": "Удалить",
+        "Share": "Поделиться",
+        "Submit": "ОК",
+        "WaitForHostMsg": "Конференция <b>{{room}}</b> еще не началась. Если вы организатор, пожалуйста, авторизируйтесь. В противном случае дождитесь организатора.",
+        "WaitForHostMsgWOk": "Конференция <b>{{room}}</b> еще не началась. Если вы организатор, пожалуйста, нажмите Ok для аутентификации. В противном случае, дождитесь организатора.",
+        "WaitingForHost": "Ждем организатора...",
+        "Yes": "Да",
         "accessibilityLabel": {
             "liveStreaming": "Трансляция"
         },
+        "add": "Добавить",
         "allow": "Разрешить",
         "alreadySharedVideoMsg": "Другой участник уже поделился ссылкой на видео. Данная конференция позволяет одновременно делиться только одним видео.",
         "alreadySharedVideoTitle": "Допускается показ только одного видео",
         "applicationWindow": "Окно приложения",
-        "Back": "Назад",
         "cameraConstraintFailedError": "Камера не отвечает определенным требованиям.",
         "cameraNotFoundError": "Камера не обнаружена.",
         "cameraNotSendingData": "Ошибка доступа к камере. Пожалуйста, проверьте, не использует ли камеру какая-нибудь другая программа. Вы можете также выбрать другое устройство из меню настроек или попробовать перезапустить приложение.",
@@ -163,7 +195,6 @@
         "cameraPermissionDeniedError": "Нет доступа к камере. Вы можете участвовать во встрече, но другие не будут вас видеть. Используйте значок камеры в адресной строке браузера, чтобы устранить проблему.",
         "cameraUnknownError": "Неизвестная ошибка использования камеры.",
         "cameraUnsupportedResolutionError": "Ваша камера не поддерживает необходимое разрешение видео.",
-        "Cancel": "Отмена",
         "close": "Закрыть",
         "conferenceDisconnectMsg": "Следует проверить интернет-соединение. Попытка восстановления связи через {{seconds}} с.",
         "conferenceDisconnectTitle": "Вы отключены.",
@@ -176,21 +207,29 @@
         "connectErrorWithMsg": "Ошибка. Невозможно установить связь для вашей встречи: {{msg}}",
         "connecting": "Подключение",
         "contactSupport": "Связь с поддержкой",
+        "copied": "Скопировано",
         "copy": "Копировать",
         "dismiss": "Отклонить",
         "displayNameRequired": "Привет! Как тебя зовут?",
         "done": "Готово",
+        "e2eeDescription": "Сквозное шифрование в настоящее время является ЭКСПЕРИМЕНТАЛЬНЫМ. Имейте в виду, что включение сквозного шифрования эффективно отключит сервисы, предоставляемые на стороне сервера, такие как: запись, потоковое вещание и участие по телефону. Также имейте в виду, что собрание будет работать только для людей, присоединяющихся из браузеров с поддержкой вставляемых потоков.",
+        "e2eeLabel": "E2EE ключ",
+        "e2eeNoKey": "Отсутствует",
+        "e2eeSet": "Установить",
+        "e2eeToggleSet": "Установить ключ",
+        "e2eeWarning": "ПРЕДУПРЕЖДЕНИЕ. Похоже, что не все участники этой встречи поддерживают сквозное шифрование. Если вы включите его, они не смогут вас ни видеть, ни слышать.",
         "enterDisplayName": "Пожалуйста, введите свое имя",
         "error": "Ошибка",
         "externalInstallationMsg": "Вам необходимо установить наше дополнение для совместного использования рабочего стола.",
         "externalInstallationTitle": "Требуется расширение",
         "goToStore": "Перейти к интернет-магазину",
         "gracefulShutdown": "Технические работы. Пожалуйста, попробуйте позже.",
-        "IamHost": "Я организатор",
-        "incorrectRoomLockPassword": "Неверный пароль",
+        "grantModeratorDialog": "Вы уверены, что хотите сделать этого участника модератором?",
+        "grantModeratorTitle": "Сделать модератором",
         "incorrectPassword": "Ошибка имени пользователя или пароля",
-        "inlineInstallationMsg": "Вам необходимо установить наше дополнение для совместного использования рабочего стола.",
+        "incorrectRoomLockPassword": "Неверный пароль",
         "inlineInstallExtension": "Установить",
+        "inlineInstallationMsg": "Вам необходимо установить наше дополнение для совместного использования рабочего стола.",
         "internalError": "Что-то пошло не так. Ошибка: {{error}}",
         "internalErrorTitle": "Внутренняя ошибка",
         "kickMessage": "Вы можете связаться с {{participantDisplayName}} для получения более подробной информации.",
@@ -199,6 +238,7 @@
         "kickParticipantTitle": "Выгнать этого участника?",
         "kickTitle": "Ай! {{participantDisplayName}} выгнал вас из конференции.",
         "liveStreaming": "Трансляция",
+        "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Невозможно пока активна запись",
         "liveStreamingDisabledForGuestTooltip": "Гости не могут начать трансляцию",
         "liveStreamingDisabledTooltip": "Возможность трансляции отключена",
         "lockMessage": "Не удалось запереть конференцию",
@@ -214,18 +254,25 @@
         "micNotSendingDataTitle": "Ваш микрофон отключен системными настройками",
         "micPermissionDeniedError": "Нет доступа к микрофону. Вы можете участвовать во встрече, но другие не будут вас слышать. Используйте значок камеры в адресной строке браузера, чтобы устранить проблему.",
         "micUnknownError": "Неизвестная ошибка использования микрофона.",
-        "muteParticipantBody": "Вы не можете включить им звук, но они могут сделать это сами в любое время.",
-        "muteParticipantButton": "Выключить звук",
+        "muteEveryoneDialog": "Вы уверены, что хотите отключить микрофоны у всех? Вы не сможете включить их, но они могут включить себя в любой момент.",
+        "muteEveryoneElseDialog": "После отключения микрофонов у участников вы не сможете включить их, но они могут включить себя в любой момент.",
+        "muteEveryoneElseTitle": "Заглушить всех, за исключением {{whom}}?",
+        "muteEveryoneSelf": "себя",
+        "muteEveryoneStartMuted": "Теперь у всех микрофоны выключены",
+        "muteEveryoneTitle": "Заглушить всех?",
+        "muteParticipantBody": "Вы не можете включить им микрофон, но они могут сделать это сами в любое время.",
+        "muteParticipantButton": "Заглушить",
         "muteParticipantDialog": "Вы уверены, что хотите отключить микрофон у данного пользователя? Вы не сможете отменить это действие, однако он сможет сам снова включить микрофон в любое время.",
-        "muteParticipantTitle": "Приглушить этого участника?",
-        "Ok": "Ok",
-        "passwordLabel": "$t(lockRoomPasswordUppercase)",
+        "muteParticipantTitle": "Заглушить этого участника?",
+        "passwordLabel": "Встреча была защищена участником. Пожалуйста, введите $t(lockRoomPasswordUppercase) чтобы присоединиться.",
         "passwordNotSupported": "Установка $t(lockRoomPassword) для конференции не поддерживается.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) не поддерживается",
         "passwordRequired": "Требуется $t(lockRoomPasswordUppercase)",
         "popupError": "Ваш браузер блокирует всплывающие окна этого сайта. Пожалуйста, разрешите всплывающие окна в настройках безопасности браузера и попробуйте снова.",
         "popupErrorTitle": "Заблокировано всплывающее окно",
+        "readMore": "больше",
         "recording": "Запись",
+        "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Невозможно пока активно потоковое вещание",
         "recordingDisabledForGuestTooltip": "Гости не могут записывать",
         "recordingDisabledTooltip": "Невозможно начать запись",
         "rejoinNow": "Подключиться снова",
@@ -236,13 +283,15 @@
         "remoteControlShareScreenWarning": "Если нажмете \"Разрешить\", то поделитесь своим экраном!",
         "remoteControlStopMessage": "Сессия удаленного управления завершена!",
         "remoteControlTitle": "Удаленное управление рабочим столом",
-        "Remove": "Удалить",
         "removePassword": "Убрать $t(lockRoomPassword)",
         "removeSharedVideoMsg": "Уверены, что хотите убрать видео, которым поделились?",
         "removeSharedVideoTitle": "Убрать видео",
         "reservationError": "Ошибка системы резервирования",
         "reservationErrorMsg": "Код ошибки: {{code}}, сообщение: {{msg}}",
         "retry": "Повторить",
+        "screenSharingAudio": "Поделиться аудио",
+        "screenSharingFailed": "Ой! Кажется что-то пошло не так, мы не можем начать показ экрана!",
+        "screenSharingFailedTitle": "Сбой показа экрана!",
         "screenSharingFailedToInstall": "Ошибка установки расширения для показа экрана.",
         "screenSharingFailedToInstallTitle": "Расширение для показа экрана не установлено",
         "screenSharingFirefoxPermissionDeniedError": "Что-то пошло не так, когда мы пытались поделиться вашим экраном. Пожалуйста, убедитесь, что вы дали нам разрешение на это. ",
@@ -254,7 +303,6 @@
         "sendPrivateMessageTitle": "Отправить личное сообщение?",
         "serviceUnavailable": "Служба недоступна",
         "sessTerminated": "Связь прервана",
-        "Share": "Поделиться",
         "shareVideoLinkError": "Пожалуйста, укажите корректную ссылку Youtube.",
         "shareVideoTitle": "Поделиться видео",
         "shareYourScreen": "Показать экран",
@@ -268,7 +316,6 @@
         "stopRecordingWarning": "Уверены, что хотите остановить запись?",
         "stopStreamingWarning": "Уверены, что хотите остановить трансляцию?",
         "streamKey": "Ключ трансляции",
-        "Submit": "ОК",
         "thankYou": "Спасибо, что используете {{appName}}!",
         "token": "токен",
         "tokenAuthFailed": "Извините, вам не разрешено присоединиться к этому сеансу связи.",
@@ -276,21 +323,17 @@
         "transcribing": "Расшифровка",
         "unlockRoom": "Убрать $t(lockRoomPassword)",
         "userPassword": "пароль пользователя",
-        "WaitForHostMsg": "Конференция <b>{{room}}</b> еще не началась. Если вы организатор, пожалуйста, авторизируйтесь. В противном случае дождитесь организатора.",
-        "WaitForHostMsgWOk": "Конференция <b>{{room}}</b> еще не началась. Если вы организатор, пожалуйста, нажмите Ok для аутентификации. В противном случае, дождитесь организатора.",
-        "WaitingForHost": "Ждем организатора...",
-        "Yes": "Да",
-        "yourEntireScreen": "Весь экран",
-        "muteEveryoneElseTitle": "Заглушить всех, за исключением {{whom}}?",
-        "screenSharingAudio": "Поделиться аудио",
-        "muteEveryoneSelf": "себя"
-    },
-    "dialOut": {
-        "statusMessage": "сейчас {{status}}"
+        "yourEntireScreen": "Весь экран"
     },
     "documentSharing": {
         "title": "Общий Документ"
     },
+    "e2ee": {
+        "labelToolTip": "Аудио и видео связь по этому вызову защищена сквозным шифрованием"
+    },
+    "embedMeeting": {
+        "title": "Встроить эту встречу"
+    },
     "feedback": {
         "average": "Средне",
         "bad": "Плохо",
@@ -300,6 +343,9 @@
         "veryBad": "Очень плохо",
         "veryGood": "Очень хорошо"
     },
+    "helpView": {
+        "header": "Справка"
+    },
     "incomingCall": {
         "answer": "Ответ",
         "audioCallTitle": "Входящий звонок",
@@ -313,8 +359,8 @@
         "cancelPassword": "Отменить $t(lockRoomPassword)",
         "conferenceURL": "Ссылка:",
         "country": "Страна",
-        "dialANumber": "Чтобы присоединиться к конференции, наберите один из этих номеров и введите pin-код",
-        "dialInConferenceID": "PIN:",
+        "dialANumber": "Чтобы присоединиться к конференции, наберите один из этих номеров и введите пин-код",
+        "dialInConferenceID": "ПИН:",
         "dialInNotSupported": "К сожалению, набор номера в настоящее время не поддерживается.",
         "dialInNumber": "Номер:",
         "dialInSummaryError": "Ошибка получения информации о наборе номера. Пожалуйста, повторите попытку позже",
@@ -326,6 +372,7 @@
         "inviteURLFirstPartGeneral": "Вас приглашают присоединиться к конференции.",
         "inviteURLFirstPartPersonal": "{{name}} приглашает Вас присоединиться к конференции. \n",
         "inviteURLSecondPart": "\nПрисоединиться к конференции:\n{{url}}\n",
+        "label": "Информация о конференции",
         "liveStreamURL": "Трансляция:",
         "moreNumbers": "Больше номеров",
         "noNumbers": "Нет номеров для набора.",
@@ -334,8 +381,13 @@
         "numbers": "Номера для набора",
         "password": "$t(lockRoomPasswordUppercase):",
         "title": "Поделиться",
-        "tooltip": "Поделитесь ссылкой и номером для подключения к этой конференции",
-        "label": "Информация о конференции"
+        "tooltip": "Поделитесь ссылкой и номером для подключения к этой конференции"
+    },
+    "inlineDialogFailure": {
+        "msg": "Небольшая заминка.",
+        "retry": "Попробовать снова",
+        "support": "Поддержка",
+        "supportMsg": "Если это продолжится, свяжитесь с"
     },
     "inviteDialog": {
         "alertText": "Не удалось пригласить некоторых участников.",
@@ -345,12 +397,6 @@
         "searchPlaceholder": "Участник или номер телефона",
         "send": "Отправить"
     },
-    "inlineDialogFailure": {
-        "msg": "Небольшая заминка.",
-        "retry": "Попробовать снова",
-        "support": "Поддержка",
-        "supportMsg": "Если это продолжится, свяжитесь с"
-    },
     "keyboardShortcuts": {
         "focusLocal": "Фокус на ваше видео",
         "focusRemote": "Фокус на видео другого участника",
@@ -383,23 +429,55 @@
         "expandedPending": "Начинается прямая трансляция...",
         "failedToStart": "Ошибка трансляции видео",
         "getStreamKeyManually": "Прямые трансляций не найдены. Попробуйте получить ключ прямой трансляции от YouTube.",
+        "googlePrivacyPolicy": "Политика конфиденциальности Google",
         "invalidStreamKey": "Похоже ключ прямой трансляции неверен.",
+        "limitNotificationDescriptionNative": "Ваша трансляция будет ограничена {{limit}} мин. Для неограниченного просмотра попробуйте {{app}}.",
+        "limitNotificationDescriptionWeb": "Из-за высокой нагрузки ваша потоковая передача будет ограничена {{limit}} мин. Для неограниченной потоковой передачи попробуйте <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
         "off": "Трансляция остановлена",
         "offBy": "{{name}} остановил прямую трансляцию",
         "on": "Трансляция",
         "onBy": "{{name}} начал прямую трансляцию",
         "pending": "Начинаем трансляцию...",
         "serviceName": "Служба трансляции",
-        "signedInAs": "В настоящее время вы вошли в систему как:",
         "signIn": "Войти через Google",
         "signInCTA": "Войдите или введите свой ключ трансляции YouTube.",
         "signOut": "Выход",
+        "signedInAs": "В настоящее время вы вошли в систему как:",
         "start": "Начать трансляцию",
         "streamIdHelp": "Что это?",
         "unavailableTitle": "Трансляция недоступна",
-        "googlePrivacyPolicy": "Политика конфиденциальности Google",
         "youtubeTerms": "Условия использования YouTube"
     },
+    "lobby": {
+        "disableDialogContent": "В настоящее время включен режим лобби. Эта функция гарантирует, что нежелательные участники не смогут присоединиться к вашей встрече. Вы хотите его отключить?",
+        "disableDialogSubmit": "Отключить",
+        "emailField": "Введите ваш адрес электронной почты",
+        "enableDialogPasswordField": "Установите пароль (необязательно)",
+        "enableDialogSubmit": "Включить",
+        "enableDialogText": "Режим лобби позволяет защитить вашу встречу, позволяя людям входить только после официального одобрения модератором.",
+        "enterPasswordButton": "Введите пароль встречи",
+        "enterPasswordTitle": "Введите пароль чтобы присоединиться к встрече",
+        "invalidPassword": "Неверный пароль",
+        "joinRejectedMessage": "Ваш запрос на присоединение был отклонен модератором.",
+        "joinTitle": "Присоединиться к встрече",
+        "joinWithPasswordMessage": "Пытаюсь присоединиться с паролем, подождите...",
+        "joiningMessage": "Вы присоединитесь к встрече, как только кто-то примет ваш запрос",
+        "joiningTitle": "Просьба присоединиться к встрече...",
+        "joiningWithPasswordTitle": "Присоединение с паролем...",
+        "knockButton": "Попросить присоединиться",
+        "knockTitle": "Кто-то хочет присоединиться к встрече",
+        "knockingParticipantList": "Список ожидающих участников",
+        "nameField": "Введите ваше имя",
+        "notificationLobbyAccessDenied": "{{originParticipantName}} запретил присоединиться {{targetParticipantName}}",
+        "notificationLobbyAccessGranted": "{{originParticipantName}}разрешил присоединиться {{targetParticipantName}} ",
+        "notificationLobbyDisabled": "Лобби отключено пользователем {{originParticipantName}}",
+        "notificationLobbyEnabled": "Лобби включено пользователем {{originParticipantName}}",
+        "notificationTitle": "Лобби",
+        "passwordField": "Введите пароль встречи",
+        "passwordJoinButton": "Присоединиться",
+        "reject": "Отказать",
+        "toggleLabel": "Включить лобби"
+    },
     "localRecording": {
         "clientState": {
             "off": "Отключен",
@@ -431,8 +509,15 @@
     },
     "lockRoomPassword": "пароль",
     "lockRoomPasswordUppercase": "Пароль",
+    "lonelyMeetingExperience": {
+        "button": "Пригласить",
+        "getHelp": "Получить помощь",
+        "title": "Защищенная, полнофункциональная и совершенно бесплатная система видеоконференций",
+        "youAreAlone": "Вы один в видеоконференции"
+    },
     "me": "я",
     "notify": {
+        "OldElectronAPPTitle": "Уязвимость в системе безопасности!",
         "connectedOneMember": "{{name}} присоединился к конференции",
         "connectedThreePlusMembers": "{{name}} и {{count}} других пользователей присоединились к конференции",
         "connectedTwoMembers": "{{first}} и {{second}} присоединились к конференции",
@@ -447,25 +532,64 @@
         "me": "Я",
         "moderator": "Получены права модератора!",
         "muted": "Вы начали разговор без звука.",
-        "mutedTitle": "Вы без звука!",
-        "mutedRemotelyTitle": "{{participantDisplayName}} отключил Вам микрофон!",
         "mutedRemotelyDescription": "Вы всегда можете включить микрофон, когда будете готовы говорить. Отключите его, когда закончите, чтобы не транслировать шумы в конференцию.",
+        "mutedRemotelyTitle": "{{participantDisplayName}} отключил Вам микрофон!",
+        "mutedTitle": "Вы без звука!",
+        "newDeviceAction": "Использовать",
+        "newDeviceAudioTitle": "Обнаружено новое аудиоустройство",
+        "newDeviceCameraTitle": "Обнаружена новая камера",
+        "oldElectronClientDescription1": "Похоже, вы используете старую версию клиента Jitsi Meet, которая имеет известные уязвимости в системе безопасности. Убедитесь, что вы обновили до нашей ",
+        "oldElectronClientDescription2": "последней версии",
+        "oldElectronClientDescription3": " сейчас!",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) удален другим участником.",
         "passwordSetRemotely": "Другой участник установил $t(lockRoomPasswordUppercase)",
         "raisedHand": "{{name}} хотел бы выступить.",
         "somebody": "Кто-то",
-        "startSilentTitle": "У вас отсутствует звук!",
         "startSilentDescription": "Перезайдите в конференцию, чтобы включить звук",
+        "startSilentTitle": "У вас отсутствует звук!",
         "suboptimalBrowserWarning": "К сожалению, ваш браузер не полностью поддерживает данную систему вэбконференций. Мы работаем над проблемой, однако, пока рекомендуем вам воспользоваться <a href='{{recommendedBrowserPageLink}}' target='_blank'> следующими браузерами</a>.",
         "suboptimalExperienceTitle": "Предупреждение браузера",
-        "unmute": "Включить микрофон",
-        "newDeviceCameraTitle": "Обнаружена новая камера",
-        "newDeviceAudioTitle": "Обнаружено новое аудиоустройство",
-        "newDeviceAction": "Использовать"
+        "unmute": "Включить микрофон"
     },
-    "passwordSetRemotely": "установлен другим участником",
     "passwordDigitsOnly": "До {{number}} цифр",
+    "passwordSetRemotely": "установлен другим участником",
     "poweredby": "работает на",
+    "prejoin": {
+        "audioAndVideoError": "Ошибка звука и видео:",
+        "audioOnlyError": "Ошибка звука:",
+        "audioTrackError": "Не удалось создать аудио дорожку.",
+        "callMe": "Позвоните мне",
+        "callMeAtNumber": "Позвоните мне по этому номеру:",
+        "calling": "Вызываем",
+        "configuringDevices": "Настраиваются устройства...",
+        "connectedWithAudioQ": "Вы подключили звук?",
+        "copyAndShare": "Скопировать и поделиться ссылкой на встречу",
+        "dialInMeeting": "Дозвониться до встречи",
+        "dialInPin": "Дозвониться до встречи и ввести ПИН код:",
+        "dialing": "Дозвон",
+        "doNotShow": "Не показывать снова",
+        "errorDialOut": "Не удалось дозвониться",
+        "errorDialOutDisconnected": "Не удалось дозвониться. Отключено",
+        "errorDialOutFailed": "Не удалось дозвониться. Сбой вызова",
+        "errorDialOutStatus": "Ошибка получения статуса вызова",
+        "errorStatusCode": "Ошибка вызова, код статуса: {{status}}",
+        "errorValidation": "Проверка номера не удалась",
+        "iWantToDialIn": "Я хочу дозвониться",
+        "initiated": "Вызов инициирован",
+        "joinAudioByPhone": "Подключиться с телефонной связью",
+        "joinMeeting": "Присоединиться ко встрече",
+        "joinWithoutAudio": "Присоединиться без звука",
+        "linkCopied": "Ссылка скопирована в буфер обмена",
+        "lookGood": "Кажется ваш микрофон работает правильно",
+        "or": "или",
+        "premeeting": "Перед подключением",
+        "screenSharingError": "Ошибка показа экрана:",
+        "showScreen": "Включить экран перед подключением",
+        "startWithPhone": "Начать с телефонной связью",
+        "videoOnlyError": "Ошибка видео:",
+        "videoTrackError": "Не удалось создать видео дорожку.",
+        "viewAllNumbers": "посмотреть всех участников"
+    },
     "presenceStatus": {
         "busy": "Занят",
         "calling": "Вызываю...",
@@ -499,14 +623,16 @@
         "expandedPending": "Начинаем запись конференции...",
         "failedToStart": "Ошибка начала записи",
         "fileSharingdescription": "Поделиться записью с участниками конференции",
-        "live": "Прямая трансляция",
+        "limitNotificationDescriptionNative": "Из-за высокой нагрузки ваша запись будет ограничена {{limit}} мин. Для неограниченного количества записей попробуйте <3> {{app}} </3>.",
+        "limitNotificationDescriptionWeb": "Из-за высокой нагрузки ваша запись будет ограничена {{limit}} мин. Для неограниченного количества записей попробуйте <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
+        "live": "В ЭФИРЕ",
         "loggedIn": "Вошел как {{userName}}",
         "off": "Запись остановлена",
         "offBy": "{{name}} остановил запись",
         "on": "Запись",
         "onBy": "{{name}} включил запись",
         "pending": "Подготовка записи конференции. . .",
-        "rec": "Идет запись",
+        "rec": "ИДЕТ ЗАПИСЬ",
         "serviceDescription": "Ваша запись будет сохранена соответствующей службой",
         "serviceName": "Служба записи",
         "signIn": "Вход",
@@ -517,6 +643,12 @@
     "sectionList": {
         "pullToRefresh": "Потяните для обновления"
     },
+    "security": {
+        "about": "Вы можете добавить к собранию $t(lockRoomPassword). Участникам необходимо будет предоставить $t(lockRoomPassword), прежде чем им будет разрешено присоединиться к собранию.",
+        "aboutReadOnly": "Участники-модераторы могут добавить к собранию $t(lockRoomPassword). Участникам необходимо будет предоставить $t(lockRoomPassword), прежде чем им будет разрешено присоединиться к собранию.",
+        "insecureRoomNameWarning": "Имя комнаты небезопасно. Нежелательные участники могут присоединиться к вашей конференции. Подумайте о том, чтобы защитить вашу встречу используя настройки безопасности.",
+        "securityOptions": "Настройки безопасности"
+    },
     "settings": {
         "calendar": {
             "about": "Интеграция с календарем {{appName}} используется для безопасного доступа к вашему календарю и синхронизации запланированных мероприятий.",
@@ -529,6 +661,7 @@
         "followMe": "Все следуют за мной",
         "language": "Язык",
         "loggedIn": "Вошел как {{name}}",
+        "microphones": "Микрофоны",
         "moderator": "Модератор",
         "more": "Больше опций",
         "name": "Имя",
@@ -536,11 +669,10 @@
         "selectAudioOutput": "Звуковой выход",
         "selectCamera": "Камера",
         "selectMic": "Микрофон",
+        "speakers": "Динамики",
         "startAudioMuted": "Все начинают с выключенным звуком",
         "startVideoMuted": "Все начинают в скрытом режиме",
-        "title": "Настройки",
-        "speakers": "Динамики",
-        "microphones": "Микрофоны"
+        "title": "Настройки"
     },
     "settingsView": {
         "advanced": "Дополнительные",
@@ -550,6 +682,8 @@
         "buildInfoSection": "Информация о сборке",
         "conferenceSection": "Номера для набора",
         "disableCallIntegration": "Отключить встроенную интеграцию вызовов",
+        "disableCrashReporting": "Отключить отправку отчетов о сбоях",
+        "disableCrashReportingWarning": "Вы действительно хотите отключить отчеты о сбоях? Настройка будет применена после перезапуска приложения.",
         "disableP2P": "Отключить режим Peer-To-Peer",
         "displayName": "Отображаемое имя",
         "email": "Email",
@@ -565,7 +699,7 @@
         "dialInfoText": "\n\n=====\n\nПросто хотите набрать номер на Вашем телефоне?\n\n{{defaultDialInNumber}}Щелкните на эту ссылку, чтобы просмотреть телефонные номера для этой конференции\n{{dialInfoPageUrl}}",
         "mainText": "Нажмите на ссылку чтобы присоединиться к конференции:\n{{roomUrl}}"
     },
-    "speaker": "Колонка",
+    "speaker": "Спикер",
     "speakerStats": {
         "hours": "{{count}}ч",
         "minutes": "{{count}}м",
@@ -584,7 +718,9 @@
         "title": "Видеосвязь прервана. Причина: этот компьютер перешел в режим сна."
     },
     "toolbar": {
+        "Settings": "Настройки",
         "accessibilityLabel": {
+            "Settings": "Вкл/Выкл меню настроек",
             "audioOnly": "Вкл/Выкл только звук",
             "audioRoute": "Выбрать аудиоустройство",
             "callQuality": "Качество связи",
@@ -592,36 +728,41 @@
             "chat": "Показать/скрыть окно чата",
             "document": "Закрыть общий документ",
             "download": "Скачать приложение",
+            "e2ee": "Сквозное шифрование",
+            "embedMeeting": "Встроить встречу",
             "feedback": "Оставить отзыв",
             "fullScreen": "Полноэкранный/оконный режим",
+            "grantModerator": "Сделать модератором",
             "hangup": "Завершить звонок",
             "help": "Справка",
             "invite": "Пригласить",
             "kick": "Выкинуть участника",
+            "lobbyButton": "Вкл/Выкл режим лобби",
             "localRecording": "Вкл/Выкл кнопки записи",
             "lockRoom": "Установить пароль",
             "moreActions": "Показать/скрыть меню доп. настроек",
-            "moreOptions": "Меню доп. настроек",
             "moreActionsMenu": "Меню доп. настроек",
+            "moreOptions": "Меню доп. настроек",
             "mute": "Вкл/Выкл звук",
+            "muteEveryone": "Выкл. микрофон у всех",
             "pip": "Вкл/Выкл режим Картинка-в-картинке",
             "privateMessage": "Отправить личное сообщение",
             "profile": "Редактировать профиль",
             "raiseHand": "Поднять руку",
             "recording": "Вкл/Выкл запись",
             "remoteMute": "Отключить участнику микрофон",
-            "Settings": "Вкл/Выкл меню настроек",
-            "sharedvideo": "Вкл/Выкл Youtube - трансляцию",
+            "security": "Настройки безопасности",
             "shareRoom": "Отправить приглашение",
             "shareYourScreen": "Вкл/Выкл демонстрацию экрана",
+            "sharedvideo": "Вкл/Выкл Youtube - трансляцию",
             "shortcuts": "Вкл/Выкл значки",
             "show": "Показать крупным планом",
             "speakerStats": "Вкл/Выкл статистику",
             "tileView": "Вкл/Выкл плитку",
             "toggleCamera": "Переключить камеру",
-            "videomute": "Вкл/Выкл видео",
-            "muteEveryone": "Выкл. микрофон у всех",
-            "videoblur": "Вкл/Выкл размытие фона"
+            "toggleFilmstrip": "Включить диафильм",
+            "videoblur": "Вкл/Выкл размытие фона",
+            "videomute": "Вкл/Выкл видео"
         },
         "addPeople": "Добавить людей к вашему сеансу связи",
         "audioOnlyOff": "Отключить режим экономии пропуской способности",
@@ -634,6 +775,8 @@
         "documentClose": "Закрыть общий документ",
         "documentOpen": "Открыть общий документ",
         "download": "Скачать приложение",
+        "e2ee": "Сквозное шифрование",
+        "embedMeeting": "Встроить встречу",
         "enterFullScreen": "Полный экран",
         "enterTileView": "Общий план",
         "exitFullScreen": "Полный экран",
@@ -642,39 +785,44 @@
         "hangup": "Выход",
         "help": "Справка",
         "invite": "Пригласить",
+        "lobbyButtonDisable": "Отключить режим лобби",
+        "lobbyButtonEnable": "Включить режим лобби",
         "login": "Войти",
         "logout": "Завершить сеанс",
         "lowerYourHand": "Опустить руку",
-        "moreActions": "Больше",
+        "moreActions": "Больше действий",
+        "moreOptions": "Больше настроек",
         "mute": "Микрофон (вкл./выкл.)",
         "muteEveryone": "Выкл. микрофон у всех",
-        "noAudioSignalTitle": "От вашего микрофона не идет звуковой сигнал!",
         "noAudioSignalDesc": "Если вы специально не отключали микрофон в системных настройках, подумайте о том, чтобы поменять его.",
         "noAudioSignalDescSuggestion": "Если вы специально не отключали микрофон в системных настройках, вы можете попробовать использовать следующее устройство:",
-        "noisyAudioInputTitle": "Похоже, ваш микрофон создает шум!",
+        "noAudioSignalDialInDesc": "Вы можете также дозвониться используя:",
+        "noAudioSignalDialInLinkDesc": "Номера для дозвона",
+        "noAudioSignalTitle": "От вашего микрофона не идет звуковой сигнал!",
         "noisyAudioInputDesc": "Возможно, ваш микрофон создает шум. Вы можете выключить его или смените устройство.",
+        "noisyAudioInputTitle": "Похоже, ваш микрофон создает шум!",
         "openChat": "Открыть чат",
         "pip": "Вкл режим Картинка-в-картинке",
         "privateMessage": "Отправить личное сообщение",
         "profile": "Редактировать профиль",
         "raiseHand": "Хочу говорить",
         "raiseYourHand": "Поднять руку",
-        "Settings": "Настройки",
-        "sharedvideo": "Видео YouTube",
+        "security": "Настройки безопасности",
         "shareRoom": "Отправить приглашение",
+        "sharedvideo": "Видео YouTube",
         "shortcuts": "Комбинации клавиш",
         "speakerStats": "Статистика",
         "startScreenSharing": "Начать трансляцию с экрана",
         "startSubtitles": "Включить субтитры",
+        "startvideoblur": "Размыть фон на видео",
         "stopScreenSharing": "Остановить трансляцию с экрана",
-        "stopSubtitles": "Отключить субтитры",
         "stopSharedVideo": "Остановить видео на YouTube",
+        "stopSubtitles": "Отключить субтитры",
+        "stopvideoblur": "Отключить размытие фона",
         "talkWhileMutedPopup": "Пытаетесь говорить? У вас отключен звук.",
         "tileViewToggle": "Вкл/выкл плитку",
         "toggleCamera": "Вкл/выкл камеру",
-        "videomute": "Камера",
-        "startvideoblur": "Размыть фон на видео",
-        "stopvideoblur": "Отключить размытие фона"
+        "videomute": "Камера"
     },
     "transcribing": {
         "ccButtonTooltip": "Вкл. / Выкл. субтитры",
@@ -685,8 +833,7 @@
         "off": "Расшифровка остановлена",
         "pending": "Подготовка расшифровки конференции...",
         "start": "Вкл/Выкл показ субтитров",
-        "stop": "Вкл/Выкл показ субтитров",
-        "tr": ""
+        "stop": "Вкл/Выкл показ субтитров"
     },
     "userMedia": {
         "androidGrantPermissions": "Выберите <b><i>Разрешить</i></b>, когда браузер спросит о разрешениях.",
@@ -732,6 +879,7 @@
         "domute": "Выключить звук",
         "domuteOthers": "Выключить остальных",
         "flip": "Отразить",
+        "grantModerator": "Сделать модератором",
         "kick": "Выкинуть",
         "moderator": "Модератор",
         "mute": "Без звука",
@@ -754,26 +902,22 @@
         "connectCalendarButton": "Привязать календарь",
         "connectCalendarText": "Подключите календарь, чтобы увидеть все ваши конференции в {{app}}. Кроме того, добавив {{provider}} конференций в календарь, вы сможете запускать их одним щелчком мышки.",
         "enterRoomTitle": "Начать новую видеоконференцию",
-        "roomNameAllowedChars": "Название конференции не должно содержать следующие символы: ?, &, :, ', \", %, #.",
+        "getHelp": "Справка",
         "go": "ОК",
         "goSmall": "ОК",
-        "join": "СОЗДАТЬ / ПРИСОЕДИНИТЬСЯ",
         "info": "Инфо",
+        "join": "СОЗДАТЬ / ПРИСОЕДИНИТЬСЯ",
+        "moderatedMessage": "Или заранее <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">зарезервируйте URL-адрес встречи</a>, где вы будете единственным модератором.",
         "privacy": "Приватность",
         "recentList": "Недавние",
         "recentListDelete": "Удалить",
         "recentListEmpty": "Сейчас ваш список недавно проведенных конференций пуст. По мере вашего пользования сервисом он будет пополняться.",
         "reducedUIText": "Добро пожаловать в {{app}}!",
+        "roomNameAllowedChars": "Название конференции не должно содержать следующие символы: ?, &, :, ', \", %, #.",
         "roomname": "Укажите название комнаты",
         "roomnameHint": "Укажите название комнаты или ее адрес. Можете сами создать название и передать его будущим участникам встречи, чтобы они использовали именно его.",
         "sendFeedback": "Обратная связь",
         "terms": "Условия",
         "title": "Защищенная, полнофункциональная и совершенно бесплатная система видеоконференций"
-    },
-    "lonelyMeetingExperience": {
-        "button": "Пригласить",
-        "youAreAlone": "Вы один в видеоконференции",
-        "title": "Защищенная, полнофункциональная и совершенно бесплатная система видеоконференций",
-        "getHelp": "Получить помощь"
     }
 }

lang/main.json

@@ -102,6 +102,7 @@
         "bandwidth": "Estimated bandwidth:",
         "bitrate": "Bitrate:",
         "bridgeCount": "Server count: ",
+        "codecs": "Codecs (A/V): ",
         "connectedTo": "Connected to:",
         "e2e_rtt": "E2E RTT:",
         "framerate": "Frame rate:",
@@ -196,10 +197,7 @@
         "displayNameRequired": "Hi! What’s your name?",
         "done": "Done",
         "e2eeDescription": "End-to-End Encryption is currently EXPERIMENTAL. Please keep in mind that turning on end-to-end encryption will effectively disable server-side provided services such as: recording, live streaming and phone participation. Also keep in mind that the meeting will only work for people joining from browsers with support for insertable streams.",
-        "e2eeLabel": "E2EE key",
-        "e2eeNoKey": "None",
-        "e2eeToggleSet": "Set key",
-        "e2eeSet": "Set",
+        "e2eeLabel": "Enable End-to-End Encryption",
         "e2eeWarning": "WARNING: Not all participants in this meeting seem to have support for End-to-End encryption. If you enable it they won't be able to see nor hear you.",
         "enterDisplayName": "Please enter your name here",
         "error": "Error",
@@ -503,6 +501,7 @@
     "poweredby": "powered by",
     "prejoin": {
         "audioAndVideoError": "Audio and video error:",
+        "audioDeviceProblem": "There is a problem with your audio device",
         "audioOnlyError": "Audio error:",
         "audioTrackError": "Could not create audio track.",
         "calling": "Calling",
@@ -510,6 +509,25 @@
         "callMeAtNumber": "Call me at this number:",
         "configuringDevices": "Configuring devices...",
         "connectedWithAudioQ": "You’re connected with audio?",
+        "connection": {
+           "good": "Your internet connection looks good!",
+           "nonOptimal": "Your internet connection is not optimal",
+           "poor": "You have a poor internet connection"
+        },
+        "connectionDetails": {
+          "audioClipping": "We expect your audio to be clipped.",
+          "audioHighQuality": "We expect your audio to have excellent quality.",
+          "audioLowNoVideo": "We expect your audio quality to be low and no video.",
+          "goodQuality": "Awesome! Your media quality is going to be great.",
+          "noMediaConnectivity": "We could not find a way to establish media connectivity for this test. This is typically caused by a firewall or NAT.",
+          "noVideo": "We expect that your video will be terrible.",
+          "undetectable": "If you still can not make calls in browser, we recommend that you make sure your speakers, microphone and camera are properly set up, that you have granted your browser rights to use your microphone and camera, and that your browser version is up-to-date. If you still have trouble calling, you should contact the web application developer.",
+          "veryPoorConnection": "We expect your call quality to be really terrible.",
+          "videoFreezing": "We expect your video to freeze, turn black, and be pixelated.",
+          "videoHighQuality": "We expect your video to have good quality.",
+          "videoLowQuality": "We expect your video to have low quality in terms of frame rate and resolution.",
+          "videoTearing": "We expect your video to be pixelated or have visual artefacts."
+        },
         "copyAndShare": "Copy & share meeting link",
         "dialInMeeting": "Dial into the meeting",
         "dialInPin": "Dial into the meeting and enter PIN code:",
@@ -519,6 +537,7 @@
         "errorDialOutDisconnected": "Could not dial out. Disconnected",
         "errorDialOutFailed": "Could not dial out. Call failed",
         "errorDialOutStatus": "Error getting dial out status",
+        "errorMissingName": "Please enter your name to join the meeting",
         "errorStatusCode": "Error dialing out, status code: {{status}}",
         "errorValidation": "Number validation failed",
         "iWantToDialIn": "I want to dial in",
@@ -675,7 +694,6 @@
             "document": "Toggle shared document",
             "download": "Download our apps",
             "embedMeeting": "Embed meeting",
-            "e2ee": "End-to-End Encryption",
             "feedback": "Leave feedback",
             "fullScreen": "Toggle full screen",
             "grantModerator": "Grant Moderator",

modules/API/API.js

@@ -19,8 +19,9 @@ import {
     processExternalDeviceRequest
 } from '../../react/features/device-selection/functions';
 import { isEnabled as isDropboxEnabled } from '../../react/features/dropbox';
-import { setE2EEKey } from '../../react/features/e2ee';
+import { toggleE2EE } from '../../react/features/e2ee/actions';
 import { invite } from '../../react/features/invite';
+import { selectParticipantInLargeVideo } from '../../react/features/large-video/actions';
 import { toggleLobbyMode } from '../../react/features/lobby/actions.web';
 import { RECORDING_TYPES } from '../../react/features/recording/constants';
 import { getActiveSession } from '../../react/features/recording/functions';
@@ -123,6 +124,11 @@ function initCommands() {
 
             APP.store.dispatch(sendTones(tones, duration, pause));
         },
+        'set-large-video-participant': participantId => {
+            logger.debug('Set large video participant command received');
+            sendAnalytics(createApiEvent('largevideo.participant.set'));
+            APP.store.dispatch(selectParticipantInLargeVideo(participantId));
+        },
         'subject': subject => {
             sendAnalytics(createApiEvent('subject.changed'));
             APP.store.dispatch(setSubject(subject));
@@ -191,9 +197,9 @@ function initCommands() {
                 logger.error('Failed sending endpoint text message', err);
             }
         },
-        'e2ee-key': key => {
-            logger.debug('Set E2EE key command received');
-            APP.store.dispatch(setE2EEKey(key));
+        'toggle-e2ee': enabled => {
+            logger.debug('Toggle E2EE key command received');
+            APP.store.dispatch(toggleE2EE(enabled));
         },
         'set-video-quality': frameHeight => {
             logger.debug('Set video quality command received');
@@ -524,6 +530,19 @@ class API {
         });
     }
 
+    /**
+     * Notify external application that the video quality setting has changed.
+     *
+     * @param {number} videoQuality - The video quality. The number represents the maximum height of the video streams.
+     * @returns {void}
+     */
+    notifyVideoQualityChanged(videoQuality: number) {
+        this._sendEvent({
+            name: 'video-quality-changed',
+            videoQuality
+        });
+    }
+
     /**
      * Notify external application (if API is enabled) that message was
      * received.
@@ -677,6 +696,21 @@ class API {
         });
     }
 
+    /**
+     * Notify external application (if API is enabled) that the an error has been logged.
+     *
+     * @param {string} logLevel - The message log level.
+     * @param {Array} args - Array of strings composing the log message.
+     * @returns {void}
+     */
+    notifyLog(logLevel: string, args: Array<string>) {
+        this._sendEvent({
+            name: 'log',
+            logLevel,
+            args
+        });
+    }
+
     /**
      * Notify external application (if API is enabled) that the conference has
      * been joined.
@@ -697,8 +731,7 @@ class API {
     }
 
     /**
-     * Notify external application (if API is enabled) that user changed their
-     * nickname.
+     * Notify external application (if API is enabled) that local user has left the conference.
      *
      * @param {string} roomName - User id.
      * @returns {void}

modules/API/external/external_api.js

@@ -37,6 +37,7 @@ const commands = {
     password: 'password',
     sendEndpointTextMessage: 'send-endpoint-text-message',
     sendTones: 'send-tones',
+    setLargeVideoParticipant: 'set-large-video-participant',
     setVideoQuality: 'set-video-quality',
     startRecording: 'start-recording',
     stopRecording: 'stop-recording',
@@ -67,6 +68,7 @@ const events = {
     'feedback-prompt-displayed': 'feedbackPromptDisplayed',
     'filmstrip-display-changed': 'filmstripDisplayChanged',
     'incoming-message': 'incomingMessage',
+    'log': 'log',
     'mic-error': 'micError',
     'outgoing-message': 'outgoingMessage',
     'participant-joined': 'participantJoined',
@@ -80,6 +82,7 @@ const events = {
     'video-conference-left': 'videoConferenceLeft',
     'video-availability-changed': 'videoAvailabilityChanged',
     'video-mute-status-changed': 'videoMuteStatusChanged',
+    'video-quality-changed': 'videoQualityChanged',
     'screen-sharing-status-changed': 'screenSharingStatusChanged',
     'dominant-speaker-changed': 'dominantSpeakerChanged',
     'subject-change': 'subjectChange',
@@ -355,6 +358,19 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         );
     }
 
+    /**
+     * Returns the formatted display name of a participant.
+     *
+     * @param {string} participantId - The id of the participant.
+     * @returns {string} The formatted display name.
+     */
+    _getFormattedDisplayName(participantId) {
+        const { formattedDisplayName }
+            = this._participants[participantId] || {};
+
+        return formattedDisplayName;
+    }
+
     /**
      * Returns the id of the on stage participant.
      *
@@ -503,6 +519,9 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
                 changeParticipantNumber(this, -1);
                 delete this._participants[this._myUserID];
                 break;
+            case 'video-quality-changed':
+                this._videoQuality = data.videoQuality;
+                break;
             }
 
             const eventName = events[name];
@@ -538,6 +557,13 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
      * the event and value - the listener.
      * Currently we support the following
      * events:
+     * {@code log} - receives event notifications whenever information has
+     * been logged and has a log level specified within {@code config.apiLogLevels}.
+     * The listener will receive object with the following structure:
+     * {{
+     * logLevel: the message log level
+     * arguments: an array of strings that compose the actual log message
+     * }}
      * {@code incomingMessage} - receives event notifications about incoming
      * messages. The listener will receive object with the following structure:
      * {{
@@ -689,6 +715,32 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         return getCurrentDevices(this._transport);
     }
 
+    /**
+     * Returns the conference participants information.
+     *
+     * @returns {Array<Object>} - Returns an array containing participants
+     * information like participant id, display name, avatar URL and email.
+     */
+    getParticipantsInfo() {
+        const participantIds = Object.keys(this._participants);
+        const participantsInfo = Object.values(this._participants);
+
+        participantsInfo.forEach((participant, idx) => {
+            participant.participantId = participantIds[idx];
+        });
+
+        return participantsInfo;
+    }
+
+    /**
+     * Returns the current video quality setting.
+     *
+     * @returns {number}
+     */
+    getVideoQuality() {
+        return this._videoQuality;
+    }
+
     /**
      * Check if the audio is available.
      *
@@ -809,19 +861,6 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         return email;
     }
 
-    /**
-     * Returns the formatted display name of a participant.
-     *
-     * @param {string} participantId - The id of the participant.
-     * @returns {string} The formatted display name.
-     */
-    _getFormattedDisplayName(participantId) {
-        const { formattedDisplayName }
-            = this._participants[participantId] || {};
-
-        return formattedDisplayName;
-    }
-
     /**
      * Returns the iframe that loads Jitsi Meet.
      *
@@ -934,6 +973,18 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         return setAudioOutputDevice(this._transport, label, deviceId);
     }
 
+    /**
+     * Displays the given participant on the large video. If no participant id is specified,
+     * dominant and pinned speakers will be taken into consideration while selecting the
+     * the large video participant.
+     *
+     * @param {string} participantId - Jid of the participant to be displayed on the large video.
+     * @returns {void}
+     */
+    setLargeVideoParticipant(participantId) {
+        this.executeCommand('setLargeVideoParticipant', participantId);
+    }
+
     /**
      * Sets the video input device to the one with the label or id that is
      * passed.

modules/UI/UI.js

@@ -6,6 +6,7 @@ const UI = {};
 import EventEmitter from 'events';
 import Logger from 'jitsi-meet-logger';
 
+import { isMobileBrowser } from '../../react/features/base/environment/utils';
 import { getLocalParticipant } from '../../react/features/base/participants';
 import { toggleChat } from '../../react/features/chat';
 import { setDocumentUrl } from '../../react/features/etherpad';
@@ -154,6 +155,12 @@ UI.start = function() {
 
     sharedVideoManager = new SharedVideoManager(eventEmitter);
 
+    if (isMobileBrowser()) {
+        $('body').addClass('mobile-browser');
+    } else {
+        $('body').addClass('desktop-browser');
+    }
+
     if (interfaceConfig.filmStripOnly) {
         $('body').addClass('filmstrip-only');
         APP.store.dispatch(setNotificationsEnabled(false));

modules/UI/videolayout/RemoteVideo.js

@@ -373,6 +373,7 @@ export default class RemoteVideo extends SmallVideo {
 
         if (stream === this.videoStream) {
             this.videoStream = null;
+            this.videoType = undefined;
         }
 
         this.updateView();
@@ -481,7 +482,12 @@ export default class RemoteVideo extends SmallVideo {
 
         const isVideo = stream.isVideoTrack();
 
-        isVideo ? this.videoStream = stream : this.audioStream = stream;
+        if (isVideo) {
+            this.videoStream = stream;
+            this.videoType = stream.videoType;
+        } else {
+            this.audioStream = stream;
+        }
 
         if (!stream.getOriginalStream()) {
             logger.debug('Remote video stream has no original stream');

modules/UI/videolayout/SmallVideo.js

@@ -83,10 +83,12 @@ export default class SmallVideo {
     constructor(VideoLayout) {
         this.isAudioMuted = false;
         this.isVideoMuted = false;
+        this.isScreenSharing = false;
         this.videoStream = null;
         this.audioStream = null;
         this.VideoLayout = VideoLayout;
         this.videoIsHovered = false;
+        this.videoType = undefined;
 
         /**
          * The current state of the user's bridge connection. The value should be
@@ -234,6 +236,18 @@ export default class SmallVideo {
         this.updateStatusBar();
     }
 
+    /**
+     * Shows / hides the screen-share indicator over small videos.
+     *
+     * @param {boolean} isScreenSharing indicates if the screen-share element should be shown
+     * or hidden
+     */
+    setScreenSharing(isScreenSharing) {
+        this.isScreenSharing = isScreenSharing;
+        this.updateView();
+        this.updateStatusBar();
+    }
+
     /**
      * Shows video muted indicator over small videos and disables/enables avatar
      * if video muted.
@@ -265,6 +279,7 @@ export default class SmallVideo {
                 <I18nextProvider i18n = { i18next }>
                     <StatusIndicators
                         showAudioMutedIndicator = { this.isAudioMuted }
+                        showScreenShareIndicator = { this.isScreenSharing }
                         showVideoMutedIndicator = { this.isVideoMuted }
                         participantID = { this.id } />
                 </I18nextProvider>
@@ -450,8 +465,10 @@ export default class SmallVideo {
      * or <tt>DISPLAY_BLACKNESS_WITH_NAME</tt>.
      */
     selectDisplayMode(input) {
-        // Display name is always and only displayed when user is on the stage
-        if (input.isCurrentlyOnLargeVideo && !input.tileViewActive) {
+        if (!input.tileViewActive && input.isScreenSharing) {
+            return input.isHovered ? DISPLAY_AVATAR_WITH_NAME : DISPLAY_AVATAR;
+        } else if (input.isCurrentlyOnLargeVideo && !input.tileViewActive) {
+            // Display name is always and only displayed when user is on the stage
             return input.isVideoPlayable && !input.isAudioOnly ? DISPLAY_BLACKNESS_WITH_NAME : DISPLAY_AVATAR_WITH_NAME;
         } else if (input.isVideoPlayable && input.hasVideo && !input.isAudioOnly) {
             // check hovering and change state to video with name
@@ -480,6 +497,7 @@ export default class SmallVideo {
             canPlayEventReceived: this._canPlayEventReceived,
             videoStream: Boolean(this.videoStream),
             isVideoMuted: this.isVideoMuted,
+            isScreenSharing: this.isScreenSharing,
             videoStreamMuted: this.videoStream ? this.videoStream.isMuted() : 'no stream'
         };
     }

modules/UI/videolayout/VideoLayout.js

@@ -177,6 +177,7 @@ const VideoLayout = {
             this.onAudioMute(id, stream.isMuted());
         } else {
             this.onVideoMute(id, stream.isMuted());
+            remoteVideo.setScreenSharing(stream.videoType === 'desktop');
         }
     },
 
@@ -188,6 +189,7 @@ const VideoLayout = {
 
         if (remoteVideo) {
             remoteVideo.removeRemoteStreamElement(stream);
+            remoteVideo.setScreenSharing(false);
         }
 
         this.updateMutedForNoTracks(id, stream.getType());
@@ -485,13 +487,14 @@ const VideoLayout = {
     },
 
     onVideoTypeChanged(id, newVideoType) {
-        if (VideoLayout.getRemoteVideoType(id) === newVideoType) {
+        const remoteVideo = remoteVideos[id];
+
+        if (!remoteVideo || remoteVideo.videoType === newVideoType) {
             return;
         }
 
         logger.info('Peer video type changed: ', id, newVideoType);
-
-        this._updateLargeVideoIfDisplayed(id, true);
+        remoteVideo.setScreenSharing(newVideoType === 'desktop');
     },
 
     /**

package.json

@@ -41,7 +41,7 @@
     "@tensorflow-models/body-pix": "2.0.4",
     "@tensorflow/tfjs": "1.5.1",
     "@webcomponents/url": "0.7.1",
-    "amplitude-js": "4.5.2",
+    "amplitude-js": "7.1.1",
     "base64-js": "1.3.1",
     "bc-css-flags": "3.0.0",
     "dropbox": "4.0.9",
@@ -56,11 +56,12 @@
     "jquery-i18next": "1.2.1",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#9abec6faeea9698db40ed3adc98ce03ec546cedb",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#43e7c853b834dc7ced0f81ee5f4b130444d85e95",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.19",
     "moment": "2.19.4",
     "moment-duration-format": "2.2.2",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "pixelmatch": "5.1.0",
     "react": "16.9",
     "react-dom": "16.9",
@@ -68,7 +69,7 @@
     "react-i18next": "10.11.4",
     "react-linkify": "1.0.0-alpha",
     "react-native": "github:jitsi/react-native#efd2aff5661d75a230e36406b698cfe0ee545be2",
-    "react-native-background-timer": "2.1.1",
+    "react-native-background-timer": "2.4.0",
     "react-native-calendar-events": "github:jitsi/react-native-calendar-events#928a80e2ffef0d7e84936d7e7e0acc4f53ee8470",
     "react-native-callstats": "3.61.0",
     "react-native-collapsible": "1.5.1",
@@ -90,7 +91,7 @@
     "redux": "4.0.4",
     "redux-thunk": "2.2.0",
     "rnnoise-wasm": "github:jitsi/rnnoise-wasm.git#566a16885897704d6e6d67a1d5ac5d39781db2af",
-    "rtcstats": "github:jitsi/rtcstats#v6.1.3",
+    "rtcstats": "github:jitsi/rtcstats#v6.2.0",
     "styled-components": "3.4.9",
     "util": "0.12.1",
     "uuid": "3.1.0",
@@ -127,7 +128,7 @@
     "imports-loader": "0.7.1",
     "jetifier": "1.6.4",
     "metro-react-native-babel-preset": "0.56.0",
-    "node-sass": "4.14.1",
+    "sass": "1.26.8",
     "string-replace-loader": "2.1.1",
     "style-loader": "0.19.0",
     "unorm": "1.6.0",

react/features/app/actions.js

@@ -2,6 +2,7 @@
 
 import type { Dispatch } from 'redux';
 
+import { API_ID } from '../../../modules/API/constants';
 import { setRoom } from '../base/conference';
 import {
     configWillLoad,
@@ -23,6 +24,7 @@ import {
     parseURIString,
     toURLString
 } from '../base/util';
+import { isVpaasMeeting } from '../billing-counter/functions';
 import { clearNotifications, showNotification } from '../notifications';
 import { setFatalError } from '../overlay';
 
@@ -168,9 +170,11 @@ export function redirectWithStoredParams(pathname: string) {
  * window.location.pathname. If the specified pathname is relative, the context
  * root of the Web app will be prepended to the specified pathname before
  * assigning it to window.location.pathname.
+ * @param {string} hashParam - Optional hash param to assign to
+ * window.location.hash.
  * @returns {Function}
  */
-export function redirectToStaticPage(pathname: string) {
+export function redirectToStaticPage(pathname: string, hashParam: ?string) {
     return () => {
         const windowLocation = window.location;
         let newPathname = pathname;
@@ -184,6 +188,10 @@ export function redirectToStaticPage(pathname: string) {
             newPathname = getLocationContextRoot(windowLocation) + newPathname;
         }
 
+        if (hashParam) {
+            windowLocation.hash = hashParam;
+        }
+
         windowLocation.pathname = newPathname;
     };
 }
@@ -284,21 +292,31 @@ export function maybeRedirectToWelcomePage(options: Object = {}) {
 
         // if close page is enabled redirect to it, without further action
         if (enableClosePage) {
-            const { isGuest } = getState()['features/base/jwt'];
+            if (isVpaasMeeting(getState())) {
+                redirectToStaticPage('/');
+            }
 
-            // save whether current user is guest or not, before navigating
-            // to close page
+            const { isGuest, jwt } = getState()['features/base/jwt'];
+
+            let hashParam;
+
+            // save whether current user is guest or not, and pass auth token,
+            // before navigating to close page
             window.sessionStorage.setItem('guest', isGuest);
+            window.sessionStorage.setItem('jwt', jwt);
 
             let path = 'close.html';
 
             if (interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
+                if (Number(API_ID) === API_ID) {
+                    hashParam = `#jitsi_meet_external_api_id=${API_ID}`;
+                }
                 path = 'close3.html';
             } else if (!options.feedbackSubmitted) {
                 path = 'close2.html';
             }
 
-            dispatch(redirectToStaticPage(`static/${path}`));
+            dispatch(redirectToStaticPage(`static/${path}`, hashParam));
 
             return;
         }

react/features/app/middlewares.any.js

@@ -18,6 +18,7 @@ import '../base/sounds/middleware';
 import '../base/testing/middleware';
 import '../base/tracks/middleware';
 import '../base/user-interaction/middleware';
+import '../billing-counter/middleware';
 import '../calendar-sync/middleware';
 import '../chat/middleware';
 import '../conference/middleware';

react/features/app/reducers.any.js

@@ -11,6 +11,7 @@ import '../base/dialog/reducer';
 import '../base/flags/reducer';
 import '../base/jwt/reducer';
 import '../base/known-domains/reducer';
+import '../base/lastn/reducer';
 import '../base/lib-jitsi-meet/reducer';
 import '../base/logging/reducer';
 import '../base/media/reducer';
@@ -29,6 +30,7 @@ import '../chat/reducer';
 import '../deep-linking/reducer';
 import '../device-selection/reducer';
 import '../dropbox/reducer';
+import '../dynamic-branding/reducer';
 import '../etherpad/reducer';
 import '../filmstrip/reducer';
 import '../follow-me/reducer';

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

@@ -2,7 +2,6 @@
 
 import React, { PureComponent } from 'react';
 
-import { IconShareDesktop } from '../../icons';
 import { getParticipantById } from '../../participants';
 import { connect } from '../../redux';
 import { getAvatarColor, getInitials } from '../functions';
@@ -192,17 +191,10 @@ 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 screenShares = state['features/video-layout'].screenShares || [];
-
-    let _loadableAvatarUrl = _participant?.loadableAvatarUrl;
-
-    if (participantId && screenShares.includes(participantId)) {
-        _loadableAvatarUrl = IconShareDesktop;
-    }
 
     return {
         _initialsBase,
-        _loadableAvatarUrl,
+        _loadableAvatarUrl: _participant?.loadableAvatarUrl,
         colorBase: !colorBase && _participant ? _participant.id : colorBase
     };
 }

react/features/base/conference/actionTypes.js

@@ -163,19 +163,6 @@ export const SET_DESKTOP_SHARING_ENABLED
  */
 export const SET_FOLLOW_ME = 'SET_FOLLOW_ME';
 
-/**
- * The type of (redux) action which sets the maximum video height that should be
- * received from remote participants, even if the user prefers a larger video
- * height.
- *
- * {
- *     type: SET_MAX_RECEIVER_VIDEO_QUALITY,
- *     maxReceiverVideoQuality: number
- * }
- */
-export const SET_MAX_RECEIVER_VIDEO_QUALITY
-    = 'SET_MAX_RECEIVER_VIDEO_QUALITY';
-
 /**
  * The type of (redux) action which sets the password to join or lock a specific
  * {@code JitsiConference}.
@@ -210,17 +197,6 @@ export const SET_PASSWORD_FAILED = 'SET_PASSWORD_FAILED';
  */
 export const SET_PENDING_SUBJECT_CHANGE = 'SET_PENDING_SUBJECT_CHANGE';
 
-/**
- * The type of (redux) action which sets the preferred maximum video height that
- * should be sent to and received from remote participants.
- *
- * {
- *     type: SET_PREFERRED_VIDEO_QUALITY,
- *     preferredVideoQuality: number
- * }
- */
-export const SET_PREFERRED_VIDEO_QUALITY = 'SET_PREFERRED_VIDEO_QUALITY';
-
 /**
  * The type of (redux) action which sets the name of the room of the
  * conference to be joined.

react/features/base/conference/actions.js

@@ -45,10 +45,8 @@ import {
     SEND_TONES,
     SET_DESKTOP_SHARING_ENABLED,
     SET_FOLLOW_ME,
-    SET_MAX_RECEIVER_VIDEO_QUALITY,
     SET_PASSWORD,
     SET_PASSWORD_FAILED,
-    SET_PREFERRED_VIDEO_QUALITY,
     SET_ROOM,
     SET_PENDING_SUBJECT_CHANGE,
     SET_START_MUTED_POLICY
@@ -615,23 +613,6 @@ export function setFollowMe(enabled: boolean) {
     };
 }
 
-/**
- * Sets the max frame height that should be received from remote videos.
- *
- * @param {number} maxReceiverVideoQuality - The max video frame height to
- * receive.
- * @returns {{
- *     type: SET_MAX_RECEIVER_VIDEO_QUALITY,
- *     maxReceiverVideoQuality: number
- * }}
- */
-export function setMaxReceiverVideoQuality(maxReceiverVideoQuality: number) {
-    return {
-        type: SET_MAX_RECEIVER_VIDEO_QUALITY,
-        maxReceiverVideoQuality
-    };
-}
-
 /**
  * Sets the password to join or lock a specific JitsiConference.
  *
@@ -698,24 +679,6 @@ export function setPassword(
     };
 }
 
-/**
- * Sets the max frame height the user prefers to send and receive from the
- * remote participants.
- *
- * @param {number} preferredVideoQuality - The max video resolution to send and
- * receive.
- * @returns {{
- *     type: SET_PREFERRED_VIDEO_QUALITY,
- *     preferredVideoQuality: number
- * }}
- */
-export function setPreferredVideoQuality(preferredVideoQuality: number) {
-    return {
-        type: SET_PREFERRED_VIDEO_QUALITY,
-        preferredVideoQuality
-    };
-}
-
 /**
  * Sets (the name of) the room of the conference to be joined.
  *

react/features/base/conference/constants.js

@@ -34,15 +34,3 @@ 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');
-
-/**
- * The supported remote video resolutions. The values are currently based on
- * available simulcast layers.
- *
- * @type {object}
- */
-export const VIDEO_QUALITY_LEVELS = {
-    HIGH: 720,
-    STANDARD: 360,
-    LOW: 180
-};

react/features/base/conference/functions.js

@@ -17,8 +17,7 @@ import {
     AVATAR_ID_COMMAND,
     AVATAR_URL_COMMAND,
     EMAIL_COMMAND,
-    JITSI_CONFERENCE_URL_KEY,
-    VIDEO_QUALITY_LEVELS
+    JITSI_CONFERENCE_URL_KEY
 } from './constants';
 import logger from './logger';
 
@@ -214,38 +213,6 @@ export function getCurrentConference(stateful: Function | Object) {
     return joining || passwordRequired || membersOnly;
 }
 
-/**
- * Finds the nearest match for the passed in {@link availableHeight} to am
- * enumerated value in {@code VIDEO_QUALITY_LEVELS}.
- *
- * @param {number} availableHeight - The height to which a matching video
- * quality level should be found.
- * @returns {number} The closest matching value from
- * {@code VIDEO_QUALITY_LEVELS}.
- */
-export function getNearestReceiverVideoQualityLevel(availableHeight: number) {
-    const qualityLevels = [
-        VIDEO_QUALITY_LEVELS.HIGH,
-        VIDEO_QUALITY_LEVELS.STANDARD,
-        VIDEO_QUALITY_LEVELS.LOW
-    ];
-
-    let selectedLevel = qualityLevels[0];
-
-    for (let i = 1; i < qualityLevels.length; i++) {
-        const previousValue = qualityLevels[i - 1];
-        const currentValue = qualityLevels[i];
-        const diffWithCurrent = Math.abs(availableHeight - currentValue);
-        const diffWithPrevious = Math.abs(availableHeight - previousValue);
-
-        if (diffWithCurrent < diffWithPrevious) {
-            selectedLevel = currentValue;
-        }
-    }
-
-    return selectedLevel;
-}
-
 /**
  * Returns the stored room name.
  *

react/features/base/conference/middleware.js

@@ -20,7 +20,7 @@ import {
     PARTICIPANT_UPDATED,
     PIN_PARTICIPANT
 } from '../participants';
-import { MiddlewareRegistry, StateListenerRegistry } from '../redux';
+import { MiddlewareRegistry } from '../redux';
 import { TRACK_ADDED, TRACK_REMOVED } from '../tracks';
 
 import {
@@ -28,7 +28,6 @@ import {
     CONFERENCE_JOINED,
     CONFERENCE_SUBJECT_CHANGED,
     CONFERENCE_WILL_LEAVE,
-    DATA_CHANNEL_OPENED,
     SEND_TONES,
     SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM
@@ -81,9 +80,6 @@ MiddlewareRegistry.register(store => next => action => {
         _conferenceWillLeave();
         break;
 
-    case DATA_CHANNEL_OPENED:
-        return _syncReceiveVideoQuality(store, next, action);
-
     case PARTICIPANT_UPDATED:
         return _updateLocalParticipantInConference(store, next, action);
 
@@ -104,31 +100,6 @@ MiddlewareRegistry.register(store => next => action => {
     return next(action);
 });
 
-/**
- * Registers a change handler for state['features/base/conference'] to update
- * the preferred video quality levels based on user preferred and internal
- * settings.
- */
-StateListenerRegistry.register(
-    /* selector */ state => state['features/base/conference'],
-    /* listener */ (currentState, store, previousState = {}) => {
-        const {
-            conference,
-            maxReceiverVideoQuality,
-            preferredVideoQuality
-        } = currentState;
-        const changedConference = conference !== previousState.conference;
-        const changedPreferredVideoQuality
-            = preferredVideoQuality !== previousState.preferredVideoQuality;
-        const changedMaxVideoQuality = maxReceiverVideoQuality !== previousState.maxReceiverVideoQuality;
-
-        if (changedConference || changedPreferredVideoQuality || changedMaxVideoQuality) {
-            _setReceiverVideoConstraint(conference, preferredVideoQuality, maxReceiverVideoQuality);
-        }
-        if (changedConference || changedPreferredVideoQuality) {
-            _setSenderVideoConstraint(conference, preferredVideoQuality);
-        }
-    });
 
 /**
  * Makes sure to leave a failed conference in order to release any allocated
@@ -448,44 +419,6 @@ function _sendTones({ getState }, next, action) {
     return next(action);
 }
 
-/**
- * Helper function for updating the preferred receiver video constraint, based
- * on the user preference and the internal maximum.
- *
- * @param {JitsiConference} conference - The JitsiConference instance for the
- * current call.
- * @param {number} preferred - The user preferred max frame height.
- * @param {number} max - The maximum frame height the application should
- * receive.
- * @returns {void}
- */
-function _setReceiverVideoConstraint(conference, preferred, max) {
-    if (conference) {
-        const value = Math.min(preferred, max);
-
-        conference.setReceiverVideoConstraint(value);
-        logger.info(`setReceiverVideoConstraint: ${value}`);
-    }
-}
-
-/**
- * Helper function for updating the preferred sender video constraint, based
- * on the user preference.
- *
- * @param {JitsiConference} conference - The JitsiConference instance for the
- * current call.
- * @param {number} preferred - The user preferred max frame height.
- * @returns {void}
- */
-function _setSenderVideoConstraint(conference, preferred) {
-    if (conference) {
-        conference.setSenderVideoConstraint(preferred)
-            .catch(err => {
-                logger.error(`Changing sender resolution to ${preferred} failed - ${err} `);
-            });
-    }
-}
-
 /**
  * Notifies the feature base/conference that the action
  * {@code SET_ROOM} is being dispatched within a specific
@@ -539,33 +472,6 @@ function _syncConferenceLocalTracksWithState({ getState }, action) {
     return promise || Promise.resolve();
 }
 
-/**
- * Sets the maximum receive video quality.
- *
- * @param {Store} store - The redux store in which the specified {@code action}
- * is being dispatched.
- * @param {Dispatch} next - The redux {@code dispatch} function to dispatch the
- * specified {@code action} to the specified {@code store}.
- * @param {Action} action - The redux action {@code DATA_CHANNEL_STATUS_CHANGED}
- * which is being dispatched in the specified {@code store}.
- * @private
- * @returns {Object} The value returned by {@code next(action)}.
- */
-function _syncReceiveVideoQuality({ getState }, next, action) {
-    const {
-        conference,
-        maxReceiverVideoQuality,
-        preferredVideoQuality
-    } = getState()['features/base/conference'];
-
-    _setReceiverVideoConstraint(
-        conference,
-        preferredVideoQuality,
-        maxReceiverVideoQuality);
-
-    return next(action);
-}
-
 /**
  * Notifies the feature base/conference that the action {@code TRACK_ADDED}
  * or {@code TRACK_REMOVED} is being dispatched within a specific redux store.
@@ -624,7 +530,7 @@ function _updateLocalParticipantInConference({ dispatch, getState }, next, actio
 
             // When the local user role is updated to moderator and we have a pending subject change
             // which was not reflected we need to set it (the first time we tried was before becoming moderator).
-            if (pendingSubjectChange !== subject) {
+            if (typeof pendingSubjectChange !== 'undefined' && pendingSubjectChange !== subject) {
                 dispatch(setSubject(pendingSubjectChange));
             }
         }

react/features/base/conference/reducer.js

@@ -18,15 +18,12 @@ import {
     P2P_STATUS_CHANGED,
     SET_DESKTOP_SHARING_ENABLED,
     SET_FOLLOW_ME,
-    SET_MAX_RECEIVER_VIDEO_QUALITY,
     SET_PASSWORD,
     SET_PENDING_SUBJECT_CHANGE,
-    SET_PREFERRED_VIDEO_QUALITY,
     SET_ROOM,
     SET_SIP_GATEWAY_ENABLED,
     SET_START_MUTED_POLICY
 } from './actionTypes';
-import { VIDEO_QUALITY_LEVELS } from './constants';
 import { isRoomValid } from './functions';
 
 const DEFAULT_STATE = {
@@ -35,11 +32,9 @@ const DEFAULT_STATE = {
     joining: undefined,
     leaving: undefined,
     locked: undefined,
-    maxReceiverVideoQuality: VIDEO_QUALITY_LEVELS.HIGH,
     membersOnly: undefined,
     password: undefined,
-    passwordRequired: undefined,
-    preferredVideoQuality: VIDEO_QUALITY_LEVELS.HIGH
+    passwordRequired: undefined
 };
 
 /**
@@ -90,24 +85,12 @@ ReducerRegistry.register(
         case SET_LOCATION_URL:
             return set(state, 'room', undefined);
 
-        case SET_MAX_RECEIVER_VIDEO_QUALITY:
-            return set(
-                state,
-                'maxReceiverVideoQuality',
-                action.maxReceiverVideoQuality);
-
         case SET_PASSWORD:
             return _setPassword(state, action);
 
         case SET_PENDING_SUBJECT_CHANGE:
             return set(state, 'pendingSubjectChange', action.subject);
 
-        case SET_PREFERRED_VIDEO_QUALITY:
-            return set(
-                state,
-                'preferredVideoQuality',
-                action.preferredVideoQuality);
-
         case SET_ROOM:
             return _setRoom(state, action);
 

react/features/base/config/actionTypes.js

@@ -43,8 +43,8 @@ export const SET_CONFIG = 'SET_CONFIG';
  * and the passed object.
  *
  * {
- *     type: _UPDATE_CONFIG,
+ *     type: UPDATE_CONFIG,
  *     config: Object
  * }
  */
-export const _UPDATE_CONFIG = '_UPDATE_CONFIG';
+export const UPDATE_CONFIG = 'UPDATE_CONFIG';

react/features/base/config/actions.js

@@ -6,10 +6,24 @@ import type { Dispatch } from 'redux';
 import { addKnownDomains } from '../known-domains';
 import { parseURIString } from '../util';
 
-import { CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
+import { CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG, UPDATE_CONFIG } from './actionTypes';
 import { _CONFIG_STORE_PREFIX } from './constants';
 import { setConfigFromURLParams } from './functions';
 
+
+/**
+ * Updates the config with new options.
+ *
+ * @param {Object} config - The new options (to add).
+ * @returns {Function}
+ */
+export function updateConfig(config: Object) {
+    return {
+        type: UPDATE_CONFIG,
+        config
+    };
+}
+
 /**
  * Signals that the configuration (commonly known in Jitsi Meet as config.js)
  * for a specific locationURL will be loaded now.

react/features/base/config/configWhitelist.js

@@ -17,6 +17,7 @@ export default [
     'audioLevelsInterval',
     'autoRecord',
     'autoRecordToken',
+    'apiLogLevels',
     'avgRtpStatsN',
 
     /**
@@ -69,6 +70,7 @@ export default [
 
     'channelLastN',
     'constraints',
+    'brandingRoomAlias',
     'debug',
     'debugAudioLevels',
     'defaultLanguage',
@@ -100,12 +102,14 @@ export default [
     'enableInsecureRoomNameWarning',
     'enableLayerSuspension',
     'enableLipSync',
+    'enableOpusRed',
     'enableRemb',
     'enableScreenshotCapture',
     'enableTalkWhileMuted',
     'enableNoAudioDetection',
     'enableNoisyMicDetection',
     'enableTcc',
+    'enableAutomaticUrlCopy',
     'etherpad_base',
     'failICE',
     'feedbackPercentage',
@@ -115,6 +119,7 @@ export default [
     'gatherStats',
     'googleApiApplicationClientID',
     'hiddenDomain',
+    'hideLobbyButton',
     'hosts',
     'iAmRecorder',
     'iAmSipGateway',
@@ -122,6 +127,7 @@ export default [
     'ignoreStartMuted',
     'liveStreamingEnabled',
     'localRecording',
+    'maxFullResolutionParticipants',
     'minParticipants',
     'nick',
     'openBridgeChannel',
@@ -147,6 +153,7 @@ export default [
     'testing',
     'useStunTurn',
     'useTurnUdp',
+    'videoQuality.persist',
     'webrtcIceTcpDisable',
     'webrtcIceUdpDisable'
 ].concat(extraConfigWhitelist);

react/features/base/config/middleware.js

@@ -8,7 +8,8 @@ import { addKnownDomains } from '../known-domains';
 import { MiddlewareRegistry } from '../redux';
 import { parseURIString } from '../util';
 
-import { _UPDATE_CONFIG, SET_CONFIG } from './actionTypes';
+import { SET_CONFIG } from './actionTypes';
+import { updateConfig } from './actions';
 import { _CONFIG_STORE_PREFIX } from './constants';
 
 /**
@@ -114,10 +115,7 @@ function _setConfig({ dispatch, getState }, next, action) {
         config.resolution = resolutionFlag;
     }
 
-    dispatch({
-        type: _UPDATE_CONFIG,
-        config
-    });
+    dispatch(updateConfig(config));
 
     // FIXME On Web we rely on the global 'config' variable which gets altered
     // multiple times, before it makes it to the reducer. At some point it may

react/features/base/config/reducer.js

@@ -4,7 +4,7 @@ import _ from 'lodash';
 
 import { equals, ReducerRegistry, set } from '../redux';
 
-import { _UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
+import { UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, SET_CONFIG } from './actionTypes';
 import { _cleanupConfig } from './functions';
 
 /**
@@ -50,7 +50,7 @@ const INITIAL_RN_STATE = {
 
 ReducerRegistry.register('features/base/config', (state = _getInitialState(), action) => {
     switch (action.type) {
-    case _UPDATE_CONFIG:
+    case UPDATE_CONFIG:
         return _updateConfig(state, action);
 
     case CONFIG_WILL_LOAD:

react/features/base/connection/actions.native.js

@@ -80,12 +80,8 @@ export function connect(id: ?string, password: ?string) {
         const state = getState();
         const options = _constructOptions(state);
         const { locationURL } = state['features/base/connection'];
-        const { issuer, jwt } = state['features/base/jwt'];
-        const connection
-            = new JitsiMeetJS.JitsiConnection(
-                options.appId,
-                jwt && issuer && issuer !== 'anonymous' ? jwt : undefined,
-                options);
+        const { jwt } = state['features/base/jwt'];
+        const connection = new JitsiMeetJS.JitsiConnection(options.appId, jwt, options);
 
         connection[JITSI_CONNECTION_URL_KEY] = locationURL;
 

react/features/base/connection/functions.js

@@ -54,7 +54,17 @@ export function getInviteURL(stateOrGetState: Function | Object): string {
         throw new Error('Can not get invite URL - the app is not ready');
     }
 
-    return getURLWithoutParams(locationURL).href;
+    const { inviteDomain } = state['features/dynamic-branding'];
+    const urlWithoutParams = getURLWithoutParams(locationURL);
+
+    if (inviteDomain) {
+        const meetingId
+            = state['features/base/config'].brandingRoomAlias || urlWithoutParams.pathname;
+
+        return `${inviteDomain}/${meetingId}`;
+    }
+
+    return urlWithoutParams.href;
 }
 
 /**

react/features/base/devices/middleware.js

@@ -5,7 +5,6 @@ import { processExternalDeviceRequest } from '../../device-selection';
 import { showNotification, showWarningNotification } from '../../notifications';
 import { replaceAudioTrackById, replaceVideoTrackById, setDeviceStatusWarning } from '../../prejoin/actions';
 import { isPrejoinPageVisible } from '../../prejoin/functions';
-import { CONFERENCE_JOINED } from '../conference';
 import { JitsiTrackErrors } from '../lib-jitsi-meet';
 import { MiddlewareRegistry } from '../redux';
 import { updateSettings } from '../settings';
@@ -24,6 +23,7 @@ import {
     setVideoInputDevice
 } from './actions';
 import {
+    areDeviceLabelsInitialized,
     formatDeviceLabel,
     groupDevicesByKind,
     setAudioOutputDeviceId
@@ -73,8 +73,6 @@ function logDeviceList(deviceList) {
 // eslint-disable-next-line no-unused-vars
 MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
-    case CONFERENCE_JOINED:
-        return _conferenceJoined(store, next, action);
     case NOTIFY_CAMERA_ERROR: {
         if (typeof APP !== 'object' || !action.error) {
             break;
@@ -148,6 +146,9 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     case UPDATE_DEVICE_LIST:
         logDeviceList(groupDevicesByKind(action.devices));
+        if (areDeviceLabelsInitialized(store.getState())) {
+            return _processPendingRequests(store, next, action);
+        }
         break;
     case CHECK_AND_NOTIFY_FOR_NEW_DEVICE:
         _checkAndNotifyForNewDevice(store, action.newDevices, action.oldDevices);
@@ -170,11 +171,15 @@ MiddlewareRegistry.register(store => next => action => {
  * @private
  * @returns {Object} The value returned by {@code next(action)}.
  */
-function _conferenceJoined({ dispatch, getState }, next, action) {
+function _processPendingRequests({ dispatch, getState }, next, action) {
     const result = next(action);
     const state = getState();
     const { pendingRequests } = state['features/base/devices'];
 
+    if (!pendingRequests || pendingRequests.length === 0) {
+        return result;
+    }
+
     pendingRequests.forEach(request => {
         processExternalDeviceRequest(
             dispatch,

react/features/base/icons/svg/index.js

@@ -98,4 +98,7 @@ export { default as IconVolume } from './volume.svg';
 export { default as IconVolumeEmpty } from './volume-empty.svg';
 export { default as IconVolumeOff } from './volume-off.svg';
 export { default as IconWarning } from './warning.svg';
+export { default as IconWifi1Bar } from './wifi-1.svg';
+export { default as IconWifi2Bars } from './wifi-2.svg';
+export { default as IconWifi3Bars } from './wifi-3.svg';
 export { default as IconYahoo } from './yahoo.svg';

react/features/base/icons/svg/wifi-1.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="12" viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.4" d="M13.0913 6.59847C12.4227 5.88894 11.629 5.32611 10.7554 4.94212C9.88182 4.55812 8.94553 4.36048 7.99997 4.36048C7.05442 4.36048 6.11813 4.55812 5.24456 4.94212C4.371 5.32611 3.57726 5.88894 2.90869 6.59847L4.36305 8.14176C4.84061 7.63486 5.4076 7.23276 6.03163 6.95842C6.65566 6.68408 7.32451 6.54288 7.99997 6.54288C8.67544 6.54288 9.34429 6.68408 9.96832 6.95842C10.5923 7.23276 11.1593 7.63486 11.6369 8.14176L13.0913 6.59847Z" fill="white"/>
+<path opacity="0.4" d="M16 3.51081C13.8766 1.26261 10.9996 0 8 0C5.00044 0 2.12337 1.26261 0 3.51081L1.45436 5.0541C3.19156 3.21432 5.54565 2.18105 8 2.18105C10.4543 2.18105 12.8084 3.21432 14.5456 5.0541L16 3.51081Z" fill="white"/>
+<path d="M5.94287 9.81713L7.99996 12L10.057 9.81713C9.78693 9.53041 9.46623 9.30297 9.11328 9.1478C8.76032 8.99263 8.38201 8.91276 7.99996 8.91276C7.6179 8.91276 7.23959 8.99263 6.88663 9.1478C6.53368 9.30297 6.21298 9.53041 5.94287 9.81713Z" />
+</svg>

react/features/base/icons/svg/wifi-2.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="12" viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.0913 6.59847C12.4227 5.88894 11.629 5.32611 10.7554 4.94211C9.88182 4.55811 8.94553 4.36047 7.99997 4.36047C7.05442 4.36047 6.11813 4.55811 5.24456 4.94211C4.371 5.32611 3.57726 5.88894 2.90869 6.59847L4.36305 8.14176C4.84061 7.63486 5.4076 7.23276 6.03163 6.95842C6.65566 6.68408 7.32451 6.54288 7.99997 6.54288C8.67544 6.54288 9.34429 6.68408 9.96832 6.95842C10.5923 7.23276 11.1593 7.63486 11.6369 8.14176L13.0913 6.59847Z" fill="white"/>
+<path opacity="0.4" d="M16 3.51081C13.8766 1.26261 10.9996 0 8 0C5.00044 0 2.12337 1.26261 0 3.51081L1.45436 5.0541C3.19156 3.21432 5.54565 2.18105 8 2.18105C10.4543 2.18105 12.8084 3.21432 14.5456 5.0541L16 3.51081Z" fill="white"/>
+<path d="M5.94287 9.81713L7.99996 12L10.057 9.81713C9.78693 9.53042 9.46623 9.30298 9.11328 9.14781C8.76032 8.99263 8.38201 8.91277 7.99996 8.91277C7.6179 8.91277 7.23959 8.99263 6.88663 9.14781C6.53368 9.30298 6.21298 9.53042 5.94287 9.81713Z" />
+</svg>

react/features/base/icons/svg/wifi-3.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="12" viewBox="0 0 16 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.0913 6.59847C12.4227 5.88894 11.629 5.32611 10.7554 4.94211C9.88182 4.55811 8.94553 4.36047 7.99997 4.36047C7.05442 4.36047 6.11813 4.55811 5.24456 4.94211C4.371 5.32611 3.57726 5.88894 2.90869 6.59847L4.36305 8.14176C4.84061 7.63486 5.4076 7.23276 6.03163 6.95842C6.65566 6.68408 7.32451 6.54288 7.99997 6.54288C8.67544 6.54288 9.34429 6.68408 9.96832 6.95842C10.5923 7.23276 11.1593 7.63486 11.6369 8.14176L13.0913 6.59847Z" fill="white"/>
+<path d="M16 3.51081C13.8766 1.26261 10.9996 0 8 0C5.00044 0 2.12337 1.26261 0 3.51081L1.45436 5.0541C3.19156 3.21432 5.54565 2.18105 8 2.18105C10.4543 2.18105 12.8084 3.21432 14.5456 5.0541L16 3.51081Z" fill="white"/>
+<path d="M5.94287 9.81713L7.99996 12L10.057 9.81713C9.78693 9.53042 9.46623 9.30298 9.11328 9.14781C8.76032 8.99263 8.38201 8.91277 7.99996 8.91277C7.6179 8.91277 7.23959 8.99263 6.88663 9.14781C6.53368 9.30298 6.21298 9.53042 5.94287 9.81713Z" />
+</svg>

react/features/base/jwt/logger.js

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

react/features/base/jwt/middleware.js

@@ -13,6 +13,7 @@ import { MiddlewareRegistry } from '../redux';
 import { SET_JWT } from './actionTypes';
 import { setJWT } from './actions';
 import { parseJWTFromURLParams } from './functions';
+import logger from './logger';
 
 declare var APP: Object;
 
@@ -133,7 +134,13 @@ function _setJWT(store, next, action) {
 
             action.isGuest = !enableUserRolesBasedOnToken;
 
-            const jwtPayload = jwtDecode(jwt);
+            let jwtPayload;
+
+            try {
+                jwtPayload = jwtDecode(jwt);
+            } catch (e) {
+                logger.error(e);
+            }
 
             if (jwtPayload) {
                 const { context, iss } = jwtPayload;

react/features/base/lastn/functions.js

@@ -0,0 +1,56 @@
+/**
+ * Checks if the given Object is a correct last N limit mapping, coverts both keys and values to numbers and sorts
+ * the keys in ascending order.
+ *
+ * @param {Object} lastNLimits - The Object to be verified.
+ * @returns {undefined|Map<number, number>}
+ */
+export function validateLastNLimits(lastNLimits) {
+    // Checks if only numbers are used
+    if (typeof lastNLimits !== 'object'
+        || !Object.keys(lastNLimits).length
+        || Object.keys(lastNLimits)
+            .find(limit => limit === null || isNaN(Number(limit))
+                || lastNLimits[limit] === null || isNaN(Number(lastNLimits[limit])))) {
+        return undefined;
+    }
+
+    // Converts to numbers and sorts the keys
+    const sortedMapping = new Map();
+    const orderedLimits = Object.keys(lastNLimits)
+        .map(n => Number(n))
+        .sort((n1, n2) => n1 - n2);
+
+    for (const limit of orderedLimits) {
+        sortedMapping.set(limit, Number(lastNLimits[limit]));
+    }
+
+    return sortedMapping;
+}
+
+/**
+ * Returns "last N" value which corresponds to a level defined in the {@code lastNLimits} mapping. See
+ * {@code config.js} for more detailed explanation on how the mapping is defined.
+ *
+ * @param {number} participantsCount - The current number of participants in the conference.
+ * @param {Map<number, number>} [lastNLimits] - The mapping of number of participants to "last N" values. NOTE that
+ * this function expects a Map that has been preprocessed by {@link validateLastNLimits}, because the keys must be
+ * sorted in ascending order and both keys and values should be numbers.
+ * @returns {number|undefined} - A "last N" number if there was a corresponding "last N" value matched with the number
+ * of participants or {@code undefined} otherwise.
+ */
+export function limitLastN(participantsCount, lastNLimits) {
+    if (!lastNLimits || !lastNLimits.keys) {
+        return undefined;
+    }
+
+    let selectedLimit;
+
+    for (const participantsN of lastNLimits.keys()) {
+        if (participantsCount >= participantsN) {
+            selectedLimit = participantsN;
+        }
+    }
+
+    return selectedLimit ? lastNLimits.get(selectedLimit) : undefined;
+}

react/features/base/lastn/middleware.js

@@ -7,9 +7,18 @@ import { SCREEN_SHARE_PARTICIPANTS_UPDATED, SET_TILE_VIEW } from '../../video-la
 import { shouldDisplayTileView } from '../../video-layout/functions';
 import { SET_AUDIO_ONLY } from '../audio-only/actionTypes';
 import { CONFERENCE_JOINED } from '../conference/actionTypes';
-import { getParticipantById } from '../participants/functions';
+import {
+    PARTICIPANT_JOINED,
+    PARTICIPANT_KICKED,
+    PARTICIPANT_LEFT
+} from '../participants/actionTypes';
+import {
+    getParticipantById,
+    getParticipantCount
+} from '../participants/functions';
 import { MiddlewareRegistry } from '../redux';
 
+import { limitLastN } from './functions';
 import logger from './logger';
 
 declare var APP: Object;
@@ -21,6 +30,9 @@ MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
     case APP_STATE_CHANGED:
     case CONFERENCE_JOINED:
+    case PARTICIPANT_JOINED:
+    case PARTICIPANT_KICKED:
+    case PARTICIPANT_LEFT:
     case SCREEN_SHARE_PARTICIPANTS_UPDATED:
     case SELECT_LARGE_VIDEO_PARTICIPANT:
     case SET_AUDIO_ONLY:
@@ -47,6 +59,8 @@ function _updateLastN({ getState }) {
     const { appState } = state['features/background'] || {};
     const { enabled: filmStripEnabled } = state['features/filmstrip'];
     const config = state['features/base/config'];
+    const { lastNLimits } = state['features/base/lastn'];
+    const participantCount = getParticipantCount(state);
 
     if (!conference) {
         logger.debug('There is no active conference, not updating last N');
@@ -57,6 +71,13 @@ function _updateLastN({ getState }) {
     const defaultLastN = typeof config.channelLastN === 'undefined' ? -1 : config.channelLastN;
     let lastN = defaultLastN;
 
+    // Apply last N limit based on the # of participants
+    const limitedLastN = limitLastN(participantCount, lastNLimits);
+
+    if (limitedLastN !== undefined) {
+        lastN = limitedLastN;
+    }
+
     if (typeof appState !== 'undefined' && appState !== 'active') {
         lastN = 0;
     } else if (audioOnly) {

react/features/base/lastn/reducer.js

@@ -0,0 +1,27 @@
+import {
+    SET_CONFIG
+} from '../config';
+import { ReducerRegistry, set } from '../redux';
+
+import { validateLastNLimits } from './functions';
+
+ReducerRegistry.register('features/base/lastn', (state = { }, action) => {
+    switch (action.type) {
+    case SET_CONFIG:
+        return _setConfig(state, action);
+    }
+
+    return state;
+});
+
+/**
+ * Reduces a specific Redux action SET_CONFIG.
+ *
+ * @param {Object} state - The Redux state of feature base/lastn.
+ * @param {Action} action - The Redux action SET_CONFIG to reduce.
+ * @private
+ * @returns {Object} The new state after the reduction of the specified action.
+ */
+function _setConfig(state, { config }) {
+    return set(state, 'lastNLimits', validateLastNLimits(config.lastNLimits));
+}

react/features/base/logging/ExternalApiLogTransport.js

@@ -0,0 +1,22 @@
+// @flow
+
+declare var APP: Object;
+
+/**
+ * Constructs a log transport object for use with external API.
+ *
+ * @param {Array} levels - The log levels forwarded to the external API.
+
+ * @returns {Object} - The transport object.
+ */
+function buildTransport(levels: Array<string>) {
+    return levels.reduce((logger, level) => {
+        logger[level] = (...args) => {
+            APP.API.notifyLog(level, args);
+        };
+
+        return logger;
+    }, {});
+}
+
+export default buildTransport;

react/features/base/logging/middleware.js

@@ -11,6 +11,7 @@ import JitsiMeetJS, {
 import { MiddlewareRegistry } from '../redux';
 import { isTestModeEnabled } from '../testing';
 
+import buildExternalApiLogTransport from './ExternalApiLogTransport';
 import JitsiMeetInMemoryLogStorage from './JitsiMeetInMemoryLogStorage';
 import JitsiMeetLogStorage from './JitsiMeetLogStorage';
 import { SET_LOGGING_CONFIG } from './actionTypes';
@@ -141,6 +142,15 @@ function _initLogging({ dispatch, getState }, loggingConfig, isTestingEnabled) {
         const _logCollector
             = new Logger.LogCollector(new JitsiMeetLogStorage(getState));
 
+        const { apiLogLevels } = getState()['features/base/config'];
+
+        if (apiLogLevels && Array.isArray(apiLogLevels) && typeof APP === 'object') {
+            const transport = buildExternalApiLogTransport(apiLogLevels);
+
+            Logger.addGlobalTransport(transport);
+            JitsiMeetJS.addGlobalLogTransport(transport);
+        }
+
         Logger.addGlobalTransport(_logCollector);
         JitsiMeetJS.addGlobalLogTransport(_logCollector);
         dispatch(setLogCollector(_logCollector));

react/features/base/premeeting/components/web/ActionButton.js

@@ -70,6 +70,7 @@ function ActionButton({
             {children}
             {hasOptions && <div
                 className = 'options'
+                data-testid = 'prejoin.joinOptions'
                 onClick = { disabled ? undefined : onOptionsClick }>
                 <Icon
                     className = 'icon'

react/features/base/premeeting/components/web/Avatar.js

@@ -0,0 +1,61 @@
+// @flow
+
+import React from 'react';
+
+import { Avatar } from '../../../avatar';
+import { connect } from '../../../redux';
+import { calculateAvatarDimensions } from '../../functions';
+
+type Props = {
+
+   /**
+    * The height of the window.
+    */
+    height: number,
+
+   /**
+    * The name of the participant (if any).
+    */
+    name: string
+}
+
+/**
+ * Component displaying the avatar for the premeeting screen.
+ *
+ * @param {Props} props - The props of the component.
+ * @returns {ReactElement}
+ */
+function PremeetingAvatar({ height, name }: Props) {
+    const { marginTop, size } = calculateAvatarDimensions(height);
+
+    if (size <= 5) {
+        return null;
+    }
+
+
+    return (
+        <div style = {{ marginTop }}>
+            <Avatar
+                className = 'preview-avatar'
+                displayName = { name }
+                participantId = 'local'
+                size = { size } />
+        </div>
+    );
+}
+
+/**
+ * Maps (parts of) the redux state to the React {@code Component} props.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {{
+ *    height: number
+ * }}
+ */
+function mapStateToProps(state) {
+    return {
+        height: state['features/base/responsive-ui'].clientHeight
+    };
+}
+
+export default connect(mapStateToProps)(PremeetingAvatar);

react/features/base/premeeting/components/web/ConnectionStatus.js

@@ -0,0 +1,104 @@
+// @flow
+
+import React, { useState } from 'react';
+
+import { translate } from '../../../i18n';
+import { Icon, IconArrowDownSmall, IconWifi1Bar, IconWifi2Bars, IconWifi3Bars } from '../../../icons';
+import { connect } from '../../../redux';
+import { CONNECTION_TYPE } from '../../constants';
+import { getConnectionData } from '../../functions';
+
+type Props = {
+
+    /**
+     * List of strings with details about the connection.
+     */
+    connectionDetails: string[],
+
+    /**
+     * The type of the connection. Can be: 'none', 'poor', 'nonOptimal' or 'good'.
+     */
+    connectionType: string,
+
+    /**
+     * Used for translation.
+     */
+    t: Function
+}
+
+const CONNECTION_TYPE_MAP = {
+    [CONNECTION_TYPE.POOR]: {
+        connectionClass: 'con-status--poor',
+        icon: IconWifi1Bar,
+        connectionText: 'prejoin.connection.poor'
+    },
+    [CONNECTION_TYPE.NON_OPTIMAL]: {
+        connectionClass: 'con-status--non-optimal',
+        icon: IconWifi2Bars,
+        connectionText: 'prejoin.connection.nonOptimal'
+    },
+    [CONNECTION_TYPE.GOOD]: {
+        connectionClass: 'con-status--good',
+        icon: IconWifi3Bars,
+        connectionText: 'prejoin.connection.good'
+    }
+};
+
+/**
+ * Component displaying information related to the connection & audio/video quality.
+ *
+ * @param {Props} props - The props of the component.
+ * @returns {ReactElement}
+ */
+function ConnectionStatus({ connectionDetails, t, connectionType }: Props) {
+    if (connectionType === CONNECTION_TYPE.NONE) {
+        return null;
+    }
+
+    const { connectionClass, icon, connectionText } = CONNECTION_TYPE_MAP[connectionType];
+    const [ showDetails, toggleDetails ] = useState(false);
+    const arrowClassName = showDetails
+        ? 'con-status-arrow con-status-arrow--up'
+        : 'con-status-arrow';
+    const detailsText = connectionDetails.map(t).join(' ');
+
+    return (
+        <div className = 'con-status'>
+            <div className = 'con-status-container'>
+                <div className = 'con-status-header'>
+                    <div className = { `con-status-circle ${connectionClass}` }>
+                        <Icon
+                            size = { 16 }
+                            src = { icon } />
+                    </div>
+                    <span className = 'con-status-text'>{t(connectionText)}</span>
+                    <Icon
+                        className = { arrowClassName }
+                        // eslint-disable-next-line react/jsx-no-bind
+                        onClick = { () => toggleDetails(!showDetails) }
+                        size = { 24 }
+                        src = { IconArrowDownSmall } />
+                </div>
+                { showDetails
+                  && <div className = 'con-status-details'>{detailsText}</div> }
+            </div>
+        </div>
+    );
+}
+
+/**
+ * Maps (parts of) the redux state to the React {@code Component} props.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {Object}
+ */
+function mapStateToProps(state): Object {
+    const { connectionDetails, connectionType } = getConnectionData(state);
+
+    return {
+        connectionDetails,
+        connectionType
+    };
+}
+
+export default translate(connect(mapStateToProps)(ConnectionStatus));

react/features/base/premeeting/components/web/CopyMeetingUrl.js

@@ -18,7 +18,13 @@ type Props = {
     /**
      * Used for translation.
      */
-    t: Function
+    t: Function,
+
+    /**
+     * Used to determine if invitation link should be automatically copied
+     * after creating a meeting.
+     */
+    _enableAutomaticUrlCopy: boolean,
 };
 
 type State = {
@@ -58,6 +64,7 @@ class CopyMeetingUrl extends Component<Props, State> {
         this._hideLinkCopied = this._hideLinkCopied.bind(this);
         this._showCopyLink = this._showCopyLink.bind(this);
         this._showLinkCopied = this._showLinkCopied.bind(this);
+        this._copyUrlAutomatically = this._copyUrlAutomatically.bind(this);
     }
 
     _copyUrl: () => void;
@@ -135,6 +142,37 @@ class CopyMeetingUrl extends Component<Props, State> {
         });
     }
 
+    _copyUrlAutomatically: () => void;
+
+    /**
+     * Attempts to automatically copy invitation URL.
+     * Document has to be focused in order for this to work.
+     *
+     * @private
+     * @returns {void}
+     */
+    _copyUrlAutomatically() {
+        navigator.clipboard.writeText(this.props.url)
+            .then(() => {
+                this._showLinkCopied();
+                window.setTimeout(this._hideLinkCopied, COPY_TIMEOUT);
+            });
+    }
+
+    /**
+     * Implements React's {@link Component#componentDidMount()}. Invoked
+     * immediately before mounting occurs.
+     *
+     * @inheritdoc
+     */
+    componentDidMount() {
+        const { _enableAutomaticUrlCopy } = this.props;
+
+        if (_enableAutomaticUrlCopy) {
+            setTimeout(this._copyUrlAutomatically, 2000);
+        }
+    }
+
     /**
      * Implements React's {@link Component#render()}.
      *
@@ -177,8 +215,11 @@ class CopyMeetingUrl extends Component<Props, State> {
  * @returns {Object}
  */
 function mapStateToProps(state) {
+    const { enableAutomaticUrlCopy } = state['features/base/config'];
+
     return {
-        url: getCurrentConferenceUrl(state)
+        url: getCurrentConferenceUrl(state),
+        _enableAutomaticUrlCopy: enableAutomaticUrlCopy || false
     };
 }
 

react/features/base/premeeting/components/web/InputField.js

@@ -6,6 +6,11 @@ import { getFieldValue } from '../../../react';
 
 type Props = {
 
+    /**
+     * If the input should be focused on display.
+     */
+    autoFocus?: boolean,
+
     /**
      * Class name to be appended to the default class list.
      */
@@ -109,6 +114,7 @@ export default class InputField extends PureComponent<Props, State> {
     render() {
         return (
             <input
+                autoFocus = { this.props.autoFocus }
                 className = { `field ${this.state.focused ? 'focused' : ''} ${this.props.className || ''}` }
                 data-testid = { this.props.testId ? this.props.testId : undefined }
                 onBlur = { this._onBlur }

react/features/base/premeeting/components/web/PreMeetingScreen.js

@@ -4,6 +4,7 @@ import React, { PureComponent } from 'react';
 
 import { AudioSettingsButton, VideoSettingsButton } from '../../../../toolbox/components/web';
 
+import ConnectionStatus from './ConnectionStatus';
 import CopyMeetingUrl from './CopyMeetingUrl';
 import Preview from './Preview';
 
@@ -82,6 +83,7 @@ export default class PreMeetingScreen extends PureComponent<Props> {
             <div
                 className = 'premeeting-screen'
                 id = 'lobby-screen'>
+                <ConnectionStatus />
                 <Preview
                     name = { name }
                     showAvatar = { showAvatar }

react/features/base/premeeting/components/web/Preview.js

@@ -2,11 +2,12 @@
 
 import React from 'react';
 
-import { Avatar } from '../../../avatar';
 import { Video } from '../../../media';
 import { connect } from '../../../redux';
 import { getLocalVideoTrack } from '../../../tracks';
 
+import PreviewAvatar from './Avatar';
+
 export type Props = {
 
     /**
@@ -54,13 +55,7 @@ function Preview(props: Props) {
             <div
                 className = 'no-video'
                 id = 'preview'>
-                <div className = 'preview-avatar-container'>
-                    <Avatar
-                        className = 'preview-avatar'
-                        displayName = { name }
-                        participantId = 'local'
-                        size = { 200 } />
-                </div>
+                <PreviewAvatar name = { name } />
             </div>
         );
     }

react/features/base/premeeting/constants.js

@@ -0,0 +1,8 @@
+// @flow
+
+export const CONNECTION_TYPE = {
+    GOOD: 'good',
+    NON_OPTIMAL: 'nonOptimal',
+    NONE: 'none',
+    POOR: 'poor'
+};