ref(Thumbnail): Create React component.

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

@@ -38,7 +38,7 @@ import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The one and only Activity that the Jitsi Meet app needs. The
@@ -183,8 +183,8 @@ public class MainActivity extends JitsiMeetActivity {
     }
 
     @Override
-    protected void onConferenceTerminated(HashMap<String, Object> extraData) {
-        Log.d(TAG, "Conference terminated: " + extraData);
+    public void onConferenceTerminated(Map<String, Object> data) {
+        Log.d(TAG, "Conference terminated: " + data);
     }
 
     // Activity lifecycle method overrides

android/build.gradle

@@ -10,17 +10,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     }
 }
 
 ext {
-    buildToolsVersion = "30.0.3"
-    compileSdkVersion = 30
+    buildToolsVersion = "29.0.3"
+    compileSdkVersion = 29
     minSdkVersion    = 23
-    targetSdkVersion = 30
+    targetSdkVersion = 29
     supportLibVersion = "28.0.0"
 
     // The Maven artifact groupdId of the third-party react-native modules which

android/gradle.properties

@@ -25,5 +25,5 @@ android.enableDexingArtifactTransform.desugaring=false
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=21.0.0
-sdkVersion=3.0.0
+appVersion=20.6.0
+sdkVersion=2.12.0

android/sdk/build.gradle

@@ -25,6 +25,10 @@ android {
     sourceSets {
         main {
             java {
+                if (rootProject.ext.libreBuild) {
+                    srcDir "src"
+                    exclude "**/AmplitudeModule.java"
+                }
                 exclude "test/"
             }
         }
@@ -36,7 +40,6 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.fragment:fragment:1.2.5'
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     //noinspection GradleDynamicVersion
@@ -48,23 +51,17 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.squareup.duktape:duktape-android:1.3.0'
 
-    if (rootProject.ext.libreBuild) {
-        implementation(project(':react-native-device-info')) {
-            exclude group: 'com.google.firebase'
-            exclude group: 'com.google.android.gms'
-            exclude group: 'com.android.installreferrer'
-        }
-    } else {
-        implementation project(':react-native-device-info')
+    if (!rootProject.ext.libreBuild) {
+        implementation 'com.amplitude:android-sdk:2.14.1'
         implementation(project(":react-native-google-signin")) {
             exclude group: 'com.google.android.gms'
             exclude group: 'androidx'
         }
     }
 
-    implementation project(':react-native-async-storage')
     implementation project(':react-native-background-timer')
     implementation project(':react-native-calendar-events')
+    implementation project(':react-native-community-async-storage')
     implementation project(':react-native-community_netinfo')
     implementation project(':react-native-default-preference')
     implementation project(':react-native-immersive')

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

@@ -0,0 +1,122 @@
+/*
+ * Copyright @ 2019-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.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+
+import com.amplitude.api.Amplitude;
+import com.facebook.react.module.annotations.ReactModule;
+
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Implements the react-native module for the Amplitude integration.
+ */
+@ReactModule(name = AmplitudeModule.NAME)
+class AmplitudeModule
+        extends ReactContextBaseJavaModule {
+
+    public static final String NAME = "Amplitude";
+    public static final String JITSI_PREFERENCES = "jitsi-preferences";
+    public static final String AMPLITUDE_DEVICE_ID_KEY = "amplitudeDeviceId";
+
+    public AmplitudeModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Initializes the Amplitude SDK.
+     *
+     * @param instanceName The name of the Amplitude instance. Should
+     * be used only for multi-project logging.
+     * @param apiKey The API_KEY of the Amplitude project.
+     */
+    @ReactMethod
+    @SuppressLint("HardwareIds")
+    public void init(String instanceName, String apiKey) {
+        Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
+
+        // Set the device ID to something consistent.
+        SharedPreferences sharedPreferences = getReactApplicationContext().getSharedPreferences(JITSI_PREFERENCES, Context.MODE_PRIVATE);
+        String android_id = sharedPreferences.getString(AMPLITUDE_DEVICE_ID_KEY, "");
+        if (!TextUtils.isEmpty(android_id)) {
+            Amplitude.getInstance(instanceName).setDeviceId(android_id);
+        } else {
+            String amplitudeId = Amplitude.getInstance(instanceName).getDeviceId();
+            SharedPreferences.Editor editor = sharedPreferences.edit();
+            editor.putString(JITSI_PREFERENCES, amplitudeId).apply();
+        }
+    }
+
+    /**
+     * Sets the user ID for an Amplitude instance.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param userId The new value for the user ID.
+     */
+    @ReactMethod
+    public void setUserId(String instanceName, String userId) {
+            Amplitude.getInstance(instanceName).setUserId(userId);
+    }
+
+    /**
+     * Sets the user properties for an Amplitude instance.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param userProps JSON string with user properties to be set.
+     */
+    @ReactMethod
+    public void setUserProperties(String instanceName, ReadableMap userProps) {
+        if (userProps != null) {
+            Amplitude.getInstance(instanceName).setUserProperties(
+                    new JSONObject(userProps.toHashMap()));
+        }
+    }
+
+    /**
+     * Log an analytics event.
+     *
+     * @param instanceName The name of the Amplitude instance.
+     * @param eventType The event type.
+     * @param eventPropsString JSON string with the event properties.
+     */
+    @ReactMethod
+    public void logEvent(String instanceName, String eventType, String eventPropsString) {
+        try {
+            JSONObject eventProps = new JSONObject(eventPropsString);
+            Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
+        } catch (JSONException e) {
+            JitsiMeetLogger.e(e, "Error logging event");
+        }
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+}

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

@@ -99,7 +99,6 @@ public abstract class BaseReactView<ListenerT>
      * The listener (e.g. {@link JitsiMeetViewListener}) instance for reporting
      * events occurring in Jitsi Meet.
      */
-    @Deprecated
     private ListenerT listener;
 
     /**
@@ -168,7 +167,6 @@ public abstract class BaseReactView<ListenerT>
      *
      * @return The listener set on this {@code BaseReactView}.
      */
-    @Deprecated
     public ListenerT getListener() {
         return listener;
     }
@@ -181,10 +179,8 @@ public abstract class BaseReactView<ListenerT>
      * @param data - The details of the event associated with/specific to the
      * specified {@code name}.
      */
-    @Deprecated
     protected abstract void onExternalAPIEvent(String name, ReadableMap data);
 
-    @Deprecated
     protected void onExternalAPIEvent(
             Map<String, Method> listenerMethods,
             String name, ReadableMap data) {
@@ -219,7 +215,6 @@ public abstract class BaseReactView<ListenerT>
      *
      * @param listener The listener to set on this {@code BaseReactView}.
      */
-    @Deprecated
     public void setListener(ListenerT listener) {
         this.listener = listener;
     }

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

@@ -1,85 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.WritableNativeMap;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.HashMap;
-
-/**
- * Wraps the name and extra data for events that were broadcasted locally.
- */
-public class BroadcastAction {
-    private static final String TAG = BroadcastAction.class.getSimpleName();
-
-    private final Type type;
-    private final HashMap<String, Object> data;
-
-    public BroadcastAction(Intent intent) {
-        this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = buildDataFromBundle(intent.getExtras());
-    }
-
-    public Type getType() {
-        return this.type;
-    }
-
-    public HashMap<String, Object> getData() {
-        return this.data;
-    }
-
-    public WritableNativeMap getDataAsWritableNativeMap() {
-        WritableNativeMap nativeMap = new WritableNativeMap();
-
-        for (String key : this.data.keySet()) {
-            try {
-                // TODO add support for different types of objects
-                nativeMap.putString(key, this.data.get(key).toString());
-            } catch (Exception e) {
-                JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
-            }
-        }
-
-        return nativeMap;
-    }
-
-    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
-        HashMap<String, Object> map = new HashMap<>();
-
-        if (bundle != null) {
-            for (String key : bundle.keySet()) {
-                map.put(key, bundle.get(key));
-            }
-        }
-
-        return map;
-    }
-
-    enum Type {
-        SET_AUDIO_MUTED("org.jitsi.meet.SET_AUDIO_MUTED"),
-        HANG_UP("org.jitsi.meet.HANG_UP"),
-        SEND_ENDPOINT_TEXT_MESSAGE("org.jitsi.meet.SEND_ENDPOINT_TEXT_MESSAGE");
-
-        private final String action;
-
-        Type(String action) {
-            this.action = action;
-        }
-
-        public String getAction() {
-            return action;
-        }
-
-        private static Type buildTypeFromAction(String action) {
-            for (Type type : Type.values()) {
-                if (type.action.equalsIgnoreCase(action)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-}

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

@@ -1,30 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import com.facebook.react.bridge.ReadableMap;
-
-/**
- * Class used to emit events through the LocalBroadcastManager, called when events
- * from JS occurred. Takes an action name from JS, builds and broadcasts the {@link BroadcastEvent}
- */
-public class BroadcastEmitter {
-    private final LocalBroadcastManager localBroadcastManager;
-
-    public BroadcastEmitter(Context context) {
-        localBroadcastManager = LocalBroadcastManager.getInstance(context);
-    }
-
-    public void sendBroadcast(String name, ReadableMap data) {
-        BroadcastEvent event = new BroadcastEvent(name, data);
-
-        Intent intent = event.buildIntent();
-
-        if (intent != null) {
-            localBroadcastManager.sendBroadcast(intent);
-        }
-    }
-}

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

@@ -1,134 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.facebook.react.bridge.ReadableMap;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.HashMap;
-
-/**
- * Wraps the name and extra data for the events that occur on the JS side and are
- * to be broadcasted.
- */
-public class BroadcastEvent {
-
-    private static final String TAG = BroadcastEvent.class.getSimpleName();
-
-    private final Type type;
-    private final HashMap<String, Object> data;
-
-    public BroadcastEvent(String name, ReadableMap data) {
-        this.type = Type.buildTypeFromName(name);
-        this.data = data.toHashMap();
-    }
-
-    public BroadcastEvent(Intent intent) {
-        this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = buildDataFromBundle(intent.getExtras());
-    }
-
-    public Type getType() {
-        return this.type;
-    }
-
-    public HashMap<String, Object> getData() {
-        return this.data;
-    }
-
-    public Intent buildIntent() {
-        if (type != null && type.action != null) {
-            Intent intent = new Intent(type.action);
-
-            for (String key : this.data.keySet()) {
-                try {
-                    intent.putExtra(key, this.data.get(key).toString());
-                } catch (Exception e) {
-                    JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
-                }
-            }
-
-            return intent;
-        }
-
-        return null;
-    }
-
-    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
-        if (bundle != null) {
-            try {
-                HashMap<String, Object> map = new HashMap<>();
-
-                for (String key : bundle.keySet()) {
-                    map.put(key, bundle.get(key));
-                }
-
-                return map;
-            } catch (Exception e) {
-                JitsiMeetLogger.w(TAG + " invalid extra data", e);
-            }
-        }
-
-        return null;
-    }
-
-    public enum Type {
-        CONFERENCE_JOINED("org.jitsi.meet.CONFERENCE_JOINED"),
-        CONFERENCE_TERMINATED("org.jitsi.meet.CONFERENCE_TERMINATED"),
-        CONFERENCE_WILL_JOIN("org.jitsi.meet.CONFERENCE_WILL_JOIN"),
-        AUDIO_MUTED_CHANGED("org.jitsi.meet.AUDIO_MUTED_CHANGED"),
-        PARTICIPANT_JOINED("org.jitsi.meet.PARTICIPANT_JOINED"),
-        PARTICIPANT_LEFT("org.jitsi.meet.PARTICIPANT_LEFT"),
-        ENDPOINT_TEXT_MESSAGE_RECEIVED("org.jitsi.meet.ENDPOINT_TEXT_MESSAGE_RECEIVED");
-
-        private static final String CONFERENCE_WILL_JOIN_NAME = "CONFERENCE_WILL_JOIN";
-        private static final String CONFERENCE_JOINED_NAME = "CONFERENCE_JOINED";
-        private static final String CONFERENCE_TERMINATED_NAME = "CONFERENCE_TERMINATED";
-        private static final String AUDIO_MUTED_CHANGED_NAME = "AUDIO_MUTED_CHANGED";
-        private static final String PARTICIPANT_JOINED_NAME = "PARTICIPANT_JOINED";
-        private static final String PARTICIPANT_LEFT_NAME = "PARTICIPANT_LEFT";
-        private static final String ENDPOINT_TEXT_MESSAGE_RECEIVED_NAME = "ENDPOINT_TEXT_MESSAGE_RECEIVED";
-
-        private final String action;
-
-        Type(String action) {
-            this.action = action;
-        }
-
-        public String getAction() {
-            return action;
-        }
-
-        private static Type buildTypeFromAction(String action) {
-            for (Type type : Type.values()) {
-                if (type.action.equalsIgnoreCase(action)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-
-        private static Type buildTypeFromName(String name) {
-            switch (name) {
-                case CONFERENCE_WILL_JOIN_NAME:
-                    return CONFERENCE_WILL_JOIN;
-                case CONFERENCE_JOINED_NAME:
-                    return CONFERENCE_JOINED;
-                case CONFERENCE_TERMINATED_NAME:
-                    return CONFERENCE_TERMINATED;
-                case AUDIO_MUTED_CHANGED_NAME:
-                    return AUDIO_MUTED_CHANGED;
-                case PARTICIPANT_JOINED_NAME:
-                    return PARTICIPANT_JOINED;
-                case PARTICIPANT_LEFT_NAME:
-                    return PARTICIPANT_LEFT;
-                case ENDPOINT_TEXT_MESSAGE_RECEIVED_NAME:
-                    return ENDPOINT_TEXT_MESSAGE_RECEIVED;
-            }
-
-            return null;
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Intent;
-
-public class BroadcastIntentHelper {
-    public static Intent buildSetAudioMutedIntent(boolean muted) {
-        Intent intent = new Intent(BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
-        intent.putExtra("muted", muted);
-        return intent;
-    }
-
-    public static Intent buildHangUpIntent() {
-        return new Intent(BroadcastAction.Type.HANG_UP.getAction());
-    }
-
-    public static Intent buildSendEndpointTextMessageIntent(String to, String message) {
-        Intent intent = new Intent(BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
-        intent.putExtra("to", to);
-        intent.putExtra("message", message);
-        return intent;
-    }
-}

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

@@ -1,33 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-/**
- * Listens for {@link BroadcastAction}s on LocalBroadcastManager. When one occurs,
- * it emits it to JS.
- */
-public class BroadcastReceiver extends android.content.BroadcastReceiver {
-
-    public BroadcastReceiver(Context context) {
-        LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
-        intentFilter.addAction(BroadcastAction.Type.HANG_UP.getAction());
-        intentFilter.addAction(BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
-
-        localBroadcastManager.registerReceiver(this, intentFilter);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        BroadcastAction action = new BroadcastAction(intent);
-        String actionName = action.getType().getAction();
-
-        ReactInstanceManagerHolder.emitEvent(actionName, action.getDataAsWritableNativeMap());
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,6 @@ import com.facebook.react.module.annotations.ReactModule;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Module implementing an API for sending events from JavaScript to native code.
  */
@@ -38,9 +35,6 @@ class ExternalAPIModule
 
     private static final String TAG = NAME;
 
-    private final BroadcastEmitter broadcastEmitter;
-    private final BroadcastReceiver broadcastReceiver;
-
     /**
      * Initializes a new module instance. There shall be a single instance of
      * this module throughout the lifetime of the app.
@@ -50,9 +44,6 @@ class ExternalAPIModule
      */
     public ExternalAPIModule(ReactApplicationContext reactContext) {
         super(reactContext);
-
-        broadcastEmitter = new BroadcastEmitter(reactContext);
-        broadcastReceiver = new BroadcastReceiver(reactContext);
     }
 
     /**
@@ -65,23 +56,6 @@ class ExternalAPIModule
         return NAME;
     }
 
-    /**
-     * Gets a mapping with the constants this module is exporting.
-     *
-     * @return a {@link Map} mapping the constants to be exported with their
-     * values.
-     */
-    @Override
-    public Map<String, Object> getConstants() {
-        Map<String, Object> constants = new HashMap<>();
-
-        constants.put("SET_AUDIO_MUTED", BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
-        constants.put("HANG_UP", BroadcastAction.Type.HANG_UP.getAction());
-        constants.put("SEND_ENDPOINT_TEXT_MESSAGE", BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
-
-        return constants;
-    }
-
     /**
      * Dispatches an event that occurred on the JavaScript side of the SDK to
      * the specified {@link BaseReactView}'s listener.
@@ -105,8 +79,7 @@ class ExternalAPIModule
             JitsiMeetLogger.d(TAG + " Sending event: " + name + " with data: " + data);
             try {
                 view.onExternalAPIEvent(name, data);
-                broadcastEmitter.sendBroadcast(name, data);
-            } catch (Exception e) {
+            } catch(Exception e) {
                 JitsiMeetLogger.e(e, TAG + " onExternalAPIEvent: error sending event");
             }
         }

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

@@ -16,41 +16,33 @@
 
 package org.jitsi.meet.sdk;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.facebook.react.modules.core.PermissionListener;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
-import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * A base activity for SDK users to embed. It uses {@link JitsiMeetFragment} to do the heavy
  * lifting and wires the remaining Activity lifecycle methods so it works out of the box.
  */
 public class JitsiMeetActivity extends FragmentActivity
-    implements JitsiMeetActivityInterface {
+        implements JitsiMeetActivityInterface, JitsiMeetViewListener {
 
     protected static final String TAG = JitsiMeetActivity.class.getSimpleName();
 
     private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
     private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";
 
-    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            onBroadcastReceived(intent);
-        }
-    };
     // Helpers for starting the activity
     //
 
@@ -76,7 +68,8 @@ public class JitsiMeetActivity extends FragmentActivity
 
         setContentView(R.layout.activity_jitsi_meet);
 
-        registerForBroadcastMessages();
+        // Listen for conference events.
+        getJitsiView().setListener(this);
 
         if (!extraInitialize()) {
             initialize();
@@ -98,8 +91,6 @@ public class JitsiMeetActivity extends FragmentActivity
         }
         JitsiMeetOngoingConferenceService.abort(this);
 
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);
-
         super.onDestroy();
     }
 
@@ -116,39 +107,26 @@ public class JitsiMeetActivity extends FragmentActivity
     protected JitsiMeetView getJitsiView() {
         JitsiMeetFragment fragment
             = (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
-        return fragment != null ? fragment.getJitsiView() : null;
+        return fragment.getJitsiView();
     }
 
     public void join(@Nullable String url) {
         JitsiMeetConferenceOptions options
             = new JitsiMeetConferenceOptions.Builder()
-            .setRoom(url)
-            .build();
+                .setRoom(url)
+                .build();
         join(options);
     }
 
     public void join(JitsiMeetConferenceOptions options) {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.join(options);
-        } else {
-            JitsiMeetLogger.w("Cannot join, view is null");
-        }
+        getJitsiView().join(options);
     }
 
     public void leave() {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.leave();
-        } else {
-            JitsiMeetLogger.w("Cannot leave, view is null");
-        }
+        getJitsiView().leave();
     }
 
-    private @Nullable
-    JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
+    private @Nullable JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
         String action = intent.getAction();
 
         if (Intent.ACTION_VIEW.equals(action)) {
@@ -167,7 +145,7 @@ public class JitsiMeetActivity extends FragmentActivity
      * Helper function called during activity initialization. If {@code true} is returned, the
      * initialization is delayed and the {@link JitsiMeetActivity#initialize()} method is not
      * called. In this case, it's up to the subclass to call the initialize method when ready.
-     * <p>
+     *
      * This is mainly required so we do some extra initialization in the Jitsi Meet app.
      *
      * @return {@code true} if the initialization will be delayed, {@code false} otherwise.
@@ -182,37 +160,6 @@ public class JitsiMeetActivity extends FragmentActivity
         join(getConferenceOptions(getIntent()));
     }
 
-    protected void onConferenceJoined(HashMap<String, Object> extraData) {
-        JitsiMeetLogger.i("Conference joined: " + extraData);
-        // Launch the service for the ongoing notification.
-        JitsiMeetOngoingConferenceService.launch(this);
-    }
-
-    protected void onConferenceTerminated(HashMap<String, Object> extraData) {
-        JitsiMeetLogger.i("Conference terminated: " + extraData);
-        finish();
-    }
-
-    protected void onConferenceWillJoin(HashMap<String, Object> extraData) {
-        JitsiMeetLogger.i("Conference will join: " + extraData);
-    }
-
-    protected void onParticipantJoined(HashMap<String, Object> extraData) {
-        try {
-            JitsiMeetLogger.i("Participant joined: ", extraData);
-        } catch (Exception e) {
-            JitsiMeetLogger.w("Invalid participant joined extraData", e);
-        }
-    }
-
-    protected void onParticipantLeft(HashMap<String, Object> extraData) {
-        try {
-            JitsiMeetLogger.i("Participant left: ", extraData);
-        } catch (Exception e) {
-            JitsiMeetLogger.w("Invalid participant left extraData", e);
-        }
-    }
-
     // Activity lifecycle methods
     //
 
@@ -244,11 +191,7 @@ public class JitsiMeetActivity extends FragmentActivity
 
     @Override
     protected void onUserLeaveHint() {
-        JitsiMeetView view = getJitsiView();
-
-        if (view != null) {
-            view.enterPictureInPicture();
-        }
+        getJitsiView().enterPictureInPicture();
     }
 
     // JitsiMeetActivityInterface
@@ -264,39 +207,24 @@ public class JitsiMeetActivity extends FragmentActivity
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
-    private void registerForBroadcastMessages() {
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BroadcastEvent.Type.CONFERENCE_JOINED.getAction());
-        intentFilter.addAction(BroadcastEvent.Type.CONFERENCE_WILL_JOIN.getAction());
-        intentFilter.addAction(BroadcastEvent.Type.CONFERENCE_TERMINATED.getAction());
-        intentFilter.addAction(BroadcastEvent.Type.PARTICIPANT_JOINED.getAction());
-        intentFilter.addAction(BroadcastEvent.Type.PARTICIPANT_LEFT.getAction());
-        intentFilter.addAction(BroadcastEvent.Type.ENDPOINT_TEXT_MESSAGE_RECEIVED.getAction());
+    // JitsiMeetViewListener
+    //
 
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter);
+    @Override
+    public void onConferenceJoined(Map<String, Object> data) {
+        JitsiMeetLogger.i("Conference joined: " + data);
+        // Launch the service for the ongoing notification.
+        JitsiMeetOngoingConferenceService.launch(this);
     }
 
-    private void onBroadcastReceived(Intent intent) {
-        if (intent != null) {
-            BroadcastEvent event = new BroadcastEvent(intent);
+    @Override
+    public void onConferenceTerminated(Map<String, Object> data) {
+        JitsiMeetLogger.i("Conference terminated: " + data);
+        finish();
+    }
 
-            switch (event.getType()) {
-                case CONFERENCE_JOINED:
-                    onConferenceJoined(event.getData());
-                    break;
-                case CONFERENCE_WILL_JOIN:
-                    onConferenceWillJoin(event.getData());
-                    break;
-                case CONFERENCE_TERMINATED:
-                    onConferenceTerminated(event.getData());
-                    break;
-                case PARTICIPANT_JOINED:
-                    onParticipantJoined(event.getData());
-                    break;
-                case PARTICIPANT_LEFT:
-                    onParticipantLeft(event.getData());
-                    break;
-            }
-        }
+    @Override
+    public void onConferenceWillJoin(Map<String, Object> data) {
+        JitsiMeetLogger.i("Conference will join: " + data);
     }
 }

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

@@ -21,14 +21,12 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Build;
 import android.os.IBinder;
 
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
+
 /**
  * This class implements an Android {@link Service}, a foreground one specifically, and it's
  * responsible for presenting an ongoing notification when a conference is in progress.
@@ -37,18 +35,19 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
  * See: https://developer.android.com/guide/components/services
  */
 public class JitsiMeetOngoingConferenceService extends Service
-    implements OngoingConferenceTracker.OngoingConferenceListener {
+        implements OngoingConferenceTracker.OngoingConferenceListener {
     private static final String TAG = JitsiMeetOngoingConferenceService.class.getSimpleName();
 
-    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver();
-
-    private boolean isAudioMuted;
+    static final class Actions {
+        static final String START = TAG + ":START";
+        static final String HANGUP = TAG + ":HANGUP";
+    }
 
     static void launch(Context context) {
         OngoingNotification.createOngoingConferenceNotificationChannel();
 
         Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        intent.setAction(Action.START.getName());
+        intent.setAction(Actions.START);
 
         ComponentName componentName;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -71,16 +70,11 @@ public class JitsiMeetOngoingConferenceService extends Service
         super.onCreate();
 
         OngoingConferenceTracker.getInstance().addListener(this);
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BroadcastEvent.Type.AUDIO_MUTED_CHANGED.getAction());
-        LocalBroadcastManager.getInstance(getApplicationContext()).registerReceiver(broadcastReceiver, intentFilter);
     }
 
     @Override
     public void onDestroy() {
         OngoingConferenceTracker.getInstance().removeListener(this);
-        LocalBroadcastManager.getInstance(getApplicationContext()).unregisterReceiver(broadcastReceiver);
 
         super.onDestroy();
     }
@@ -92,37 +86,26 @@ public class JitsiMeetOngoingConferenceService extends Service
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        final String actionName = intent.getAction();
-        final Action action = Action.fromName(actionName);
-
-        switch (action) {
-            case UNMUTE:
-            case MUTE:
-                Intent muteBroadcastIntent = BroadcastIntentHelper.buildSetAudioMutedIntent(action == Action.MUTE);
-                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(muteBroadcastIntent);
-                break;
-            case START:
-                Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
-                if (notification == null) {
-                    stopSelf();
-                    JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-                } else {
-                    startForeground(OngoingNotification.NOTIFICATION_ID, notification);
-                    JitsiMeetLogger.i(TAG + " Service started");
-                }
-                break;
-            case HANGUP:
-                JitsiMeetLogger.i(TAG + " Hangup requested");
-
-                Intent hangupBroadcastIntent = BroadcastIntentHelper.buildHangUpIntent();
-                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(hangupBroadcastIntent);
-
+        final String action = intent.getAction();
+        if (Actions.START.equals(action)) {
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification();
+            if (notification == null) {
                 stopSelf();
-                break;
-            default:
-                JitsiMeetLogger.w(TAG + " Unknown action received: " + action);
-                stopSelf();
-                break;
+                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
+            } else {
+                startForeground(OngoingNotification.NOTIFICATION_ID, notification);
+                JitsiMeetLogger.i(TAG + " Service started");
+            }
+        } else if (Actions.HANGUP.equals(action)) {
+            JitsiMeetLogger.i(TAG + " Hangup requested");
+            // Abort all ongoing calls
+            if (AudioModeModule.useConnectionService()) {
+                ConnectionService.abortConnections();
+            }
+            stopSelf();
+        } else {
+            JitsiMeetLogger.w(TAG + " Unknown action received: " + action);
+            stopSelf();
         }
 
         return START_NOT_STICKY;
@@ -135,46 +118,4 @@ public class JitsiMeetOngoingConferenceService extends Service
             JitsiMeetLogger.i(TAG + "Service stopped");
         }
     }
-
-    public enum Action {
-        START(TAG + ":START"),
-        HANGUP(TAG + ":HANGUP"),
-        MUTE(TAG + ":MUTE"),
-        UNMUTE(TAG + ":UNMUTE");
-
-        private final String name;
-
-        Action(String name) {
-            this.name = name;
-        }
-
-        public static Action fromName(String name) {
-            for (Action action : Action.values()) {
-                if (action.name.equalsIgnoreCase(name)) {
-                    return action;
-                }
-            }
-            return null;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    private class BroadcastReceiver extends android.content.BroadcastReceiver {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
-            if (notification == null) {
-                stopSelf();
-                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-            } else {
-                startForeground(OngoingNotification.NOTIFICATION_ID, notification);
-                JitsiMeetLogger.i(TAG + " Service started");
-            }
-        }
-    }
 }

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

@@ -197,7 +197,6 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
      * by/associated with the specified {@code name}.
      */
     @Override
-    @Deprecated
     protected void onExternalAPIEvent(String name, ReadableMap data) {
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }

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

@@ -21,7 +21,6 @@ import java.util.Map;
 /**
  * Interface for listening to events coming from Jitsi Meet.
  */
-@Deprecated
 public interface JitsiMeetViewListener {
     /**
      * Called when a conference was joined.

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

@@ -32,7 +32,6 @@ import java.util.regex.Pattern;
  * Utility methods for helping with transforming {@link ExternalAPIModule}
  * events into listener methods. Used with descendants of {@link BaseReactView}.
  */
-@Deprecated
 public final class ListenerUtils {
     /**
      * Extracts the methods defined in a listener and creates a mapping of this

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

@@ -23,13 +23,13 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-
 import androidx.core.app.NotificationCompat;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 import java.util.Random;
 
+
 /**
  * Helper class for creating the ongoing notification which is used with
  * {@link JitsiMeetOngoingConferenceService}. It allows the user to easily get back to the app
@@ -43,6 +43,7 @@ class OngoingNotification {
 
     static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
 
+
     static void createOngoingConferenceNotificationChannel() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             return;
@@ -55,7 +56,7 @@ class OngoingNotification {
         }
 
         NotificationManager notificationManager
-            = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+            = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
 
         NotificationChannel channel
             = notificationManager.getNotificationChannel(CHANNEL_ID);
@@ -72,7 +73,7 @@ class OngoingNotification {
         notificationManager.createNotificationChannel(channel);
     }
 
-    static Notification buildOngoingConferenceNotification(boolean isMuted) {
+    static Notification buildOngoingConferenceNotification() {
         Context context = ReactInstanceManagerHolder.getCurrentActivity();
         if (context == null) {
             JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
@@ -82,7 +83,12 @@ class OngoingNotification {
         Intent notificationIntent = new Intent(context, context.getClass());
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
+        NotificationCompat.Builder builder;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder = new NotificationCompat.Builder(context, CHANNEL_ID);
+        } else {
+            builder = new NotificationCompat.Builder(context);
+        }
 
         builder
             .setCategory(NotificationCompat.CATEGORY_CALL)
@@ -93,27 +99,21 @@ class OngoingNotification {
             .setOngoing(true)
             .setAutoCancel(false)
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setUsesChronometer(true)
             .setOnlyAlertOnce(true)
             .setSmallIcon(context.getResources().getIdentifier("ic_notification", "drawable", context.getPackageName()));
 
-        NotificationCompat.Action hangupAction = createAction(context, JitsiMeetOngoingConferenceService.Action.HANGUP, "Hang up");
+        // Add a "hang-up" action only if we are using ConnectionService.
+        if (AudioModeModule.useConnectionService()) {
+            Intent hangupIntent = new Intent(context, JitsiMeetOngoingConferenceService.class);
+            hangupIntent.setAction(JitsiMeetOngoingConferenceService.Actions.HANGUP);
+            PendingIntent hangupPendingIntent
+                = PendingIntent.getService(context, 0, hangupIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            NotificationCompat.Action hangupAction = new NotificationCompat.Action(0, "Hang up", hangupPendingIntent);
 
-        JitsiMeetOngoingConferenceService.Action toggleAudioAction = isMuted
-            ? JitsiMeetOngoingConferenceService.Action.UNMUTE : JitsiMeetOngoingConferenceService.Action.MUTE;
-        String toggleAudioTitle = isMuted ? "Unmute" : "Mute";
-        NotificationCompat.Action audioAction = createAction(context, toggleAudioAction, toggleAudioTitle);
-
-        builder.addAction(hangupAction);
-        builder.addAction(audioAction);
+            builder.addAction(hangupAction);
+        }
 
         return builder.build();
     }
-
-    private static NotificationCompat.Action createAction(Context context, JitsiMeetOngoingConferenceService.Action action, String title) {
-        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
-        intent.setAction(action.getName());
-        PendingIntent pendingIntent
-            = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        return new NotificationCompat.Action(0, title, pendingIntent);
-    }
 }

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

@@ -91,6 +91,14 @@ class ReactInstanceManagerHolder {
 
         nativeModules.add(new WebRTCModule(reactContext, options));
 
+        try {
+            Class<?> amplitudeModuleClass = Class.forName("org.jitsi.meet.sdk.AmplitudeModule");
+            Constructor constructor = amplitudeModuleClass.getConstructor(ReactApplicationContext.class);
+            nativeModules.add((NativeModule)constructor.newInstance(reactContext));
+        } catch (Exception e) {
+            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
+        }
+
         return nativeModules;
     }
 
@@ -184,7 +192,6 @@ class ReactInstanceManagerHolder {
                 new com.facebook.react.shell.MainReactPackage(),
                 new com.horcrux.svg.SvgPackage(),
                 new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
-                new com.learnium.RNDeviceInfo.RNDeviceInfo(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),

android/settings.gradle

@@ -1,18 +1,16 @@
 rootProject.name = 'jitsi-meet'
 
 include ':app', ':sdk'
-include ':react-native-async-storage'
-project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 include ':react-native-calendar-events'
 project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
+include ':react-native-community-async-storage'
+project(':react-native-community-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
 include ':react-native-community_netinfo'
 project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-default-preference'
 project(':react-native-default-preference').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-default-preference/android')
-include ':react-native-device-info'
-project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'

conference.js

@@ -472,8 +472,8 @@ export default {
      */
     createInitialLocalTracks(options = {}) {
         const errors = {};
-        const initialDevices = config.disableInitialGUM ? [] : [ 'audio' ];
-        const requestedAudio = !config.disableInitialGUM;
+        const initialDevices = [ 'audio' ];
+        const requestedAudio = true;
         let requestedVideo = false;
 
         // Always get a handle on the audio input device so that we have statistics even if the user joins the
@@ -484,22 +484,19 @@ export default {
             this.muteAudio(true, true);
         }
 
-        if (!config.disableInitialGUM
-                && !options.startWithVideoMuted
+        if (!options.startWithVideoMuted
                 && !options.startAudioOnly
                 && !options.startScreenSharing) {
             initialDevices.push('video');
             requestedVideo = true;
         }
 
-        if (!config.disableInitialGUM) {
-            JitsiMeetJS.mediaDevices.addEventListener(
-                JitsiMediaDevicesEvents.PERMISSION_PROMPT_IS_SHOWN,
-                browserName =>
-                    APP.store.dispatch(
-                        mediaPermissionPromptVisibilityChanged(true, browserName))
-            );
-        }
+        JitsiMeetJS.mediaDevices.addEventListener(
+            JitsiMediaDevicesEvents.PERMISSION_PROMPT_IS_SHOWN,
+            browserName =>
+                APP.store.dispatch(
+                    mediaPermissionPromptVisibilityChanged(true, browserName))
+        );
 
         let tryCreateLocalTracks;
 
@@ -2382,9 +2379,7 @@ export default {
     _onConferenceJoined() {
         APP.UI.initConference();
 
-        if (!config.disableShortcuts) {
-            APP.keyboardshortcut.init();
-        }
+        APP.keyboardshortcut.init();
 
         APP.store.dispatch(conferenceJoined(room));
     },

config.js

@@ -336,13 +336,6 @@ var config = {
     // will be joined when no room is specified.
     enableWelcomePage: true,
 
-    // Disable app shortcuts that are registered upon joining a conference
-    // disableShortcuts: false,
-
-    // Disable initial browser getUserMedia requests.
-    // This is useful for scenarios where users might want to start a conference for screensharing only
-    // disableInitialGUM: false,
-
     // Enabling the close page will ignore the welcome page redirection when
     // a call is hangup.
     // enableClosePage: false,
@@ -623,25 +616,16 @@ var config = {
          logoImageUrl: 'https://example.com/logo-img.png'
      }
     */
-    // dynamicBrandingUrl: '',
+    // brandingDataUrl: '',
 
     // The URL of the moderated rooms microservice, if available. If it
     // is present, a link to the service will be rendered on the welcome page,
     // otherwise the app doesn't render it.
     // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
 
-    // If true, tile view will not be enabled automatically when the participants count threshold is reached.
-    // disableTileView: true,
-
-    // Hides the conference subject
-    // hideConferenceSubject: true
-
     // Hides the conference timer.
     // hideConferenceTimer: true,
 
-    // Hides the participants stats
-    // hideParticipantsStats: true
-
     // Sets the conference subject
     // subject: 'Conference Subject',
 
@@ -698,65 +682,6 @@ var config = {
      ignoreStartMuted
      */
 
-    /**
-        Use this array to configure which notifications will be shown to the user
-        The items correspond to the title or description key of that notification
-        Some of these notifications also depend on some other internal logic to be displayed or not,
-        so adding them here will not ensure they will always be displayed
-
-        A falsy value for this prop will result in having all notifications enabled (e.g null, undefined, false)
-    */
-    // notifications: [
-    //     'connection.CONNFAIL', // shown when the connection fails,
-    //     'dialog.cameraNotSendingData', // shown when there's no feed from user's camera
-    //     'dialog.kickTitle', // shown when user has been kicked
-    //     'dialog.liveStreaming', // livestreaming notifications (pending, on, off, limits)
-    //     'dialog.lockTitle', // shown when setting conference password fails
-    //     'dialog.maxUsersLimitReached', // shown when maximmum users limit has been reached
-    //     'dialog.micNotSendingData', // shown when user's mic is not sending any audio
-    //     'dialog.passwordNotSupportedTitle', // shown when setting conference password fails due to password format
-    //     'dialog.recording', // recording notifications (pending, on, off, limits)
-    //     'dialog.remoteControlTitle', // remote control notifications (allowed, denied, start, stop, error)
-    //     'dialog.reservationError',
-    //     'dialog.serviceUnavailable', // shown when server is not reachable
-    //     'dialog.sessTerminated', // shown when there is a failed conference session
-    //     'dialog.tokenAuthFailed', // show when an invalid jwt is used
-    //     'dialog.transcribing', // transcribing notifications (pending, off)
-    //     'dialOut.statusMessage', // shown when dial out status is updated.
-    //     'liveStreaming.busy', // shown when livestreaming service is busy
-    //     'liveStreaming.failedToStart', // shown when livestreaming fails to start
-    //     'liveStreaming.unavailableTitle', // shown when livestreaming service is not reachable
-    //     'lobby.joinRejectedMessage', // shown when while in a lobby, user's request to join is rejected
-    //     'lobby.notificationTitle', // shown when lobby is toggled and when join requests are allowed / denied
-    //     'localRecording.localRecording', // shown when a local recording is started
-    //     'notify.disconnected', // shown when a participant has left
-    //     'notify.grantedTo', // shown when moderator rights were granted to a participant
-    //     'notify.invitedOneMember', // shown when 1 participant has been invited
-    //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
-    //     'notify.invitedTwoMembers', // shown when 2 participants have been invited
-    //     'notify.kickParticipant', // shown when a participant is kicked
-    //     'notify.mutedRemotelyTitle', // shown when user is muted by a remote party
-    //     'notify.mutedTitle', // shown when user has been muted upon joining,
-    //     'notify.newDeviceAudioTitle', // prompts the user to use a newly detected audio device
-    //     'notify.newDeviceCameraTitle', // prompts the user to use a newly detected camera
-    //     'notify.passwordRemovedRemotely', // shown when a password has been removed remotely
-    //     'notify.passwordSetRemotely', // shown when a password has been set remotely
-    //     'notify.raisedHand', // shown when a partcipant used raise hand,
-    //     'notify.startSilentTitle', // shown when user joined with no audio
-    //     'prejoin.errorDialOut',
-    //     'prejoin.errorDialOutDisconnected',
-    //     'prejoin.errorDialOutFailed',
-    //     'prejoin.errorDialOutStatus',
-    //     'prejoin.errorStatusCode',
-    //     'prejoin.errorValidation',
-    //     'recording.busy', // shown when recording service is busy
-    //     'recording.failedToStart', // shown when recording fails to start
-    //     'recording.unavailableTitle', // shown when recording service is not reachable
-    //     'toolbar.noAudioSignalTitle', // shown when a broken mic is detected
-    //     'toolbar.noisyAudioInputTitle', // shown when noise is detected for the current microphone
-    //     'toolbar.talkWhileMutedPopup', // shown when user tries to speak while muted
-    //     'transcribing.failedToStart' // shown when transcribing fails to start
-    // ]
 
     // Allow all above example options to include a trailing comma and
     // prevent fear when commenting out the last value.

css/_atlaskit_overrides.scss

@@ -48,19 +48,3 @@
 .toolbox-button-wth-dialog .eYJELv {
     max-height: initial;
 }
-
-/**
- * Override @atlaskit/InlineDialog styling for the overflowmenu so it displays
- * a scrollable list of elements at small screen widths.
- */
-.sc-eNQAEJ {
-    overflow-y: auto;
-}
-
-/**
- * Keep overflow menu within screen vertical bounds and make it scrollable.
- */
-.toolbox-button-wth-dialog .sc-ckVGcZ.fdAqDG > :first-child {
-    max-height: calc(100vh - #{$newToolbarSizeWithPadding} - 16px);
-    overflow-y: auto;
-}

css/_base.scss

@@ -17,7 +17,6 @@ textarea {
 html {
     height: 100%;
     width: 100%;
-    overflow: hidden;
 }
 
 body {
@@ -202,3 +201,74 @@ form {
     background: rgba(0, 0, 0, .5);
     border-radius: 4px;
 }
+
+.desktop-browser {
+    @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;
+        }
+        .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/_chat.scss

@@ -379,31 +379,3 @@
         }
     }
 }
-
-.chat-dialog {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    margin-top: -5px; // Margin set by atlaskit.
-
-    &-header {
-        display: flex;
-        justify-content: space-between;
-        margin: 16px 16px 24px;
-        width: calc(100% - 32px);
-        box-sizing: border-box;
-        color: #fff;
-        font-weight: 600;
-        font-size: 24px;
-        line-height: 32px;
-
-        .jitsi-icon > svg {
-            cursor: pointer;
-            fill: #A4B8D1;
-        }
-    }
-
-    #chatconversation {
-        width: 100%;
-    }
-}

css/_drawer.scss

@@ -1,124 +0,0 @@
-.drawer-portal {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: $drawerZ;
-}
-
-.drawer-menu {
-    padding: 12px 16px;
-    max-height: 50vh;
-    background: #242528;
-    border-radius: 16px 16px 0 0;
-    overflow-y: auto;
-
-    &.expanded {
-        max-height: 80vh;
-    }
-
-    .drawer-toggle {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 44px;
-        cursor: pointer;
-
-        &:hover {
-            background-color: $overflowMenuItemHoverBG;
-        }
-
-        svg, path {
-            fill: #b8c7e0;
-        }
-    }
-
-    .popupmenu {
-        margin: auto;
-        width: 100%;
-    }
-
-    .popupmenu__item {
-        height: 48px;
-    }
-
-    &#{&} .overflow-menu {
-        margin: auto;
-        font-size: 1.2em;
-        list-style-type: none;
-        padding: 0;
-
-        .overflow-menu-item {
-            box-sizing: border-box;
-            height: 48px;
-            padding: 12px 16px;
-
-            align-items: center;
-            color: $overflowMenuItemColor;
-            cursor: pointer;
-            display: flex;
-            font-size: 14px;
-
-            div {
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-            }
-
-            &:hover {
-                background-color: $overflowMenuItemHoverBG;
-                color: $overflowMenuItemHoverColor;
-            }
-
-            &.unclickable {
-                cursor: default;
-            }
-            &.unclickable:hover {
-                background: inherit;
-            }
-            &.disabled {
-                cursor: initial;
-                color: #3b475c;
-            }
-        }
-
-        .beta-tag {
-            background: $overflowMenuItemColor;
-            border-radius: 2px;
-            color: $overflowMenuBG;
-            font-size: 11px;
-            font-weight: bold;
-            margin-left: 8px;
-            padding: 0 6px;
-        }
-
-        .overflow-menu-item-icon {
-            margin-right: 10px;
-
-            i {
-                display: inline;
-                font-size: 24px;
-            }
-
-            i:hover {
-                background-color: initial;
-            }
-
-            img {
-                max-width: 24px;
-                max-height: 24px;
-            }
-
-            svg {
-                fill: #B8C7E0 !important;
-            }
-        }
-
-        .profile-text {
-            max-width: 150px;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-        }
-    }
-}

css/_responsive.scss

@@ -1,73 +1,3 @@
-@mixin small-button-size() {
-    .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;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@mixin very-small-button-size() {
-    .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;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@mixin full-size-modal-positioner() {
-    height: 100%;
-    left: 0;
-    position: fixed;
-    top: 0;
-    max-width: 100%;
-    width: 100%;
-}
-
-@mixin full-size-modal-dialog() {
-    height: 100%;
-    max-height: 100%;
-    border-radius: 0;
-}
-
 @media only screen and (max-width: $verySmallScreen) {
     .welcome {
         display: block;
@@ -135,65 +65,3 @@
         }
     }
 }
-
-.desktop-browser {
-    @media only screen and (max-width: $smallScreen) {
-        @include small-button-size();
-    }
-
-    @media only screen and (max-width: $verySmallScreen) {
-        @include very-small-button-size();
-
-        #videoResolutionLabel {
-            display: none;
-        }
-        .vertical-filmstrip .filmstrip {
-            display: none;
-        }
-        .chrome-extension-banner {
-            display: none;
-        }
-    }
-
-    &.shift-right {
-        @media only screen and (max-width: $smallScreen + $sidebarWidth) {
-            @include small-button-size()
-        }
-
-        @media only screen and (max-width: $verySmallScreen + $sidebarWidth) {
-            @include very-small-button-size();
-
-            #videoResolutionLabel {
-                display: none;
-            }
-            .vertical-filmstrip .filmstrip {
-                display: none;
-            }
-            .chrome-extension-banner {
-                display: none;
-            }
-        }
-    }
-}
-
-@media (min-width: 480px) and (max-width: 580px) {
-    .shift-right [class^="Modal__PositionerAbsolute"] {
-        @include full-size-modal-positioner();
-    }
-
-    .shift-right [class^="Modal__Dialog-"] {
-        @include full-size-modal-dialog();
-    }
-}
-
-@media (min-width: 580px) and (max-width: 680px) {
-    .mobile-browser {
-        &.shift-right [class^="Modal__PositionerAbsolute"] {
-            @include full-size-modal-positioner();
-        }
-
-        &.shift-right [class^="Modal__Dialog-"] {
-            @include full-size-modal-dialog();
-        }
-    }
-}

css/_subject.scss

@@ -14,15 +14,12 @@
     text-overflow: ellipsis;
     box-sizing: border-box;
     white-space: nowrap;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
 
     &.visible {
         top: 0px;
     }
 
-    &.gradient {
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
-    }
-
     &-text {
         vertical-align: middle;
     }

css/_variables.scss

@@ -121,7 +121,6 @@ $poweredByZ: 100;
 $ringingZ: 300;
 $sideToolbarContainerZ: 300;
 $toolbarZ: 350;
-$drawerZ: 351;
 $tooltipsZ: 401;
 $dropdownMaskZ: 900;
 $dropdownZ: 901;

css/_welcome_page.scss

@@ -90,7 +90,7 @@ body.welcome-page {
                     color: $defaultWarningColor;
                     display: flex;
                     flex-direction: row;
-                    margin-top: 15px;
+                    margin-top: 5px;
 
                     .jitsi-icon {
                         margin-right: 15px;

css/filmstrip/_tile_view.scss

@@ -109,4 +109,14 @@
     .has-overflow .videocontainer {
         align-self: baseline;
     }
+
+    /**
+     * Firefox flex acts a little differently. To make sure the bottom row of
+     * thumbnails is not overlapped by the horizontal toolbar, margin is added
+     * to the local thumbnail to keep it from the bottom of the screen. It is
+     * assumed the local thumbnail will always be on the bottom row.
+     */
+    .has-overflow #localVideoContainer {
+        margin-bottom: 100px !important;
+    }
 }

css/main.scss

@@ -103,6 +103,5 @@ $flagsImagePath: "../images/";
 @import 'e2ee';
 @import 'responsive';
 @import 'connection-status';
-@import 'drawer';
 
 /* Modules END */

css/modals/invite/_info.scss

@@ -50,12 +50,6 @@
     }
 }
 
-.dial-in-number {
-    display: flex;
-    justify-content: space-between;
-    padding-right: 8px;
-}
-
 .dial-in-numbers-list {
     margin-top: 20px;
     font-size: 12px;

css/modals/invite/_invite_more.scss

@@ -135,6 +135,7 @@
             .dial-in-copy {
                 display: inline-block;
                 vertical-align: middle;
+                margin-left: 21px;
                 cursor: pointer;
             }
         }

debian/jitsi-meet-prosody.postinst

@@ -60,6 +60,15 @@ case "$1" in
             JICOFO_AUTH_PASSWORD="$RET"
         fi
 
+        db_get jicofo/jicofosecret
+        if [ -z "$RET" ] ; then
+            # if secret is missing generate it, and store it
+            JICOFO_SECRET=`generateRandomPassword`
+            db_set jicofo/jicofosecret "$JICOFO_SECRET"
+        else
+            JICOFO_SECRET="$RET"
+        fi
+
         JICOFO_AUTH_DOMAIN="auth.$JVB_HOSTNAME"
 
         # detect dpkg-reconfigure, just delete old links
@@ -98,6 +107,7 @@ case "$1" in
             mkdir -p /etc/prosody/conf.d/
             cp /usr/share/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
             sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
+            sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG
             sed -i "s/focusUser/$JICOFO_AUTH_USER/g" $PROSODY_HOST_CONFIG
             sed -i "s/__turnSecret__/$TURN_SECRET/g" $PROSODY_HOST_CONFIG
             if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
@@ -132,28 +142,6 @@ case "$1" in
             echo -e "    admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\", \"jvb@auth.$JVB_HOSTNAME\" }" >> $PROSODY_HOST_CONFIG
         fi
 
-        # Convert the old focus component config to the new one.
-        # Old:
-        # Component "focus.jitmeet.example.com"
-        #     component_secret = "focusSecret"
-        # New:
-        # Component "focus.jitmeet.example.com" "client_proxy"
-        #    target_address = "focus@auth.jitmeet.example.com"
-        if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
-            sed -i "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n    target_address = \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\"/g" $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
-        # Old versions of jitsi-meet-prosody come with the extra plugin path commented out (https://github.com/jitsi/jitsi-meet/commit/e11d4d3101e5228bf956a69a9e8da73d0aee7949)
-        # Make sure it is uncommented, as it contains required modules.
-        if grep -q -- '--plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }' $PROSODY_HOST_CONFIG ;then
-            sed -i 's#--plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }#plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }#g' $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
-        # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
-        prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@auth.$JVB_HOSTNAME
-
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
             # prosodyctl takes care for the permissions
             # echo for using all default values

debian/jitsi-meet-prosody.templates

@@ -24,6 +24,11 @@ Type: password
 _Description: Jicofo user password:
  The secret used to connect to xmpp server as jicofo user.
 
+Template: jicofo/jicofosecret
+Type: password
+_Description: Jicofo Component secret:
+ The secret used to connect to xmpp server as component
+
 Template: jitsi-meet-prosody/turn-secret
 Type: string
 _Description: The turn server secret

debian/jitsi-meet-web-config.postinst

@@ -30,7 +30,6 @@ case "$1" in
             db_set jitsi-videobridge/jvb-hostname "localhost"
             db_input critical jitsi-videobridge/jvb-hostname || true
             db_go
-            db_get jitsi-videobridge/jvb-hostname
         fi
         JVB_HOSTNAME="$RET"
 
@@ -76,21 +75,15 @@ case "$1" in
             CERT_CHOICE="$RET"
 
             if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
+                db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
+                db_input critical jitsi-meet/cert-path-key || true
+                db_go
                 db_get jitsi-meet/cert-path-key
-                if [ -z "$RET" ] ; then
-                    db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
-                    db_input critical jitsi-meet/cert-path-key || true
-                    db_go
-                    db_get jitsi-meet/cert-path-key
-                fi
                 CERT_KEY="$RET"
+                db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
+                db_input critical jitsi-meet/cert-path-crt || true
+                db_go
                 db_get jitsi-meet/cert-path-crt
-                if [ -z "$RET" ] ; then
-                    db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
-                    db_input critical jitsi-meet/cert-path-crt || true
-                    db_go
-                    db_get jitsi-meet/cert-path-crt
-                fi
                 CERT_CRT="$RET"
             else
                 # create self-signed certs

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

@@ -3,11 +3,12 @@ plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
 -- domain mapper options, must at least have domain base set to use the mapper
 muc_mapper_domain_base = "jitmeet.example.com";
 
-external_service_secret = "__turnSecret__";
-external_services = {
-     { type = "stun", host = "jitmeet.example.com", port = 3478 },
-     { type = "turn", host = "jitmeet.example.com", port = 3478, transport = "udp", secret = true, ttl = 86400, algorithm = "turn" },
-     { type = "turns", host = "jitmeet.example.com", port = 5349, transport = "tcp", secret = true, ttl = 86400, algorithm = "turn" }
+turncredentials_secret = "__turnSecret__";
+
+turncredentials = {
+  { type = "stun", host = "jitmeet.example.com", port = "3478" },
+  { type = "turn", host = "jitmeet.example.com", port = "3478", transport = "udp" },
+  { type = "turns", host = "jitmeet.example.com", port = "5349", transport = "tcp" }
 };
 
 cross_domain_bosh = false;
@@ -16,48 +17,48 @@ consider_bosh_secure = true;
 
 -- https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
 ssl = {
-    protocol = "tlsv1_2+";
-    ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
+  protocol = "tlsv1_2+";
+  ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
 }
 
 VirtualHost "jitmeet.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Properties below are modified by jitsi-meet-tokens package config
-    -- and authentication above is switched to "token"
-    --app_id="example_app_id"
-    --app_secret="example_app_secret"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/etc/prosody/certs/jitmeet.example.com.key";
-        certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
-    }
-    speakerstats_component = "speakerstats.jitmeet.example.com"
-    conference_duration_component = "conferenceduration.jitmeet.example.com"
-    -- we need bosh
-    modules_enabled = {
-        "bosh";
-        "pubsub";
-        "ping"; -- Enable mod_ping
-        "speakerstats";
-        "external_services";
-        "conference_duration";
-        "muc_lobby_rooms";
-    }
-    c2s_require_encryption = false
-    lobby_muc = "lobby.jitmeet.example.com"
-    main_muc = "conference.jitmeet.example.com"
-    -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
+        -- enabled = false -- Remove this line to enable this host
+        authentication = "anonymous"
+        -- Properties below are modified by jitsi-meet-tokens package config
+        -- and authentication above is switched to "token"
+        --app_id="example_app_id"
+        --app_secret="example_app_secret"
+        -- Assign this host a certificate for TLS, otherwise it would use the one
+        -- set in the global section (if any).
+        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
+        -- use the global one.
+        ssl = {
+                key = "/etc/prosody/certs/jitmeet.example.com.key";
+                certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
+        }
+        speakerstats_component = "speakerstats.jitmeet.example.com"
+        conference_duration_component = "conferenceduration.jitmeet.example.com"
+        -- we need bosh
+        modules_enabled = {
+            "bosh";
+            "pubsub";
+            "ping"; -- Enable mod_ping
+            "speakerstats";
+            "turncredentials";
+            "conference_duration";
+            "muc_lobby_rooms";
+        }
+        c2s_require_encryption = false
+        lobby_muc = "lobby.jitmeet.example.com"
+        main_muc = "conference.jitmeet.example.com"
+        -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
 
 Component "conference.jitmeet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
-        --"token_verification";
+        -- "token_verification";
     }
     admins = { "focusUser@auth.jitmeet.example.com" }
     muc_room_locking = false
@@ -67,7 +68,7 @@ Component "conference.jitmeet.example.com" "muc"
 Component "internal.auth.jitmeet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
-        "ping";
+      "ping";
     }
     admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
     muc_room_locking = false
@@ -76,9 +77,8 @@ Component "internal.auth.jitmeet.example.com" "muc"
 VirtualHost "auth.jitmeet.example.com"
     authentication = "internal_plain"
 
--- Proxy to jicofo's user JID, so that it doesn't have to register as a component.
-Component "focus.jitmeet.example.com" "client_proxy"
-    target_address = "focusUser@auth.jitmeet.example.com"
+Component "focus.jitmeet.example.com"
+    component_secret = "focusSecret"
 
 Component "speakerstats.jitmeet.example.com" "speakerstats_component"
     muc_component = "conference.jitmeet.example.com"

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

@@ -6,14 +6,14 @@ server {
     server_name jitsi-meet.example.com;
 
     location ^~ /.well-known/acme-challenge/ {
-        default_type "text/plain";
-        root         /usr/share/jitsi-meet;
+       default_type "text/plain";
+       root         /usr/share/jitsi-meet;
     }
     location = /.well-known/acme-challenge/ {
-        return 404;
+       return 404;
     }
     location / {
-        return 301 https://$host$request_uri;
+       return 301 https://$host$request_uri;
     }
 }
 server {
@@ -21,7 +21,7 @@ server {
     listen [::]:443 ssl;
     server_name jitsi-meet.example.com;
 
-    # Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
+# Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
     ssl_protocols TLSv1.2 TLSv1.3;
     ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
     ssl_prefer_server_ciphers off;
@@ -58,7 +58,7 @@ server {
         alias /usr/share/jitsi-meet/libs/external_api.min.js;
     }
 
-    # ensure all static content can always be found first
+    #ensure all static content can always be found first
     location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
     {
         add_header 'Access-Control-Allow-Origin' '*';
@@ -66,13 +66,13 @@ server {
 
         # cache all versioned files
         if ($arg_v) {
-            expires 1y;
+          expires 1y;
         }
     }
 
     # BOSH
     location = /http-bind {
-        proxy_pass       http://localhost:5280/http-bind;
+        proxy_pass      http://localhost:5280/http-bind;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $http_host;
     }
@@ -89,11 +89,11 @@ server {
 
     # colibri (JVB) websockets for jvb1
     location ~ ^/colibri-ws/default-id/(.*) {
-        proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        tcp_nodelay on;
+       proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
+       proxy_http_version 1.1;
+       proxy_set_header Upgrade $http_upgrade;
+       proxy_set_header Connection "upgrade";
+       tcp_nodelay on;
     }
 
     location ~ ^/([^/?&:'"]+)$ {
@@ -106,13 +106,13 @@ server {
 
     location ~ ^/([^/?&:'"]+)/config.js$
     {
-        set $subdomain "$1.";
-        set $subdir "$1/";
+       set $subdomain "$1.";
+       set $subdir "$1/";
 
-        alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
+       alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
 
-    # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
+    #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
     location ~ ^/([^/?&:'"]+)/(.*)$ {
         set $subdomain "$1.";
         set $subdir "$1/";

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

@@ -8,49 +8,50 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-    ServerName jitsi-meet.example.com
 
-    # enable HTTP/2, if available
-    Protocols h2 http/1.1
+  ServerName jitsi-meet.example.com
 
-    SSLEngine on
-    SSLProxyEngine on
-    SSLCertificateFile /etc/jitsi/meet/jitsi-meet.example.com.crt
-    SSLCertificateKeyFile /etc/jitsi/meet/jitsi-meet.example.com.key
+  # enable HTTP/2, if available
+  Protocols h2 http/1.1
 
-    Header always set Strict-Transport-Security "max-age=63072000"
+  SSLEngine on
+  SSLProxyEngine on
+  SSLCertificateFile /etc/jitsi/meet/jitsi-meet.example.com.crt
+  SSLCertificateKeyFile /etc/jitsi/meet/jitsi-meet.example.com.key
 
-    DocumentRoot "/usr/share/jitsi-meet"
-    <Directory "/usr/share/jitsi-meet">
-        Options Indexes MultiViews Includes FollowSymLinks
-        AddOutputFilter Includes html
-        AllowOverride All
-        Order allow,deny
-        Allow from all
-    </Directory>
+  Header always set Strict-Transport-Security "max-age=63072000"
 
-    ErrorDocument 404 /static/404.html
+  DocumentRoot "/usr/share/jitsi-meet"
+  <Directory "/usr/share/jitsi-meet">
+    Options Indexes MultiViews Includes FollowSymLinks
+    AddOutputFilter Includes html
+    AllowOverride All
+    Order allow,deny
+    Allow from all
+  </Directory>
 
-    Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
-    <Location /config.js>
-        Require all granted
-    </Location>
+  ErrorDocument 404 /static/404.html
 
-    Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
-    <Location /external_api.js>
-        Require all granted
-    </Location>
+  Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
+  <Location /config.js>
+    Require all granted
+  </Location>
 
-    ProxyPreserveHost on
-    ProxyPass /http-bind http://localhost:5280/http-bind/
-    ProxyPassReverse /http-bind http://localhost:5280/http-bind/
+  Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
+  <Location /external_api.js>
+    Require all granted
+  </Location>
 
-    RewriteEngine on
-    RewriteRule ^/([a-zA-Z0-9]+)$ /index.html
+  ProxyPreserveHost on
+  ProxyPass /http-bind http://localhost:5280/http-bind/
+  ProxyPassReverse /http-bind http://localhost:5280/http-bind/
+
+  RewriteEngine on
+  RewriteRule ^/([a-zA-Z0-9]+)$ /index.html
 </VirtualHost>
 
 # Mozilla Guideline v5.4, Apache 2.4.41, OpenSSL 1.1.1d, intermediate configuration, no OCSP
-SSLProtocol         all -SSLv3 -TLSv1 -TLSv1.1
-SSLCipherSuite      ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
-SSLHonorCipherOrder off
-SSLSessionTickets   off
+SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
+SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+SSLHonorCipherOrder     off
+SSLSessionTickets       off

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

@@ -10,6 +10,7 @@ server {
     index index.html;
     set $prefix "";
 
+
     # BOSH
     location /http-bind {
         proxy_pass      http://localhost:5280/http-bind;
@@ -43,13 +44,13 @@ server {
 
     location ~ ^/([^/?&:'"]+)/config.js$
     {
-        set $subdomain "$1.";
-        set $subdir "$1/";
+       set $subdomain "$1.";
+       set $subdir "$1/";
 
-        alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
+       alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
     }
 
-    # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
+    #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
     location ~ ^/([^/?&:'"]+)/(.*)$ {
         set $subdomain "$1.";
         set $subdir "$1/";

doc/example-config-files/multidomain/prosody.cfg.multidomain.example

@@ -34,56 +34,55 @@ component_ports = { 5347 }
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
 modules_enabled = {
 
-    -- Generally required
-    "roster"; -- Allow users to have a roster. Recommended ;)
-    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-    "tls"; -- Add support for secure TLS on c2s/s2s connections
-    "dialback"; -- s2s dialback support
-    "disco"; -- Service discovery
-    "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 
-    -- Not essential, but recommended
-    "private"; -- Private XML storage (for room bookmarks, etc.)
-    "vcard"; -- Allow users to set vCards
+	-- Not essential, but recommended
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"vcard"; -- Allow users to set vCards
 
-    -- These are commented by default as they have a performance impact
-    --"privacy"; -- Support privacy lists
-    "compression"; -- Stream compression (requires the lua-zlib package installed)
+	-- These are commented by default as they have a performance impact
+		--"privacy"; -- Support privacy lists
+		"compression"; -- Stream compression (requires the lua-zlib package installed)
 
-    -- Nice to have
-    "version"; -- Replies to server version requests
-    "uptime"; -- Report how long server has been running
-    "time"; -- Let others know the time here on this server
-    "ping"; -- Replies to XMPP pings with pongs
-    "pep"; -- Enables users to publish their mood, activity, playing music and more
-    "register"; -- Allow users to register on this server using a client and change passwords
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"register"; -- Allow users to register on this server using a client and change passwords
 
-    -- Admin interfaces
-    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
-    -- HTTP modules
-    "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-    --"http_files"; -- Serve static files from a directory over HTTP
+	-- HTTP modules
+		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"http_files"; -- Serve static files from a directory over HTTP
 
-    -- Other specific functionality
-    --"groups"; -- Shared roster support
-    --"announce"; -- Send announcement to all online users
-    --"welcome"; -- Welcome users who register accounts
-    --"watchregistrations"; -- Alert admins of registrations
-    --"motd"; -- Send a message to users when they log in
-    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-
-    -- jitsi
-    "smacks";
-    "carbons";
-    "mam";
-    "lastactivity";
-    "offline";
-    "pubsub";
-    "adhoc";
-    "websocket";
-    "http_altconnect";
+	-- Other specific functionality
+		--"groups"; -- Shared roster support
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+	-- jitsi
+		"smacks";
+		"carbons";
+		"mam";
+		"lastactivity";
+		"offline";
+		"pubsub";
+		"adhoc";
+		"websocket";
+		"http_altconnect";
 }
 
 -- domain mapper options, must at least have domain base set to use the mapper
@@ -92,9 +91,9 @@ muc_mapper_domain_base = "jitsi.example.com";
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-    --"offline"; -- Store offline messages
-    --"c2s"; -- Handle client connections
-    --"s2s"; -- Handle server-to-server connections
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
 }
 
 -- Disable account creation by default, for security
@@ -111,7 +110,7 @@ ssl = {
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 
---c2s_require_encryption = true
+-- c2s_require_encryption = true
 
 -- Force certificate authentication for server-to-server connections?
 -- This provides ideal security, but requires servers you communicate
@@ -119,7 +118,7 @@ ssl = {
 -- NOTE: Your version of LuaSec must support certificate verification!
 -- For more information see http://prosody.im/doc/s2s#security
 
---s2s_secure_auth = false
+-- s2s_secure_auth = false
 
 -- Many servers don't support encryption or have invalid or self-signed
 -- certificates. You can list domains here that will not be required to
@@ -160,9 +159,9 @@ authentication = "internal_hashed"
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-    error = "/var/log/prosody/prosody.err";
-    "*syslog";
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	"*syslog";
 }
 
 ----------- Virtual hosts -----------
@@ -172,25 +171,25 @@ log = {
 --VirtualHost "localhost"
 
 VirtualHost "jitsi.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/var/lib/prosody/jitsi.example.com.key";
-        certificate = "/var/lib/prosody/jitsi.example.com.crt";
-    }
+	-- enabled = false -- Remove this line to enable this host
+	authentication = "anonymous"
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "/var/lib/prosody/jitsi.example.com.key";
+		certificate = "/var/lib/prosody/jitsi.example.com.crt";
+	}
 
-    c2s_require_encryption = false
+	c2s_require_encryption = false
 
 VirtualHost "auth.jitsi.example.com"
-    ssl = {
-        key = "/var/lib/prosody/auth.jitsi.example.com.key";
-        certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
-    }
-    authentication = "internal_plain"
+	ssl = {
+		key = "/var/lib/prosody/auth.jitsi.example.com.key";
+		certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
+	}
+	authentication = "internal_plain"
 
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
@@ -210,7 +209,7 @@ VirtualHost "auth.jitsi.example.com"
 -- see: http://prosody.im/doc/components#adding_an_external_component
 --
 --Component "gateway.example.com"
---    component_secret = "password"
+--	component_secret = "password"
 
 Component "conference.jitsi.example.com" "muc"
     modules_enabled = { "muc_domain_mapper" }

doc/example-config-files/prosody.cfg.lua.example

@@ -34,64 +34,63 @@ component_ports = { 5347 }
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
 modules_enabled = {
 
-    -- Generally required
-    "roster"; -- Allow users to have a roster. Recommended ;)
-    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-    "tls"; -- Add support for secure TLS on c2s/s2s connections
-    "dialback"; -- s2s dialback support
-    "disco"; -- Service discovery
-    "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 
-    -- Not essential, but recommended
-    "private"; -- Private XML storage (for room bookmarks, etc.)
-    "vcard"; -- Allow users to set vCards
+	-- Not essential, but recommended
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"vcard"; -- Allow users to set vCards
 
-    -- These are commented by default as they have a performance impact
-    --"privacy"; -- Support privacy lists
-    "compression"; -- Stream compression (requires the lua-zlib package installed)
+	-- These are commented by default as they have a performance impact
+		--"privacy"; -- Support privacy lists
+		"compression"; -- Stream compression (requires the lua-zlib package installed)
 
-    -- Nice to have
-    "version"; -- Replies to server version requests
-    "uptime"; -- Report how long server has been running
-    "time"; -- Let others know the time here on this server
-    "ping"; -- Replies to XMPP pings with pongs
-    "pep"; -- Enables users to publish their mood, activity, playing music and more
-    "register"; -- Allow users to register on this server using a client and change passwords
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"register"; -- Allow users to register on this server using a client and change passwords
 
-    -- Admin interfaces
-    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
-    -- HTTP modules
-    "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-    --"http_files"; -- Serve static files from a directory over HTTP
+	-- HTTP modules
+		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"http_files"; -- Serve static files from a directory over HTTP
 
-    -- Other specific functionality
-    --"groups"; -- Shared roster support
-    --"announce"; -- Send announcement to all online users
-    --"welcome"; -- Welcome users who register accounts
-    --"watchregistrations"; -- Alert admins of registrations
-    --"motd"; -- Send a message to users when they log in
-    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-
-    -- jitsi
-    "smacks";
-    "carbons";
-    "mam";
-    "lastactivity";
-    "offline";
-    "pubsub";
-    "adhoc";
-    "websocket";
-    "http_altconnect";
+	-- Other specific functionality
+		--"groups"; -- Shared roster support
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+	-- jitsi
+		"smacks";
+		"carbons";
+		"mam";
+		"lastactivity";
+		"offline";
+		"pubsub";
+		"adhoc";
+		"websocket";
+		"http_altconnect";
 }
 
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-    --"offline"; -- Store offline messages
-    --"c2s"; -- Handle client connections
-    --"s2s"; -- Handle server-to-server connections
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
 }
 
 -- Disable account creation by default, for security
@@ -108,7 +107,7 @@ ssl = {
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 
---c2s_require_encryption = true
+-- c2s_require_encryption = true
 
 -- Force certificate authentication for server-to-server connections?
 -- This provides ideal security, but requires servers you communicate
@@ -116,7 +115,7 @@ ssl = {
 -- NOTE: Your version of LuaSec must support certificate verification!
 -- For more information see http://prosody.im/doc/s2s#security
 
---s2s_secure_auth = false
+-- s2s_secure_auth = false
 
 -- Many servers don't support encryption or have invalid or self-signed
 -- certificates. You can list domains here that will not be required to
@@ -157,9 +156,9 @@ authentication = "internal_hashed"
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-    error = "/var/log/prosody/prosody.err";
-    "*syslog";
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	"*syslog";
 }
 
 ----------- Virtual hosts -----------
@@ -169,25 +168,25 @@ log = {
 --VirtualHost "localhost"
 
 VirtualHost "jitsi.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/var/lib/prosody/jitsi.example.com.key";
-        certificate = "/var/lib/prosody/jitsi.example.com.crt";
-    }
+	-- enabled = false -- Remove this line to enable this host
+	authentication = "anonymous"
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "/var/lib/prosody/jitsi.example.com.key";
+		certificate = "/var/lib/prosody/jitsi.example.com.crt";
+	}
 
-    c2s_require_encryption = false
+	c2s_require_encryption = false
 
 VirtualHost "auth.jitsi.example.com"
-    ssl = {
-        key = "/var/lib/prosody/auth.jitsi.example.com.key";
-        certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
-    }
-    authentication = "internal_plain"
+	ssl = {
+		key = "/var/lib/prosody/auth.jitsi.example.com.key";
+		certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
+	}
+	authentication = "internal_plain"
 
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
@@ -207,7 +206,7 @@ VirtualHost "auth.jitsi.example.com"
 -- see: http://prosody.im/doc/components#adding_an_external_component
 --
 --Component "gateway.example.com"
---    component_secret = "password"
+--	component_secret = "password"
 
 Component "conference.jitsi.example.com" "muc"
 

doc/example-config-files/scalable/jicofo_config.scalable.example

@@ -24,9 +24,4 @@ JICOFO_AUTH_PASSWORD=$JICOFO_PASSWORD
 JICOFO_OPTS=""
 
 # adds java system props that are passed to jicofo (default are for home and logging config file)
-JAVA_SYS_PROPS=" \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \
-    -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi \
-    -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties \
-"
+JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties"

doc/example-config-files/scalable/meet.example.com.cfg.lua.scalable.example

@@ -6,48 +6,48 @@ muc_mapper_domain_base = "meet.example.com";
 turncredentials_secret = "turncredentials_secret_test";
 
 turncredentials = {
-    { type = "stun", host = "meet.example.com", port = "443" },
-    { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
-    { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
+  { type = "stun", host = "meet.example.com", port = "443" },
+  { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
+  { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
 };
 
 cross_domain_bosh = false;
 consider_bosh_secure = true;
 
 VirtualHost "meet.example.com"
-    -- enabled = false -- Remove this line to enable this host
-    authentication = "anonymous"
-    -- Properties below are modified by jitsi-meet-tokens package config
-    -- and authentication above is switched to "token"
-    --app_id="example_app_id"
-    --app_secret="example_app_secret"
-    -- Assign this host a certificate for TLS, otherwise it would use the one
-    -- set in the global section (if any).
-    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-    -- use the global one.
-    ssl = {
-        key = "/etc/prosody/certs/meet.example.com.key";
-        certificate = "/etc/prosody/certs/meet.example.com.crt";
-    }
-    speakerstats_component = "speakerstats.meet.example.com"
-    conference_duration_component = "conferenceduration.meet.example.com"
-    -- we need bosh
-    modules_enabled = {
-        "bosh";
-        "pubsub";
-        "ping"; -- Enable mod_ping
-        "speakerstats";
-        "turncredentials";
-        "conference_duration";
-    }
-    c2s_require_encryption = false
+        -- enabled = false -- Remove this line to enable this host
+        authentication = "anonymous"
+        -- Properties below are modified by jitsi-meet-tokens package config
+        -- and authentication above is switched to "token"
+        --app_id="example_app_id"
+        --app_secret="example_app_secret"
+        -- Assign this host a certificate for TLS, otherwise it would use the one
+        -- set in the global section (if any).
+        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
+        -- use the global one.
+        ssl = {
+                key = "/etc/prosody/certs/meet.example.com.key";
+                certificate = "/etc/prosody/certs/meet.example.com.crt";
+        }
+        speakerstats_component = "speakerstats.meet.example.com"
+        conference_duration_component = "conferenceduration.meet.example.com"
+        -- we need bosh
+        modules_enabled = {
+            "bosh";
+            "pubsub";
+            "ping"; -- Enable mod_ping
+            "speakerstats";
+            "turncredentials";
+            "conference_duration";
+        }
+        c2s_require_encryption = false
 
 Component "conference.meet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
-        --"token_verification";
+        -- "token_verification";
     }
     admins = { "focus@auth.meet.example.com" }
     muc_room_locking = false
@@ -58,7 +58,7 @@ Component "conference.meet.example.com" "muc"
 Component "internal.auth.meet.example.com" "muc"
     storage = "memory"
     modules_enabled = {
-        "ping";
+      "ping";
     }
     admins = { "focus@auth.meet.example.com", "jvb@auth.meet.example.com" }
 
@@ -75,6 +75,7 @@ Component "focus.meet.example.com"
 Component "speakerstats.meet.example.com" "speakerstats_component"
     muc_component = "conference.meet.example.com"
 
+
 Component "conferenceduration.meet.example.com" "conference_duration_component"
     muc_component = "conference.meet.example.com"
 

doc/example-config-files/scalable/prosody.cfg.lua.scalable.example

@@ -13,58 +13,58 @@ network_backend = "epoll"
 -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
 modules_enabled = {
 
-    -- Generally required
-    "roster"; -- Allow users to have a roster. Recommended ;)
-    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-    "tls"; -- Add support for secure TLS on c2s/s2s connections
-    "dialback"; -- s2s dialback support
-    "disco"; -- Service discovery
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
 
-    -- Not essential, but recommended
-    "carbons"; -- Keep multiple clients in sync
-    "pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
-    "private"; -- Private XML storage (for room bookmarks, etc.)
-    "blocklist"; -- Allow users to block communications with other users
-    "vcard4"; -- User profiles (stored in PEP)
-    "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
+	-- Not essential, but recommended
+		"carbons"; -- Keep multiple clients in sync
+		"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"blocklist"; -- Allow users to block communications with other users
+		"vcard4"; -- User profiles (stored in PEP)
+		"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
 
-    -- Nice to have
-    "version"; -- Replies to server version requests
-    "uptime"; -- Report how long server has been running
-    "time"; -- Let others know the time here on this server
-    "ping"; -- Replies to XMPP pings with pongs
-    "register"; -- Allow users to register on this server using a client and change passwords
-    --"mam"; -- Store messages in an archive and allow users to access it
-    --"csi_simple"; -- Simple Mobile optimizations
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"register"; -- Allow users to register on this server using a client and change passwords
+		--"mam"; -- Store messages in an archive and allow users to access it
+		--"csi_simple"; -- Simple Mobile optimizations
 
-    -- Admin interfaces
-    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
-    -- HTTP modules
-    --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-    --"websocket"; -- XMPP over WebSockets
-    --"http_files"; -- Serve static files from a directory over HTTP
+	-- HTTP modules
+		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"websocket"; -- XMPP over WebSockets
+		--"http_files"; -- Serve static files from a directory over HTTP
 
-    -- Other specific functionality
-    --"limits"; -- Enable bandwidth limiting for XMPP connections
-    --"groups"; -- Shared roster support
-    --"server_contact_info"; -- Publish contact information for this service
-    --"announce"; -- Send announcement to all online users
-    --"welcome"; -- Welcome users who register accounts
-    --"watchregistrations"; -- Alert admins of registrations
-    --"motd"; -- Send a message to users when they log in
-    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-    --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
+	-- Other specific functionality
+		--"limits"; -- Enable bandwidth limiting for XMPP connections
+		--"groups"; -- Shared roster support
+		--"server_contact_info"; -- Publish contact information for this service
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
 }
 
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-    --"offline"; -- Store offline messages
-    --"c2s"; -- Handle client connections
-    --"s2s"; -- Handle server-to-server connections
-    --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
+	-- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 }
 
 -- Disable account creation by default, for security
@@ -85,6 +85,7 @@ s2s_require_encryption = true
 
 s2s_secure_auth = false
 
+
 -- Required for init scripts and prosodyctl
 pidfile = "/var/run/prosody/prosody.pid"
 
@@ -98,12 +99,13 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
 -- Logging configuration
 -- For advanced logging see https://prosody.im/doc/logging
 log = {
-    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-    error = "/var/log/prosody/prosody.err";
-    --"*syslog"; -- Uncomment this for logging to syslog
-    --"*console"; -- Log to the console, useful for debugging with daemonize=false
+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/prosody/prosody.err";
+	-- "*syslog"; -- Uncomment this for logging to syslog
+	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
 }
 
+
 -- Location of directory to find certificates in (relative to main config file):
 certificates = "certs"
 

doc/example-config-files/scalable/videobridge_config.scalable.example

@@ -15,10 +15,6 @@ JVB_SECRET=$VP_SECRET
 # extra options to pass to the JVB daemon
 JVB_OPTS="--apis=rest,"
 
+
 # adds java system props that are passed to jvb (default are for home and logging config file)
-JAVA_SYS_PROPS=" \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi \
-    -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
-    -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi \
-    -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties \
-"
+JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties"

ios/Podfile

@@ -3,7 +3,7 @@ workspace 'jitsi-meet'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 install! 'cocoapods', :deterministic_uuids => false
 
-target 'JitsiMeet' do
+target 'jitsi-meet' do
   project 'app/app.xcodeproj'
 
   pod 'Firebase/Analytics', '~> 6.33.0'
@@ -11,7 +11,7 @@ target 'JitsiMeet' do
   pod 'Firebase/DynamicLinks', '~> 6.33.0'
 end
 
-target 'JitsiMeetSDK' do
+target 'JitsiMeet' do
   project 'sdk/sdk.xcodeproj'
 
   # React Native and its dependencies
@@ -58,21 +58,21 @@ target 'JitsiMeetSDK' do
   pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
   pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
   pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
   pod 'react-native-webview', :path => '../node_modules/react-native-webview'
   pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
   pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
-  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'
-  pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
+  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
   pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'
   pod 'RNSound', :path => '../node_modules/react-native-sound'
   pod 'RNSVG', :path => '../node_modules/react-native-svg'
   pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
   pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
+  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
 
   # Native pod dependencies
   #
 
+  pod 'Amplitude-iOS', '~> 4.0.4'
   pod 'CocoaLumberjack', '~>3.5.3'
   pod 'ObjectiveDropboxOfficial', '~> 3.9.4'
 

ios/Podfile.lock

@@ -1,4 +1,5 @@
 PODS:
+  - Amplitude-iOS (4.0.4)
   - AppAuth (1.2.0):
     - AppAuth/Core (= 1.2.0)
     - AppAuth/ExternalUserAgent (= 1.2.0)
@@ -292,7 +293,7 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webrtc (1.87.3):
+  - react-native-webrtc (1.87.1):
     - React-Core
   - react-native-webview (11.0.2):
     - React-Core
@@ -350,12 +351,10 @@ PODS:
     - React-jsi (= 0.61.5-jitsi.2)
     - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-  - RNCAsyncStorage (1.13.2):
+  - RNCAsyncStorage (1.3.4):
     - React
   - RNDefaultPreference (1.4.2):
     - React
-  - RNDeviceInfo (8.0.0):
-    - React-Core
   - RNGoogleSignin (3.0.1):
     - GoogleSignIn (~> 5.0.0)
     - React
@@ -364,13 +363,14 @@ PODS:
     - RNSound/Core (= 0.11.0)
   - RNSound/Core (0.11.0):
     - React
-  - RNSVG (12.1.0):
+  - RNSVG (10.1.0):
     - React
   - RNWatch (0.4.3):
     - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
+  - Amplitude-iOS (~> 4.0.4)
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - CocoaLumberjack (~> 3.5.3)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -410,9 +410,8 @@ DEPENDENCIES:
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`)
-  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
+  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
-  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)"
   - RNSound (from `../node_modules/react-native-sound`)
   - RNSVG (from `../node_modules/react-native-svg`)
@@ -421,6 +420,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - Amplitude-iOS
     - AppAuth
     - boost-for-react-native
     - CocoaLumberjack
@@ -507,11 +507,9 @@ EXTERNAL SOURCES:
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
   RNCAsyncStorage:
-    :path: "../node_modules/@react-native-async-storage/async-storage"
+    :path: "../node_modules/@react-native-community/async-storage"
   RNDefaultPreference:
     :path: "../node_modules/react-native-default-preference"
-  RNDeviceInfo:
-    :path: "../node_modules/react-native-device-info"
   RNGoogleSignin:
     :path: "../node_modules/@react-native-community/google-signin"
   RNSound:
@@ -524,6 +522,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
+  Amplitude-iOS: 2ad4d7270c99186236c1272a3a9425463b1ae1a7
   AppAuth: bce82c76043657c99d91e7882e8a9e1a93650cd4
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
@@ -563,7 +562,7 @@ SPEC CHECKSUMS:
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
   react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webrtc: dc1208bdca2c4d091f7b57859e69332bff6f1986
+  react-native-webrtc: 40eca4cac200fda34fb843da07e3402211bbbd10
   react-native-webview: b2542d6fd424bcc3e3b2ec5f854f0abb4ec86c87
   React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
   React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
@@ -575,15 +574,14 @@ SPEC CHECKSUMS:
   React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
   React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
   ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
-  RNCAsyncStorage: bc2f81cc1df90c267ce9ed30bb2dbc93b945a8ee
+  RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
   RNDefaultPreference: 56a405ce61033ac77b95004dccd7ac54c2eb50d1
-  RNDeviceInfo: 72ded653ce636b3f03571e90bed99309a714944e
   RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
   RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20
-  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
+  RNSVG: 069864be08c9fe065a2cf7e63656a34c78653c99
   RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
   Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
 
-PODFILE CHECKSUM: 5be5132e41831a98362eeed760558227a4df89ae
+PODFILE CHECKSUM: f6626cd705333112182cedbe175ae2f9006e8874
 
 COCOAPODS: 1.10.0

ios/app/app.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; };
+		0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */; };
 		0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0B412F201EDEE95300B1A0A6 /* Main.storyboard */; };
 		0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */; };
@@ -23,12 +25,10 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */; };
+		695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */; };
 		DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; };
 		DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
-		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
-		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; };
 		E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; };
 /* End PBXBuildFile section */
@@ -57,8 +57,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */,
 				DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */,
+				0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -115,17 +115,14 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-jitsi-meet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-jitsi-meet/Pods-jitsi-meet.debug.xcconfig"; sourceTree = "<group>"; };
-		609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
+		489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-jitsi-meet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
-		D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = "<group>"; };
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
-		DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = "<group>"; };
 		E58801132278944E008B0561 /* JitsiMeetContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetContext.swift; sourceTree = "<group>"; };
 		E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetCommands.swift; sourceTree = "<group>"; };
-		FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -140,9 +137,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */,
+				695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */,
 				DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */,
-				DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */,
-				55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -159,12 +156,11 @@
 		0B26BE711EC5BC4D00EEFB41 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */,
 				DE050388256E904600DEE3A5 /* WebRTC.xcframework */,
 				0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */,
 				DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */,
 				0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */,
-				D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */,
+				489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -221,8 +217,6 @@
 			children = (
 				4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */,
 				09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */,
-				609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */,
-				FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -290,9 +284,9 @@
 			productReference = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */;
 			productType = "com.apple.product-type.watchkit2-extension";
 		};
-		13B07F861A680F5B00A75B9A /* JitsiMeet */ = {
+		13B07F861A680F5B00A75B9A /* jitsi-meet */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
+			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */;
 			buildPhases = (
 				B6607F42A5CF0C76E98929E2 /* [CP] Check Pods Manifest.lock */,
 				0BBA83C41EC9F7600075A103 /* Run React packager */,
@@ -311,7 +305,7 @@
 			dependencies = (
 				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 			);
-			name = JitsiMeet;
+			name = "jitsi-meet";
 			productName = "Jitsi Meet";
 			productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet.app */;
 			productType = "com.apple.product-type.application";
@@ -362,7 +356,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				13B07F861A680F5B00A75B9A /* JitsiMeet */,
+				13B07F861A680F5B00A75B9A /* jitsi-meet */,
 				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
 				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
 			);
@@ -443,7 +437,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-jitsi-meet-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -713,9 +707,8 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */;
+			baseConfigurationReference = 4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -743,9 +736,8 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */;
+			baseConfigurationReference = 09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -905,7 +897,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
+		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* Debug */,

ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-               BuildableName = "JitsiMeetSDK.framework"
-               BlueprintName = "JitsiMeetSDK"
+               BuildableName = "JitsiMeet.framework"
+               BlueprintName = "JitsiMeet"
                ReferencedContainer = "container:../sdk/sdk.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -30,7 +30,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
                BuildableName = "jitsi-meet.app"
-               BlueprintName = "JitsiMeet"
+               BlueprintName = "jitsi-meet"
                ReferencedContainer = "container:app.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,7 +46,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
             BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
+            BlueprintName = "jitsi-meet"
             ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -69,7 +69,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
             BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
+            BlueprintName = "jitsi-meet"
             ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -86,7 +86,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
             BuildableName = "jitsi-meet.app"
-            BlueprintName = "JitsiMeet"
+            BlueprintName = "jitsi-meet"
             ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

ios/app/src/AppDelegate.m

@@ -21,7 +21,7 @@
 #import "ViewController.h"
 
 @import Firebase;
-@import JitsiMeetSDK;
+@import JitsiMeet;
 
 @implementation AppDelegate
 

ios/app/src/FIRUtilities.m

@@ -16,7 +16,7 @@
 
 #import "FIRUtilities.h"
 
-@import JitsiMeetSDK;
+@import JitsiMeet;
 
 @implementation FIRUtilities
 

ios/app/src/Info.plist

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

ios/app/src/ViewController.h

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-@import UIKit;
-@import JitsiMeetSDK;
+#import <UIKit/UIKit.h>
+
+#import <JitsiMeet/JitsiMeet.h>
 
 @interface ViewController : UIViewController<JitsiMeetViewDelegate>
 

ios/app/src/ViewController.m

@@ -21,7 +21,7 @@
 @import MobileCoreServices;
 @import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase
 
-@import JitsiMeetSDK;
+@import JitsiMeet;
 
 #import "Types.h"
 #import "ViewController.h"
@@ -99,26 +99,9 @@
 #if 0
 - (void)enterPictureInPicture:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"ENTER_PICTURE_IN_PICTURE" withData:data];
-
 }
 #endif
 
-- (void)participantJoined:(NSDictionary *)data {
-  NSLog(@"%@%@", @"Participant joined: ", data[@"participantId"]);
-}
-
-- (void)participantLeft:(NSDictionary *)data {
-  NSLog(@"%@%@", @"Participant left: ", data[@"participantId"]);
-}
-
-- (void)audioMutedChanged:(NSDictionary *)data {
-  NSLog(@"%@%@", @"Audio muted changed: ", data[@"muted"]);
-}
-
-- (void)endpointTextMessageReceived:(NSDictionary *)data; {
-  NSLog(@"%@%@", @"Endpoint text message received: ", data);
-}
-
 #pragma mark - Helpers
 
 - (void)terminate {

ios/app/watchos/app/Info.plist

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

ios/app/watchos/extension/Info.plist

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

ios/fastlane/Fastfile

@@ -54,7 +54,7 @@ platform :ios do
 
     # Actually build the app
     build_app(
-        scheme: "JitsiMeet",
+        scheme: "jitsi-meet",
         include_bitcode: true,
         include_symbols: true,
         export_xcargs: "-allowProvisioningUpdates"

ios/scripts/release-sdk.sh

@@ -27,10 +27,10 @@ pushd ${PROJECT_REPO}
 rm -rf ios/sdk/out
 xcodebuild clean \
     -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDK
+    -scheme JitsiMeet
 xcodebuild archive \
     -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDK  \
+    -scheme JitsiMeet  \
     -configuration Release \
     -sdk iphonesimulator \
     -destination='generic/platform=iOS Simulator' \
@@ -41,7 +41,7 @@ xcodebuild archive \
     BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild archive \
     -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeetSDK  \
+    -scheme JitsiMeet  \
     -configuration Release \
     -sdk iphoneos \
     -destination='generic/platform=iOS' \
@@ -51,9 +51,9 @@ xcodebuild archive \
     SKIP_INSTALL=NO \
     BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild -create-xcframework \
-    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
-    -output ios/sdk/out/JitsiMeetSDK.xcframework
+    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeet.framework \
+    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeet.framework \
+    -output ios/sdk/out/JitsiMeet.xcframework
 if [[ $DO_GIT_TAG == 1 ]]; then
     git tag ios-sdk-${SDK_VERSION}
 fi
@@ -62,7 +62,7 @@ popd
 pushd ${RELEASE_REPO}
 
 # Put the new files in the repo
-cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework Frameworks/
+cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeet.xcframework Frameworks/
 cp -a ${PROJECT_REPO}/node_modules/react-native-webrtc/apple/WebRTC.xcframework Frameworks/
 
 # Add all files to git

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -24,13 +24,14 @@
 		0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
 		0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
 		0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */; };
 		6C31EDC820C06D490089C899 /* recordingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC720C06D490089C899 /* recordingOn.mp3 */; };
 		6C31EDCA20C06D530089C899 /* recordingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC920C06D530089C899 /* recordingOff.mp3 */; };
-		6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */; };
 		75635B0A20751D6D00F29C9F /* joined.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0820751D6D00F29C9F /* joined.wav */; };
 		75635B0B20751D6D00F29C9F /* left.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0920751D6D00F29C9F /* left.wav */; };
 		87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */; };
 		A4414AE020B37F1A003546E6 /* rejected.wav in Resources */ = {isa = PBXBuildFile; fileRef = A4414ADF20B37F1A003546E6 /* rejected.wav */; };
+		A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A480429B21EE335600289B73 /* AmplitudeModule.m */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
 		C30F88D0CB0F4F5593216D24 /* liveStreamingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */; };
 		C30F88D2CB0F4F5593216D24 /* liveStreamingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D3CB0F4F5593216D24 /* liveStreamingOn.mp3 */; };
@@ -41,7 +42,6 @@
 		C69EFA0E209A0F660027712B /* JMCallKitListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = C69EFA0B209A0F660027712B /* JMCallKitListener.swift */; };
 		C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A3425E204EF76800E062DD /* DragGestureController.swift */; };
 		C6CC49AF207412CF000DFA42 /* PiPViewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */; };
-		C81E9AB925AC5AD800B134D9 /* ExternalAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */; };
 		C8AFD27F2462C613000293D2 /* InfoPlistUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C8AFD2802462C613000293D2 /* InfoPlistUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */; };
 		DE438CDA2350934700DD541D /* JavaScriptSandbox.m in Sources */ = {isa = PBXBuildFile; fileRef = DE438CD82350934700DD541D /* JavaScriptSandbox.m */; };
@@ -54,7 +54,6 @@
 		DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D72316AC7600AE1940 /* LogBridge.m */; };
 		DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */; };
-		DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
 		DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAFA778229EAD520033A7FA /* RNRootView.m */; };
@@ -64,7 +63,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.debug.xcconfig"; sourceTree = "<group>"; };
+		03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JitsiMeetView.h; sourceTree = "<group>"; };
 		0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetView.m; sourceTree = "<group>"; };
 		0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetViewDelegate.h; sourceTree = "<group>"; };
@@ -82,7 +81,7 @@
 		0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = "<group>"; };
 		0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = "<group>"; };
 		0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = "<group>"; };
-		0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD906E81EC0C00300C8C18E /* JitsiMeet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeet.h; sourceTree = "<group>"; };
 		0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6C31EDC720C06D490089C899 /* recordingOn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = recordingOn.mp3; path = ../../sounds/recordingOn.mp3; sourceTree = "<group>"; };
@@ -90,10 +89,10 @@
 		75635B0820751D6D00F29C9F /* joined.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = joined.wav; path = ../../sounds/joined.wav; sourceTree = "<group>"; };
 		75635B0920751D6D00F29C9F /* left.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = left.wav; path = ../../sounds/left.wav; sourceTree = "<group>"; };
 		87FE6F3221E52437004A5DC7 /* incomingMessage.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = incomingMessage.wav; path = ../../sounds/incomingMessage.wav; sourceTree = "<group>"; };
-		891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = "<group>"; };
 		98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		A4414ADF20B37F1A003546E6 /* rejected.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = rejected.wav; path = ../../sounds/rejected.wav; sourceTree = "<group>"; };
+		A480429B21EE335600289B73 /* AmplitudeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AmplitudeModule.m; path = src/analytics/AmplitudeModule.m; sourceTree = SOURCE_ROOT; };
 		A4A934E8212F3ADB001E9388 /* Dropbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dropbox.m; sourceTree = "<group>"; };
 		A4A934EB21349A06001E9388 /* Dropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dropbox.h; sourceTree = "<group>"; };
 		C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = liveStreamingOff.mp3; path = ../../sounds/liveStreamingOff.mp3; sourceTree = "<group>"; };
@@ -106,7 +105,6 @@
 		C6A3425E204EF76800E062DD /* DragGestureController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DragGestureController.swift; sourceTree = "<group>"; };
 		C6CC49AE207412CF000DFA42 /* PiPViewCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PiPViewCoordinator.swift; sourceTree = "<group>"; };
 		C6F99C13204DB63D0001F710 /* JitsiMeetView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetView+Private.h"; sourceTree = "<group>"; };
-		C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExternalAPI.h; sourceTree = "<group>"; };
 		C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoPlistUtil.h; sourceTree = "<group>"; };
 		C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InfoPlistUtil.m; sourceTree = "<group>"; };
 		DE438CD82350934700DD541D /* JavaScriptSandbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JavaScriptSandbox.m; sourceTree = "<group>"; };
@@ -120,7 +118,6 @@
 		DE81A2D72316AC7600AE1940 /* LogBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LogBridge.m; sourceTree = "<group>"; };
 		DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetBaseLogHandler.h; sourceTree = "<group>"; };
 		DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetBaseLogHandler.m; sourceTree = "<group>"; };
-		DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetSDK.h; sourceTree = "<group>"; };
 		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
 		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
 		DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = "<group>"; };
@@ -131,7 +128,6 @@
 		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
 		DEFE535721FB2E9E00011A3A /* ReactUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactUtils.h; sourceTree = "<group>"; };
 		DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet+Private.h"; sourceTree = "<group>"; };
-		E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,7 +137,7 @@
 			files = (
 				0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */,
 				0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */,
-				6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */,
+				0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -182,7 +178,7 @@
 		0BD906E61EC0C00300C8C18E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */,
+				0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -190,6 +186,7 @@
 		0BD906E71EC0C00300C8C18E /* src */ = {
 			isa = PBXGroup;
 			children = (
+				A480429821ECE2D800289B73 /* analytics */,
 				0BB9AD7C1F60356D001C08DB /* AppInfo.m */,
 				0BCA495C1EC4B6C600B793EE /* AudioMode.m */,
 				C69EFA02209A0EFD0027712B /* callkit */,
@@ -199,7 +196,6 @@
 				DE438CD82350934700DD541D /* JavaScriptSandbox.m */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
 				DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */,
-				DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */,
 				DEFE535321FB1BF800011A3A /* JitsiMeet.m */,
 				DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */,
 				DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */,
@@ -230,7 +226,6 @@
 				0B93EF7D1EC9DDCD0030D24D /* RCTBridgeWrapper.m */,
 				C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */,
 				C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */,
-				C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -241,11 +236,20 @@
 				0BB9AD761F5EC6CE001C08DB /* CallKit.framework */,
 				0B93EF7A1EC608550030D24D /* CoreText.framework */,
 				0BB9AD781F5EC6D7001C08DB /* Intents.framework */,
-				E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */,
+				03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		A480429821ECE2D800289B73 /* analytics */ = {
+			isa = PBXGroup;
+			children = (
+				A480429B21EE335600289B73 /* AmplitudeModule.m */,
+			);
+			name = analytics;
+			path = "New Group";
+			sourceTree = "<group>";
+		};
 		A4A934E7212F3AB8001E9388 /* dropbox */ = {
 			isa = PBXGroup;
 			children = (
@@ -260,8 +264,6 @@
 			children = (
 				98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */,
 				9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */,
-				09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */,
-				891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -297,14 +299,12 @@
 				0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */,
 				0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */,
 				DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */,
-				DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */,
 				DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
 				DE81A2D42316AC4D00AE1940 /* JitsiMeetLogger.h in Headers */,
 				DE65AACA2317FFCD00290BEC /* LogUtils.h in Headers */,
 				DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */,
-				C81E9AB925AC5AD800B134D9 /* ExternalAPI.h in Headers */,
 				C8AFD27F2462C613000293D2 /* InfoPlistUtil.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -312,9 +312,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */ = {
+		0BD906E41EC0C00300C8C18E /* JitsiMeet */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */;
+			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
 			buildPhases = (
 				26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */,
 				0BD906E01EC0C00300C8C18E /* Sources */,
@@ -328,9 +328,9 @@
 			);
 			dependencies = (
 			);
-			name = JitsiMeetSDK;
+			name = JitsiMeet;
 			productName = "Jitsi Meet SDK";
-			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */;
+			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -362,7 +362,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */,
+				0BD906E41EC0C00300C8C18E /* JitsiMeet */,
 			);
 		};
 /* End PBXProject section */
@@ -416,7 +416,7 @@
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-JitsiMeetSDK-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -429,16 +429,24 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der",
+				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaDomainValidationCA.der",
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/api.amplitude.com.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoCaLimitedRsaCertificationAuthority.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaCA.der",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -463,6 +471,7 @@
 				DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */,
 				0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */,
 				0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */,
+				A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */,
 				C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */,
 				DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */,
 				C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */,
@@ -600,7 +609,7 @@
 		};
 		0BD906EE1EC0C00300C8C18E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */;
+			baseConfigurationReference = 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -627,7 +636,7 @@
 		};
 		0BD906EF1EC0C00300C8C18E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */;
+			baseConfigurationReference = 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -663,7 +672,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */ = {
+		0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0BD906EE1EC0C00300C8C18E /* Debug */,

ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-               BuildableName = "JitsiMeetSDK.framework"
-               BlueprintName = "JitsiMeetSDK"
+               BuildableName = "JitsiMeet.framework"
+               BlueprintName = "JitsiMeet"
                ReferencedContainer = "container:sdk.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -44,8 +44,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-            BuildableName = "JitsiMeetSDK.framework"
-            BlueprintName = "JitsiMeetSDK"
+            BuildableName = "JitsiMeet.framework"
+            BlueprintName = "JitsiMeet"
             ReferencedContainer = "container:sdk.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -60,8 +60,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-            BuildableName = "JitsiMeetSDK.framework"
-            BlueprintName = "JitsiMeetSDK"
+            BuildableName = "JitsiMeet.framework"
+            BlueprintName = "JitsiMeet"
             ReferencedContainer = "container:sdk.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

ios/sdk/src/AppInfo.m

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ios/sdk/src/ExternalAPI.h

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

ios/sdk/src/ExternalAPI.m

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +14,17 @@
  * limitations under the License.
  */
 
-#import "ExternalAPI.h"
+#import <React/RCTBridgeModule.h>
+
 #import "JitsiMeetView+Private.h"
 
-// Events
-static NSString * const hangUpAction = @"org.jitsi.meet.HANG_UP";
-static NSString * const setAudioMutedAction = @"org.jitsi.meet.SET_AUDIO_MUTED";
-static NSString * const sendEndpointTextMessageAction = @"org.jitsi.meet.SEND_ENDPOINT_TEXT_MESSAGE";
+@interface ExternalAPI : NSObject<RCTBridgeModule>
+@end
 
 @implementation ExternalAPI
 
 RCT_EXPORT_MODULE();
 
-- (NSDictionary *)constantsToExport {
-    return @{
-        @"HANG_UP": hangUpAction,
-        @"SET_AUDIO_MUTED" : setAudioMutedAction,
-        @"SEND_ENDPOINT_TEXT_MESSAGE": sendEndpointTextMessageAction
-    };
-};
-
 /**
  * Make sure all methods in this module are invoked on the main/UI thread.
  */
@@ -41,14 +32,6 @@ RCT_EXPORT_MODULE();
     return dispatch_get_main_queue();
 }
 
-+ (BOOL)requiresMainQueueSetup {
-    return NO;
-}
-
-- (NSArray<NSString *> *)supportedEvents {
-    return @[ hangUpAction, setAudioMutedAction, sendEndpointTextMessageAction ];
-}
-
 /**
  * Dispatches an event that occurred on JavaScript to the view's delegate.
  *
@@ -104,23 +87,4 @@ RCT_EXPORT_METHOD(sendEvent:(NSString *)name
    return methodName;
 }
 
-- (void)sendHangUp {
-    [self sendEventWithName:hangUpAction body:nil];
-}
-
-- (void)sendSetAudioMuted:(BOOL)muted {
-    NSDictionary *data = @{ @"muted": [NSNumber numberWithBool:muted]};
-
-    [self sendEventWithName:setAudioMutedAction body:data];
-}
-
-- (void)sendEndpointTextMessage:(NSString*)to :(NSString*)message {
-    NSDictionary *data = @{
-        @"to": to,
-        @"message": message
-    };
-    
-    [self sendEventWithName:sendEndpointTextMessageAction body:data];
-}
-
 @end

ios/sdk/src/Info.plist

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

ios/sdk/src/JitsiMeet+Private.h

@@ -16,13 +16,11 @@
 
 #import <React/RCTBridge.h>
 
-#import "ExternalAPI.h"
 #import "JitsiMeet.h"
 
 @interface JitsiMeet ()
 
 - (NSDictionary *)getDefaultProps;
 - (RCTBridge *)getReactBridge;
-- (ExternalAPI *)getExternalAPI;
 
 @end

ios/sdk/src/JitsiMeet.h

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2018-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +15,13 @@
  * limitations under the License.
  */
 
-@import UIKit;
-@import Foundation;
+#import <JitsiMeet/JitsiMeetView.h>
+#import <JitsiMeet/JitsiMeetViewDelegate.h>
+#import <JitsiMeet/JitsiMeetConferenceOptions.h>
+#import <JitsiMeet/JitsiMeetLogger.h>
+#import <JitsiMeet/JitsiMeetBaseLogHandler.h>
+#import <JitsiMeet/InfoPlistUtil.h>
 
-#import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>
 
 @interface JitsiMeet : NSObject
 

ios/sdk/src/JitsiMeet.m

@@ -213,8 +213,4 @@
     return _bridgeWrapper.bridge;
 }
 
-- (ExternalAPI *)getExternalAPI {
-    return [_bridgeWrapper.bridge moduleForClass:ExternalAPI.class];
-}
-
 @end

ios/sdk/src/JitsiMeetSDK.h

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

ios/sdk/src/JitsiMeetView.h

@@ -37,10 +37,4 @@
  */
 - (void)leave;
 
-- (void)hangUp;
-
-- (void)setAudioMuted:(BOOL)muted;
-
-- (void)sendEndpointTextMessage:(NSString*)to :(NSString*)message;
-
 @end

ios/sdk/src/JitsiMeetView.m

@@ -17,7 +17,6 @@
 
 #include <mach/mach_time.h>
 
-#import "ExternalAPI.h"
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
 #import "JitsiMeetView+Private.h"
@@ -50,6 +49,7 @@ static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
  * identifiers within the process).
  */
 static NSMapTable<NSString *, JitsiMeetView *> *views;
+
 /**
  * This gets called automagically when the program starts.
  */
@@ -115,21 +115,6 @@ static void initializeViewsMap() {
     [self setProps:@{}];
 }
 
-- (void)hangUp {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendHangUp];
-}
-
-- (void)setAudioMuted:(BOOL)muted {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendSetAudioMuted:muted];
-}
-
-- (void)sendEndpointTextMessage:(NSString*)to :(NSString*)message {
-    ExternalAPI *externalAPI = [[JitsiMeet sharedInstance] getExternalAPI];
-    [externalAPI sendEndpointTextMessage:to :message];
-}
-
 #pragma mark Private methods
 
 /**

ios/sdk/src/JitsiMeetViewDelegate.h

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2017-present Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,32 +55,4 @@
  */
 - (void)enterPictureInPicture:(NSDictionary *)data;
 
-/**
- * Called when a participant has joined the conference.
- *
- * The `data` dictionary contains a `participantId` key with the id of the participant that has joined.
- */
-- (void)participantJoined:(NSDictionary *)data;
-
-/**
- * Called when a participant has left the conference.
- *
- * The `data` dictionary contains a `participantId` key with the id of the participant that has left.
- */
-- (void)participantLeft:(NSDictionary *)data;
-
-/**
- * Called when audioMuted state changed.
- *
- * The `data` dictionary contains a `muted` key with state of the audioMuted for the localParticipant.
- */
-- (void)audioMutedChanged:(NSDictionary *)data;
-
-/**
- * Called when an endpoint text message is received.
- *
- * The `data` dictionary contains a `senderId` key with the participantId of the sender and a 'message' key with the content.
- */
-- (void)endpointTextMessageReceived:(NSDictionary *)data;
-
 @end

ios/sdk/src/analytics/AmplitudeModule.m

@@ -0,0 +1,61 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <React/RCTBridgeModule.h>
+
+#import "Amplitude.h"
+#import "LogUtils.h"
+
+
+@interface AmplitudeModule : NSObject<RCTBridgeModule>
+@end
+
+@implementation AmplitudeModule
+
+RCT_EXPORT_MODULE(Amplitude)
+
++ (BOOL)requiresMainQueueSetup {
+    return NO;
+}
+
+RCT_EXPORT_METHOD(init:(NSString*)instanceName API_KEY:(NSString*)apiKey) {
+    [[Amplitude instanceWithName:instanceName] initializeApiKey:apiKey];
+}
+
+RCT_EXPORT_METHOD(setUserId:(NSString*)instanceName userId: (NSString *) userId) {
+    [[Amplitude instanceWithName:instanceName] setUserId:userId];
+}
+
+RCT_EXPORT_METHOD(setUserProperties:(NSString*)instanceName userPropsString:(NSDictionary*)userProps) {
+    if (userProps != nil) {
+        [[Amplitude instanceWithName:instanceName] setUserProperties:userProps];
+    }
+}
+
+RCT_EXPORT_METHOD(logEvent:(NSString*)instanceName eventType:(NSString*)eventType eventPropsString:(NSString*)eventPropsString) {
+    NSError *error;
+    NSData *eventPropsData = [eventPropsString dataUsingEncoding:NSUTF8StringEncoding];
+    NSDictionary *eventProperties = [NSJSONSerialization JSONObjectWithData:eventPropsData
+                                                                   options:NSJSONReadingMutableContainers
+                                                                     error:&error];
+    if (eventProperties == nil) {
+        DDLogError(@"[Amplitude] Error parsing event properties: %@", error);
+    } else {
+        [[Amplitude instanceWithName:instanceName] logEvent:eventType withEventProperties:eventProperties];
+    }
+}
+
+@end

ios/sdk/src/callkit/CallKit.m

@@ -28,9 +28,9 @@
 #import <React/RCTUtils.h>
 #import <WebRTC/WebRTC.h>
 
-#import <JitsiMeetSDK/JitsiMeetSDK-Swift.h>
+#import <JitsiMeet/JitsiMeet-Swift.h>
 
-#import "../LogUtils.h"
+#import "LogUtils.h"
 
 
 // The events emitted/supported by RNCallKit:

ios/sdk/src/picture-in-picture/DragGestureController.swift

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import UIKit
-
 final class DragGestureController {
 
     var insets: UIEdgeInsets = UIEdgeInsets.zero

ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import UIKit
-
 public typealias AnimationCompletion = (Bool) -> Void
 
 public protocol PiPViewCoordinatorDelegate: class {

lang/languages-fa.json

@@ -1,50 +1,32 @@
 {
     "en": "انگلیسی",
     "af": "آفریقایی",
-    "ar": "عربی",
     "bg": "بلغاری",
     "ca": "کاتالانی",
     "cs": "چک",
-    "da": "دانمارکی",
     "de": "آلمانی",
     "el": "یونانی",
     "enGB": "انگلیسی (انگلستان)",
     "eo": "اسپرانتو",
     "es": "اسپانیایی",
     "esUS": "اسپانیایی (آمریکا لاتین)",
-    "et": "استونیایی",
-    "eu": "باسکایی",
     "fi": "فنلاندی",
     "fr": "فرانسوی",
     "frCA": "فرانسوی (کانادا)",
-    "he": "عبری",
-    "mr":"مراتی",
-    "hr": "کرواتی",
+    "hr": "",
     "hu": "بلغاری",
     "hy": "ارمنی",
-    "id": "اندونزیایی",
     "it": "ایتالیایی",
     "ja": "ژاپنی",
-    "kab": "کابیلی",
     "ko": "کره ای",
-    "lt": "لیتوانیایی",
-    "ml": "مالایایی",
-    "lv": "لتونیایی",
-    "nl": "هلندی",
+    "nl": "",
     "oc": "اکسیتان(قدیمی)",
     "pl": "لهستانی",
     "ptBR": "پرتغالی (برزیل)",
     "ru": "روسی",
-    "ro": "رومانیایی",
-    "sc": "ساردینی",
-    "sk": "اسلواکیایی",
-    "sl": "اسلوونیایی",
-    "sr": "صربی",
     "sv": "سوئدی",
-    "th": "تایلندی",
     "tr": "ترکی",
-    "uk": "اوکراینی",
     "vi": "ویتنامی",
     "zhCN": "چینی",
-    "zhTW": "چینی (تایوان)"
+    "zhTW": ""
 }

lang/languages-gl.json

@@ -1,50 +1,34 @@
 {
     "en": "Inglés",
     "af": "Afrikans",
-    "ar": "Árabe",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
-    "da": "Dinamarqués",
     "de": "Alemán",
     "el": "Grego",
-    "enGB": "Inglés (Reino Unido)",
+    "enGB": "Inglés (RU)",
     "eo": "Esperanto",
-    "es": "Español",
+    "es": "Castelán",
     "esUS": "Español (Hispanoamérica)",
-    "et": "Estoniano",
-    "eu": "Éuscaro",
-    "fi": "Finlandés",
+    "fi": "Finés",
     "fr": "Francés",
     "frCA": "Francés (Canadá)",
-    "he": "Hebreo",
-    "mr":"Marathi",
     "hr": "Croata",
     "hu": "Húngaro",
     "hy": "Armenio",
-    "id": "Indonesio",
     "it": "Italiano",
     "ja": "Xaponés",
-    "kab": "Cabila",
     "ko": "Coreano",
-    "lt": "Lituano",
-    "ml": "Malayalam",
-    "lv": "Letón",
-    "nl": "Holandés",
+    "nl": "Neerlandés",
     "oc": "Occitano",
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
     "ru": "Ruso",
-    "ro": "Romanés",
-    "sc": "Sardo",
-    "sk": "Eslovaco",
-    "sl": "Esloveno",
-    "sr": "Serbio",
     "sv": "Sueco",
-    "th": "Tailandés",
     "tr": "Turco",
-    "uk": "Ucraíno",
     "vi": "Vietnamita",
     "zhCN": "Chinés (China)",
-    "zhTW": "Chinés (Taiwán)"
+    "zhTW": "Chinés (Taiwan)",
+    "et": "Estoniano",
+    "da": "Dinamarqués"
 }

lang/languages-it.json

@@ -3,48 +3,36 @@
     "af": "Afrikaans",
     "az": "Azero",
     "bg": "Bulgaro",
-    "ca": "Catalano",
     "cs": "Ceco",
-    "da": "Danese",
     "de": "Tedesco",
     "el": "Greco",
-    "enGB": "Inglese (Regno Unito)",
     "eo": "Esperanto",
     "es": "Spagnolo",
-    "esUS": "Spagnolo (America Latina)",
-    "et": "Estone",
-    "eu": "Basco",
-    "fi": "Finlandese",
     "fr": "Francese",
-    "frCA": "Francese (Canada)",
-    "he": "Ebraico",
-    "mr": "Marathi",
-    "hr": "Croato",
-    "hu": "Ungaro",
     "hy": "Armeno",
-    "id": "Indonesiano",
     "it": "Italiano",
     "ja": "Giapponese",
-    "kab": "Kabyle",
     "ko": "Coreano",
-    "lt": "Lituano",
-    "ml": "Malese",
-    "lv": "Lettone",
-    "nl": "Olandese",
+    "nb": "Norvegese bokmal",
     "oc": "Occitano",
     "pl": "Polacco",
     "ptBR": "Portoghese (Brasile)",
-    "ru": "Russo",    
-    "ro": "Rumeno",    
-    "sc": "Sardo",
+    "ru": "Russo",
     "sk": "Slovacco",
-    "sl": "Sloveno",    
-    "sr": "Serbo",
-    "sv": "Svedese",    
-    "th": "Tailandese",
+    "sl": "Sloveno",
+    "sv": "Svedese",
     "tr": "Turco",
-    "uk": "Ucraino",
     "vi": "Vietnamita",
     "zhCN": "Cinese (Cina)",
-    "zhTW": "Cinese (Taiwan)"
+    "enGB": "Inglese (Regno Unito)",
+    "da": "Danese",
+    "ca": "Catalano",
+    "zhTW": "Cinese (Taiwan)",
+    "nl": "Olandese",
+    "hu": "Ungaro",
+    "hr": "Croato",
+    "frCA": "Francese (Canada)",
+    "fi": "Finlandese",
+    "et": "Etiope",
+    "esUS": "Spagnolo (USA)"
 }

lang/languages-oc.json

@@ -28,8 +28,6 @@
     "kab": "Cabil",
     "ko": "Corean",
     "lt": "Lituanian",
-    "ml": "Malaialam",
-    "lv": "Leton",
     "nl": "Neerlandés",
     "oc": "Occitan",
     "pl": "Polonés",

lang/main-de.json

@@ -8,28 +8,28 @@
         "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 Personen einladen.",
-        "failedToAdd": "Fehler beim Hinzufügen von Personen",
+        "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",
         "linkCopied": "Link in die Zwischenablage kopiert",
-        "loading": "Suche nach Personen und Telefonnummern",
+        "loading": "Suche nach Teilnehmern und Telefonnummern",
         "loadingNumber": "Telefonnummer wird überprüft",
-        "loadingPeople": "Suche nach einzuladenden Personen",
+        "loadingPeople": "Suche nach einzuladenden Teilnehmern",
         "noResults": "Keine passenden Ergebnisse",
         "noValidNumbers": "Telefonnummer eingeben",
         "outlookEmail": "Outlook-E-Mail",
         "searchNumbers": "Telefonnummern hinzufügen",
-        "searchPeople": "Nach Personen suchen",
-        "searchPeopleAndNumbers": "Nach Personen suchen oder deren 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 Konferenzlink, um andere einzuladen",
         "shareStream": "Den Livestreaminglink freigeben",
         "telephone": "Telefon: {{number}}",
-        "title": "Personen zu dieser Konferenz einladen",
+        "title": "Teilnehmer zu dieser Konferenz einladen",
         "yahooEmail": "Yahoo-E-Mail"
     },
     "audioDevices": {
@@ -128,7 +128,7 @@
         "remoteport_plural": "Entfernte Ports:",
         "resolution": "Auflösung:",
         "savelogs": "Logs speichern",
-        "participant_id": "Personen-ID:",
+        "participant_id": "Teilnehmer-ID:",
         "status": "Verbindung:",
         "transport": "Protokoll:",
         "transport_plural": "Protokolle:",
@@ -171,7 +171,7 @@
         },
         "add": "Hinzufügen",
         "allow": "Erlauben",
-        "alreadySharedVideoMsg": "Eine andere Person gibt bereits ein Video weiter. Bei dieser Konferenz ist jeweils nur ein geteiltes Video möglich.",
+        "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",
         "applicationWindow": "Anwendungsfenster",
         "Back": "Zurück",
@@ -179,7 +179,7 @@
         "cameraNotFoundError": "Kamera nicht gefunden.",
         "cameraNotSendingData": "Die Kamera ist nicht verfügbar. Bitte prüfen, ob eine andere Applikation die Kamera verwendet, eine andere Kamera vom Einstellungs-Menü auswählen oder die Applikation neu laden.",
         "cameraNotSendingDataTitle": "Zugriff auf Kamera nicht möglich",
-        "cameraPermissionDeniedError": "Die Berechtigung zur Verwendung der Kamera wurde nicht erteilt. Sie können trotzdem an der Konferenz teilnehmen, aber die anderen Personen können Sie nicht sehen. Verwenden Sie die Kamera-Schaltfläche in der Adressleiste, um die Berechtigungen zu erteilen.",
+        "cameraPermissionDeniedError": "Die Berechtigung zur Verwendung der Kamera wurde nicht erteilt. Sie können trotzdem an der Konferenz teilnehmen, aber die anderen Teilnehmer können Sie nicht sehen. Verwenden Sie die Kamera-Schaltfläche in der Adressleiste, um die Berechtigungen zu erteilen.",
         "cameraUnknownError": "Die Kamera kann aus einem unbekannten Grund nicht verwendet werden.",
         "cameraUnsupportedResolutionError": "Die Kamera unterstützt die erforderliche Auflösung nicht.",
         "Cancel": "Abbrechen",
@@ -202,21 +202,21 @@
         "done": "Fertig",
         "e2eeDescription": "Ende-zu-Ende-Verschlüsselung ist derzeit noch EXPERIMENTELL. Bitte beachten Sie, dass das Aktivieren der Ende-zu-Ende-Verschlüsselung diverse serverseitige Funktionen deaktiviert: Aufnahmen, Livestreaming und Telefoneinwahl. Bitte beachten Sie außerdem, dass der Konferenz dann nur noch mit Browsern beigetreten werden kann, die Insertable Streams unterstützen.",
         "e2eeLabel": "Ende-zu-Ende-Verschlüsselung aktivieren",
-        "e2eeWarning": "WARNUNG: Nicht alle Personen dieser Konferenz scheinen Ende-zu-Ende-Verschlüsselung zu unterstützen. Wenn Sie diese aktivieren, können die entsprechenden Personen nichts mehr sehen oder hören.",
+        "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",
         "gracefulShutdown": "Der Dienst steht momentan wegen Wartungsarbeiten nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
-        "grantModeratorDialog": "Möchten Sie diesen Person wirklich zum Moderator:in machen?",
-        "grantModeratorTitle": "Moderationsrechte vergeben",
-        "IamHost": "Ich organisiere das Meeting",
+        "grantModeratorDialog": "Möchten Sie diesen Teilnehmer wirklich zum Moderator machen?",
+        "grantModeratorTitle": "Zum Moderator machen",
+        "IamHost": "Ich bin der Organisator",
         "incorrectRoomLockPassword": "Falsches Passwort",
-        "incorrectPassword": "Name oder Passwort ungültig",
+        "incorrectPassword": "Benutzername oder Passwort ungültig",
         "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.",
         "kickParticipantButton": "Entfernen",
-        "kickParticipantDialog": "Wollen Sie diese Person wirklich entfernen?",
-        "kickParticipantTitle": "Person entfernen?",
+        "kickParticipantDialog": "Wollen Sie diesen Teilnehmer wirklich entfernen?",
+        "kickParticipantTitle": "Teilnehmer entfernen?",
         "kickTitle": "Autsch! {{participantDisplayName}} hat Sie aus dem Meeting geworfen",
         "liveStreaming": "Livestreaming",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Während einer Aufnahme nicht möglich",
@@ -227,13 +227,13 @@
         "lockTitle": "Sperren fehlgeschlagen",
         "logoutQuestion": "Sind Sie sicher, dass Sie sich abmelden und die Konferenz verlassen möchten?",
         "logoutTitle": "Abmelden",
-        "maxUsersLimitReached": "Das Limit für die maximale Personenzahl ist erreicht. Die Konferenz ist voll. Bitte wenden Sie sich an die verwaltende Person des Meetings oder versuchen Sie es später noch einmal!",
-        "maxUsersLimitReachedTitle": "Maximale Personenzahl erreicht",
+        "maxUsersLimitReached": "Das Limit für die maximale Teilnehmerzahl ist erreicht. Die Konferenz ist voll. Bitte wenden Sie sich an den Besitzer des Meetings oder versuchen Sie es später noch einmal!",
+        "maxUsersLimitReachedTitle": "Maximales Teilnehmerlimit erreicht",
         "micConstraintFailedError": "Ihr Mikrofon erfüllt die notwendigen Anforderungen nicht.",
         "micNotFoundError": "Mikrofon nicht gefunden.",
         "micNotSendingData": "Gehen Sie zu den Einstellungen Ihres Computers, um die Stummschaltung Ihres Mikrofons aufzuheben und seinen Pegel einzustellen",
         "micNotSendingDataTitle": "Ihr Mikrofon ist durch Ihre Systemeinstellungen stumm geschaltet",
-        "micPermissionDeniedError": "Die Berechtigung zur Verwendung des Mikrofons wurde nicht erteilt. Sie können trotzdem an der Konferenz teilnehmen, aber die anderen Personen können Sie nicht hören. Verwenden Sie die Kamera-Schaltfläche in der Adressleiste, um die Berechtigungen zu erteilen.",
+        "micPermissionDeniedError": "Die Berechtigung zur Verwendung des Mikrofons wurde nicht erteilt. Sie können trotzdem an der Konferenz teilnehmen, aber die anderen Teilnehmer können Sie nicht hören. Verwenden Sie die Kamera-Schaltfläche in der Adressleiste, um die Berechtigungen zu erteilen.",
         "micUnknownError": "Das Mikrofon kann aus einem unbekannten Grund nicht verwendet werden.",
         "muteEveryoneElseDialog": "Einmal stummgeschaltet, können Sie deren Stummschaltung nicht mehr beenden, aber sie können ihre Stummschaltung jederzeit selbst beenden.",
         "muteEveryoneElseTitle": "Alle außer {{whom}} stummschalten?",
@@ -241,12 +241,12 @@
         "muteEveryoneTitle": "Alle stummschalten?",
         "muteEveryoneSelf": "sich selbst",
         "muteEveryoneStartMuted": "Alle beginnen von jetzt an stummgeschaltet",
-        "muteParticipantBody": "Sie können die Stummschaltung anderer Personen nicht aufheben, aber eine Person kann ihre eigene Stummschaltung jederzeit beenden.",
+        "muteParticipantBody": "Sie können die Stummschaltung anderer Teilnehmer nicht aufheben, aber ein Teilnehmer kann seine eigene Stummschaltung jederzeit beenden.",
         "muteParticipantButton": "Stummschalten",
-        "muteParticipantDialog": "Wollen Sie diese Person wirklich stummschalten? Sie können die Stummschaltung nicht wieder aufheben, die Person kann dies aber jederzeit selbst tun.",
-        "muteParticipantTitle": "Person stummschalten?",
+        "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 gesichert. Bitte geben Sie das $t(lockRoomPasswordUppercase) ein, um dem Meeting beizutreten.",
+        "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",
@@ -303,11 +303,10 @@
         "tokenAuthFailedTitle": "Authentifizierung fehlgeschlagen",
         "transcribing": "Wird transkribiert",
         "unlockRoom": "Konferenz$t(lockRoomPassword) entfernen",
-        "user": "Anmeldename",
-        "userPassword": "Passwort",
-        "WaitForHostMsg": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Falls sie die Konferenz organisieren, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
-        "WaitForHostMsgWOk": "Die Konferenz <b>{{room}}</b> wurde noch nicht gestartet. Falls sie die Konferenz organisieren, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
-        "WaitingForHost": "Warten auf den Beginn der Konferenz …",
+        "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 …",
         "Yes": "Ja",
         "yourEntireScreen": "Ganzer Bildschirm"
     },
@@ -318,7 +317,7 @@
         "title": "Freigegebenes Dokument"
     },
     "e2ee": {
-        "labelToolTip": "Audio- und Videodaten dieser Unterhaltung sind jetzt zwischen den Personen verschlüsselt"
+        "labelToolTip": "Audio- und Videodaten dieser Unterhaltung sind jetzt zwischen den Teilnehmern verschlüsselt"
     },
     "embedMeeting": {
         "title": "Diese Konferenz einbetten"
@@ -370,11 +369,11 @@
         "label": "Einwahlinformationen"
     },
     "inviteDialog": {
-        "alertText": "Die Einladung einiger Personen ist fehlgeschlagen.",
+        "alertText": "Die Einladung einiger Teilnehmer ist fehlgeschlagen.",
         "header": "Einladen",
         "searchCallOnlyPlaceholder": "Telefonnummer eingeben",
-        "searchPeopleOnlyPlaceholder": "Nach Personen suchen",
-        "searchPlaceholder": "Personen oder Telefonnummer",
+        "searchPeopleOnlyPlaceholder": "Nach Teilnehmern suchen",
+        "searchPlaceholder": "Teilnehmer oder Telefonnummer",
         "send": "Senden"
     },
     "inlineDialogFailure": {
@@ -385,14 +384,14 @@
     },
     "keyboardShortcuts": {
         "focusLocal": "Lokales Video fokussieren",
-        "focusRemote": "Auf das Video einer anderen Person fokussieren",
+        "focusRemote": "Auf das Video eines anderen Teilnehmers fokussieren",
         "fullScreen": "Vollbildmodus aktivieren oder deaktivieren",
         "keyboardShortcuts": "Tastenkürzel",
         "localRecording": "Lokale Aufzeichnungssteuerelemente ein- oder ausblenden",
         "mute": "Stummschaltung aktivieren oder deaktivieren",
         "pushToTalk": "Push-to-Talk (Sprechtaste)",
         "raiseHand": "Hand erheben",
-        "showSpeakerStats": "Sprechstatistik anzeigen",
+        "showSpeakerStats": "Sprecherstatistik anzeigen",
         "toggleChat": "Chat öffnen oder schließen",
         "toggleFilmstrip": "Video-Miniaturansichten ein- oder ausblenden",
         "toggleScreensharing": "Zwischen Kamera und Bildschirmfreigabe wechseln",
@@ -450,14 +449,14 @@
         "me": "Ich",
         "messages": {
             "engaged": "Lokale Aufzeichnung ist aktiviert.",
-            "finished": "Aufzeichnung der Sitzung {{token}} ist beendet. Senden Sie die aufgezeichnete Datei an die Moderation.",
-            "finishedModerator": "Aufzeichnung der Sitzung {{token}} ist beendet. Die Aufzeichnung des lokalen Verlaufs wurde gespeichert. Bitten Sie die anderen Personen, ihre Aufzeichnungen zu übermitteln.",
-            "notModerator": "Sie moderieren nicht. Sie können die lokale Aufzeichnung nicht starten oder stoppen."
+            "finished": "Aufzeichnung der Sitzung {{token}} ist beendet. Senden Sie die aufgezeichnete Datei an den Moderator.",
+            "finishedModerator": "Aufzeichnung der Sitzung {{token}} ist beendet. Die Aufzeichnung des lokalen Verlaufs wurde gespeichert. Bitten Sie die anderen Teilnehmer, ihre Aufzeichnungen zu übermitteln.",
+            "notModerator": "Sie sind nicht der Moderator. Sie können die lokale Aufzeichnung nicht starten oder stoppen."
         },
-        "moderator": "Moderator:in",
+        "moderator": "Moderator",
         "no": "Nein",
-        "participant": "Person",
-        "participantStats": "Personenstatistik",
+        "participant": "Teilnehmer",
+        "participantStats": "Teilnehmerstatistik",
         "sessionToken": "Sitzungs-Token",
         "start": "Aufnahme starten",
         "stop": "Aufnahme stoppen",
@@ -471,21 +470,21 @@
         "connectedThreePlusMembers": "{{name}} und {{count}} andere Personen nehmen am Meeting teil",
         "connectedTwoMembers": "{{first}} und {{second}} nehmen am Meeting teil",
         "disconnected": "getrennt",
-        "focus": "Konferenz-Organisator:in",
+        "focus": "Konferenz-Organisator",
         "focusFail": "{{component}} ist im Moment nicht verfügbar - wiederholen in {{ms}} Sekunden",
-        "grantedTo": "Moderationsrechte an {{to}} vergeben!",
+        "grantedTo": "Moderatorenrechte an {{to}} vergeben!",
         "invitedOneMember": "{{name}} wurde eingeladen",
         "invitedThreePlusMembers": "{{name}} und {{count}} andere wurden eingeladen",
         "invitedTwoMembers": "{{first}} und {{second}} wurden eingeladen",
         "kickParticipant": "{{kicked}} wurde von {{kicker}} ausgewiesen",
         "me": "Ich",
-        "moderator": "Moderationsrechte vergeben!",
+        "moderator": "Moderatorenrechte vergeben!",
         "muted": "Der Konferenz wurde stumm beigetreten.",
         "mutedTitle": "Stummschaltung aktiv!",
         "mutedRemotelyTitle": "Sie wurden von {{participantDisplayName}} stummgeschaltet!",
         "mutedRemotelyDescription": "Sie können jederzeit die Stummschaltung aufheben, wenn Sie bereit sind zu sprechen. Wenn Sie fertig sind, können Sie sich wieder stummschalten, um Geräusche vom Meeting fernzuhalten.",
-        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person entfernt",
-        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) von einer anderen Person gesetzt",
+        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) von einem anderen Teilnehmer entfernt",
+        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) von einem anderen Teilnehmer gesetzt",
         "raisedHand": "{{name}} möchte sprechen.",
         "somebody": "Jemand",
         "startSilentTitle": "Sie sind ohne Audioausgabe beigetreten!",
@@ -501,7 +500,7 @@
         "oldElectronClientDescription2": "aktuelle Version",
         "oldElectronClientDescription3": "!"
     },
-    "passwordSetRemotely": "von einer anderen Person gesetzt",
+    "passwordSetRemotely": "von einem anderen Teilnehmer gesetzt",
     "passwordDigitsOnly": "Bis zu {{number}} Ziffern",
     "poweredby": "Betrieben von",
     "prejoin": {
@@ -526,7 +525,7 @@
           "goodQuality": "Großartig! Ihre Bild- und Tonqualität sollte super sein.",
           "noMediaConnectivity": "Es konnte für diesen Test keine Medienverbindung hergestellt werden. Das wird gewöhnlich durch eine Firewall oder ein NAT ausgelöst.",
           "noVideo": "Ihr Bild wird wahrscheinlich eine schlechte Qualität haben.",
-          "undetectable": "Wenn Sie mit Ihrem Browser weiterhin Probleme in Konferenzen haben, sollten Sie die Verbindung und Funktion Ihrer Lautsprecher, Ihres Mikrofons und Ihrer Kamera überprüfen. Stellen Sie außerdem sicher, dass Ihr Browser die erforderlichen Rechte hat, auf das Mikrofon und die Kamera zuzugreifen, und dass Sie die neuste Browserversion installiert haben. Sollten Sie immer noch Probleme haben, kontaktieren Sie bitte die Entwickler:innen der Webanwendung.",
+          "undetectable": "Wenn Sie mit Ihrem Browser weiterhin Probleme in Konferenzen haben, sollten Sie die Verbindung und Funktion Ihrer Lautsprecher, Ihres Mikrofons und Ihrer Kamera überprüfen. Stellen Sie außerdem sicher, dass Ihr Browser die erforderlichen Rechte hat, auf das Mikrofon und die Kamera zuzugreifen, und dass Sie die neuste Browserversion installiert haben. Sollten Sie immer noch Probleme haben, kontaktieren Sie bitte den Entwickler der Webanwendung.",
           "veryPoorConnection": "Ihre Konferenzqualität wird wahrscheinlich sehr schlecht sein.",
           "videoFreezing": "Ihr Bild wird wahrscheinlich einfrieren, schwarz werden und eine geringe Auflösung haben.",
           "videoHighQuality": "Ihr Bild sollte sehr gut aussehen.",
@@ -595,7 +594,7 @@
         "expandedOn": "Das Meeting wird momentan aufgezeichnet.",
         "expandedPending": "Aufzeichnung wird gestartet…",
         "failedToStart": "Die Aufnahme konnte nicht gestartet werden",
-        "fileSharingdescription": "Aufzeichnung mit den Personen der Konferenz teilen",
+        "fileSharingdescription": "Aufzeichnung mit Konferenzteilnehmer teilen",
         "live": "LIVE",
         "loggedIn": "Als {{userName}} angemeldet",
         "off": "Aufnahme gestoppt",
@@ -615,9 +614,9 @@
         "pullToRefresh": "Ziehen, um zu aktualisieren"
     },
     "security": {
-        "about": "Sie können Ihre Konferenz mit einem Passwort sichern. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
-        "aboutReadOnly": "Mit Moderationsrechten kann die Konferenz mit einem Passwort gesichert werden. Personen müssen dieses eingeben, bevor sie an der Sitzung teilnehmen dürfen.",
-        "insecureRoomNameWarning": "Der Raumname ist unsicher. Unerwünschte Personen könnten Ihrer Konferenz beitreten",
+        "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"
     },
     "settings": {
@@ -629,11 +628,11 @@
             "title": "Kalender"
         },
         "devices": "Geräte",
-        "followMe": "Follow-me für alle Personen",
+        "followMe": "Follow-me für alle Teilnehmer",
         "language": "Sprache",
         "loggedIn": "Als {{name}} angemeldet",
         "microphones": "Mikrofon",
-        "moderator": "Moderator:in",
+        "moderator": "Moderator",
         "more": "Mehr",
         "name": "Name",
         "noDevice": "Kein",
@@ -641,8 +640,8 @@
         "selectCamera": "Kamera",
         "selectMic": "Mikrofon",
         "speakers": "Lautsprecher",
-        "startAudioMuted": "Alle Personen treten stumm geschaltet bei",
-        "startVideoMuted": "Alle Personen treten ohne Video bei",
+        "startAudioMuted": "Alle Teilnehmer treten stumm geschaltet bei",
+        "startVideoMuted": "Alle Teilnehmer treten ohne Video bei",
         "title": "Einstellungen"
     },
     "settingsView": {
@@ -671,14 +670,14 @@
         "dialInfoText": "\n\n=====\n\nWollen Sie sich nur auf Ihrem Telefon einwählen?\n\n{{defaultDialInNumber}}Klicken Sie auf diesen Link, um die eingewählten Telefonnummern für dieses Meeting zu sehen\n{{dialInfoPageUrl}}",
         "mainText": "Klicken Sie auf den folgenden Link, um dem Meeting beizutreten:\n{{roomUrl}}"
     },
-    "speaker": "Sprecher:in",
+    "speaker": "Sprecher",
     "speakerStats": {
         "hours": "{{count}}h",
         "minutes": "{{count}}m",
         "name": "Name",
         "seconds": "{{count}}s",
-        "speakerStats": "Sprechstatistik",
-        "speakerTime": "Sprechzeit"
+        "speakerStats": "Sprecherstatistik",
+        "speakerTime": "Sprecherzeit"
     },
     "startupoverlay": {
         "policyText": " ",
@@ -701,11 +700,11 @@
             "embedMeeting": "Konferenz einbetten",
             "feedback": "Feedback hinterlassen",
             "fullScreen": "Vollbildmodus ein-/ausschalten",
-            "grantModerator": "Moderationsrechte vergeben",
+            "grantModerator": "Zum Moderator machen",
             "hangup": "Anruf beenden",
             "help": "Hilfe",
-            "invite": "Person einladen",
-            "kick": "Person entfernen",
+            "invite": "Teilnehmer einladen",
+            "kick": "Teilnehmer entfernen",
             "lobbyButton": "Lobbymodus ein-/ausschalten",
             "localRecording": "Lokale Aufzeichnungssteuerelemente ein-/ausschalten",
             "lockRoom": "Konferenzpasswort ein-/ausschalten",
@@ -719,7 +718,7 @@
             "profile": "Profil bearbeiten",
             "raiseHand": "„Melden“ ein-/ausschalten",
             "recording": "Aufzeichnung ein-/ausschalten",
-            "remoteMute": "Personen stummschalten",
+            "remoteMute": "Teilnehmer stummschalten",
             "security": "Sicherheitsoptionen",
             "Settings": "Einstellungen ein-/ausschalten",
             "sharedvideo": "YouTube-Videofreigabe ein-/ausschalten",
@@ -727,14 +726,14 @@
             "shareYourScreen": "Bildschirmfreigabe ein-/ausschalten",
             "shortcuts": "Tastenkombinationen ein-/ausblenden",
             "show": "Im Vordergrund anzeigen",
-            "speakerStats": "Sprechstatistik ein-/ausblenden",
+            "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"
         },
-        "addPeople": "Personen zur Konferenz hinzufügen",
+        "addPeople": "Teilnehmer zur Konferenz hinzufügen",
         "audioOnlyOff": "Modus „Nur Audio“ deaktivieren",
         "audioOnlyOn": "Modus „Nur Audio“ aktivieren",
         "audioRoute": "Audiogerät auswählen",
@@ -754,7 +753,7 @@
         "feedback": "Feedback hinterlassen",
         "hangup": "Verlassen",
         "help": "Hilfe",
-        "invite": "Personen einladen",
+        "invite": "Teilnehmer einladen",
         "lobbyButtonDisable": "Lobbymodus deaktivieren",
         "lobbyButtonEnable": "Lobbymodus aktivieren",
         "login": "Anmelden",
@@ -782,7 +781,7 @@
         "sharedvideo": "YouTube-Video teilen",
         "shareRoom": "Person einladen",
         "shortcuts": "Tastenkürzel anzeigen",
-        "speakerStats": "Sprechstatistik",
+        "speakerStats": "Sprecherstatistik",
         "startScreenSharing": "Bildschirmfreigabe starten",
         "startSubtitles": "Untertitel einschalten",
         "stopScreenSharing": "Bildschirmfreigabe stoppen",
@@ -851,14 +850,14 @@
         "domute": "Stummschalten",
         "domuteOthers": "Alle anderen stummschalten",
         "flip": "Spiegeln",
-        "grantModerator": "Moderationsrechte vergeben",
+        "grantModerator": "Zum Moderator machen",
         "kick": "Hinauswerfen",
-        "moderator": "Moderator:in",
-        "mute": "Person ist stumm geschaltet",
+        "moderator": "Moderator",
+        "mute": "Teilnehmer ist stumm geschaltet",
         "muted": "Stummgeschaltet",
         "remoteControl": "Fernsteuerung",
         "show": "Im Vordergrund anzeigen",
-        "videomute": "Person hat die Kamera angehalten"
+        "videomute": "Teilnehmer hat die Kamera angehalten"
     },
     "welcomepage": {
         "accessibilityLabel": {
@@ -877,11 +876,9 @@
         "getHelp": "Hilfe",
         "go": "Los",
         "goSmall": "Los",
-        "headerTitle": "Jitsi Meet",
-        "headerSubtitle": "Sichere und hochqualitative Meetings",
         "info": "Einwahlinformationen",
         "join": "ERSTELLEN / BEITRETEN",
-        "moderatedMessage": "Oder <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservieren Sie sich eine Konferenz-URL</a>, die nur Sie moderieren.",
+        "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": "Verlauf",
         "recentListDelete": "Eintrag löschen",
@@ -889,9 +886,8 @@
         "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 Personen übermittelt werden, damit diese der gleichen Konferenz beitreten.",
+        "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",
-        "startMeeting": "Meeting starten",
         "terms": "AGB",
         "title": "Sichere, voll funktionale und komplett kostenlose Videokonferenzen"
     },
@@ -903,22 +899,22 @@
         "header": "Hilfecenter"
     },
     "lobby": {
-        "knockingParticipantList": "Liste anklopfender Personen",
+        "knockingParticipantList": "Liste anklopfender Teilnehmer",
         "allow": "Annehmen",
         "backToKnockModeButton": "Kein Passwort, stattdessen Beitritt anfragen",
         "dialogTitle": "Lobbymodus",
-        "disableDialogContent": "Lobbymodus derzeit aktiviert. Diese Funktion stellt sicher, dass unerwünschte Personen Ihrer Konferenz nicht beitreten können. Funktion deaktivieren?",
+        "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, damit der Beitritt von Ihnen moderiert werden kann.",
+        "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": "Ihre Beitrittsanfrage wurde von der Moderation abgelehnt.",
+        "joinRejectedMessage": "Ihr Beitrittsanfrage wurde von einem Moderator abgelehnt.",
         "joinTitle": "Konferenz beitreten",
         "joiningTitle": "Beitritt anfragen …",
         "joiningWithPasswordTitle": "Mit Passwort beitreten …",

lang/main-enGB.json

@@ -83,7 +83,6 @@
         "bandwidth": "Estimated bandwidth:",
         "bitrate": "Bitrate:",
         "bridgeCount": "Server count: ",
-        "codecs": "Codecs (A/V): ",
         "connectedTo": "Connected to:",
         "framerate": "Frame rate:",
         "less": "Show less",
@@ -380,7 +379,7 @@
         "getStreamKeyManually": "We weren’t able to fetch any live streams. Try getting your live stream key from YouTube.",
         "invalidStreamKey": "Live stream key may be incorrect.",
         "off": "Live Streaming stopped",
-        "on": "Live Streaming started",
+        "on": "Live Streaming",
         "pending": "Starting Live Stream…",
         "serviceName": "Live Streaming service",
         "signedInAs": "You are currently signed in as:",
@@ -497,7 +496,7 @@
         "live": "LIVE",
         "loggedIn": "Logged in as {{userName}}",
         "off": "Recording stopped",
-        "on": "Recording started",
+        "on": "Recording",
         "pending": "Preparing to record the meeting…",
         "rec": "REC",
         "serviceDescription": "Your recording will be saved by the recording service",

lang/main-gl.json

@@ -2,7 +2,7 @@
     "addPeople": {
         "add": "Convidar",
         "countryNotSupported": "Aínda non é posíbel chamar a este destino",
-        "countryReminder": "Quere chamar fóra dos EEUU? Asegúrese de comezar co código de país!",
+        "countryReminder": "Chamar fóra dos EE.UU. ? Asegúrese de comezar co código de país!",
         "disabled": "Non pode convidar xente.",
         "failedToAdd": "Produciuse un erro ao engadir participantes",
         "footerText": "As chamadas están desactivadas",
@@ -62,7 +62,7 @@
     "chromeExtensionBanner": {
         "installExtensionText": "Instala a extensión para a integración con Google Calendar e Office 365",
         "buttonText": "Instalar Extensión Chrome",
-        "dontShowAgain": "Non mostrar isto máis"
+        "dontShowAgain": ""
     },
     "connectingOverlay": {
         "joiningRoom": "Está a conectar coa reunión…"
@@ -632,8 +632,8 @@
         "noAudioSignalTitle": "Non hai sinal de entrada desde o seu micro!",
         "noAudioSignalDesc": "Se vostede non o silenciou adrede na configuración do seu sistema ou hardware, considere cambiar de dispositivo.",
         "noAudioSignalDescSuggestion": "Se vostede non o silenciou adrede na configuración do sistema ou no hardware, considere utilizar o seguinte dispositivo:",
-        "noisyAudioInputTitle": "Parece que seu micrófono fai moito ruído",
-        "noisyAudioInputDesc": "Parece que o seu micrófono está a crear ruído. Considere a posibilidade de calalo ou de cambiar de dispositivo",
+        "noisyAudioInputTitle": "",
+        "noisyAudioInputDesc": "",
         "openChat": "Abrir chat",
         "pip": "Entrar no modo Picture-in-Picture",
         "privateMessage": "Enviar mensaxe privada",
@@ -716,7 +716,7 @@
         "moderator": "Moderador",
         "mute": "O participante está silenciado",
         "muted": "Silenciado",
-        "remoteControl": "Iniciar / Deter control remoto",
+        "remoteControl": "",
         "show": "Amosar en primeiro plano",
         "videomute": "O participante parou a cámara"
     },

lang/main-it.json

@@ -2,26 +2,26 @@
     "addPeople": {
         "add": "Invita",
         "addContacts": "Invita tuoi contatti",
-        "copyInvite": "Copia invito alla riunione",
-        "copyLink": "Copia collegamento alla riunione",
+        "copyInvite": "Copia invito della riunione",
+        "copyLink": "Copia collegamento della riunione",
         "copyStream": "Copia collegamento della diretta",
         "countryNotSupported": "Non supportiamo ancora questa destinazione.",
         "countryReminder": "Stai chiamando fuori dagli Stati Uniti? Assicurati d'inserire il prefisso internazionale!",
-        "defaultEmail": "Tua e-mail di default",
+        "defaultEmail": "Tua Email di default",
         "disabled": "Non puoi invitare persone.",
         "failedToAdd": "L'aggiunta di nuove persone è fallita",
         "footerText": "La chiamata all'esterno è disabilitata.",
-        "googleEmail": "E-mail Google",
-        "inviteMoreHeader": "Sei l'unico presente nella riunione",
+        "googleEmail": "Email Google",
+        "inviteMoreHeader": "Sei l'unico presente alla riunione",
         "inviteMoreMailSubject": "Unisciti alla riunione {{appName}}",
-        "inviteMorePrompt": "Invita altre persone",
+        "inviteMorePrompt": "Invita altra gente",
         "linkCopied": "Collegamento copiato negli appunti",
         "loading": "Sto cercando persone e numeri di telefono",
-        "loadingNumber": "Sto controllando il numero di telefono",
+        "loadingNumber": "Sto validando il numero di telefono",
         "loadingPeople": "Sto cercando le persone da invitare",
         "noResults": "Nessun risultato corrispondente",
         "noValidNumbers": "Per favore inserire un numero di telefono",
-        "outlookEmail": "E-mail Outlook",
+        "outlookEmail": "Email Outlook",
         "searchNumbers": "Aggiungi numeri di telefono",
         "searchPeople": "Cerca persone",
         "searchPeopleAndNumbers": "Cerca persone o aggiungi i loro numeri di telefono",
@@ -30,20 +30,20 @@
         "shareStream": "Condividi il collegamento alla diretta",
         "telephone": "Telefono: {{number}}",
         "title": "Invita persone a questa riunione",
-        "yahooEmail": "E-mail Yahoo"
+        "yahooEmail": "Email Yahoo"
     },
     "audioDevices": {
         "bluetooth": "Bluetooth",
         "headphones": "Cuffie",
         "phone": "Telefono",
         "speaker": "Vivavoce",
-        "none": "Nessun dispositivo audio esistente"
+        "none": "Nessun disposistivo audio esistente"
     },
     "audioOnly": {
-        "audioOnly": "Utilizzo di minore banda"
+        "audioOnly": "Solo audio"
     },
     "calendarSync": {
-        "addMeetingURL": "Aggiungi un collegamento alla riunione",
+        "addMeetingURL": "Aggiungi un collegamento alla conferenza",
         "confirmAddLink": "Vuoi aggiungere un collegamento Jitsi a questo evento?",
         "error": {
             "appConfiguration": "L'integrazione del calendario non è configurata in modo appropriato.",
@@ -51,27 +51,27 @@
             "notSignedIn": "È stato riscontrato un errore durante l'autenticazione per la visualizzazione degli eventi del calendario. Controllare le impostazioni del calendario e provare a ripetere l'accesso."
         },
         "join": "Partecipa",
-        "joinTooltip": "Partecipa alla riunione",
-        "nextMeeting": "prossima riunione",
+        "joinTooltip": "Partecipa alla conferenza",
+        "nextMeeting": "prossimo meeting",
         "noEvents": "Non ci sono eventi programmati a breve.",
-        "ongoingMeeting": "riunione in corso",
+        "ongoingMeeting": "conferenza in corso",
         "permissionButton": "Apri impostazioni",
-        "permissionMessage": "Per visualizzare la lista delle riunioni nell'app è richiesto il permesso Calendario",
+        "permissionMessage": "Per visualizzare la lista delle conferenze nell'app è richiesto il permesso Calendario",
         "refresh": "Aggiorna calendario",
         "today": "Oggi"
     },
     "chat": {
-        "error": "Errore: il tuo messaggio non è stato inviato. Motivo: {{error}}",
+        "error": "Errore: il tuo messaggio “{{originalText}}” non e’ stato inviato. Motivo: {{error}}",
         "fieldPlaceHolder": "Scrivi qui il tuo messaggio",
         "messagebox": "Digitare un messaggio",
         "messageTo": "Messaggio privato per {{recipient}}",
         "noMessagesMessage": "Non ci sono ancora messaggi nella riunione. Comincia una conversazione, qui!",
         "nickname": {
             "popover": "Scegli un nickname",
-            "title": "Inserire un nickname per utilizzare la conversazione"
+            "title": "Inserire un nickname per utilizzare la chat"
         },
         "privateNotice": "Messaggio privato per {{recipient}}",
-        "title": "Conversazione",
+        "title": "Chat",
         "you": "tu"
     },
     "chromeExtensionBanner": {
@@ -80,21 +80,21 @@
         "dontShowAgain": "Non mostrare più questo messaggio"
     },
     "connectingOverlay": {
-        "joiningRoom": "Collegamento alla riunione in corso..."
+        "joiningRoom": "Collegamento alla riunione in corso…"
     },
     "connection": {
         "ATTACHED": "Collegato",
-        "AUTHENTICATING": "Autenticazione in corso",
+        "AUTHENTICATING": "Autenticazione",
         "AUTHFAIL": "Autenticazione fallita",
         "CONNECTED": "Connesso",
-        "CONNECTING": "Connessione in corso",
+        "CONNECTING": "Connessione",
         "CONNFAIL": "Connessione non riuscita",
         "DISCONNECTED": "Disconnesso",
         "DISCONNECTING": "Disconnessione in corso",
         "ERROR": "Errore",
         "FETCH_SESSION_ID": "Sto ottenendo ID di sessione...",
-        "GET_SESSION_ID_ERROR": "Errore nell'ottenere ID di sessione: {{code}}",
-        "GOT_SESSION_ID": "Sto ottenendo ID di sessione... completato",
+        "GET_SESSION_ID_ERROR": "Id dell'errore di sessione: {{code}}",
+        "GOT_SESSION_ID": "Ricevuto ID di sessione",
         "LOW_BANDWIDTH": "Il video per {{displayName}} è stato interrotto per risparmiare banda"
     },
     "connectionindicator": {
@@ -102,7 +102,7 @@
         "audio_ssrc": "Audio SSRC:",
         "bandwidth": "Banda stimata:",
         "bitrate": "Bitrate:",
-        "bridgeCount": "Conteggio server:",
+        "bridgeCount": "Contatore server:",
         "codecs": "Codec (A/V): ",
         "connectedTo": "Connesso a:",
         "e2e_rtt": "E2E RTT:",
@@ -140,15 +140,15 @@
         "yesterday": "Ieri"
     },
     "deepLinking": {
-        "appNotInstalled": "Per partecipare a questa riunione sul tuo telefono ti serve l'app mobile {{app}}.",
-        "description": "Non è successo nulla? Abbiamo provato ad avviare la tua riunione sull'app desktop {{app}}. Prova di nuovo o avviala nell'app web {{app}}.",
-        "descriptionWithoutWeb": "Non è successo niente? Abbiamo provato ad avviare la riunione nell'app desktop {{app}}",
+        "appNotInstalled": "Per partecipare a questo meeting sul tuo telefono ti serve l'app mobile di {{app}}",
+        "description": "Non è successo nulla? Abbiamo provato ad avviare la tua videoconferenza sull'app desktop di {{app}}. Prova di nuovo o avviala nell'app web di {{app}}.",
+        "descriptionWithoutWeb": "Non è successo niente? Abbiamo provato ad avviare la riunione nell'app per desktop {{app}}",
         "downloadApp": "Scarica l'app",
         "ifDoNotHaveApp": "Se non hai ancora l'app:",
         "ifHaveApp": "Se hai già l'app:",
         "joinInApp": "Entra in riunione usando l'app",
         "launchWebButton": "Avvia sul web",
-        "title": "Sto avviando la tua riunione su {{app}}...",
+        "title": "Sto avviando la tua videoconferenza su {{app}}…",
         "tryAgainButton": "Prova di nuovo sul desktop"
     },
     "defaultLink": "es. {{url}}",
@@ -171,38 +171,38 @@
         },
         "add": "Aggiungi",
         "allow": "Consenti",
-        "alreadySharedVideoMsg": "Un altro utente sta condividendo un video. Questa riunione permette di condividere un solo video alla volta.",
+        "alreadySharedVideoMsg": "Un altro utente sta condividendo un video. Questa conferenza permette di condividere un solo video alla volta.",
         "alreadySharedVideoTitle": "È permesso un solo video alla volta",
-        "applicationWindow": "Finestra dell'applicazione",
+        "applicationWindow": "Finestra applicazione",
         "Back": "Indietro",
-        "cameraConstraintFailedError": "La tua videocamera non soddisfa alcuni dei requisiti.",
+        "cameraConstraintFailedError": "La tua videocamera non soddisfa alcuni dei requisiti richiesti.",
         "cameraNotFoundError": "Videocamera non trovata.",
         "cameraNotSendingData": "Non possiamo accedere alla tua videocamera. Controlla che non sia già usata da un'altra applicazione, seleziona un altro dispositivo dalle impostazioni o prova a ricaricare l'applicazione.",
         "cameraNotSendingDataTitle": "Impossibile accedere alla videocamera",
-        "cameraPermissionDeniedError": "Non hai concesso il permesso di usare la videocamera. Potrai partecipare comunque alla riunione ma gli altri non potranno vederti. Usa il pulsante a forma di videocamera nella barra degli indirizzi per risolvere il problema.",
+        "cameraPermissionDeniedError": "Non hai concesso il permesso di usare la videocamera. Potrai partecipare comunque alla conferenza ma gli altri non potranno vederti. Usa il pulsante a forma di videocamera nella barra degli indirizzi per risolvere il problema.",
         "cameraUnknownError": "Impossibile usare la videocamera per un motivo sconosciuto.",
         "cameraUnsupportedResolutionError": "La tua videocamera non supporta la risoluzione richiesta.",
         "Cancel": "Annulla",
         "close": "Chiudi",
-        "conferenceDisconnectMsg": "Controlla la tua connessione. Riconnessione in {{seconds}} secondi...",
+        "conferenceDisconnectMsg": "Controlla la tua connessione. Riconnessione in {{seconds}} secondi…",
         "conferenceDisconnectTitle": "Sei stato disconnesso.",
-        "conferenceReloadMsg": "Stiamo cercando di risolvere il problema. Riconnessione in {{seconds}} secondi...",
+        "conferenceReloadMsg": "Stiamo cercando di risolvere il problema. Riconnessione in {{seconds}} secondi…",
         "conferenceReloadTitle": "Purtroppo qualcosa è andato storto.",
         "confirm": "Conferma",
         "confirmNo": "No",
         "confirmYes": "Sì",
-        "connectError": "Oh! Qualcosa è andato storto e non ti puoi collegare alla riunione.",
-        "connectErrorWithMsg": "Oops! Qualcosa è andato storto e non ti puoi collegare alla riunione: {{msg}}",
-        "connecting": "Connessione in corso",
+        "connectError": "Oh! Qualcosa è andato storto e non ti puoi collegare alla conferenza.",
+        "connectErrorWithMsg": "Oops! Qualcosa è andato storto e non ti puoi collegare alla conferenza: {{msg}}",
+        "connecting": "Connessione",
         "contactSupport": "Contatta il supporto",
         "copied": "Copiato",
         "copy": "Copia",
         "dismiss": "Scarta",
-        "displayNameRequired": "Ciao, qual è il tuo nome",
+        "displayNameRequired": "Tutti devono avere un nome",
         "done": "Fatto",
-        "e2eeDescription": "La crittografia punto-a-punto al momento è SPERIMENTALE. Tieni presente che attivandola disabiliterai i servizi svolti dal server, come: la registrazione, la dirette streaming e la partecipazione usando telefoni. Tieni anche presente che la riunione funzionerà solo per chi si collega usando browser che supportano flussi inseribili (insertable streams).",
+        "e2eeDescription": "La crittografia punto-a-punto al momento è SPERIMENTALE. Tieni presente che attivandola disabiliterai i servizi svolti dal server, come: la registrazione su Dropobox, le dirette streaming e la partecipazione usando solo telefoni. Tieni anche presente che la riunione funzionerà solo per chi si collega usando browser che supportano flussi inseribili (insertable streams).",
         "e2eeLabel": "Attiva la crittografia punto-a-punto",
-        "e2eeWarning": "ATTENZIONE: non tutti i partecipanti a questa riunione sembrano supportare le funzionalità di crittografia punto-a-punto. Se la attivi, non potranno sentirti o vederti.",
+        "e2eeWarning": "ATTENZIONE: non tutti i partecipanti a questa riunione sembrano supportare le funzionalità di crittografia punto-a-punto. Se la attivi, non potranno sentirti, o vederti.",
         "enterDisplayName": "Inserisci qui il tuo nome",
         "error": "Errore",
         "gracefulShutdown": "Il nostro servizio è al momento spento per manutenzione. Si prega di riprovare più tardi.",
@@ -213,58 +213,58 @@
         "incorrectPassword": "Nome utente o password errati",
         "internalError": "Ops! Qualcosa è andato storto. Questo è l'errore: {{error}}",
         "internalErrorTitle": "Errore interno",
-        "kickMessage": "Puoi contattare {{participantDisplayName}} per maggiori dettagli.",
-        "kickParticipantButton": "Escludi",
-        "kickParticipantDialog": "Sei sicuro di voler escludere questo partecipante?",
-        "kickParticipantTitle": "Escludi questo partecipante?",
-        "kickTitle": "Escluso dalla riunione",
+        "kickMessage": "Acc! Sei stato espulso dal meeting!",
+        "kickParticipantButton": "Butta fuori",
+        "kickParticipantDialog": "Sei sicuro di voler espellere questo partecipante?",
+        "kickParticipantTitle": "Espellere questi partecipante?",
+        "kickTitle": "Espulso dal meeting",
         "liveStreaming": "Diretta",
-        "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Impossibile durante la registrazione.",
+        "liveStreamingDisabledForGuestTooltip": "Gli ospiti non possono avviare una diretta.",
         "liveStreamingDisabledTooltip": "Trasmissioni in diretta disabilitate.",
-        "lockMessage": "Impossibile bloccare la riunione.",
-        "lockRoom": "Aggiungi una $t(lockRoomPasswordUppercase) alla riunione",
+        "lockMessage": "Impossibile bloccare la conferenza.",
+        "lockRoom": "Aggiungi una password al meeting",
         "lockTitle": "Blocco fallito",
-        "logoutQuestion": "Vuoi disconnetterti e interrompere la riunione?",
-        "logoutTitle": "Disconnessione",
-        "maxUsersLimitReached": "È stato raggiunto il numero massimo di partecipanti. La riunione è al completo. Contatta l'organizzatore o riprova più tardi!",
-        "maxUsersLimitReachedTitle": "Raggiunto limite massimo partecipanti",
-        "micConstraintFailedError": "Il tuo microfono non soddisfa alcuni dei requisiti.",
+        "logoutQuestion": "Vuoi disconnetterti e interrompere la conferenza ?",
+        "logoutTitle": "Logout",
+        "maxUsersLimitReached": "È stato raggiunto il numero massimo di partecipanti. La conferenza è al completo. Contatta l'organizzatore, o riprova più tardi!",
+        "maxUsersLimitReachedTitle": "Raggiunto limite partecipanti",
+        "micConstraintFailedError": "Il tuo microfono non soddisfa alcuni dei requisiti richiesti.",
         "micNotFoundError": "Microfono non trovato.",
-        "micNotSendingData": "Apri le impostazioni del computer per togliere il «muto» al microfono e imposta il volume.",
-        "micNotSendingDataTitle": "Il microfono è muto per impostazione di sistema",
-        "micPermissionDeniedError": "Non hai concesso il permesso di usare il microfono. Puoi comunque partecipare alla riunione ma gli altri non potranno sentirti. Usa il bottone a forma di telecamera nella barra degli indirizzi per cambiare impostazioni.",
+        "micNotSendingData": "Non riusciamo a ricevere suoni dal microfono scelto. Prova a selezionare nelle impostazioni un microfono diverso, o a riavviare l'applicazione.",
+        "micNotSendingDataTitle": "Impossibile accedere al microfono",
+        "micPermissionDeniedError": "Non hai concesso il permesso di usare il microfono. Puoi comunque partecipare alla conferenza ma gli altri non potranno sentirti. Usa il bottone a forma di telecamera nella barra degli indirizzi per cambiare impostazioni.",
         "micUnknownError": "Impossibile usare il microfono per un motivo sconosciuto.",
         "muteEveryoneElseDialog": "Una volta zittiti, non potrai riattivargli i microfoni, ma loro potranno farlo in qualsiasi momento.",
         "muteEveryoneElseTitle": "Zittisco tutti eccetto {{whom}}?",
         "muteEveryoneDialog": "Sei sicuro di voler zittire tutti? Non potrai riattivar loro il microfono, ma loro potranno farlo in qualsiasi momento.",
         "muteEveryoneTitle": "Zittisco tutti?",
         "muteEveryoneSelf": "te stesso",
-        "muteEveryoneStartMuted": "Tutti cominciano a microfono spento, d'adesso in avanti",
+        "muteEveryoneStartMuted": "Tutti cominciano a microfono spento, d'adessp in avanti",
         "muteParticipantBody": "Non sarai in grado di riattivare il loro microfono, ma loro potranno riattivarlo in qualsiasi momento.",
         "muteParticipantButton": "Zittisci",
-        "muteParticipantDialog": "Sei sicuro di voler zittire questo partecipante? Sarà lui a dovere riattivare l'audio, per parlare.",
+        "muteParticipantDialog": "Sei sicuro di voler zittire questo partecipante? Saranno lui a doversi riattivare l'audio, per parlare.",
         "muteParticipantTitle": "Zittisco questo partecipante?",
         "Ok": "OK",
         "passwordLabel": "La riunione è stata bloccata da un partecipante. Immetti la $t(lockRoomPassword) per collegarti, per favore.",
-        "passwordNotSupported": "Impostare una $t(lockRoomPassword) non è supportato.",
+        "passwordNotSupported": "Le password per le riunioni non sono supportate.",
         "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) non supportato",
-        "passwordRequired": "$t(lockRoomPasswordUppercase) richiesta",
+        "passwordRequired": "E' richiesto $t(lockRoomPasswordUppercase)",
         "popupError": "Il tuo browser sta bloccando i pop-up da questo sito. Per favore abilita i pop-up dalle impostazioni di sicurezza del browser e riprova.",
         "popupErrorTitle": "Pop-up bloccato",
-        "readMore": "continua",
+        "readMore": "altro",
         "recording": "Registrazione",
-        "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Impossibile durante una diretta.",
+        "recordingDisabledForGuestTooltip": "Gli ospiti non possono avviare una registrazione.",
         "recordingDisabledTooltip": "Registrazione disabilitata.",
         "rejoinNow": "Ricollegati ora",
         "remoteControlAllowedMessage": "{{user}} ha accettato la tua richiesta di controllo remoto!",
         "remoteControlDeniedMessage": "{{user}} ha respinto la tua richiesta di controllo remoto!",
         "remoteControlErrorMessage": "Si è verificato un errore mentre si cercava di richiedere il controllo remoto a {{user}}!",
         "remoteControlRequestMessage": "Vuoi consentire ad {{user}} di controllare da remoto il tuo desktop?",
-        "remoteControlShareScreenWarning": "Tieni conto che premendo «Permetti» condividerai il tuo schermo.",
+        "remoteControlShareScreenWarning": "Tieni conto che premendo \"Permetti\" condividerai il tuo schermo.",
         "remoteControlStopMessage": "Sessione di controllo remoto terminata!",
         "remoteControlTitle": "Connessione desktop remoto",
         "Remove": "Rimuovi",
-        "removePassword": "Togli la $t(lockRoomPassword)",
+        "removePassword": "Togli la password",
         "removeSharedVideoMsg": "Sei sicuro di voler rimuovere il tuo video condiviso?",
         "removeSharedVideoTitle": "Rimuovi video condiviso",
         "reservationError": "Errore di sistema in prenotazione",
@@ -273,11 +273,11 @@
         "screenSharingAudio": "Condividi audio",
         "screenSharingFailed": "Ops! Non è stato possibile avviare la condivisione dello schermo!",
         "screenSharingFailedTitle": "Condivisione dello schermo fallita!",
-        "screenSharingPermissionDeniedError": "Qualcosa non funziona nei permessi di condivisione dello schermo. Ricarica e riprova.",
-        "sendPrivateMessage": "Hai ricevuto un messaggio privato poco fa. Vorresti rispondergli privatamente o vuoi mandare la risposta al gruppo?",
+        "screenSharingPermissionDeniedError": "Qualcosa non funziona nei permessi di condivisione dello schermo. Ricarica e prova ancora, autorizzando la condivisione.",
+        "sendPrivateMessage": "Hai ricevuto un messaggio privato, poco fa. Vorresti rispondergli privatamente, o vuoi mandare la risposta al gruppo?",
         "sendPrivateMessageCancel": "Invia al gruppo",
         "sendPrivateMessageOk": "Invia privatamente",
-        "sendPrivateMessageTitle": "Invio privatamente?",
+        "sendPrivateMessageTitle": "Mando privatamente?",
         "serviceUnavailable": "Servizio non disponibile",
         "sessTerminated": "Chiamata terminata",
         "Share": "Condividi",
@@ -298,13 +298,12 @@
         "token": "token",
         "tokenAuthFailed": "Ci dispiace ma non sei autorizzato a partecipare a questa chiamata.",
         "tokenAuthFailedTitle": "Autenticazione fallita",
-        "transcribing": "Trascrizione in corso",
-        "unlockRoom": "Togli la $t(lockRoomPassword) alla riunione",
-        "user": "utente",
+        "transcribing": "Trascrizione",
+        "unlockRoom": "Togli la password al meeting",
         "userPassword": "password utente",
-        "WaitForHostMsg": "La riunione <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, per favore autenticati. Altrimenti, aspetta l'arrivo dell'organizzatore.",
-        "WaitForHostMsgWOk": "La riunione <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, allora premi OK per autenticarti. Altrimenti, aspetta l'arrivo dell'organizzatore.",
-        "WaitingForHost": "In attesa dell'organizzatore...",
+        "WaitForHostMsg": "La conferenza <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, per favore autenticati. Altrimenti, aspetta l'arrivo dell'organizzatore.",
+        "WaitForHostMsgWOk": "La conferenza <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, allora premi OK per autenticarti. Altrimenti, aspetta l'arrivo dell'organizzatore.",
+        "WaitingForHost": "In attesa dell'organizzatore ...",
         "Yes": "Sì",
         "yourEntireScreen": "Schermo intero"
     },
@@ -318,7 +317,7 @@
         "labelToolTip": "Le comunicazioni audio e video di questa chiamata, sono crittografate dall'origine alla destinazione"
     },
     "embedMeeting": {
-        "title": "Incorpora questa riunione"
+        "title": "Incorpora questa riunione altrove"
     },
     "feedback": {
         "average": "Media",
@@ -327,19 +326,19 @@
         "good": "Buona",
         "rateExperience": "Valuta la qualità della videoconferenza.",
         "veryBad": "Pessima",
-        "veryGood": "Ottima"
+        "veryGood": "Molto Buona"
     },
     "incomingCall": {
         "answer": "Rispondi",
         "audioCallTitle": "Chiamata in arrivo",
-        "decline": "Chiudi",
+        "decline": "Scarta",
         "productLabel": "da Jitsi Meet",
         "videoCallTitle": "Videochiamata in arrivo"
     },
     "info": {
         "accessibilityLabel": "Mostra informazioni",
-        "addPassword": "Aggiungi $t(lockRoomPassword)",
-        "cancelPassword": "Togli $t(lockRoomPassword)",
+        "addPassword": "Aggiungi password",
+        "cancelPassword": "Togli password",
         "conferenceURL": "Collegamento:",
         "country": "Paese",
         "dialANumber": "Per collegarti telefonicamente al meeting, chiama uno di questi numeri e metti il pin.",
@@ -349,12 +348,12 @@
         "dialInSummaryError": "Errore nella ricerca dei numeri telefonici. Riprova più tardi.",
         "dialInTollFree": "Numero verde",
         "genericError": "Ops, qualcosa è andato storto.",
-        "inviteLiveStream": "Per vedere la diretta di questa riunione, fai click su questo link: {{url}}",
-        "invitePhone": "Per seguire solo telefonicamente, fai click:  {{number}},,{{conferenceID}}#",
+        "inviteLiveStream": "Per vedere la diretta di questo meeting, clicca su questo link: {{url}}",
+        "invitePhone": "ATTENZIONE E' UNA CHIAMATA INTERNAZIONALE A PAGAMENTO! NON E' GRATUITA. Per seguire solo telefonicamente, clicca:  {{number}},,{{conferenceID}}#",
         "invitePhoneAlternatives": "Cerchi un numero diverso da chiamare?\nEcco dei numeri telefonici per collegarsi alle riunioni: {{url}}\n\n\nSe entri in riunione anche col computer, entra senza attivare l'audio: {{silentUrl}}",
-        "inviteURLFirstPartGeneral": "Invito a connettersi ad una riunione.",
-        "inviteURLFirstPartPersonal": "{{name}} ti sta invitando ad una riunione.\n",
-        "inviteURLSecondPart": "\nPartecipa alla riunione:\n{{url}}\n",
+        "inviteURLFirstPartGeneral": "Invito a connettersi ad una conferenza.",
+        "inviteURLFirstPartPersonal": "{{name}} ti sta invitando ad un meeting.\n",
+        "inviteURLSecondPart": "\nPartecipa al meeting:\n{{url}}\n",
         "liveStreamURL": "Trasmissione in diretta:",
         "moreNumbers": "Più numeri",
         "noNumbers": "Nessun numero da chiamare.",
@@ -363,8 +362,8 @@
         "numbers": "Numeri da chiamare",
         "password": "$t(lockRoomPasswordUppercase):",
         "title": "Condividi",
-        "tooltip": "Invia il collegamento e i numeri telefonici di questa riunione",
-        "label": "Informazioni riunione"
+        "tooltip": "Invia il collegamento e i numeri telefonici di questa conferenza",
+        "label": "Informazioni meeting"
     },
     "inviteDialog": {
         "alertText": "Errore nell'invitare alcuni partecipanti.",
@@ -390,11 +389,12 @@
         "pushToTalk": "Premi per parlare",
         "raiseHand": "Alza o abbassa la mano",
         "showSpeakerStats": "Mostra statistiche",
-        "toggleChat": "Apri o chiudi la conversazione",
-        "toggleFilmstrip": "Mostra o nascondi miniature video",
+        "toggleChat": "Apri o chiudi la chat",
+        "toggleFilmstrip": "Mostra o nascondi anteprime video",
         "toggleScreensharing": "Cambia modalità tra videocamera e condivisione schermo",
         "toggleShortcuts": "Mostra o nascondi le scorciatoie",
-        "videoMute": "Accendi o spegni la videocamera"
+        "videoMute": "Accendo o spegni la videocamera",
+        "videoQuality": "Imposta qualità della telefonata"
     },
     "liveStreaming": {
         "limitNotificationDescriptionWeb": "Data l'alta domanda la tua diretta sarà limitata a {{limit}} minuti. Per dirette illimitate, prova <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
@@ -403,32 +403,32 @@
         "busyTitle": "Tutti gli streamer sono impegnati al momento",
         "changeSignIn": "Cambia account",
         "choose": "Scegli una trasmissione in diretta",
-        "chooseCTA": "Scegli un'opzione di trasmissione. Attualmente sei collegato come {{email}}.",
+        "chooseCTA": "Scegli un'opzione di trasmissione. Attualmente sei loggato come {{email}}.",
         "enterStreamKey": "Inserisci qui la tua chiave YouTube per le trasmissioni in diretta.",
         "error": "Diretta fallita. Prova di nuovo.",
-        "errorAPI": "Si è verificato un errore durante l'accesso alle tue trasmissioni YouTube. Prova a effettuare nuovamente il login.",
+        "errorAPI": "Si è verificato un errore durante l'accesso ai tuoi broadcast YouTube. Prova a effettuare nuovamente il login.",
         "errorLiveStreamNotEnabled": "La diretta non è attivata su {{email}}. Per favore abilita la diretta o effettua l'accesso con un account abilitato alle dirette.",
         "expandedOff": "La diretta è stata interrotta",
-        "expandedOn": "La riunione è attualmente in diretta su YouTube.",
+        "expandedOn": "La conferenza è attualmente in diretta su YouTube.",
         "expandedPending": "La diretta è in fase di avvio...",
         "failedToStart": "Avvio trasmissione in diretta fallito",
         "getStreamKeyManually": "Non siamo stati in grado di trovare nessuna trasmissione dal vivo. Prova ad ottenere una chiave stream da Youtube",
-        "invalidStreamKey": "La chiave per le dirette potrebbe non essere corretta.",
+        "invalidStreamKey": "La chiave stream potrebbe non essere corretta.",
         "off": "La diretta si è interrotta",
         "offBy": "{{name}} ha fermato la diretta",
         "on": "Trasmissione in diretta",
         "onBy": "{{name}} ha iniziato la diretta",
         "pending": "Avvio diretta...",
-        "serviceName": "Servizio dirette",
+        "serviceName": "Servizio live streaming",
         "signedInAs": "Sei attualmente collegato come:",
-        "signIn": "Collegati con Google",
-        "signInCTA": "Collegati o inserisci la tua chiave YouTube per la trasmissione in diretta.",
-        "signOut": "Scollegati",
+        "signIn": "Registrati con Google",
+        "signInCTA": "Registrati o inserisci la tua chiave YouTube per la trasmissione in diretta.",
+        "signOut": "Esci",
         "start": "Inizia una diretta",
         "streamIdHelp": "Cos'è questo?",
         "unavailableTitle": "La diretta non è disponibile",
-        "youtubeTerms": "Condizioni di utilizzo di YouTube",
-        "googlePrivacyPolicy": "Norme sulla riservatezza di Google"
+        "youtubeTerms": "YouTube terms of services",
+        "googlePrivacyPolicy": "Google Privacy Policy"
     },
     "localRecording": {
         "clientState": {
@@ -436,9 +436,9 @@
             "on": "Acceso",
             "unknown": "Sconosciuto"
         },
-        "dialogTitle": "Controlli di registrazione locale",
+        "dialogTitle": "Controlli di registrazione",
         "duration": "Durata",
-        "durationNA": "N/D",
+        "durationNA": "N/A",
         "encoding": "Codifica",
         "label": "LOR",
         "labelToolTip": "Registrazione locale avviata",
@@ -447,14 +447,14 @@
         "messages": {
             "engaged": "Registrazione locale avviata.",
             "finished": "La registrazione della sessione {{token}} è terminata. Invia il file della registrazione al moderatore.",
-            "finishedModerator": "La registrazione della sessione {{token}} è terminata. Il registrazione della traccia è stata salvata. Richiedere ai partecipanti di inviare le loro registrazioni.",
+            "finishedModerator": "La registrazione della sessione {{token}} è terminata. Il file della traccia local è stato salvato. Richiedere ai partecipanti di inviare le loro registrazioni.",
             "notModerator": "Non sei un moderatore. Non puoi avviare o interrompere la registrazione"
         },
         "moderator": "Moderatore",
         "no": "No",
         "participant": "Partecipante",
         "participantStats": "Statistiche partecipanti",
-        "sessionToken": "Token della sessione",
+        "sessionToken": "Token della sessione ",
         "start": "Avvia Registrazione",
         "stop": "Ferma registrazione",
         "yes": "Sì"
@@ -467,9 +467,9 @@
         "connectedThreePlusMembers": "{{name}} e altri {{count}} si sono connessi",
         "connectedTwoMembers": "{{first}} e {{second}} si sono connessi",
         "disconnected": "disconnesso",
-        "focus": "Focus su riunione",
+        "focus": "Focus su conferenza",
         "focusFail": "{{component}} non disponibile - riprova in {{ms}} sec",
-        "grantedTo": "Permessi di moderatore accordati a {{to}}!",
+        "grantedTo": "Permessi di moderatore garantiti a {{to}}!",
         "invitedOneMember": "{{displayName}} è stato invitato",
         "invitedThreePlusMembers": "Hai invitato {{name}} e altri {{count}}",
         "invitedTwoMembers": "Hai invitato {{first}} e {{second}}",
@@ -484,16 +484,16 @@
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) è stata messa da un altro partecipante",
         "raisedHand": "{{name}} vorrebbe intervenire.",
         "somebody": "Qualcuno",
-        "startSilentTitle": "Sei entrato nella riunione senza aver scelto un dispositivo audio per sentire!",
-        "startSilentDescription": "Entra di nuovo nella riunione, per attivare l'audio",
-        "suboptimalBrowserWarning": "Temiamo che la tua esperienza non sarà granché su questo browser. Stiamo cercando di migliorare la situazione ma, per il momento, prova ad utilizzare uno di questi <a href='{{recommendedBrowserPageLink}}' target='_blank'>browser supportati</a>.",
-        "suboptimalExperienceTitle": "Avviso sul browser",
+        "startSilentTitle": "Sei entrato in riunione senza aver scelto un dispositivo audio per sentire!",
+        "startSilentDescription": "Entra di nuovo in riunione, per attivare l'audio",
+        "suboptimalExperienceDescription": "Ehm... temiamo che la tua esperienza con {{appName}} non sarà granché su questo browser. Stiamo cercando di migliorare la situazione ma, per il momento, prova ad utilizzare uno di questi <a href='{{recommendedBrowserPageLink}}' target='_blank'>browser supportati</a>.",
+        "suboptimalExperienceTitle": "Problemi con il browser",
         "unmute": "Accendi microfono",
         "newDeviceCameraTitle": "Trovata nuova videocamera",
         "newDeviceAudioTitle": "Trovata nuova origine audio",
         "newDeviceAction": "OK, usala",
         "OldElectronAPPTitle": "Falla di sicurezza!",
-        "oldElectronClientDescription1": "Sembri stare usando una versione obsoleta del client Jitsi Meet che ha dei problemi di sicurezza noti. Assicurati di aggiornarla presso il nostro ",
+        "oldElectronClientDescription1": "Sembri stare usando una versione obsoleta di Jitsi Meet che ha delle falle di sicurezza note. Assicurati di aggiornarla presso il nostro ",
         "oldElectronClientDescription2": "ultima build",
         "oldElectronClientDescription3": " ora!"
     },
@@ -505,7 +505,7 @@
         "audioDeviceProblem": "C'è un problema con il tuo microfono",
         "audioOnlyError": "Errore audio:",
         "audioTrackError": "Impossibile creare traccia audio.",
-        "calling": "Chiamata in corso",
+        "calling": "Chiamando",
         "callMe": "Chiamami",
         "callMeAtNumber": "Chiamami a questo numero:",
         "configuringDevices": "Configurazione dispositivi...",
@@ -522,7 +522,7 @@
           "goodQuality": "Ottimo! La tue funzioni multimediali andranno alla grande.",
           "noMediaConnectivity": "Non siamo riusciti a stabilire una connessione multimediale per fare questo test. Questo è tipicamente causato da un firewall o dal NAT.",
           "noVideo": "Ci aspettiamo una pessima qualità video.",
-          "undetectable": "Se non riesci ancora a fare chiamate nel browser, ti consigliamo di verificare che il microfono e la videocamera siano configurate correttamente, che tu abbia dato al browser i permessi di usare microfono e videocamera e che il tuo browser sia aggiornato all'ultima versione. Se hai ancora problemi, dovresti contattare lo sviluppatore dell'applicazione web.",
+          "undetectable": "Se non riesci ancora a fare chiamate nel browser, ti consigliamo di verificare che il microfono e la tua videocamera siano configurate correttamente, che tu abbia dato al browser i permessi di usare microfono e videocamera, e che il tuo browser sia aggiornato all'ultima versione. Se hai ancora problemi, dovresti contattare lo sviluppatore dell'applicazione web.",
           "veryPoorConnection": "Ci aspettiamo una qualità della chiamata davvero terribile.",
           "videoFreezing": "Ci aspettiamo che il video si blocchi, sparisca, o sia molto pixelato.",
           "videoHighQuality": "Ci aspettiamo che il video sia di buona qualità.",
@@ -535,7 +535,7 @@
         "dialing": "Chiamata",
         "doNotShow": "Non mostrare più questa finestra",
         "errorDialOut": "Impossibile fare la chiamata",
-        "errorDialOutDisconnected": "Impossibile fare la chiamata. Scollegato",
+        "errorDialOutDisconnected": "Impossibile fare la chiamata. Occupato",
         "errorDialOutFailed": "Impossibile fare la chiamata. Chiamata fallita",
         "errorDialOutStatus": "Errore nel ricevere lo stato della rete",
         "errorMissingName": "Inserire il proprio nome, per accedere alla riunione",
@@ -559,22 +559,22 @@
     },
     "presenceStatus": {
         "busy": "Occupato",
-        "calling": "Chiamata...",
+        "calling": "Chiamata…",
         "connected": "Connesso",
         "connecting": "Connessione...",
         "connecting2": "Connessione*...",
-        "disconnected": "Scollegato",
+        "disconnected": "Occupato",
         "expired": "Scaduto",
         "ignored": "Ignorato",
-        "initializingCall": "Inizializzazione chiamata...",
+        "initializingCall": "Inizializzazione chiamata…",
         "invited": "Invitato",
         "rejected": "Rifiutato",
-        "ringing": "Sta suonando..."
+        "ringing": "Sta suonando…"
     },
     "profile": {
         "setDisplayNameLabel": "Imposta il nome da visualizzare",
         "setEmailInput": "Inserisci e-mail",
-        "setEmailLabel": "Imposta l'e-mail gravatar",
+        "setEmailLabel": "Imposta la mail gravatar",
         "title": "Profilo"
     },
     "raisedHand": "Vorrebbe parlare",
@@ -588,21 +588,20 @@
         "busyTitle": "Tutti i registratori sono occupati",
         "error": "Registrazione fallita. Prova di nuovo.",
         "expandedOff": "Registrazione interrotta",
-        "expandedOn": "La registrazione della riunione è attiva.",
-        "expandedPending": "La registrazione è in fase di avvio...",
+        "expandedOn": "La registrazione della conferenza è attiva.",
+        "expandedPending": "La registrazione è in fase di avvio…",
         "failedToStart": "Non è stato possibile avviare la registrazione",
         "fileSharingdescription": "Condividi la registrazione con i partecipanti alla riunione",
         "live": "DIRETTA",
         "loggedIn": "Accesso effettuato come {{userName}}",
         "off": "Registrazione interrotta",
-        "offBy": "{{name}} ha interrotto la registrazione",
+        "offBy": "{{name}} registrazione fermata",
         "on": "Registrazione",
-        "onBy": "Registrazione iniziata da {{name}}",
-        "pending": "In preparazione alla registrazione della riunione",
+        "onBy": "{{name}} registrazione iniziata",
+        "pending": "In preparazione alla registrazione della conferenza…",
         "rec": "REC",
         "serviceDescription": "La tua registrazione verrà salvata dal servizio di registrazione che hai scelto",
         "serviceName": "Servizio di registrazione",
-        "serviceDescriptionCloud": "Registrazione in rete",
         "signIn": "Entra",
         "signOut": "Esci",
         "unavailable": "Ops! Il {{serviceName}} non è al momento disponibile. Stiamo lavorando per risolvere il problema. Riprova più tardi.",
@@ -614,22 +613,21 @@
     "security": {
         "about": "Puoi aggiungere alla riunione una $t(lockRoomPassword). I partecipanti dovranno fornire la $t(lockRoomPassword) per essere autorizzati a partecipare alla riunione.",
         "aboutReadOnly": "I moderatori della riunione possono aggiungere $t(lockRoomPassword). I partecipanti dovranno fornire la $t(lockRoomPassword) per essere autorizzati a partecipare alla riunione.",
-        "insecureRoomNameWarning": "Il nome della riunione non è sicuro. Dei partecipanti indesiderati potrebbero unirsi alla riunione. Puoi proteggere l'accesso alla riunione col bottone sicurezza.",
-        "securityOptions": "Impostazioni di sicurezza"
+        "insecureRoomNameWarning": "La riunione non è protetta. Dei partecipanti indesiderati potrebbero unirsi alla riunione. Puoi proteggere l'accesso alla riunione col bottone sicurezza.",
+        "securityOptions": "Impostazioni sicurezza"
     },
     "settings": {
         "calendar": {
-            "about": "L’integrazione del calendario con {{appName}} è usata per accedere in sicurezza al proprio calendario per poter leggere i prossimi appuntamenti ",
+            "about": "L’integrazione del calendario con {{appName}} e’ consigliata per accedere in sicurezza al proprio calendario per poter leggere i prossimi appuntamenti ",
             "disconnect": "Disconnetti",
             "microsoftSignIn": "Connettiti con un account Microsoft",
-            "signedIn": "Sto accedendo agli eventi del calendario per {{email}}. Fai click su «Disconnetti» per interrompere l’accesso agli eventi del calendario.",
+            "signedIn": "Sto accedendo agli eventi del calendario per {{email}}. Clicca su Disconnetti per interrompere l’accesso agli eventi del calendario.",
             "title": "Calendario"
         },
         "devices": "Dispositivi",
         "followMe": "Tutti mi seguono",
         "language": "Lingua",
         "loggedIn": "Connesso come {{name}}",
-        "microphones": "Microfoni",
         "moderator": "Moderatore",
         "more": "Altro",
         "name": "Nome",
@@ -637,10 +635,11 @@
         "selectAudioOutput": "Uscita audio",
         "selectCamera": "Videocamera",
         "selectMic": "Microfono",
-        "speakers": "Altoparlanti",
         "startAudioMuted": "Tutti cominciano con il microfono disattivato",
         "startVideoMuted": "Tutti cominciano con il video disattivato",
-        "title": "Impostazioni"
+        "title": "Impostazioni",
+        "speakers": "Altoparlanti",
+        "microphones": "Microfoni"
     },
     "settingsView": {
         "advanced": "Avanzate",
@@ -649,13 +648,13 @@
         "alertTitle": "Attenzione",
         "alertURLText": "L'URL del server inserito non è valido",
         "buildInfoSection": "Versione",
-        "conferenceSection": "Riunione",
+        "conferenceSection": "Conferenza",
         "disableCallIntegration": "Disattiva l'integrazione delle chiamate native",
         "disableP2P": "Disattiva la modalità punto-punto",
         "disableCrashReporting": "Disattiva la diagnostica dei crash",
         "disableCrashReportingWarning": "Sei sicuro di voler disattivare la diagnostica dei crash? Quest'impostazione verrà eseguita al prossimo avvio dell'app.",
         "displayName": "Nome visualizzato",
-        "email": "e-mail",
+        "email": "Email",
         "header": "Impostazioni",
         "profileSection": "Profilo",
         "serverURL": "URL del server",
@@ -665,8 +664,8 @@
         "version": "Versione"
     },
     "share": {
-        "dialInfoText": "\n\n=====\n\nVuoi solo ascoltare la riunione da un telefono?\n\n{{defaultDialInNumber}}Clicca questo link per vedere i numeri telefonici di questo meeting\n{{dialInfoPageUrl}}",
-        "mainText": "Fai click sul link seguente per partecipare alla riunione:\n{{roomUrl}}"
+        "dialInfoText": "\n\n=====\n\nVuoi solo ascoltare la conferenza da un telefono?\n\n{{defaultDialInNumber}}Clicca questo link per vedere i numeri telefonici di questo meeting\n{{dialInfoPageUrl}}",
+        "mainText": "Clicca sul link seguente per partecipare alla conferenza:\n{{roomUrl}}"
     },
     "speaker": "Relatore",
     "speakerStats": {
@@ -678,7 +677,7 @@
         "speakerTime": "Tempo"
     },
     "startupoverlay": {
-        "policyText": " ",
+        "policyText": "   ",
         "genericTitle": "Per la riunione devono essere usati il tuo microfono e la tua videocamera.",
         "title": "{{app}} ha bisogno di usare il tuo microfono e la tua videocamera."
     },
@@ -693,19 +692,19 @@
             "audioRoute": "Scegli l'uscita audio",
             "callQuality": "Imposta qualità della chiamata",
             "cc": "Attiva/disattiva sottotitoli",
-            "chat": "Attiva/disattiva la conversazione",
+            "chat": "Attiva/disattiva la chat",
             "document": "Attiva/disattiva documento condiviso",
             "download": "Scarica le nostre app",
             "embedMeeting": "Incorpora riunione altrove",
             "feedback": "Lascia un feedback",
             "fullScreen": "Attiva/disattiva schermo intero",
-            "grantModerator": "Autorizza moderatore",
-            "hangup": "Lascia la riunione",
+            "grantModerator": "Autorizza Moderator",
+            "hangup": "Lascia la conferenza",
             "help": "Aiuto",
             "invite": "Invita persone",
             "kick": "Espelli partecipante",
             "lobbyButton": "Attiva/disattiva sala d'attesa",
-            "localRecording": "Abilita/disattiva controlli di registrazione locale",
+            "localRecording": "Abilita controlli di registrazione locale",
             "lockRoom": "Attiva o disattiva password",
             "moreActions": "Attiva o disattiva menu avanzato",
             "moreActionsMenu": "Menu avanzato",
@@ -718,7 +717,7 @@
             "raiseHand": "Attiva/disattiva alzata di mano",
             "recording": "Attiva/disattiva registrazione",
             "remoteMute": "Zittisci partecipante",
-            "security": "Impostazioni di sicurezza",
+            "security": "Impostazioni sicurezza",
             "Settings": "Attiva/disattiva impostazioni",
             "sharedvideo": "Attiva/disattiva condivisione YouTube",
             "shareRoom": "Invita qualcuno",
@@ -733,13 +732,13 @@
             "videoblur": "Attiva/disattiva offuscamento video"
         },
         "addPeople": "Aggiungi persone alla chiamata",
-        "audioOnlyOff": "Disabilita modalità per banda limitata",
-        "audioOnlyOn": "Abilita modalità per banda limitatao",
+        "audioOnlyOff": "Anche video",
+        "audioOnlyOn": "Solo audio",
         "audioRoute": "Scegli l'uscita audio",
         "authenticate": "Autenticazione",
-        "callQuality": "Imposta qualità video",
-        "chat": "Apri / Chiudi conversazione",
-        "closeChat": "Chiudi conversazione",
+        "callQuality": "Imposta qualità della chiamata",
+        "chat": "Apri / Chiudi chat",
+        "closeChat": "Chiudi chat",
         "documentClose": "Chiudi documento condiviso",
         "documentOpen": "Apri documento condiviso",
         "download": "Scarica le nostre app",
@@ -755,8 +754,8 @@
         "invite": "Invita persone",
         "lobbyButtonDisable": "Disabilita sala d'attesa",
         "lobbyButtonEnable": "Abilita sala d'attesa",
-        "login": "Accedi",
-        "logout": "Scollegati",
+        "login": "Login",
+        "logout": "Logout",
         "lowerYourHand": "Abbassa la mano",
         "moreActions": "Più azioni",
         "moreOptions": "Più opzioni",
@@ -769,13 +768,13 @@
         "noAudioSignalDialInLinkDesc": "Numberi di telefono",
         "noisyAudioInputTitle": "Il tuo microfono sembra rumoroso!",
         "noisyAudioInputDesc": "Sembra che il tuo microfono faccia dei rumori, prova a spegnerlo o cambiarlo per favore.",
-        "openChat": "Apri una conversazione",
-        "pip": "Abilita visualizzazione immagine nell'immagine",
+        "openChat": "Apri una chat",
+        "pip": "Abilita visualizzazione immagine nell’immagine",
         "privateMessage": "invia un messaggio privato",
         "profile": "Modifica profilo",
         "raiseHand": "Alza / Abbassa la mano",
         "raiseYourHand": "Alza la mano",
-        "security": "Impostazioni di sicurezza",
+        "security": "Impostazioni sicurezza",
         "Settings": "Impostazioni",
         "sharedvideo": "Condividi un video Youtube",
         "shareRoom": "Invita partecipante",
@@ -790,17 +789,17 @@
         "tileViewToggle": "Vedi tutti i partecipanti insieme, o uno solo",
         "toggleCamera": "Cambia videocamera",
         "videomute": "Attiva / Disattiva videocamera",
-        "startvideoblur": "Sfoca lo sfondo del video",
-        "stopvideoblur": "Non sfocare lo sfondo video"
+        "startvideoblur": "Offusca il video",
+        "stopvideoblur": "Non offuscare il video"
     },
     "transcribing": {
         "ccButtonTooltip": "Inizia / Ferma i sottotitoli",
-        "error": "Trascrizione fallita. Prova di nuovo.",
-        "expandedLabel": "La trascrizione della riunione è attiva",
-        "failedToStart": "C'è stato un errore nell'avvio del servizio di trascrizione.",
+        "error": "Registrazione fallita. Prova di nuovo.",
+        "expandedLabel": "La trascrizione della conferenza è attiva",
+        "failedToStart": "C’è stato un errore nell’avvio del servizio di trascrizione.",
         "labelToolTip": "Il servizio di trascrizione è in fase di avvio",
         "off": "Trascrizione interrotta",
-        "pending": "Avvio del servizio di trascrizione della riunione...",
+        "pending": "Avvio del servizio di trascrizione della conferenza…",
         "start": "Avvia visualizzazione sottotitoli",
         "stop": "Interrompi la visualizzazione dei sottotitoli",
         "tr": "TR"
@@ -808,7 +807,7 @@
     "userMedia": {
         "androidGrantPermissions": "Seleziona <b><i>consenti</i></b> quando richiesto dal browser.",
         "chromeGrantPermissions": "Seleziona <b><i>consenti</i></b> quando richiesto dal browser.",
-        "edgeGrantPermissions": "Seleziona <b><i>Sì</i></b> quando richiesto dal browser.",
+        "edgeGrantPermissions": "Seleziona <b><i>Si</i></b> quando richiesto dal browser.",
         "electronGrantPermissions": "Concedi l'autorizzazione ad usare telecamera e microfono",
         "firefoxGrantPermissions": "Seleziona <b><i>condividi i dispositivi selezionati</i></b> quando richiesto dal browser.",
         "iexplorerGrantPermissions": "Seleziona <b><i>OK</i></b> quando richiesto dal browser.",
@@ -821,7 +820,7 @@
         "busy": "Stiamo lavorando per liberare le risorse. Riprova tra qualche minuto.",
         "busyTitle": "Il servizio Stanza al momento è occupato",
         "errorAlreadyInvited": "{{displayName}} già invitato",
-        "errorInvite": "Riunione non ancora stabilita. Riprova più tardi.",
+        "errorInvite": "Conferenza non ancora stabilita. Riprova più tardi.",
         "errorInviteFailed": "Stiamo lavorando per risolvere il problema. Riprova più tardi.",
         "errorInviteFailedTitle": "Invito a {{displayName}} fallito",
         "errorInviteTitle": "Errore nell'invito alla stanza",
@@ -829,13 +828,13 @@
     },
     "videoStatus": {
         "audioOnly": "AUD",
-        "audioOnlyExpanded": "Hai attivato la modalità con banda limitata. Questa modalità permette di risparmiare banda, ma non vedrai gli altri partecipanti.",
+        "audioOnlyExpanded": "Hai attivato la modalità solo audio. Questa modalità permette di risparmiare banda, ma non vedrai gli altri partecipanti.",
         "callQuality": "Qualità video",
         "hd": "HD",
         "hdTooltip": "Stai vedendo in alta definizione",
         "highDefinition": "Alta definizione",
         "labelTooiltipNoVideo": "Nessun video",
-        "labelTooltipAudioOnly": "Hai attivato la modalità con banda limitata",
+        "labelTooltipAudioOnly": "Hai attivato la modalità solo audio",
         "ld": "LD",
         "ldTooltip": "Stai vedendo a bassa definizione",
         "lowDefinition": "Bassa definizione",
@@ -844,58 +843,57 @@
         "standardDefinition": "Definizione standard"
     },
     "videothumbnail": {
-        "connectionInfo": "Info connessione",
         "domute": "Disattiva audio",
         "domuteOthers": "Zittisci tutti gli altri",
         "flip": "Rifletti",
         "grantModerator": "Autorizza moderatore",
-        "kick": "Espelli",
+        "kick": "Butta fuori",
         "moderator": "Moderatore",
         "mute": "Il partecipante ha il microfono spento",
         "muted": "Audio disattivato",
-        "remoteControl": "Avvia/ferma il controllo remoto",
+        "remoteControl": "Controllo remoto",
         "show": "Mostra in primo piano",
         "videomute": "Il partecipante ha la videocamera spenta"
     },
     "welcomepage": {
         "accessibilityLabel": {
-            "join": "Tocca per accedere",
+            "join": "Tap per accedere",
             "roomname": "Inserisci nome stanza"
         },
-        "appDescription": "Avvia una videochiamata con tutto il team. Invita tutti quelli che conosci. {{app}} è una soluzione per effettuare videoconferenze totalmente crittografata, 100% open source, che puoi usare sempre, ogni giorno, gratuitamente – senza bisogno di un account.",
+        "appDescription": "Avvia una videochiamata con tutto il team. Invita tutti quelli che conosci.  {{app}} è una soluzione per effettuare videoconferenze totalmente crittografata, 100% open source, che puoi usare sempre, ogni giorno, gratuitamente – senza bisogno di un account.",
         "audioVideoSwitch": {
             "audio": "Voce",
             "video": "Video"
         },
         "calendar": "Calendario",
         "connectCalendarButton": "Collega calendario",
-        "connectCalendarText": "Connetti il tuo calendario per vedere tutte le riunione dentro {{app}}. Poi, aggiungi {{provider}} di riunione al tuo calendario, per avviarle con un clic.",
-        "enterRoomTitle": "Avvia una nuova riunione",
+        "connectCalendarText": "Connetti il tuo calendario per vedere tutte le riunione dentro {{app}}. Poi, aggiungi {{provider}} di riunioni al tuo calendario, per avviarle con un clic.",
+        "enterRoomTitle": "Avvia una nuova conferenza",
         "getHelp": "Trova aiuto",
         "go": "VAI",
         "goSmall": "VAI",
         "headerTitle": "Jitsi Meet",
-        "headerSubtitle": "Riunioni sicure e di alta qualità",
+        "headerSubtitle": "Secure and high quality meetings",
         "info": "Informazioni chiamata",
-        "join": "CREA / UNISCITI",
+        "join": "UNISCITI",
         "jitsiOnMobile": "Jitsi su mobile – scarica le nostre app e dai inizio ad una riunione dovunque tu sia",
         "moderatedMessage": "O <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">prepara una URL</a> in anticipo, per le riunioni di cui sei il moderatore.",
-        "privacy": "Riservatezza",
-        "recentList": "Recenti",
+        "privacy": "Privacy",
+        "recentList": "Recente",
         "recentListDelete": "Cancella",
-        "recentListEmpty": "La tua lista è vuota. Conversa con qualcuno del tuo team e lo vedrai apparire nella lista delle riunioni recenti.",
+        "recentListEmpty": "La tua lista è vuota. Chatta con qualcuno del tuo team e lo vedrai apparire nella lista di meeting recenti.",
         "reducedUIText": "Benvenuto in {{app}}!",
         "roomNameAllowedChars": "Il nome della riunione non deve contenere questi caratteri: ?, &, :, ', \", %, #.",
-        "roomname": "Inserisci il nome della stanza",
-        "roomnameHint": "Inserisci il nome o l'URL della stanza alla quale vuoi accedere. Puoi anche inventarti un nome, assicurati solo che le persone che vuoi contattare lo conoscano, così che possano inserire lo stesso nome.",
+        "roomname": "Inserisci nome stanza",
+        "roomnameHint": "Inserisci il nome o l'URL della stanza alla quale vuoi accedere. Puoi anche inventarti un nome, assicurati solo che le persone che vuoi contattare lo sappiano, così che possano inserire lo stesso nome.",
         "sendFeedback": "Invia feedback",
         "startMeeting": "Inizia riunione",
         "terms": "Termini di utilizzo",
         "title": "Il sistema di videoconferenza sicuro, funzionale e completamente gratuito."
     },
     "lonelyMeetingExperience": {
-        "button": "Invita altri",
-        "youAreAlone": "Sei l'unico nella riunione"
+        "button": "invita altri",
+        "youAreAlone": "Sei l'unico in riunione"
     },
     "helpView": {
         "header": "Aiuto"
@@ -903,25 +901,25 @@
     "lobby": {
         "knockingParticipantList": "Lista dei partecipanti in attesa",
         "allow": "Autorizza",
-        "backToKnockModeButton": "Nessuna password, richiedi l'accesso",
+        "backToKnockModeButton": "No password, ask to join instead",
         "dialogTitle": "Sala d'attesa",
         "disableDialogContent": "Sala d'attesa attiva. Questa funzione ti permette di non dare accesso alla riunione a partecipanti indesiderati. Vuoi disattivarla?",
         "disableDialogSubmit": "Disattiva",
-        "emailField": "Inserisci il tuo indirizzo e-mail",
+        "emailField": "Inserisci il tuo indirizzo Email",
         "enableDialogPasswordField": "Imposta password (opzionale)",
         "enableDialogSubmit": "Attiva",
         "enableDialogText": "La sala d'attesa ti permette di proteggere la tua riunione concedendo l'ingresso solo alle persone autorizzate da un moderatore.",
         "enterPasswordButton": "Inserisci password riunione",
         "enterPasswordTitle": "Inserisci la password per entrare nella riunione",
         "invalidPassword": "Password errata",
-        "joiningMessage": "Entrerai nella riunione non appena qualcuno approva la tua richiesta",
+        "joiningMessage": "Entrerai nella riunione, non appena qualcuno approva la tua richiesta",
         "joinWithPasswordMessage": "Ho inviato la password per entrare, attendi...",
         "joinRejectedMessage": "La tua richiesta d'accesso è stata respinta da un moderatore.",
-        "joinTitle": "Entra nella riunione",
+        "joinTitle": "Entra in riunione",
         "joiningTitle": "Richiesta inviata...",
-        "joiningWithPasswordTitle": "Accesso con password...",
+        "joiningWithPasswordTitle": "Entrando con la password...",
         "knockButton": "Chiedi d'entrare",
-        "knockTitle": "Qualcuno vuole entrare nella riunione",
+        "knockTitle": "Qualcuno vuole entrare in riunione",
         "nameField": "Scrivi il tuo nome",
         "notificationLobbyAccessDenied": "{{targetParticipantName}} è stato respinto da {{originParticipantName}}",
         "notificationLobbyAccessGranted": "{{targetParticipantName}} è stato autorizzato ad entrare da {{originParticipantName}}",

lang/main-ko.json

@@ -2,7 +2,7 @@
     "addPeople": {
         "add": "초대",
         "addContacts": "연락처로 초대하세요",
-        "copyInvite": "회의 초대 복사",
+        "copyInvite": "호의 초대 복사",
         "copyLink": "회의 링크 복사",
         "copyStream": "라이브 스트리밍 링크 복사",
         "countryNotSupported": "아직 해당 지역을 지원하지 않습니다.",
@@ -17,7 +17,7 @@
         "inviteMorePrompt": "더 많은 사람을 초대하세요",
         "linkCopied": "링크가 클립보드에 복사되었습니다.",
         "loading": "사람 및 전화번호 검색",
-        "loadingNumber": "전화번호 확인중",
+        "loadingNumber": "전화번호 확인 중",
         "loadingPeople": "초대할 사람 찾기",
         "noResults": "일치하는 검색 결과 없음",
         "noValidNumbers": "전화 번호를 입력하십시오.",
@@ -80,21 +80,21 @@
         "dontShowAgain": "다시 보지 않기"
     },
     "connectingOverlay": {
-        "joiningRoom": "회의에 연결중 ..."
+        "joiningRoom": "회의에 연결 중 ..."
     },
     "connection": {
         "ATTACHED": "첨부",
-        "AUTHENTICATING": "인증중",
+        "AUTHENTICATING": "인증 중",
         "AUTHFAIL": "인증 실패",
-        "CONNECTED": "연결됨",
-        "CONNECTING": "연결중",
+        "CONNECTED": "연결 됨",
+        "CONNECTING": "연결 중",
         "CONNFAIL": "연결 실패",
         "DISCONNECTED": "연결 끊김",
-        "DISCONNECTING": "연결 종료중",
+        "DISCONNECTING": "연결 종료 중",
         "ERROR": "에러",
-        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결중...",
-        "GET_SESSION_ID_ERROR": "세션 ID 가져오기 오류 : {{code}}",
-        "GOT_SESSION_ID": "세션 ID를 가져오는중 ... 완료",
+        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결 중...",
+        "GET_SESSION_ID_ERROR": "세션 ID 가져 오기 오류 : {{code}}",
+        "GOT_SESSION_ID": "세션 ID를 가져 오는 중 ... 완료",
         "LOW_BANDWIDTH": "대역폭을 절약하기 위해 {{displayName}}의 동영상이 중지되었습니다."
     },
     "connectionindicator": {
@@ -160,16 +160,16 @@
         },
         "add": "추가",
         "allow": "허락",
-        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오만 허용합니다.",
-        "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오만 허용됩니다",
+        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오 만 허용합니다.",
+        "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오 만 허용됩니다",
         "applicationWindow": "응용 프로그램 창",
         "Back": "뒤로가기",
         "cameraConstraintFailedError": "카메라가 필요한 제약 조건 중 일부를 만족하지 못합니다",
         "cameraNotFoundError": "카메라를 찾을 수 없습니다",
-        "cameraNotSendingData": "카메라에 액세스 할 수 없습니다. 다른 응용 프로그램이 장치를 사용하고 있는지 확인한 후 설정 메뉴에서 다른 장치를 선택하거나 응용 프로그램을 다시 로드하십시오.",
+        "cameraNotSendingData": "카메라에 액세스 할 수 없습니다. 다른 응용 프로그램이이 장치를 사용하고 있는지 확인한 후 설정 메뉴에서 다른 장치를 선택하거나 응용 프로그램을 다시로드하십시오.",
         "cameraNotSendingDataTitle": "카메라에 액세스 할 수 없습니다",
         "cameraPermissionDeniedError": "카메라 사용 권한을 부여하지 않았습니다. 회의에 계속 참여할 수 있지만 다른 참석자는 귀하를 볼 수 없습니다. 검색 주소창의 카메라 버튼을 사용하여 문제를 해결하십시오.",
-        "cameraUnknownError": "알 수 없는 이유로 카메라를 사용할 수 없습니다",
+        "cameraUnknownError": "알 수없는 이유로 카메라를 사용할 수 없습니다",
         "cameraUnsupportedResolutionError": "카메라가 필요한 비디오 해상도를 지원하지 않습니다",
         "Cancel": "취소",
         "close": "닫기",
@@ -182,7 +182,7 @@
         "confirmYes": "예",
         "connectError": "죄송합니다. 문제가 발생하여 회의에 연결할 수 없습니다",
         "connectErrorWithMsg": "죄송합니다. 뭔가 잘못되어 회의에 연결할 수 없습니다: {{msg}}",
-        "connecting": "연결중",
+        "connecting": "연결 중",
         "contactSupport": "지원 연락처",
         "copy": "복사",
         "dismiss": "",
@@ -190,7 +190,7 @@
         "done": "완료",
         "enterDisplayName": "당신의 이름을 입력해주세요.",
         "error": "에러",
-        "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야 합니다",
+        "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야합니다",
         "externalInstallationTitle": "확장 프로그램이 필요합니다",
         "goToStore": "웹 스토어로 이동",
         "gracefulShutdown": "서비스는 현재 유지 관리를 위해 중단되었습니다. 나중에 다시 시도 해주십시오.",
@@ -227,7 +227,7 @@
         "muteParticipantDialog": "",
         "muteParticipantTitle": "이 참가자를 음소거 하시겠습니까?",
         "Ok": "확인",
-        "passwordLabel": "잠긴 회의입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
+        "passwordLabel": "잠긴 회의 입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
         "passwordNotSupported": "회의 비밀번호 설정은 지원되지 않습니다",
         "passwordNotSupportedTitle": "비밀번호 미지원",
         "passwordRequired": "비밀번호 필수",
@@ -285,8 +285,8 @@
         "transcribing": "",
         "unlockRoom": "회의 비밀번호 제거",
         "userPassword": "사용자 비밀번호",
-        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
-        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트 인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트 인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
         "WaitingForHost": "호스트를 기다리는 중입니다…",
         "Yes": "예",
         "yourEntireScreen": "전체 화면"
@@ -371,8 +371,7 @@
         "toggleFilmstrip": "동영상 표시 또는 숨기기",
         "toggleScreensharing": "카메라와 화면 공유간에 전환",
         "toggleShortcuts": "도움말 메뉴 표시 또는 숨기기",
-        "videoMute": "카메라 시작 또는 중지",
-        "videoQuality": "비디오 품질"
+        "videoMute": "카메라 시작 또는 중지"
     },
     "liveStreaming": {
         "busy": "스트리밍 자원을 확보하기 위해 노력하고 있습니다. 몇 분 후에 다시 시도하십시오.",
@@ -383,7 +382,7 @@
         "enterStreamKey": "YouTube 실시간 스트리밍 키를 입력하십시오",
         "error": "실시간 스트리밍에 실패했습니다. 다시 시도하십시오.",
         "errorAPI": "YouTube 방송에 액세스하는 중에 오류가 발생했습니다. 다시 로그인하십시오.",
-        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화된 계정으로 로그인하십시오.",
+        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화 된 계정으로 로그인하십시오.",
         "expandedOff": "라이브 스트리밍이 중지되었습니다",
         "expandedOn": "현재 회의가 YouTube로 스트리밍되고 있습니다.",
         "expandedPending": "라이브 스트리밍이 시작됩니다 ...",
@@ -472,17 +471,17 @@
     "poweredby": "powered by",
     "presenceStatus": {
         "busy": "바쁨",
-        "calling": "전화 거는중",
-        "connected": "연결됨",
-        "connecting": "연결중",
-        "connecting2": "연결중*",
+        "calling": "전화 거는 중",
+        "connected": "연결 됨",
+        "connecting": "연결 중",
+        "connecting2": "연결 중*",
         "disconnected": "연결 끊김",
-        "expired": "만료됨",
-        "ignored": "무시됨",
-        "initializingCall": "통화 초기화중",
-        "invited": "초대됨",
-        "rejected": "거부됨",
-        "ringing": "전화중"
+        "expired": "만료 됨",
+        "ignored": "무시 됨",
+        "initializingCall": "통화 초기화 중",
+        "invited": "초대 됨",
+        "rejected": "거부 됨",
+        "ringing": "전화 중"
     },
     "profile": {
         "setDisplayNameLabel": "표시 이름 설정",
@@ -495,10 +494,10 @@
         "availableSpace": "사용 가능한 공간 : {{spaceLeft}}MB (약 {{duration}}분 녹화)",
         "beta": "베타",
         "busy": "레코딩 자원을 확보하고 있습니다. 몇 분 후에 다시 시도하십시오.",
-        "busyTitle": "모든 레코더가 현재 사용중입니다",
+        "busyTitle": "모든 레코더가 현재 사용 중입니다",
         "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
         "expandedOff": "레코딩이 중지됨",
-        "expandedOn": "회의가 현재 녹화중입니다.",
+        "expandedOn": "회의가 현재 녹화 중입니다.",
         "expandedPending": "녹화가 시작됩니다 ...",
         "failedToStart": "레코딩을 시작하지 못했습니다",
         "fileSharingdescription": "회의 참가자와 녹음 공유",
@@ -619,7 +618,7 @@
         "audioOnlyOff": "음성전용 모드 끄기",
         "audioOnlyOn": "음성전용 모드 끄기",
         "audioRoute": "음성 장비 선택하기",
-        "authenticate": "인증중",
+        "authenticate": "인증 중",
         "callQuality": "품질 설정하기",
         "chat": "대화 열기/닫기",
         "closeChat": "대화 닫기",
@@ -666,7 +665,7 @@
     "transcribing": {
         "ccButtonTooltip": "자막 시작/종료",
         "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
-        "expandedLabel": "현재 스크립트 작성중",
+        "expandedLabel": "현재 스크립트 작성 중",
         "failedToStart": "스크립트 작성을 시작하지 못했습니다.",
         "labelToolTip": "회의가 기록되고 있습니다.",
         "off": "스크립트 작성이 중지되었습니다.",
@@ -699,7 +698,7 @@
     },
     "videoStatus": {
         "audioOnly": "오디오 전용",
-        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유만 수신합니다.",
+        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유 만 수신합니다.",
         "callQuality": "비디오 품질",
         "hd": "HD",
         "highDefinition": "고해상도",

lang/main-nl.json

@@ -696,7 +696,7 @@
             "show": "Op podium weergeven",
             "speakerStats": "Sprekerstatistieken in- of uitschakelen",
             "tileView": "Tegelweergave in- of uitschakelen",
-            "toggleCamera": "Camera wisselen",
+            "toggleCamera": "Camera in- of uitschakelen",
             "toggleFilmstrip": "Filmstrip in- of uitschakelen",
             "videomute": "Video dempen in- of uitschakelen",
             "videoblur": "Video vervagen in- of uitschakelen"

lang/main-oc.json

@@ -314,8 +314,7 @@
         "e2eeDescription": "Lo chiframent del cap a la fin es actualament EXPERIMENTALA. Mercés de gardar a l'esperit qu'activar lo chiframent del cap a la fin desactivarà en efièch los servicis costat servidor coma : l'enregistrament, la difusion en dirècte e las participacions telefonicas. Remembratz tanben que la conferéncia foncionarà pas que per lo monde que participan amb un navigador compatible amb los fluxes inseribles.",
         "screenSharingFailed": "Ops ! Quicòm a trucat, avèm pas pogut començar lo partiment d'ecran!",
         "e2eeWarning": "AVERTIMENT : pas totes los participants d'aquesta conferéncia semblan poder suportar lo chiframent del cap a la fin. Se l'activatz poiràn pas vos veire nimai vos entendre.",
-        "muteEveryoneElseDialog": "Un còp mut, poiretz pas mai lo tornar la paraula, mas la se pòdon tornar quora vòlgan.",
-        "user": "utilizaire"
+        "muteEveryoneElseDialog": "Un còp mut, poiretz pas mai lo tornar la paraula, mas la se pòdon tornar quora vòlgan."
     },
     "dialOut": {
         "statusMessage": "ara es {{status}}"
@@ -550,8 +549,7 @@
         "signIn": "Connexion",
         "signOut": "Se desconnectar",
         "unavailable": "Ops ! Lo {{serviceName}} es pas disponible pel moment. Sèm a reglar aqueste problèma. Mercés de tornar ensajar mai tard.",
-        "unavailableTitle": "Enregistrament indisponible",
-        "serviceDescriptionCloud": "Enregistrament distant"
+        "unavailableTitle": "Enregistrament indisponible"
     },
     "sectionList": {
         "pullToRefresh": "Tirar per actualizar"
@@ -618,8 +616,7 @@
     },
     "startupoverlay": {
         "policyText": " ",
-        "title": "{{app}} a besonh d'utilizar vòstre microfòn e camèra.",
-        "genericTitle": "Aquesta reünion requerís l'utilizacion del microfòn e de la camèra."
+        "title": "{{app}} a besonh d'utilizar vòstre microfòn e camèra."
     },
     "suspendedoverlay": {
         "rejoinKeyTitle": "Tornar participar",
@@ -669,8 +666,7 @@
             "security": "Opcions de seguretat",
             "embedMeeting": "Conferéncia integrada",
             "grantModerator": "Passar moderator",
-            "lobbyButton": "Activar/Desactivar mòde sala d'espèra",
-            "toggleFilmstrip": "Bascular mòde benda film"
+            "lobbyButton": "Activar/Desactivar mòde sala d'espèra"
         },
         "addPeople": "Ajustar de monde a vòstra sonada",
         "audioOnlyOff": "Desactivar lo mòde connexion febla",
@@ -795,9 +791,7 @@
         "remoteControl": "Contraròtle alonhat",
         "show": "Mostrar davant",
         "videomute": "Lo participant a arrestat la camèra",
-        "domuteOthers": "Rendre mut totes los autres",
-        "connectionInfo": "Info connexion",
-        "grantModerator": "Nomenar moderator"
+        "domuteOthers": "Rendre mut totes los autres"
     },
     "welcomepage": {
         "accessibilityLabel": {
@@ -833,8 +827,7 @@
         "jitsiOnMobile": "Jitsi sus mobil –telecargatz nòstra aplicacion e començatz de conferéncias de pertot",
         "moderatedMessage": "O <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">reservatz una URL de conferéncia</a> a l'avança ont sètz l'unic moderator.",
         "jitsiMeet": "Jitsi Meet",
-        "secureMeetings": "Conferéncias seguras e de nauta qualitat",
-        "headerTitle": "Jitsi Meet"
+        "secureMeetings": "Conferéncias seguras e de nauta qualitat"
     },
     "helpView": {
         "header": "Centre d’ajuda"
@@ -891,14 +884,7 @@
             "videoFreezing": "Nos esperam a veire vòstra vidèo se gelar, venir negra e se pixelizar."
         },
         "premeeting": "Preconferéncia",
-        "errorMissingName": "Mercés de picar vòstre nom per rejónher la conferéncia",
-        "errorDialOutDisconnected": "Impossible de sonar aqueste numèro. Desconnectat",
-        "errorDialOutStatus": "Error en recuperant l’estat de la sonada sortissenta",
-        "errorDialOut": "Impossible de sonar aqueste numèro",
-        "errorDialOutFailed": "Impossible de sonar aqueste numèro. La sonada a fracassat",
-        "dialInMeeting": "Participatz a la reünion",
-        "dialInPin": "Participar a la reünion e picar lo còdi PIN :",
-        "iWantToDialIn": "Vòli me connectar"
+        "errorMissingName": "Mercés de picar vòstre nom per rejónher la conferéncia"
     },
     "lobby": {
         "reject": "Regetar",

lang/main-ptBR.json

@@ -546,8 +546,8 @@
         "errorValidation": "Validação do número falhou",
         "iWantToDialIn": "Eu quere discar",
         "joinAudioByPhone": "Participar com o áudio via ligação",
-        "joinMeeting": "Participar da reunião",
-        "joinWithoutAudio": "Participar sem áudio",
+        "joinMeeting": "Particar da reunião",
+        "joinWithoutAudio": "Particar sem áudio",
         "initiated": "Chamada iniciada",
         "linkCopied": "Link copiado para a área de transferência",
         "lookGood": "Seu microfone está funcionando corretamente",

lang/main-tr.json

@@ -404,7 +404,7 @@
         "invalidStreamKey": "Canlı akış anahtarı yanlış olabilir.",
         "off": "Canlı Akış durduruldu",
         "offBy": "{{name}} canlı akışı durdurdu",
-        "on": "Canlı Akış başlatıldı",
+        "on": "Canlı Akış",
         "onBy": "{{name}} canlı akışı başlattı",
         "pending": "Canlı Akış başlatılıyor...",
         "serviceName": "Canlı Akış hizmeti",
@@ -564,7 +564,7 @@
         "live": "CANLI",
         "loggedIn": "{{userName}} olarak giriş yapıldı",
         "off": "Kayıt durdu",
-        "on": "Kayıt başladı",
+        "on": "Kaydediliyor",
         "pending": "Toplantıyı kaydetmeye hazırlanıyor ...",
         "rec": "KAYIT",
         "serviceDescription": "Kaydınız kayıt hizmeti tarafından kaydedilecektir",
@@ -844,7 +844,7 @@
         "sendFeedback": "Geri bildirim gönder",
         "terms": "Kurallar",
         "title": "Güvenli, tüm özelliklere erişimli ve tamamen ücretsiz görüntülü arama"
-
+       
     },
 
     "lonelyMeetingExperience": {

lang/main-zhCN.json

@@ -298,7 +298,7 @@
         "tokenAuthFailed": "对不起，您未被允许参加此会议。",
         "tokenAuthFailedTitle": "认证失败",
         "transcribing": "转录中",
-        "unlockRoom": "移除会议 $t(lockRoomPassword)",
+        "unlockRoom": "",
         "userPassword": "用户密码",
         "WaitForHostMsg": "会议<b>{{room}}</b>尚未开始。如果您是主持人，请进行身份验证。否则，请等待主持人的到来。",
         "WaitForHostMsgWOk": "会议<b>{{room}}</b>尚未开始。如果您是主持人，请进行身份验证。否则，请等待主持人的到来。",

lang/main.json

@@ -416,7 +416,7 @@
         "invalidStreamKey": "Live stream key may be incorrect.",
         "off": "Live Streaming stopped",
         "offBy": "{{name}} stopped the live streaming",
-        "on": "Live Streaming started",
+        "on": "Live Streaming",
         "onBy": "{{name}} started the live streaming",
         "pending": "Starting Live Stream...",
         "serviceName": "Live Streaming service",
@@ -596,12 +596,11 @@
         "loggedIn": "Logged in as {{userName}}",
         "off": "Recording stopped",
         "offBy": "{{name}} stopped the recording",
-        "on": "Recording started",
+        "on": "Recording",
         "onBy": "{{name}} started the recording",
         "pending": "Preparing to record the meeting...",
         "rec": "REC",
         "serviceDescription": "Your recording will be saved by the recording service",
-        "serviceDescriptionCloud": "Cloud recording",
         "serviceName": "Recording service",
         "signIn": "Sign in",
         "signOut": "Sign out",
@@ -844,7 +843,6 @@
         "standardDefinition": "Standard definition"
     },
     "videothumbnail": {
-        "connectionInfo": "Connection Info",
         "domute": "Mute",
         "domuteOthers": "Mute everyone else",
         "flip": "Flip",

modules/API/API.js

@@ -14,8 +14,7 @@ import {
 } from '../../react/features/base/conference';
 import { parseJWTFromURLParams } from '../../react/features/base/jwt';
 import JitsiMeetJS, { JitsiRecordingConstants } from '../../react/features/base/lib-jitsi-meet';
-import { pinParticipant, getParticipantById } from '../../react/features/base/participants';
-import { setPrivateMessageRecipient } from '../../react/features/chat/actions';
+import { pinParticipant } from '../../react/features/base/participants';
 import {
     processExternalDeviceRequest
 } from '../../react/features/device-selection/functions';
@@ -331,24 +330,6 @@ function initCommands() {
             } else {
                 logger.error('No recording or streaming session found');
             }
-        },
-        'initiate-private-chat': participantId => {
-            const state = APP.store.getState();
-            const participant = getParticipantById(state, participantId);
-
-            if (participant) {
-                const { isOpen: isChatOpen } = state['features/chat'];
-
-                if (!isChatOpen) {
-                    APP.UI.toggleChat();
-                }
-                APP.store.dispatch(setPrivateMessageRecipient(participant));
-            } else {
-                logger.error('No participant found for the given participantId');
-            }
-        },
-        'cancel-private-chat': () => {
-            APP.store.dispatch(setPrivateMessageRecipient());
         }
     };
     transport.on('event', ({ data, name }) => {
@@ -432,15 +413,6 @@ function initCommands() {
         case 'is-sharing-screen':
             callback(Boolean(APP.conference.isSharingScreen));
             break;
-        case 'get-content-sharing-participants': {
-            const tracks = getState()['features/base/tracks'];
-            const sharingParticipantIds = tracks.filter(tr => tr.videoType === 'desktop').map(t => t.participantId);
-
-            callback({
-                sharingParticipantIds
-            });
-            break;
-        }
         default:
             return false;
         }
@@ -592,8 +564,8 @@ class API {
      * @returns {void}
      */
     notifyReceivedChatMessage(
-            { body, id, nick, privateMessage, ts }: {
-                body: *, id: string, nick: string, privateMessage: boolean, ts: *
+            { body, id, nick, ts }: {
+                body: *, id: string, nick: string, ts: *
             } = {}) {
         if (APP.conference.isLocalId(id)) {
             return;
@@ -604,7 +576,6 @@ class API {
             from: id,
             message: body,
             nick,
-            privateMessage,
             stamp: ts
         });
     }
@@ -685,19 +656,6 @@ class API {
         });
     }
 
-    /**
-     * Notify external application (if API is enabled) that the list of sharing participants changed.
-     *
-     * @param {Object} data - The event data.
-     * @returns {void}
-     */
-    notifySharingParticipantsChanged(data: Object) {
-        this._sendEvent({
-            name: 'content-sharing-participants-changed',
-            data
-        });
-    }
-
     /**
      * Notify external application (if API is enabled) that the device list has
      * changed.
@@ -1064,21 +1022,6 @@ class API {
         });
     }
 
-    /**
-     * Notify external application (if API is enabled) that user updated their hand raised.
-     *
-     * @param {string} id - User id.
-     * @param {boolean} handRaised - Whether user has raised hand.
-     * @returns {void}
-     */
-    notifyRaiseHandUpdated(id: string, handRaised: boolean) {
-        this._sendEvent({
-            name: 'raise-hand-updated',
-            handRaised,
-            id
-        });
-    }
-
     /**
      * Disposes the allocated resources.
      *

modules/API/external/external_api.js

@@ -28,13 +28,11 @@ const ALWAYS_ON_TOP_FILENAMES = [
  */
 const commands = {
     avatarUrl: 'avatar-url',
-    cancelPrivateChat: 'cancel-private-chat',
     displayName: 'display-name',
     e2eeKey: 'e2ee-key',
     email: 'email',
     toggleLobby: 'toggle-lobby',
     hangup: 'video-hangup',
-    intiatePrivateChat: 'initiate-private-chat',
     muteEveryone: 'mute-everyone',
     password: 'password',
     pinParticipant: 'pin-participant',
@@ -64,7 +62,6 @@ const events = {
     'audio-availability-changed': 'audioAvailabilityChanged',
     'audio-mute-status-changed': 'audioMuteStatusChanged',
     'camera-error': 'cameraError',
-    'content-sharing-participants-changed': 'contentSharingParticipantsChanged',
     'device-list-changed': 'deviceListChanged',
     'display-name-change': 'displayNameChange',
     'email-change': 'emailChange',
@@ -82,7 +79,6 @@ const events = {
     'participant-role-changed': 'participantRoleChanged',
     'password-required': 'passwordRequired',
     'proxy-connection-event': 'proxyConnectionEvent',
-    'raise-hand-updated': 'raiseHandUpdated',
     'video-ready-to-close': 'readyToClose',
     'video-conference-joined': 'videoConferenceJoined',
     'video-conference-left': 'videoConferenceLeft',
@@ -726,17 +722,6 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         return getAvailableDevices(this._transport);
     }
 
-    /**
-     * Gets a list of the currently sharing participant id's.
-     *
-     * @returns {Promise} - Resolves with the list of participant id's currently sharing.
-     */
-    getContentSharingParticipants() {
-        return this._transport.sendRequest({
-            name: 'get-content-sharing-participants'
-        });
-    }
-
     /**
      * Returns Promise that resolves with current selected devices.
      *

modules/UI/shared_video/SharedVideoThumb.js

@@ -7,7 +7,7 @@ import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
 import { i18next } from '../../../react/features/base/i18n';
-import { Thumbnail } from '../../../react/features/filmstrip';
+import Thumbnail from '../../../react/features/filmstrip/components/web/Thumbnail';
 import SmallVideo from '../videolayout/SmallVideo';
 /* eslint-enable no-unused-vars */
 
@@ -18,9 +18,11 @@ export default class SharedVideoThumb extends SmallVideo {
     /**
      *
      * @param {*} participant
+     * @param {*} videoType
+     * @param {*} VideoLayout
      */
-    constructor(participant) {
-        super();
+    constructor(participant, videoType, VideoLayout) {
+        super(VideoLayout);
         this.id = participant.id;
         this.isLocal = false;
         this.url = participant.id;

modules/UI/videolayout/LargeVideoManager.js

@@ -6,21 +6,18 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
-import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
 import { Avatar } from '../../../react/features/base/avatar';
 import { i18next } from '../../../react/features/base/i18n';
 import {
     JitsiParticipantConnectionStatus
 } from '../../../react/features/base/lib-jitsi-meet';
-import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media';
+import { VIDEO_TYPE } from '../../../react/features/base/media';
 import { getParticipantById } from '../../../react/features/base/participants';
-import { getTrackByMediaTypeAndParticipant } from '../../../react/features/base/tracks';
 import { CHAT_SIZE } from '../../../react/features/chat';
 import {
     updateKnownLargeVideoResolution
 } from '../../../react/features/large-video/actions';
 import { PresenceLabel } from '../../../react/features/presence-status';
-import { shouldDisplayTileView } from '../../../react/features/video-layout';
 /* eslint-enable no-unused-vars */
 import UIEvents from '../../../service/UI/UIEvents';
 import { createDeferred } from '../../util/helpers';
@@ -206,7 +203,8 @@ export default class LargeVideoManager {
             // FIXME this does not really make sense, because the videoType
             // (camera or desktop) is a completely different thing than
             // the video container type (Etherpad, SharedVideo, VideoContainer).
-            const isVideoContainer = LargeVideoManager.isVideoContainer(videoType);
+            const isVideoContainer
+                = LargeVideoManager.isVideoContainer(videoType);
 
             this.newStreamData = null;
 
@@ -221,15 +219,14 @@ export default class LargeVideoManager {
             this.updateAvatar();
 
             const isVideoMuted = !stream || stream.isMuted();
-            const state = APP.store.getState();
-            const participant = getParticipantById(state, id);
+            const participant = getParticipantById(APP.store.getState(), id);
             const connectionStatus = participant?.connectionStatus;
             const isVideoRenderable = !isVideoMuted
                 && (APP.conference.isLocalId(id) || connectionStatus === JitsiParticipantConnectionStatus.ACTIVE);
-            const isAudioOnly = APP.conference.isAudioOnly();
+
             const showAvatar
                 = isVideoContainer
-                    && ((isAudioOnly && videoType !== VIDEO_TYPE.DESKTOP) || !isVideoRenderable);
+                    && ((APP.conference.isAudioOnly() && videoType !== VIDEO_TYPE.DESKTOP) || !isVideoRenderable);
 
             let promise;
 
@@ -241,29 +238,6 @@ export default class LargeVideoManager {
                 // If the intention of this switch is to show the avatar
                 // we need to make sure that the video is hidden
                 promise = container.hide();
-
-                if ((!shouldDisplayTileView(state) || participant?.pinned) // In theory the tile view may not be
-                // enabled yet when we auto pin the participant.
-
-                        && participant && !participant.local && !participant.isFakeParticipant) {
-                    // remote participant only
-                    const track = getTrackByMediaTypeAndParticipant(
-                        state['features/base/tracks'], MEDIA_TYPE.VIDEO, id);
-                    const isScreenSharing = track?.videoType === 'desktop';
-
-                    if (isScreenSharing) {
-                        // send the event
-                        sendAnalytics(createScreenSharingIssueEvent({
-                            source: 'large-video',
-                            connectionStatus,
-                            isVideoMuted,
-                            isAudioOnly,
-                            isVideoContainer,
-                            videoType
-                        }));
-                    }
-                }
-
             } else {
                 promise = container.show();
             }

modules/UI/videolayout/LocalVideo.js

@@ -24,11 +24,12 @@ import SmallVideo from './SmallVideo';
 export default class LocalVideo extends SmallVideo {
     /**
      *
+     * @param {*} VideoLayout
      * @param {*} emitter
      * @param {*} streamEndedCallback
      */
-    constructor(emitter, streamEndedCallback) {
-        super();
+    constructor(VideoLayout, emitter, streamEndedCallback) {
+        super(VideoLayout);
         this.videoSpanId = 'localVideoContainer';
         this.streamEndedCallback = streamEndedCallback;
         this.container = this.createContainer();

modules/UI/videolayout/RemoteVideo.js

@@ -63,10 +63,11 @@ export default class RemoteVideo extends SmallVideo {
      * Creates new instance of the <tt>RemoteVideo</tt>.
      * @param user {JitsiParticipant} the user for whom remote video instance will
      * be created.
+     * @param {VideoLayout} VideoLayout the video layout instance.
      * @constructor
      */
-    constructor(user) {
-        super();
+    constructor(user, VideoLayout) {
+        super(VideoLayout);
 
         this.user = user;
         this.id = user.getId();

modules/UI/videolayout/SmallVideo.js

@@ -8,7 +8,6 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
-import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
 import { AudioLevelIndicator } from '../../../react/features/audio-level-indicator';
 import { Avatar as AvatarDisplay } from '../../../react/features/base/avatar';
 import { i18next } from '../../../react/features/base/i18n';
@@ -30,9 +29,9 @@ import { ConnectionIndicator } from '../../../react/features/connection-indicato
 import { DisplayName } from '../../../react/features/display-name';
 import {
     DominantSpeakerIndicator,
+    isVideoPlayable,
     RaisedHandIndicator,
-    StatusIndicators,
-    isVideoPlayable
+    StatusIndicators
 } from '../../../react/features/filmstrip';
 import {
     LAYOUTS,
@@ -91,7 +90,8 @@ export default class SmallVideo {
     /**
      * Constructor.
      */
-    constructor() {
+    constructor(VideoLayout) {
+        this.VideoLayout = VideoLayout;
         this.videoIsHovered = false;
         this.videoType = undefined;
 
@@ -244,7 +244,7 @@ export default class SmallVideo {
             = isLocal ? getLocalVideoTrack(tracks) : getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.VIDEO, id);
 
         if (typeof participant !== 'undefined' && !participant.isFakeParticipant && !participant.local) {
-            isScreenSharing = videoTrack?.videoType === 'desktop';
+            isScreenSharing = typeof track !== 'undefined' && videoTrack?.videoType === 'desktop';
             connectionStatus = participant.connectionStatus;
         }
 
@@ -315,18 +315,6 @@ export default class SmallVideo {
         if (this.displayMode !== oldDisplayMode) {
             logger.debug(`Displaying ${displayModeString} for ${this.id}, data: [${JSON.stringify(displayModeInput)}]`);
         }
-
-        if (this.displayMode !== DISPLAY_VIDEO
-            && this.displayMode !== DISPLAY_VIDEO_WITH_NAME
-            && displayModeInput.tileViewActive
-            && displayModeInput.isScreenSharing
-            && !displayModeInput.isAudioOnly) {
-            // send the event
-            sendAnalytics(createScreenSharingIssueEvent({
-                source: 'thumbnail',
-                ...displayModeInput
-            }));
-        }
     }
 
     /**