fix(screen-capture): disable.

[0] introduced sorted language keys, but we had the assumption that the
first one meant to indicate the default language.

Break that assumption and be explicit about English being the default
language.

[0]: 7fe319d965

.flowconfig

@@ -1,118 +0,0 @@
-[ignore]
-; We fork some components by platform
-.*/*[.]android.js
-
-; Ignore unexpected extra "@providesModule"
-.*/node_modules/.*/node_modules/fbjs/.*
-node_modules/react-native/Libraries/react-native/React.js
-
-; Ignore duplicate module providers
-; For RN Apps installed via npm, "Libraries" folder is inside
-; "node_modules/react-native" but in the source repo it is in the root
-node_modules/react-native/Libraries/react-native/React.js
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
-
-; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
-
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/HMRLoadingView.js
-
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
-
-; Ignore packages in node_modules which we (i.e. the jitsi-meet project) have
-; seen to cause errors and we have chosen not to fix.
-.*/node_modules/@atlaskit/.*/*.js.flow
-.*/node_modules/react-native-keep-awake/.*
-.*/node_modules/react-native-permissions/.*
-.*/node_modules/styled-components/.*
-
-.*/\.git/.*
-
-[include]
-
-[libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
-
-[options]
-emoji=true
-
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
-; We (i.e. the jitsi-meet project) are using the haste module system on Web as
-; well, not only on React Native. Unfortunately, Flow does not support .web.js
-; by default. Override Flow's defaults to include .web.js as well. Technically,
-; we have .native.js as well so the choice of .web.js may lead to errors.
-; Practically though, it is a potential future problem that we do not have at
-; the time of this writing.
-module.file_ext=.web.js
-; Flow's defaults:
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
-
-module.system=haste
-module.system.haste.use_name_reducers=true
-# get basename
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
-# strip .js or .js.flow suffix
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
-# strip .ios suffix
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-
-munge_underscores=true
-
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
-
-suppress_type=$FlowIssue
-suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
-
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-inexact-spread=warn
-unnecessary-invariant=warn
-signature-verification-failure=warn
-deprecated-utility=error
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
-
-[version]
-^0.104.0

.github/workflows/ci.yml

@@ -14,9 +14,12 @@ jobs:
     - run: npm install
     - name: Check git status
       run: git status
+    - name: Normalize lang files to ensure sorted
+      run: npm run lang-sort
     - name: Check git diff
       run: git diff
     - name: Check if the git repository is clean
       run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
     - run: npm run lint
+    - run: for file in lang/*.json; do npx jsonlint -q $file || exit 1; done
     - run: make

Makefile

@@ -102,7 +102,7 @@ deploy-facial-expressions:
 
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
-	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
+	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) && \
 	rm $(STYLES_BUNDLE)
 
 deploy-local:

android/app/build.gradle

@@ -76,7 +76,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    // https://github.com/facebook/react-native/issues/31572
+    // We can update past 1.4.0 on RN 0.68
+    implementation ('androidx.appcompat:appcompat:1.3.1') {
+        version {
+            strictly '1.3.1'
+        }
+    }
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 

android/app/src/main/res/values/styles.xml

@@ -3,5 +3,6 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-    </style>
+        <item name="android:windowDisablePreview">true</item>
+   </style>
 </resources>

android/build.gradle

@@ -7,12 +7,12 @@ import org.gradle.util.VersionNumber
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     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.2.2'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
     }
 }
 
@@ -22,6 +22,7 @@ ext {
     minSdkVersion    = 23
     targetSdkVersion = 31
     supportLibVersion = "28.0.0"
+    ndkVersion = "21.4.7075529"
 
     // The Maven artifact groupdId of the third-party react-native modules which
     // Jitsi Meet SDK for Android depends on and which are not available in
@@ -42,12 +43,20 @@ ext {
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
-        jcenter()
         // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
         maven { url "$rootDir/../node_modules/react-native/android" }
         // Android JSC is installed from npm.
         maven { url("$rootDir/../node_modules/jsc-android/dist") }
+        maven { url 'https://www.jitpack.io' }
+        // https://github.com/react-native-video/react-native-video/issues/2454
+        //noinspection JcenterRepositoryObsolete
+        jcenter() {
+            content {
+                includeModule("com.yqritc", "android-scalablevideoview")
+            }
+        }
     }
 
     // Make sure we use the react-native version in node_modules and not the one

android/gradle.properties

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

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Sep 23 11:48:00 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

android/gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -1,84 +1,89 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/sdk/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
+    ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -34,8 +35,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.fragment:fragment:1.2.5'
+    // https://github.com/facebook/react-native/issues/31572
+    // We can update past 1.4.0 on RN 0.68
+    implementation ('androidx.appcompat:appcompat:1.3.1') {
+        version {
+            strictly '1.3.1'
+        }
+    }
+    implementation 'androidx.fragment:fragment:1.4.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
@@ -76,6 +83,7 @@ dependencies {
     implementation project(':react-native-immersive')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-masked-view_masked-view')
+    implementation project(':react-native-pager-view')
     implementation project(':react-native-performance')
     implementation project(':react-native-reanimated')
     implementation project(':react-native-safe-area-context')

android/sdk/src/debug/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application android:usesCleartextTraffic="true">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
+</manifest>

android/sdk/src/main/AndroidManifest.xml

@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -36,7 +35,6 @@
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
             android:windowSoftInputMode="adjustResize"/>
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
         <service
             android:name=".ConnectionService"

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

@@ -16,6 +16,7 @@
 
 package org.jitsi.meet.sdk;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
@@ -54,6 +55,7 @@ import java.util.concurrent.Executors;
  * Before a call has started and after it has ended the
  * {@code AudioModeModule.DEFAULT} mode should be used.
  */
+@SuppressLint("AnnotateVersionCheck")
 @ReactModule(name = AudioModeModule.NAME)
 class AudioModeModule extends ReactContextBaseJavaModule {
     public static final String NAME = "AudioMode";
@@ -79,7 +81,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     /**
      * Whether or not the ConnectionService is used for selecting audio devices.
      */
-
     private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     private static boolean useConnectionService_ = supportsConnectionService;
 
@@ -148,6 +149,16 @@ class AudioModeModule extends ReactContextBaseJavaModule {
         audioManager = (AudioManager)reactContext.getSystemService(Context.AUDIO_SERVICE);
     }
 
+    @ReactMethod
+    public void addListener(String eventName) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
     /**
      * Gets a mapping with the constants this module is exporting.
      *

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

@@ -31,8 +31,7 @@ import java.util.Map;
  * Module implementing an API for sending events from JavaScript to native code.
  */
 @ReactModule(name = ExternalAPIModule.NAME)
-class ExternalAPIModule
-    extends ReactContextBaseJavaModule {
+class ExternalAPIModule extends ReactContextBaseJavaModule {
 
     public static final String NAME = "ExternalAPI";
 
@@ -57,6 +56,16 @@ class ExternalAPIModule
         ParticipantsService.init(reactContext);
     }
 
+    @ReactMethod
+    public void addListener(String eventName) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
     /**
      * Gets the name of this module to be used in the React Native bridge.
      *

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

@@ -59,6 +59,16 @@ class RNConnectionService extends ReactContextBaseJavaModule {
         super(reactContext);
     }
 
+    @ReactMethod
+    public void addListener(String eventName) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
     /**
      * Starts a new outgoing call.
      *

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

@@ -26,7 +26,6 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.LifecycleState;
-import com.facebook.react.devsupport.DevInternalSettings;
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
@@ -177,11 +176,12 @@ class ReactInstanceManagerHolder {
             = new ArrayList<>(Arrays.asList(
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
-                new com.calendarevents.CalendarEventsPackage(),
+                new com.calendarevents.RNCalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),
                 new com.reactnativecommunity.clipboard.ClipboardPackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),
+                new com.reactnativepagerview.PagerViewPackage(),
                 new com.oblador.performance.PerformancePackage(),
                 new com.reactnativecommunity.slider.ReactSliderPackage(),
                 new com.brentvatne.react.ReactVideoPackage(),
@@ -219,7 +219,7 @@ class ReactInstanceManagerHolder {
 
         // RNGoogleSigninPackage
         try {
-            Class<?> googlePackageClass = Class.forName("co.apptailor.googlesignin.RNGoogleSigninPackage");
+            Class<?> googlePackageClass = Class.forName("com.reactnativegooglesignin.RNGoogleSigninPackage");
             Constructor constructor = googlePackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
@@ -242,13 +242,6 @@ class ReactInstanceManagerHolder {
                 .setInitialLifecycleState(LifecycleState.RESUMED)
                 .build();
 
-        // Disable delta updates on Android, they have caused trouble.
-        DevInternalSettings devSettings
-            = (DevInternalSettings)reactInstanceManager.getDevSupportManager().getDevSettings();
-        if (devSettings != null) {
-            devSettings.setBundleDeltasEnabled(false);
-        }
-
         // Register our uncaught exception handler.
         JitsiMeetUncaughtExceptionHandler.register();
     }

android/settings.gradle

@@ -22,13 +22,15 @@ project(':react-native-gesture-handler').projectDir = new File(rootProject.proje
 include ':react-native-get-random-values'
 project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-get-random-values/android')
 include ':react-native-google-signin'
-project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
+project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-masked-view_masked-view'
 project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
+include ':react-native-pager-view'
+project(':react-native-pager-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-pager-view/android')
 include ':react-native-performance'
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
 include ':react-native-reanimated'

conference.js

@@ -135,7 +135,6 @@ import { mediaPermissionPromptVisibilityChanged, toggleSlowGUMOverlay } from './
 import { suspendDetected } from './react/features/power-monitor';
 import {
     initPrejoin,
-    isPrejoinPageEnabled,
     isPrejoinPageVisible,
     makePrecallTest,
     setJoiningInProgress,
@@ -797,7 +796,21 @@ export default {
             logger.warn('initial device list initialization failed', error);
         }
 
-        if (isPrejoinPageEnabled(APP.store.getState())) {
+        const handleStartAudioMuted = (options, tracks) => {
+            if (options.startWithAudioMuted) {
+                // Always add the track on Safari because of a known issue where audio playout doesn't happen
+                // if the user joins audio and video muted, i.e., if there is no local media capture.
+                if (browser.isWebKitBased()) {
+                    this.muteAudio(true, true);
+                } else {
+                    return tracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
+                }
+            }
+
+            return tracks;
+        };
+
+        if (isPrejoinPageVisible(APP.store.getState())) {
             _connectionPromise = connect(roomName).then(c => {
                 // we want to initialize it early, in case of errors to be able
                 // to gather logs
@@ -828,25 +841,28 @@ export default {
 
             this._displayErrorsForCreateInitialLocalTracks(errors);
 
-            return this._setLocalAudioVideoStreams(tracks);
+            let localTracks = handleStartAudioMuted(initialOptions, tracks);
+
+            // in case where gum is slow and resolves after the startAudio/VideoMuted coming from jicofo, we can be
+            // join unmuted even though jicofo had instruct us to mute, so let's respect that before passing the tracks
+            if (!browser.isWebKitBased()) {
+                if (room?.isStartAudioMuted()) {
+                    localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
+                }
+            }
+
+            if (room?.isStartVideoMuted()) {
+                localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.VIDEO);
+            }
+
+            return this._setLocalAudioVideoStreams(localTracks);
         }
 
         const [ tracks, con ] = await this.createInitialLocalTracksAndConnect(roomName, initialOptions);
-        let localTracks = tracks;
 
         this._initDeviceList(true);
 
-        if (initialOptions.startWithAudioMuted) {
-            // Always add the track on Safari because of a known issue where audio playout doesn't happen
-            // if the user joins audio and video muted, i.e., if there is no local media capture.
-            if (browser.isWebKitBased()) {
-                this.muteAudio(true, true);
-            } else {
-                localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
-            }
-        }
-
-        return this.startConference(con, localTracks);
+        return this.startConference(con, handleStartAudioMuted(initialOptions, tracks));
     },
 
     /**

config.js

@@ -615,41 +615,61 @@ var config = {
     //     alwaysVisible: false
     // },
 
-    // Toolbar buttons which have their click event exposed through the API on
-    // `toolbarButtonClicked` event instead of executing the normal click routine.
+    // Toolbar buttons which have their click/tap event exposed through the API on
+    // `toolbarButtonClicked`. Passing a string for the button key will
+    // prevent execution of the click/tap routine; passing an object with `key` and
+    // `preventExecution` flag on false will not prevent execution of the click/tap
+    // routine. Below array with mixed mode for passing the buttons.
     // buttonsWithNotifyClick: [
-    //    'camera',
-    //    'chat',
-    //    'closedcaptions',
-    //    'desktop',
-    //    'download',
-    //    'embedmeeting',
-    //    'etherpad',
-    //    'feedback',
-    //    'filmstrip',
-    //    'fullscreen',
-    //    'hangup',
-    //    'help',
-    //    'invite',
-    //    'livestreaming',
-    //    'microphone',
-    //    'mute-everyone',
-    //    'mute-video-everyone',
-    //    'participants-pane',
-    //    'profile',
-    //    'raisehand',
-    //    'recording',
-    //    'security',
-    //    'select-background',
-    //    'settings',
-    //    'shareaudio',
-    //    'sharedvideo',
-    //    'shortcuts',
-    //    'stats',
-    //    'tileview',
-    //    'toggle-camera',
-    //    'videoquality',
-    //    '__end'
+    //     'camera',
+    //     {
+    //         key: 'chat',
+    //         preventExecution: false
+    //     },
+    //     {
+    //         key: 'closedcaptions',
+    //         preventExecution: true
+    //     },
+    //     'desktop',
+    //     'download',
+    //     'embedmeeting',
+    //     'etherpad',
+    //     'feedback',
+    //     'filmstrip',
+    //     'fullscreen',
+    //     'hangup',
+    //     'help',
+    //     {
+    //         key: 'invite',
+    //         preventExecution: false
+    //     },
+    //     'livestreaming',
+    //     'microphone',
+    //     'mute-everyone',
+    //     'mute-video-everyone',
+    //     'participants-pane',
+    //     'profile',
+    //     {
+    //         key: 'raisehand',
+    //         preventExecution: true
+    //     },
+    //     'recording',
+    //     'security',
+    //     'select-background',
+    //     'settings',
+    //     'shareaudio',
+    //     'sharedvideo',
+    //     'shortcuts',
+    //     'stats',
+    //     'tileview',
+    //     'toggle-camera',
+    //     'videoquality',
+    //     // The add passcode button from the security dialog.
+    //     {
+    //         key: 'add-passcode',
+    //         preventExecution: false
+    //     }
+    //     '__end'
     // ],
 
     // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
@@ -1025,14 +1045,15 @@ var config = {
     // If true, tile view will not be enabled automatically when the participants count threshold is reached.
     // disableTileView: true,
 
-    // If true, the tiles will be displayed contained within the available space rather than enlarged to cover it.
+    // If true, the tiles will be displayed contained within the available space rather than enlarged to cover it,
+    // with a 16:9 aspect ratio (old behaviour).
     // disableTileEnlargement: true,
 
     // Controls the visibility and behavior of the top header conference info labels.
     // If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
     // conferenceInfo: {
     //     // those labels will not be hidden in tandem with the toolbox.
-    //     alwaysVisible: ['recording', 'local-recording'],
+    //     alwaysVisible: ['recording', 'local-recording', 'raised-hands-count'],
     //     // those labels will be auto-hidden in tandem with the toolbox buttons.
     //     autoHide: [
     //         'subject',

css/_audio-preview.scss

@@ -121,9 +121,18 @@
             }
         }
 
-        .audio-preview-entry-text {
-            max-width: 178px;
+        &--nometer {
+            .audio-preview-entry-text {
+                max-width: 238px;
+            }
         }
+
+        &--withmeter {
+            .audio-preview-entry-text {
+                max-width: 178px;
+            }
+        }
+
     }
 
     &-icon {

css/_base.scss

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

css/_subject.scss

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

css/_toolbars.scss

@@ -30,7 +30,7 @@
     transition: bottom .3s ease-in;
     width: 100%;
     pointer-events: none;
-
+    z-index: $toolbarZ + 2;
 
     &.visible {
         bottom: 0;

css/filmstrip/_filmstrip_toolbar.scss

@@ -1,30 +0,0 @@
-.filmstrip__toolbar {
-    @include flex();
-    flex-direction: column-reverse;
-    flex-wrap: nowrap;
-    position: relative;
-    width: $filmstripToggleButtonWidth;
-
-    button {
-        font-size: 14px;
-        line-height: 1.2;
-        text-align: center;
-        background: transparent;
-        opacity: 0.7;
-        height: auto;
-        width: 100%;
-        padding: 0;
-        margin: 0;
-        border: none;
-
-        -webkit-appearance: none;
-
-        &:hover {
-            opacity: 1;
-        }
-
-        i {
-            cursor: pointer;
-        }
-    }
-}

css/filmstrip/_horizontal_filmstrip.scss

@@ -6,11 +6,8 @@
 }
 
 .horizontal-filmstrip .filmstrip {
-    bottom: 0;
-    right: 0;
     padding: 10px 5px;
     @extend %align-right;
-    transition: bottom .3s;
     z-index: $filmstripVideosZ;
     box-sizing: border-box;
     width: 100%;
@@ -58,7 +55,7 @@
         }
 
         &.hidden {
-            bottom: calc(-196px - #{$newToolbarSizeWithPadding});
+            bottom: calc(-196px - #{$newToolbarSizeWithPadding} + 50px);
         }
     }
 

css/filmstrip/_tile_view_overrides.scss

@@ -17,8 +17,7 @@
     #dominantSpeaker,
     #filmstripLocalVideoThumbnail,
     #largeVideoElementsContainer,
-    #sharedVideo,
-    .filmstrip__toolbar {
+    #sharedVideo {
         display: none;
     }
 

css/filmstrip/_vertical_filmstrip.scss

@@ -37,7 +37,6 @@
      */
     position: fixed;
     top: 0;
-    transition: height .3s ease-in;
     right: 0;
     z-index: $filmstripVideosZ;
 
@@ -52,11 +51,6 @@
         right: 0;
         width: auto;
 
-        &.hidden {
-            bottom: auto;
-            right: -196px;
-        }
-
         /**
          * An id selector is used to match id specificity with existing
          * filmstrip styles.
@@ -64,7 +58,6 @@
         &#remoteVideos {
             border: $thumbnailsBorder solid transparent;
             padding-left: 0;
-            transition: right 2s;
             width: 100%;
         }
     }

css/filmstrip/_vertical_filmstrip_overrides.scss

@@ -1,11 +1,3 @@
-/**
- * Rotate the hide filmstrip icon so it points towards the right edge
- * of the screen.
- */
-.vertical-filmstrip .filmstrip__toolbar {
-    transform: rotate(-90deg);
-}
-
 /**
  * Overrides for video containers that should not be centered aligned to avoid=
  * clashing with the filmstrip.

css/main.scss

@@ -69,7 +69,6 @@ $flagsImagePath: "../images/";
 @import '404';
 @import 'policy';
 @import 'popover';
-@import 'filmstrip/filmstrip_toolbar';
 @import 'filmstrip/horizontal_filmstrip';
 @import 'filmstrip/small_video';
 @import 'filmstrip/tile_view';

css/modals/virtual-background/_virtual-background.scss

@@ -201,3 +201,7 @@
     top: 40%;
     left: 45%;
 }
+
+.dialog-margin-top{
+    margin-top: 44px;
+}

css/premeeting/_lobby.scss

@@ -41,64 +41,6 @@
     }
 }
 
-#notification-participant-list {
-    background-color: $newToolbarBackgroundColor;
-    border: 1px solid rgba(255, 255, 255, .4);
-    border-radius: 8px;
-    left: 0;
-    margin: 20px;
-    max-height: 600px;
-    overflow: hidden;
-    overflow-y: auto;
-    position: fixed;
-    top: 30px;
-    z-index: $toolbarZ + 1;
-
-    &:empty {
-        border: none;
-    }
-
-    &.toolbox-visible {
-        // Same as toolbox subject position
-        top: 120px;
-    }
-
-    .title {
-        background-color: rgba(0, 0, 0, .2);
-        font-size: 1.2em;
-        padding: 15px
-    }
-
-    button {
-        align-self: stretch;
-        margin-bottom: 8px 0;
-        padding: 12px;
-        transition: .2s transform ease;
-
-        &:disabled {
-            opacity: .5;
-        }
-
-        &:hover {
-            transform: scale(1.05);
-
-            &:disabled {
-                transform: none;
-            }
-        }
-
-        &.borderLess {
-            background-color: transparent;
-            border-width: 0;
-        }
-
-        &.primary {
-            background-color: rgb(3, 118, 218);
-            border-width: 0;
-        }
-    }
-}
-
 .knocking-participants-container {
     list-style-type: none;
     padding: 0 15px 15px 15px;

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

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

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

@@ -1,6 +0,0 @@
-// flow-typed signature: 4e6a5da3290fe9ea49e6bcdced64f358
-// flow-typed version: c6154227d1/flow-bin_v0.x.x/flow_>=v0.25.x <=v0.103.x
-
-declare module "flow-bin" {
-  declare module.exports: string;
-}

flow-typed/npm/react-redux_v7.x.x.js

@@ -1,300 +0,0 @@
-// flow-typed signature: 8da1e134b3de1d6f6bf9ba1cc7e2dc7e
-// flow-typed version: 387a235736/react-redux_v7.x.x/flow_>=v0.104.x
-
-/**
-The order of type arguments for connect() is as follows:
-
-connect<Props, OwnProps, StateProps, DispatchProps, State, Dispatch>(…)
-
-In Flow v0.89 only the first two are mandatory to specify. Other 4 can be repaced with the new awesome type placeholder:
-
-connect<Props, OwnProps, _, _, _, _>(…)
-
-But beware, in case of weird type errors somewhere in random places
-just type everything and get to a green field and only then try to
-remove the definitions you see bogus.
-
-Decrypting the abbreviations:
-  WC = Component being wrapped
-  S = State
-  D = Dispatch
-  OP = OwnProps
-  SP = StateProps
-  DP = DispatchProps
-  MP = Merge props
-  RSP = Returned state props
-  RDP = Returned dispatch props
-  RMP = Returned merge props
-  CP = Props for returned component
-  Com = React Component
-  SS = Selected state
-  ST = Static properties of Com
-  EFO = Extra factory options (used only in connectAdvanced)
-*/
-
-declare module "react-redux" {
-  // ------------------------------------------------------------
-  // Typings for connect()
-  // ------------------------------------------------------------
-
-  declare export type Options<S, OP, SP, MP> = {|
-    pure?: boolean,
-    forwardRef?: boolean,
-    areStatesEqual?: (next: S, prev: S) => boolean,
-    areOwnPropsEqual?: (next: OP, prev: OP) => boolean,
-    areStatePropsEqual?: (next: SP, prev: SP) => boolean,
-    areMergedPropsEqual?: (next: MP, prev: MP) => boolean,
-    storeKey?: string,
-  |};
-
-  declare type MapStateToProps<-S, -OP, +SP> =
-    | ((state: S, ownProps: OP) => SP)
-    // If you want to use the factory function but get a strange error
-    // like "function is not an object" then just type the factory function
-    // like this:
-    // const factory: (State, OwnProps) => (State, OwnProps) => StateProps
-    // and provide the StateProps type to the SP type parameter.
-    | ((state: S, ownProps: OP) => (state: S, ownProps: OP) => SP);
-
-  declare type Bind<D> = <A, R>((...A) => R) => (...A) => $Call<D, R>;
-
-  declare type MapDispatchToPropsFn<D, -OP, +DP> =
-    | ((dispatch: D, ownProps: OP) => DP)
-    // If you want to use the factory function but get a strange error
-    // like "function is not an object" then just type the factory function
-    // like this:
-    // const factory: (Dispatch, OwnProps) => (Dispatch, OwnProps) => DispatchProps
-    // and provide the DispatchProps type to the DP type parameter.
-    | ((dispatch: D, ownProps: OP) => (dispatch: D, ownProps: OP) => DP);
-
-  declare class ConnectedComponent<OP, +WC> extends React$Component<OP> {
-    static +WrappedComponent: WC;
-    getWrappedInstance(): React$ElementRef<WC>;
-  }
-  // The connection of the Wrapped Component and the Connected Component
-  // happens here in `MP: P`. It means that type wise MP belongs to P,
-  // so to say MP >= P.
-  declare type Connector<P, OP, MP: P> = <WC: React$ComponentType<P>>(
-    WC,
-  ) => Class<ConnectedComponent<OP, WC>> & WC;
-
-  // No `mergeProps` argument
-
-  // Got error like inexact OwnProps is incompatible with exact object type?
-  // Just make the OP parameter for `connect()` an exact object.
-  declare type MergeOP<OP, D> = {| ...$Exact<OP>, dispatch: D |};
-  declare type MergeOPSP<OP, SP, D> = {| ...$Exact<OP>, ...SP, dispatch: D |};
-  declare type MergeOPDP<OP, DP> = {| ...$Exact<OP>, ...DP |};
-  declare type MergeOPSPDP<OP, SP, DP> = {| ...$Exact<OP>, ...SP, ...DP |};
-
-  declare export function connect<-P, -OP, -SP, -DP, -S, -D>(
-    mapStateToProps?: null | void,
-    mapDispatchToProps?: null | void,
-    mergeProps?: null | void,
-    options?: ?Options<S, OP, {||}, MergeOP<OP, D>>,
-  ): Connector<P, OP, MergeOP<OP, D>>;
-
-  declare export function connect<-P, -OP, -SP, -DP, -S, -D>(
-    // If you get error here try adding return type to your mapStateToProps function
-    mapStateToProps: MapStateToProps<S, OP, SP>,
-    mapDispatchToProps?: null | void,
-    mergeProps?: null | void,
-    options?: ?Options<S, OP, SP, MergeOPSP<OP, SP, D>>,
-  ): Connector<P, OP, MergeOPSP<OP, SP, D>>;
-
-  // In this case DP is an object of functions which has been bound to dispatch
-  // by the given mapDispatchToProps function.
-  declare export function connect<-P, -OP, -SP, -DP, S, D>(
-    mapStateToProps: null | void,
-    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
-    mergeProps?: null | void,
-    options?: ?Options<S, OP, {||}, MergeOPDP<OP, DP>>,
-  ): Connector<P, OP, MergeOPDP<OP, DP>>;
-
-  // In this case DP is an object of action creators not yet bound to dispatch,
-  // this difference is not important in the vanila redux,
-  // but in case of usage with redux-thunk, the return type may differ.
-  declare export function connect<-P, -OP, -SP, -DP, S, D>(
-    mapStateToProps: null | void,
-    mapDispatchToProps: DP,
-    mergeProps?: null | void,
-    options?: ?Options<S, OP, {||}, MergeOPDP<OP, DP>>,
-  ): Connector<P, OP, MergeOPDP<OP, $ObjMap<DP, Bind<D>>>>;
-
-  declare export function connect<-P, -OP, -SP, -DP, S, D>(
-    // If you get error here try adding return type to your mapStateToProps function
-    mapStateToProps: MapStateToProps<S, OP, SP>,
-    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
-    mergeProps?: null | void,
-    options?: ?Options<S, OP, SP, {| ...OP, ...SP, ...DP |}>,
-  ): Connector<P, OP, {| ...OP, ...SP, ...DP |}>;
-
-  declare export function connect<-P, -OP, -SP, -DP, S, D>(
-    // If you get error here try adding return type to your mapStateToProps function
-    mapStateToProps: MapStateToProps<S, OP, SP>,
-    mapDispatchToProps: DP,
-    mergeProps?: null | void,
-    options?: ?Options<S, OP, SP, MergeOPSPDP<OP, SP, DP>>,
-  ): Connector<P, OP, MergeOPSPDP<OP, SP, $ObjMap<DP, Bind<D>>>>;
-
-  // With `mergeProps` argument
-
-  declare type MergeProps<+P, -OP, -SP, -DP> = (
-    stateProps: SP,
-    dispatchProps: DP,
-    ownProps: OP,
-  ) => P;
-
-  declare export function connect<-P, -OP, -SP: {||}, -DP: {||}, S, D>(
-    mapStateToProps: null | void,
-    mapDispatchToProps: null | void,
-    // If you get error here try adding return type to you mapStateToProps function
-    mergeProps: MergeProps<P, OP, {||}, {| dispatch: D |}>,
-    options?: ?Options<S, OP, {||}, P>,
-  ): Connector<P, OP, P>;
-
-  declare export function connect<-P, -OP, -SP, -DP: {||}, S, D>(
-    mapStateToProps: MapStateToProps<S, OP, SP>,
-    mapDispatchToProps: null | void,
-    // If you get error here try adding return type to you mapStateToProps function
-    mergeProps: MergeProps<P, OP, SP, {| dispatch: D |}>,
-    options?: ?Options<S, OP, SP, P>,
-  ): Connector<P, OP, P>;
-
-  // In this case DP is an object of functions which has been bound to dispatch
-  // by the given mapDispatchToProps function.
-  declare export function connect<-P, -OP, -SP: {||}, -DP, S, D>(
-    mapStateToProps: null | void,
-    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
-    mergeProps: MergeProps<P, OP, {||}, DP>,
-    options?: ?Options<S, OP, {||}, P>,
-  ): Connector<P, OP, P>;
-
-  // In this case DP is an object of action creators not yet bound to dispatch,
-  // this difference is not important in the vanila redux,
-  // but in case of usage with redux-thunk, the return type may differ.
-  declare export function connect<-P, -OP, -SP: {||}, -DP, S, D>(
-    mapStateToProps: null | void,
-    mapDispatchToProps: DP,
-    mergeProps: MergeProps<P, OP, {||}, $ObjMap<DP, Bind<D>>>,
-    options?: ?Options<S, OP, {||}, P>,
-  ): Connector<P, OP, P>;
-
-  // In this case DP is an object of functions which has been bound to dispatch
-  // by the given mapDispatchToProps function.
-  declare export function connect<-P, -OP, -SP, -DP, S, D>(
-    mapStateToProps: MapStateToProps<S, OP, SP>,
-    mapDispatchToProps: MapDispatchToPropsFn<D, OP, DP>,
-    mergeProps: MergeProps<P, OP, SP, DP>,
-    options?: ?Options<S, OP, SP, P>,
-  ): Connector<P, OP, P>;
-
-  // In this case DP is an object of action creators not yet bound to dispatch,
-  // this difference is not important in the vanila redux,
-  // but in case of usage with redux-thunk, the return type may differ.
-  declare export function connect<-P, -OP, -SP, -DP, S, D>(
-    mapStateToProps: MapStateToProps<S, OP, SP>,
-    mapDispatchToProps: DP,
-    mergeProps: MergeProps<P, OP, SP, $ObjMap<DP, Bind<D>>>,
-    options?: ?Options<S, OP, SP, P>,
-  ): Connector<P, OP, P>;
-
-  // ------------------------------------------------------------
-  // Typings for Hooks
-  // ------------------------------------------------------------
-
-  declare export function useDispatch<D>(): D;
-
-  declare export function useSelector<S, SS>(
-    selector: (state: S) => SS,
-    equalityFn?: (a: SS, b: SS) => boolean,
-  ): SS;
-
-  declare export function useStore<Store>(): Store;
-
-  // ------------------------------------------------------------
-  // Typings for Provider
-  // ------------------------------------------------------------
-
-  declare export class Provider<Store> extends React$Component<{
-    store: Store,
-    children?: React$Node,
-    ...
-  }> {}
-
-  declare export function createProvider(
-    storeKey?: string,
-    subKey?: string,
-  ): Class<Provider<*>>;
-
-  // ------------------------------------------------------------
-  // Typings for connectAdvanced()
-  // ------------------------------------------------------------
-
-  declare type ConnectAdvancedOptions = {
-    getDisplayName?: (name: string) => string,
-    methodName?: string,
-    renderCountProp?: string,
-    shouldHandleStateChanges?: boolean,
-    storeKey?: string,
-    forwardRef?: boolean,
-    ...
-  };
-
-  declare type SelectorFactoryOptions<Com> = {
-    getDisplayName: (name: string) => string,
-    methodName: string,
-    renderCountProp: ?string,
-    shouldHandleStateChanges: boolean,
-    storeKey: string,
-    forwardRef: boolean,
-    displayName: string,
-    wrappedComponentName: string,
-    WrappedComponent: Com,
-    ...
-  };
-
-  declare type MapStateToPropsEx<S: Object, SP: Object, RSP: Object> = (
-    state: S,
-    props: SP,
-  ) => RSP;
-
-  declare type SelectorFactory<
-    Com: React$ComponentType<*>,
-    Dispatch,
-    S: Object,
-    OP: Object,
-    EFO: Object,
-    CP: Object,
-  > = (
-    dispatch: Dispatch,
-    factoryOptions: SelectorFactoryOptions<Com> & EFO,
-  ) => MapStateToPropsEx<S, OP, CP>;
-
-  declare export function connectAdvanced<
-    Com: React$ComponentType<*>,
-    D,
-    S: Object,
-    OP: Object,
-    CP: Object,
-    EFO: Object,
-    ST: { [_: $Keys<Com>]: any, ... },
-  >(
-    selectorFactory: SelectorFactory<Com, D, S, OP, EFO, CP>,
-    connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),
-  ): (component: Com) => React$ComponentType<OP> & $Shape<ST>;
-
-  declare export function batch(() => void): void
-
-  declare export default {
-    Provider: typeof Provider,
-    createProvider: typeof createProvider,
-    connect: typeof connect,
-    connectAdvanced: typeof connectAdvanced,
-    useDispatch: typeof useDispatch,
-    useSelector: typeof useSelector,
-    useStore: typeof useStore,
-    batch: typeof batch,
-    ...
-  };
-}

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

@@ -1,100 +0,0 @@
-// flow-typed signature: 99b2d8ebd0ab4be20976dc62a3bbf54c
-// flow-typed version: c6154227d1/redux_v4.x.x/flow_>=v0.89.x <=v0.103.x
-
-declare module 'redux' {
-  /*
-
-    S = State
-    A = Action
-    D = Dispatch
-
-  */
-
-  declare export type Action<T> = {
-    type: T
-  }
-
-  declare export type DispatchAPI<A> = (action: A) => A;
-
-  declare export type Dispatch<A: { type: * }> = DispatchAPI<A>;
-
-  declare export type MiddlewareAPI<S, A, D = Dispatch<A>> = {
-    dispatch: D,
-    getState(): S,
-  };
-
-  declare export type Store<S, A, D = Dispatch<A>> = {
-    // rewrite MiddlewareAPI members in order to get nicer error messages (intersections produce long messages)
-    dispatch: D,
-    getState(): S,
-    subscribe(listener: () => void): () => void,
-    replaceReducer(nextReducer: Reducer<S, A>): void,
-  };
-
-  declare export type Reducer<S, A> = (state: S | void, action: A) => S;
-
-  declare export type CombinedReducer<S, A> = (
-    state: ($Shape<S> & {}) | void,
-    action: A
-  ) => S;
-
-  declare export type Middleware<S, A, D = Dispatch<A>> = (
-    api: MiddlewareAPI<S, A, D>
-  ) => (next: D) => D;
-
-  declare export type StoreCreator<S, A, D = Dispatch<A>> = {
-    (reducer: Reducer<S, A>, enhancer?: StoreEnhancer<S, A, D>): Store<S, A, D>,
-    (
-      reducer: Reducer<S, A>,
-      preloadedState: S,
-      enhancer?: StoreEnhancer<S, A, D>
-    ): Store<S, A, D>,
-  };
-
-  declare export type StoreEnhancer<S, A, D = Dispatch<A>> = (
-    next: StoreCreator<S, A, D>
-  ) => StoreCreator<S, A, D>;
-
-  declare export function createStore<S, A, D>(
-    reducer: Reducer<S, A>,
-    enhancer?: StoreEnhancer<S, A, D>
-  ): Store<S, A, D>;
-  declare export function createStore<S, A, D>(
-    reducer: Reducer<S, A>,
-    preloadedState?: S,
-    enhancer?: StoreEnhancer<S, A, D>
-  ): Store<S, A, D>;
-
-  declare export function applyMiddleware<S, A, D>(
-    ...middlewares: Array<Middleware<S, A, D>>
-  ): StoreEnhancer<S, A, D>;
-
-  declare export type ActionCreator<A, B> = (...args: Array<B>) => A;
-  declare export type ActionCreators<K, A> = {
-    [key: K]: ActionCreator<A, any>,
-  };
-
-  declare export function bindActionCreators<
-    A,
-    C: ActionCreator<A, any>,
-    D: DispatchAPI<A>
-  >(
-    actionCreator: C,
-    dispatch: D
-  ): C;
-  declare export function bindActionCreators<
-    A,
-    K,
-    C: ActionCreators<K, A>,
-    D: DispatchAPI<A>
-  >(
-    actionCreators: C,
-    dispatch: D
-  ): C;
-
-  declare export function combineReducers<O: {}, A>(
-    reducers: O
-  ): CombinedReducer<$ObjMap<O, <S>(r: Reducer<S, any>) => S>, A>;
-
-  declare export var compose: $Compose;
-}

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

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

ios/Podfile

@@ -1,6 +1,9 @@
+require_relative '../node_modules/react-native/scripts/react_native_pods'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+
 platform :ios, '12.0'
 workspace 'jitsi-meet'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+
 install! 'cocoapods', :deterministic_uuids => false
 
 target 'JitsiMeet' do
@@ -17,84 +20,33 @@ target 'JitsiMeetSDK' do
   # React Native and its dependencies
   #
 
-  pod 'FBLazyVector', :path => '../node_modules/react-native/Libraries/FBLazyVector/'
-  pod 'FBReactNativeSpec', :path => '../node_modules/react-native/Libraries/FBReactNativeSpec/'
-  pod 'RCTRequired', :path => '../node_modules/react-native/Libraries/RCTRequired/'
-  pod 'RCTTypeSafety', :path => '../node_modules/react-native/Libraries/TypeSafety/'
-  pod 'React', :path => '../node_modules/react-native/'
-  pod 'ReactCommon', :path => '../node_modules/react-native/ReactCommon', :subspecs => [
-    'turbomodule'
-  ]
-  pod 'React-Core', :path => '../node_modules/react-native/', :subspecs => [
-    'CoreModulesHeaders',
-    'DevSupport',
-    'RCTWebSocket'
-  ], :modular_headers => true
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-
-  # React Native plugins
-  #
-
-  pod 'amplitude-react-native', :path => '../node_modules/@amplitude/react-native'
-  pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer'
-  pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
-  pod 'react-native-get-random-values', :path => '../node_modules/react-native-get-random-values'
-  pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
-  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
-  pod 'react-native-performance', :path => '../node_modules/react-native-performance/ios'
-  pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
-  pod 'react-native-slider', :path => '../node_modules/@react-native-community/slider'
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
-  pod 'react-native-video', :path => '../node_modules/react-native-video/react-native-video.podspec'
-  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
-  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
-  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'
-  pod 'RNCClipboard', :path => '../node_modules/@react-native-community/clipboard'
-  pod 'RNCMaskedView', :path => '../node_modules/@react-native-masked-view/masked-view'
-  pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
-  pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
-  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
-  pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'
-  pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
-  pod 'RNScreens', :path => '../node_modules/react-native-screens'
-  pod 'RNSound', :path => '../node_modules/react-native-sound'
-  pod 'RNSVG', :path => '../node_modules/react-native-svg'
-  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
+  config = use_native_modules!
+  use_react_native!(
+    :path => config["reactNativePath"],
+    :hermes_enabled => false
+  )
 
   # Native pod dependencies
   #
 
   pod 'CocoaLumberjack', '~>3.5.3'
   pod 'ObjectiveDropboxOfficial', '~>6.1.0'
-
-  use_native_modules!
 end
 
 post_install do |installer|
+  react_native_post_install(installer)
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['ENABLE_BITCODE'] = 'YES'
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
     end
+    # https://github.com/facebook/react-native/issues/32351#issuecomment-939157955
+    case target.name
+    when 'RCT-Folly'
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
+      end
+    end
   end
 end

ios/Podfile.lock

@@ -1,26 +1,26 @@
 PODS:
-  - Amplitude (8.2.0)
-  - amplitude-react-native (2.3.3):
-    - Amplitude (= 8.2.0)
+  - Amplitude (8.7.1)
+  - amplitude-react-native (2.7.0):
+    - Amplitude (= 8.7.1)
     - React-Core
   - AppAuth (1.4.0):
     - AppAuth/Core (= 1.4.0)
     - AppAuth/ExternalUserAgent (= 1.4.0)
   - AppAuth/Core (1.4.0)
   - AppAuth/ExternalUserAgent (1.4.0)
-  - boost-for-react-native (1.63.0)
+  - boost (1.76.0)
   - CocoaLumberjack (3.5.3):
     - CocoaLumberjack/Core (= 3.5.3)
   - CocoaLumberjack/Core (3.5.3)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.61.5-jitsi.2)
-  - FBReactNativeSpec (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - RCTRequired (= 0.61.5-jitsi.2)
-    - RCTTypeSafety (= 0.61.5-jitsi.2)
-    - React-Core (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
+  - FBLazyVector (0.66.4)
+  - FBReactNativeSpec (0.66.4):
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTRequired (= 0.66.4)
+    - RCTTypeSafety (= 0.66.4)
+    - React-Core (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
   - Firebase/Analytics (6.33.0):
     - Firebase/Core
   - Firebase/Core (6.33.0):
@@ -65,15 +65,7 @@ PODS:
     - GoogleUtilities/Environment (~> 6.7)
     - GoogleUtilities/UserDefaults (~> 6.7)
     - PromisesObjC (~> 1.2)
-  - Folly (2018.10.22.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - Folly/Default (= 2018.10.22.00)
-    - glog
-  - Folly/Default (2018.10.22.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - glog
+  - fmt (6.2.1)
   - glog (0.3.5)
   - GoogleAppMeasurement (6.8.3):
     - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
@@ -83,8 +75,8 @@ PODS:
     - nanopb (~> 1.30906.0)
   - GoogleDataTransport (7.5.1):
     - nanopb (~> 1.30906.0)
-  - GoogleSignIn (5.0.2):
-    - AppAuth (~> 1.2)
+  - GoogleSignIn (6.0.2):
+    - AppAuth (~> 1.4)
     - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
   - GoogleUtilities/AppDelegateSwizzler (6.7.2):
@@ -117,296 +109,347 @@ PODS:
   - nanopb/encode (1.30906.0)
   - ObjectiveDropboxOfficial (6.1.0)
   - PromisesObjC (1.2.12)
-  - RCTRequired (0.61.5-jitsi.2)
-  - RCTTypeSafety (0.61.5-jitsi.2):
-    - FBLazyVector (= 0.61.5-jitsi.2)
-    - Folly (= 2018.10.22.00)
-    - RCTRequired (= 0.61.5-jitsi.2)
-    - React-Core (= 0.61.5-jitsi.2)
-  - React (0.61.5-jitsi.2):
-    - React-Core (= 0.61.5-jitsi.2)
-    - React-Core/DevSupport (= 0.61.5-jitsi.2)
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
-    - React-RCTActionSheet (= 0.61.5-jitsi.2)
-    - React-RCTAnimation (= 0.61.5-jitsi.2)
-    - React-RCTBlob (= 0.61.5-jitsi.2)
-    - React-RCTImage (= 0.61.5-jitsi.2)
-    - React-RCTLinking (= 0.61.5-jitsi.2)
-    - React-RCTNetwork (= 0.61.5-jitsi.2)
-    - React-RCTSettings (= 0.61.5-jitsi.2)
-    - React-RCTText (= 0.61.5-jitsi.2)
-    - React-RCTVibration (= 0.61.5-jitsi.2)
-  - React-Core (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default (= 0.61.5-jitsi.2)
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/CoreModulesHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/Default (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/DevSupport (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default (= 0.61.5-jitsi.2)
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - React-jsinspector (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTAnimationHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTBlobHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTImageHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTLinkingHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTNetworkHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTSettingsHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTTextHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTVibrationHeaders (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-Core/RCTWebSocket (0.61.5-jitsi.2):
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core/Default (= 0.61.5-jitsi.2)
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-jsiexecutor (= 0.61.5-jitsi.2)
-    - Yoga
-  - React-CoreModules (0.61.5-jitsi.2):
-    - FBReactNativeSpec (= 0.61.5-jitsi.2)
-    - Folly (= 2018.10.22.00)
-    - RCTTypeSafety (= 0.61.5-jitsi.2)
-    - React-Core/CoreModulesHeaders (= 0.61.5-jitsi.2)
-    - React-RCTImage (= 0.61.5-jitsi.2)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-  - React-cxxreact (0.61.5-jitsi.2):
-    - boost-for-react-native (= 1.63.0)
+  - RCT-Folly (2021.06.28.00-v2):
+    - boost
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - fmt (~> 6.2.1)
     - glog
-    - React-jsinspector (= 0.61.5-jitsi.2)
-  - React-jsi (0.61.5-jitsi.2):
-    - boost-for-react-native (= 1.63.0)
+    - RCT-Folly/Default (= 2021.06.28.00-v2)
+  - RCT-Folly/Default (2021.06.28.00-v2):
+    - boost
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - fmt (~> 6.2.1)
     - glog
-    - React-jsi/Default (= 0.61.5-jitsi.2)
-  - React-jsi/Default (0.61.5-jitsi.2):
-    - boost-for-react-native (= 1.63.0)
+  - RCTRequired (0.66.4)
+  - RCTTypeSafety (0.66.4):
+    - FBLazyVector (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTRequired (= 0.66.4)
+    - React-Core (= 0.66.4)
+  - React (0.66.4):
+    - React-Core (= 0.66.4)
+    - React-Core/DevSupport (= 0.66.4)
+    - React-Core/RCTWebSocket (= 0.66.4)
+    - React-RCTActionSheet (= 0.66.4)
+    - React-RCTAnimation (= 0.66.4)
+    - React-RCTBlob (= 0.66.4)
+    - React-RCTImage (= 0.66.4)
+    - React-RCTLinking (= 0.66.4)
+    - React-RCTNetwork (= 0.66.4)
+    - React-RCTSettings (= 0.66.4)
+    - React-RCTText (= 0.66.4)
+    - React-RCTVibration (= 0.66.4)
+  - React-callinvoker (0.66.4)
+  - React-Core (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default (= 0.66.4)
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/CoreModulesHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/Default (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/DevSupport (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default (= 0.66.4)
+    - React-Core/RCTWebSocket (= 0.66.4)
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-jsinspector (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTActionSheetHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTAnimationHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTBlobHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTImageHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTLinkingHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTNetworkHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTSettingsHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTTextHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTVibrationHeaders (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-Core/RCTWebSocket (0.66.4):
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/Default (= 0.66.4)
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsiexecutor (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - Yoga
+  - React-CoreModules (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.66.4)
+    - React-Core/CoreModulesHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-RCTImage (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-cxxreact (0.66.4):
+    - boost (= 1.76.0)
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
     - glog
-  - React-jsiexecutor (0.61.5-jitsi.2):
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-callinvoker (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-jsinspector (= 0.66.4)
+    - React-logger (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+    - React-runtimeexecutor (= 0.66.4)
+  - React-jsi (0.66.4):
+    - boost (= 1.76.0)
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
     - glog
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-  - React-jsinspector (0.61.5-jitsi.2)
-  - react-native-background-timer (2.4.0):
-    - React
-  - react-native-calendar-events (2.0.0):
-    - React
-  - react-native-get-random-values (1.7.0):
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-jsi/Default (= 0.66.4)
+  - React-jsi/Default (0.66.4):
+    - boost (= 1.76.0)
+    - DoubleConversion
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+  - React-jsiexecutor (0.66.4):
+    - DoubleConversion
+    - glog
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+  - React-jsinspector (0.66.4)
+  - React-logger (0.66.4):
+    - glog
+  - react-native-background-timer (2.4.1):
+    - React-Core
+  - react-native-get-random-values (1.7.2):
     - React-Core
   - react-native-keep-awake (4.0.0):
     - React
-  - react-native-netinfo (4.1.5):
-    - React
-  - react-native-performance (2.0.0):
+  - react-native-netinfo (7.1.7):
+    - React-Core
+  - react-native-pager-view (5.4.9):
+    - React-Core
+  - react-native-performance (2.1.0):
     - React-Core
   - react-native-safe-area-context (3.3.2):
     - React-Core
-  - react-native-slider (3.0.3):
-    - React
-  - react-native-splash-screen (3.2.0):
-    - React
-  - react-native-video (5.1.1):
+  - react-native-slider (4.1.12):
     - React-Core
-    - react-native-video/Video (= 5.1.1)
-  - react-native-video/Video (5.1.1):
+  - react-native-splash-screen (3.3.0):
+    - React-Core
+  - react-native-video (5.2.0):
+    - React-Core
+    - react-native-video/Video (= 5.2.0)
+  - react-native-video/Video (5.2.0):
     - React-Core
   - react-native-webrtc (1.94.1):
     - React-Core
-  - react-native-webview (11.0.2):
+  - react-native-webview (11.15.1):
     - React-Core
-  - React-RCTActionSheet (0.61.5-jitsi.2):
-    - React-Core/RCTActionSheetHeaders (= 0.61.5-jitsi.2)
-  - React-RCTAnimation (0.61.5-jitsi.2):
-    - React-Core/RCTAnimationHeaders (= 0.61.5-jitsi.2)
-  - React-RCTBlob (0.61.5-jitsi.2):
-    - React-Core/RCTBlobHeaders (= 0.61.5-jitsi.2)
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - React-RCTNetwork (= 0.61.5-jitsi.2)
-  - React-RCTImage (0.61.5-jitsi.2):
-    - React-Core/RCTImageHeaders (= 0.61.5-jitsi.2)
-    - React-RCTNetwork (= 0.61.5-jitsi.2)
-  - React-RCTLinking (0.61.5-jitsi.2):
-    - React-Core/RCTLinkingHeaders (= 0.61.5-jitsi.2)
-  - React-RCTNetwork (0.61.5-jitsi.2):
-    - React-Core/RCTNetworkHeaders (= 0.61.5-jitsi.2)
-  - React-RCTSettings (0.61.5-jitsi.2):
-    - React-Core/RCTSettingsHeaders (= 0.61.5-jitsi.2)
-  - React-RCTText (0.61.5-jitsi.2):
-    - React-Core/RCTTextHeaders (= 0.61.5-jitsi.2)
-  - React-RCTVibration (0.61.5-jitsi.2):
-    - React-Core/RCTVibrationHeaders (= 0.61.5-jitsi.2)
-  - ReactCommon/jscallinvoker (0.61.5-jitsi.2):
+  - React-perflogger (0.66.4)
+  - React-RCTActionSheet (0.66.4):
+    - React-Core/RCTActionSheetHeaders (= 0.66.4)
+  - React-RCTAnimation (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.66.4)
+    - React-Core/RCTAnimationHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-RCTBlob (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/RCTBlobHeaders (= 0.66.4)
+    - React-Core/RCTWebSocket (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-RCTNetwork (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-RCTImage (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.66.4)
+    - React-Core/RCTImageHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-RCTNetwork (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-RCTLinking (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - React-Core/RCTLinkingHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-RCTNetwork (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.66.4)
+    - React-Core/RCTNetworkHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-RCTSettings (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.66.4)
+    - React-Core/RCTSettingsHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-RCTText (0.66.4):
+    - React-Core/RCTTextHeaders (= 0.66.4)
+  - React-RCTVibration (0.66.4):
+    - FBReactNativeSpec (= 0.66.4)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/RCTVibrationHeaders (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - ReactCommon/turbomodule/core (= 0.66.4)
+  - React-runtimeexecutor (0.66.4):
+    - React-jsi (= 0.66.4)
+  - ReactCommon/turbomodule/core (0.66.4):
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
     - glog
-    - React-cxxreact (= 0.61.5-jitsi.2)
-  - ReactCommon/turbomodule (0.61.5-jitsi.2):
-    - DoubleConversion
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core (= 0.61.5-jitsi.2)
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-    - ReactCommon/turbomodule/samples (= 0.61.5-jitsi.2)
-  - ReactCommon/turbomodule/core (0.61.5-jitsi.2):
-    - DoubleConversion
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core (= 0.61.5-jitsi.2)
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
-  - ReactCommon/turbomodule/samples (0.61.5-jitsi.2):
-    - DoubleConversion
-    - Folly (= 2018.10.22.00)
-    - glog
-    - React-Core (= 0.61.5-jitsi.2)
-    - React-cxxreact (= 0.61.5-jitsi.2)
-    - React-jsi (= 0.61.5-jitsi.2)
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-  - RNCAsyncStorage (1.15.5):
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-callinvoker (= 0.66.4)
+    - React-Core (= 0.66.4)
+    - React-cxxreact (= 0.66.4)
+    - React-jsi (= 0.66.4)
+    - React-logger (= 0.66.4)
+    - React-perflogger (= 0.66.4)
+  - RNCalendarEvents (2.2.0):
+    - React
+  - RNCAsyncStorage (1.15.14):
     - React-Core
   - RNCClipboard (1.5.1):
     - React-Core
   - RNCMaskedView (0.2.6):
     - React-Core
-  - RNDefaultPreference (1.4.2):
-    - React
-  - RNDeviceInfo (8.0.0):
+  - RNDefaultPreference (1.4.3):
     - React-Core
-  - RNGestureHandler (1.10.3):
+  - RNDeviceInfo (8.4.8):
+    - React-Core
+  - RNGestureHandler (2.1.0):
+    - React-Core
+  - RNGoogleSignin (7.0.4):
+    - GoogleSignIn (~> 6.0.0)
     - React-Core
-  - RNGoogleSignin (3.0.1):
-    - GoogleSignIn (~> 5.0.0)
-    - React
   - RNReanimated (1.13.3):
     - React-Core
-  - RNScreens (2.18.1):
+  - RNScreens (3.10.1):
+    - React-Core
+    - React-RCTImage
+  - RNSound (0.11.1):
+    - React-Core
+    - RNSound/Core (= 0.11.1)
+  - RNSound/Core (0.11.1):
     - React-Core
-  - RNSound (0.11.0):
-    - React
-    - RNSound/Core (= 0.11.0)
-  - RNSound/Core (0.11.0):
-    - React
   - RNSVG (12.1.0):
     - React
-  - RNWatch (0.4.3):
+  - RNWatch (1.0.4):
     - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
   - "amplitude-react-native (from `../node_modules/@amplitude/react-native`)"
+  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - CocoaLumberjack (~> 3.5.3)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
-  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
+  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
+  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - Firebase/Analytics (~> 6.33.0)
   - Firebase/Crashlytics (~> 6.33.0)
   - Firebase/DynamicLinks (~> 6.33.0)
-  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - ObjectiveDropboxOfficial (~> 6.1.0)
-  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired/`)
-  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety/`)
+  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
+  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
+  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
-  - React-Core/CoreModulesHeaders (from `../node_modules/react-native/`)
+  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
+  - React-Core (from `../node_modules/react-native/`)
   - React-Core/DevSupport (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
@@ -414,18 +457,20 @@ DEPENDENCIES:
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
-  - react-native-calendar-events (from `../node_modules/react-native-calendar-events`)
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
+  - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-performance (from `../node_modules/react-native-performance/ios`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
-  - react-native-video (from `../node_modules/react-native-video/react-native-video.podspec`)
+  - react-native-video (from `../node_modules/react-native-video`)
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
   - react-native-webview (from `../node_modules/react-native-webview`)
+  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -435,14 +480,16 @@ DEPENDENCIES:
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
   - 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`)
+  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
+  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNCalendarEvents (from `../node_modules/react-native-calendar-events`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
   - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
-  - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)"
+  - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSound (from `../node_modules/react-native-sound`)
@@ -454,7 +501,6 @@ SPEC REPOS:
   trunk:
     - Amplitude
     - AppAuth
-    - boost-for-react-native
     - CocoaLumberjack
     - Firebase
     - FirebaseAnalytics
@@ -463,6 +509,7 @@ SPEC REPOS:
     - FirebaseCrashlytics
     - FirebaseDynamicLinks
     - FirebaseInstallations
+    - fmt
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleSignIn
@@ -476,22 +523,26 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   amplitude-react-native:
     :path: "../node_modules/@amplitude/react-native"
+  boost:
+    :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
-    :path: "../node_modules/react-native/Libraries/FBLazyVector/"
+    :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
-    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec/"
-  Folly:
-    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
+    :path: "../node_modules/react-native/React/FBReactNativeSpec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
+  RCT-Folly:
+    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
-    :path: "../node_modules/react-native/Libraries/RCTRequired/"
+    :path: "../node_modules/react-native/Libraries/RCTRequired"
   RCTTypeSafety:
-    :path: "../node_modules/react-native/Libraries/TypeSafety/"
+    :path: "../node_modules/react-native/Libraries/TypeSafety"
   React:
     :path: "../node_modules/react-native/"
+  React-callinvoker:
+    :path: "../node_modules/react-native/ReactCommon/callinvoker"
   React-Core:
     :path: "../node_modules/react-native/"
   React-CoreModules:
@@ -504,16 +555,18 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
+  React-logger:
+    :path: "../node_modules/react-native/ReactCommon/logger"
   react-native-background-timer:
     :path: "../node_modules/react-native-background-timer"
-  react-native-calendar-events:
-    :path: "../node_modules/react-native-calendar-events"
   react-native-get-random-values:
     :path: "../node_modules/react-native-get-random-values"
   react-native-keep-awake:
     :path: "../node_modules/react-native-keep-awake"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
+  react-native-pager-view:
+    :path: "../node_modules/react-native-pager-view"
   react-native-performance:
     :path: "../node_modules/react-native-performance/ios"
   react-native-safe-area-context:
@@ -523,11 +576,13 @@ EXTERNAL SOURCES:
   react-native-splash-screen:
     :path: "../node_modules/react-native-splash-screen"
   react-native-video:
-    :path: "../node_modules/react-native-video/react-native-video.podspec"
+    :path: "../node_modules/react-native-video"
   react-native-webrtc:
     :path: "../node_modules/react-native-webrtc"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
+  React-perflogger:
+    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -546,8 +601,12 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Text"
   React-RCTVibration:
     :path: "../node_modules/react-native/Libraries/Vibration"
+  React-runtimeexecutor:
+    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNCalendarEvents:
+    :path: "../node_modules/react-native-calendar-events"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCClipboard:
@@ -561,7 +620,7 @@ EXTERNAL SOURCES:
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNGoogleSignin:
-    :path: "../node_modules/@react-native-community/google-signin"
+    :path: "../node_modules/@react-native-google-signin/google-signin"
   RNReanimated:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
@@ -576,14 +635,14 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Amplitude: 263118b9e691e73a1c864b05bb08a3aff3636d16
-  amplitude-react-native: 9369759dc6d01590aeb6261f714d53beaebc7e6f
+  Amplitude: 834c7332dfb9640a751e21c13efb22a07c0c12d4
+  amplitude-react-native: 0ed8cab759aafaa94961b82122bf56297da607ad
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
-  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
-  FBLazyVector: ca7f56c8ff6cd8590f7a673d7903b06019805581
-  FBReactNativeSpec: 8136c3cf27de2bb310a69cffbb423c5643f5c1c4
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
+  FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
+  FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
   Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
   FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
   FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
@@ -591,62 +650,68 @@ SPEC CHECKSUMS:
   FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb
   FirebaseDynamicLinks: 6eac37d86910382eafb6315d952cc44c9e176094
   FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
-  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
+  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
+  glog: 5337263514dd6f09803962437687240c5dc39aa4
   GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
-  GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
+  GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
   GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
   ObjectiveDropboxOfficial: b4765572e334d6fc6214b43a7595510324bbbbaa
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
-  RCTRequired: a686731276578c125dff205f08b6ec9cee6ede32
-  RCTTypeSafety: 88e5500e801c00d16a3d1895e3470d13beed6584
-  React: 8b2bcf6a93846e47a7a365a54ec6edeb78b37701
-  React-Core: 3fbdbc87c18c4742b735ff9a0c02fa38c87e0fba
-  React-CoreModules: f6f8a8212aec52a21251c0af58bdb037b57c70b3
-  React-cxxreact: c6ad34143db06a5c3cb0e8e169c775475287ac9c
-  React-jsi: ddb471a56185e4007835a1bba0882ecb5ce3dc0e
-  React-jsiexecutor: 67106691c60030ec888d7cbbc4f48a3168e27a02
-  React-jsinspector: 92ceee6c66dc19886289b52436ade7e020b89602
-  react-native-background-timer: 029c606b3fd6dd476b153e177c518b6ade4c169f
-  react-native-calendar-events: 82dc6c915653a1a8a266e43fdbbfdb3b1022ca99
-  react-native-get-random-values: 237bffb1c7e05fb142092681531810a29ba53015
+  RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
+  RCTRequired: 4bf86c70714490bca4bf2696148638284622644b
+  RCTTypeSafety: c475a7059eb77935fa53d2c17db299893f057d5d
+  React: f64af14e3f2c50f6f2c91a5fd250e4ff1b3c3459
+  React-callinvoker: b74e4ae80287780dcdf0cab262bcb581eeef56e7
+  React-Core: 3eb7432bad96ff1d25aebc1defbae013fee2fd0e
+  React-CoreModules: ad9e1fd5650e16666c57a08328df86fd7e480cb9
+  React-cxxreact: 02633ff398cf7e91a2c1e12590d323c4a4b8668a
+  React-jsi: 805c41a927d6499fb811772acb971467d9204633
+  React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396
+  React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
+  React-logger: 933f80c97c633ee8965d609876848148e3fef438
+  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
+  react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
-  react-native-netinfo: 0e563248a4b9a99c33ec29bd03c2d50767db22a6
-  react-native-performance: 6bd6cfac80594775fb782405fceaaf206becf53b
+  react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
+  react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
+  react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
   react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
-  react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168
-  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
+  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
+  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
+  react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
   react-native-webrtc: 2f20515f3ebb9dbf1f2aad638cc7573396cf948f
-  react-native-webview: dfd7202ff115c44d3ea401c2f36122fb3ac79f07
-  React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
-  React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
-  React-RCTBlob: 70d88f7b68b5c44953cdb286ac2e36a7a509a97e
-  React-RCTImage: e0d25b620e42de91ed791ef129e2d3a0df1eb5ab
-  React-RCTLinking: bc2287cfd9e56403ecea5dafdbdac8c57fa1ac36
-  React-RCTNetwork: cd8ae8fc787c02ed5152fe9cbf7521ee70c1bce7
-  React-RCTSettings: f6667271ccd8876a934134b73002b5a2714e1525
-  React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
-  React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
-  ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
-  RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
+  react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
+  React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd
+  React-RCTActionSheet: 7d3041e6761b4f3044a37079ddcb156575fb6d89
+  React-RCTAnimation: 743e88b55ac62511ae5c2e22803d4f503f2a3a13
+  React-RCTBlob: bee3a2f98fa7fc25c957c8643494244f74bea0a0
+  React-RCTImage: 19fc9e29b06cc38611c553494f8d3040bf78c24e
+  React-RCTLinking: dc799503979c8c711126d66328e7ce8f25c2848f
+  React-RCTNetwork: 417e4e34cf3c19eaa5fd4e9eb20180d662a799ce
+  React-RCTSettings: 4df89417265af26501a7e0e9192a34d3d9848dff
+  React-RCTText: f8a21c3499ab322326290fa9b701ae29aa093aa5
+  React-RCTVibration: e3ffca672dd3772536cb844274094b0e2c31b187
+  React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a
+  ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4
+  RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
+  RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
-  RNDefaultPreference: 1f8133ec0bc0f9453cdada578564ba1ef551fb44
-  RNDeviceInfo: 87d2d175c760f6bcf58acd036f887e8b2392802c
-  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
-  RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
+  RNDefaultPreference: 326860d42a681bfd7338c8f6d061cf58745bd860
+  RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
+  RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a
+  RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
   RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
-  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
-  RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
+  RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e
+  RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
-  RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
-  Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c
+  RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
+  Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280
 
-PODFILE CHECKSUM: 0cfc1f35e2872ceb0a86252e14e226bd489a2602
+PODFILE CHECKSUM: 93620e428bb16cc7fb8fd7314c0402e26929b5bf
 
 COCOAPODS: 1.11.2

ios/app/app.xcodeproj/project.pbxproj

@@ -977,6 +977,7 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1037,6 +1038,7 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

ios/app/broadcast-extension/Info.plist

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

ios/app/src/Info.plist

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

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>21.6.0</string>
+	<string>22.0.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.6.0</string>
+	<string>22.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -407,13 +407,15 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
-				"${PODS_ROOT}/Amplitude/Sources/Amplitude/Resources/ComodoRsaDomainValidationCA.der",
-				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
+				"${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -516,6 +518,7 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -578,6 +581,7 @@
 				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

ios/sdk/src/Info.plist

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

lang/languages-af.json

@@ -1,11 +1,11 @@
 {
-    "en": "Engels",
     "af": "",
     "az": "Azerbeidjans",
     "bg": "Bulgaars",
     "cs": "Tsjeggies",
     "de": "Duits",
     "el": "Grieks",
+    "en": "Engels",
     "eo": "Esperanto",
     "es": "Spaans",
     "fr": "Frans",
@@ -24,4 +24,4 @@
     "tr": "Turks",
     "vi": "Viëtnamees",
     "zhCN": "Sjinees (Sjina)"
-}
+}

lang/languages-ar.json

@@ -1,47 +1,47 @@
 {
-    "ar": "العربية",
-    "en": "الإنجليزية",
     "af": "الأفريكانية",
+    "ar": "العربية",
     "bg": "البلغارية",
     "ca": "الكاتالانية",
     "cs": "التشيكية",
     "da": "الدنماركية",
     "de": "الألمانية",
     "el": "اليونانية",
+    "en": "الإنجليزية",
     "enGB": "الإنجليزية (المملكة المتحدة)",
     "eo": "الإسبرانتو",
     "es": "الإسبانية",
     "esUS": "الإسبانية (أمريكا اللاتينية)",
     "et": "الإستونية",
+    "eu": "الباسكية",
     "fi": "الفنلندية",
     "fr": "الفرنسية",
     "frCA": "الفرنسية (الكندية)",
+    "he": "العبرية",
     "hr": "الكرواتية",
     "hu": "الهنغارية",
     "hy": "الأرمنية",
+    "id": "الإندونيسية",
     "it": "الإيطالية",
     "ja": "اليابانية",
+    "kab": "قَبَلي",
     "ko": "الكورية",
+    "lt": "الليتوانية",
+    "mr": "الماراثى",
     "nl": "الهولندية",
     "oc": "القسطانية",
     "pl": "البولندية",
     "ptBR": "البرتغالية (البرازيل)",
+    "ro": "الرومانية",
     "ru": "الروسية",
+    "sc": "السردينية",
+    "sk": "السلوفاكية",
+    "sl": "السلوفينية",
     "sv": "السويدية",
+    "th": "التايلندية",
     "tr": "التركية",
+    "uk": "الأوكرانية",
     "vi": "الفيتنامية",
     "zhCN": "الصينية (الصين)",
-    "zhTW": "الصينية (تايوان)",
-    "th": "التايلندية",
-    "sc": "السردينية",
-    "eu": "الباسكية",
-    "uk": "الأوكرانية",
-    "sk": "السلوفاكية",
-    "lt": "الليتوانية",
-    "id": "الإندونيسية",
-    "he": "العبرية",
-    "mr":"الماراثى",
-    "kab": "قَبَلي",
-    "ro": "الرومانية",
-    "sl": "السلوفينية",
+    "zhTW": "الصينية (تايوان)"
 }

lang/languages-be.json

@@ -1,5 +1,4 @@
 {
-    "en": "Англійская",
     "af": "Афрыкаанс",
     "bg": "Балгарская",
     "ca": "Каталанская",
@@ -7,6 +6,7 @@
     "da": "Дацкая",
     "de": "Нямецкая",
     "el": "Грэцкая",
+    "en": "Англійская",
     "enGB": "Англійская (Вялікабрытанія)",
     "eo": "Эсперанта",
     "es": "Іспанская",

lang/languages-bg.json

@@ -1,11 +1,11 @@
 {
-    "en": "Английски",
     "af": "Африканс",
     "bg": "Български",
     "ca": "Каталонски",
     "cs": "Чешки",
     "de": "Немски",
     "el": "Гръцки",
+    "en": "Английски",
     "enGB": "Английски (Великобритания)",
     "eo": "Есперанто",
     "es": "Испански",
@@ -29,4 +29,4 @@
     "vi": "Виетнамски",
     "zhCN": "Китайски (Китай)",
     "zhTW": "Тайвански"
-}
+}

lang/languages-ca.json

@@ -1,5 +1,4 @@
 {
-    "en": "Anglès",
     "af": "Afrikaans",
     "ar": "Àrab",
     "bg": "Búlgar",
@@ -8,36 +7,46 @@
     "da": "Danès",
     "de": "Alemany",
     "el": "Grec",
+    "en": "Anglès",
     "enGB": "Anglès (Regne Unit)",
     "eo": "Esperanto",
     "es": "Espanyol",
-    "esUS": "Espanyol (Amèrica Llatina)",
+    "esUS": "Espanyol (Amèrica llatina)",
     "et": "Estonià",
-    "eu": "Èuscar",
+    "eu": "Basc",
+    "fa": "Persa",
     "fi": "Finès",
     "fr": "Francès",
     "frCA": "Francès (Canadà)",
     "he": "Hebreu",
-    "mr": "Marathi",
+    "hi": "Hindi",
     "hr": "Croat",
     "hu": "Hongarès",
     "hy": "Armeni",
     "id": "Indonesi",
     "it": "Italià",
     "ja": "Japonès",
+    "kab": "Cabilenc",
     "ko": "Coreà",
     "lt": "Lituà",
+    "lv": "Letó",
+    "ml": "Malaiàlam",
+    "mr": "Marathi",
     "nl": "Neerlandès",
     "oc": "Occità",
     "pl": "Polonès",
+    "pt": "Portuguès",
     "ptBR": "Portuguès (Brasil)",
-    "ru": "Rus",
     "ro": "Romanès",
+    "ru": "Rus",
     "sc": "Sard",
     "sk": "Eslovac",
     "sl": "Eslovè",
+    "sq": "Albanès",
+    "sr": "Serbi",
     "sv": "Suec",
-    "th": "Tai",
+    "te": "Telugu",
+    "th": "tailandès",
     "tr": "Turc",
     "uk": "Ucraïnès",
     "vi": "Vietnamita",

lang/languages-cs.json

@@ -1,5 +1,4 @@
 {
-    "en": "Angličtina",
     "af": "Afrikánština",
     "ar": "Arabština",
     "az": "Ázerbájdžánština",
@@ -9,6 +8,7 @@
     "da": "Dánština",
     "de": "Němčina",
     "el": "Řečtina",
+    "en": "Angličtina",
     "enGB": "Angličtina (Spojené království)",
     "eo": "Esperanto",
     "es": "Španělština",
@@ -19,7 +19,6 @@
     "fr": "Francouština",
     "frCA": "Francouzština (Kanada)",
     "he": "Hebrejština",
-    "mr":"Maráthština",
     "hr": "Chorvatština",
     "hu": "Maďarština",
     "hy": "Arménština",
@@ -29,13 +28,14 @@
     "kab": "Kabylština",
     "ko": "Korejština",
     "lt": "Litevština",
-    "nl": "Nizozemština",
+    "mr": "Maráthština",
     "nb": "Norština Bokmal",
+    "nl": "Nizozemština",
     "oc": "Okcitánština",
     "pl": "Polština",
     "ptBR": "Portugalština (Brazílie)",
-    "ru": "Ruština",
     "ro": "Rumunština",
+    "ru": "Ruština",
     "sc": "Sardinština",
     "sk": "Slovenština",
     "sl": "Slovinština",

lang/languages-da.json

@@ -1,5 +1,4 @@
 {
-    "en": "Engelsk",
     "af": "Sydafrikansk",
     "bg": "Bulgarsk",
     "ca": "Katalansk",
@@ -7,6 +6,7 @@
     "da": "Dansk",
     "de": "Tysk",
     "el": "Græsk",
+    "en": "Engelsk",
     "enGB": "Engelsk (Storbritannien)",
     "eo": "Esperanto",
     "es": "Spansk",

lang/languages-de.json

@@ -1,19 +1,29 @@
 {
-    "en": "Englisch",
     "af": "Afrikaans",
     "az": "Aserbaidschanisch",
     "bg": "Bulgarisch",
+    "ca": "Katalanisch",
     "cs": "Tschechisch",
+    "da": "Dänisch",
     "de": "Deutsch",
     "el": "Griechisch",
+    "en": "Englisch",
+    "enGB": "Englisch (Vereinigtes Königreich)",
     "eo": "Esperanto",
     "es": "Spanisch",
+    "esUS": "Spanisch (Lateinamerika)",
+    "et": "Estnisch",
+    "fi": "Finnisch",
     "fr": "Französisch",
+    "frCA": "Französisch (Kanada)",
+    "hr": "Kroatisch",
+    "hu": "Ungarisch",
     "hy": "Armenisch",
     "it": "Italienisch",
     "ja": "Japanisch",
     "ko": "Koreanisch",
     "nb": "Norwegisch (Bokmal)",
+    "nl": "Niederländisch",
     "oc": "Okzitanisch",
     "pl": "Polnisch",
     "ptBR": "Portugiesisch (Brasilien)",
@@ -25,15 +35,5 @@
     "tr": "Türkisch",
     "vi": "Vietnamesisch",
     "zhCN": "Chinesisch (China)",
-    "zhTW": "Chinesisch (Taiwan)",
-    "nl": "Niederländisch",
-    "hu": "Ungarisch",
-    "hr": "Kroatisch",
-    "frCA": "Französisch (Kanada)",
-    "fi": "Finnisch",
-    "et": "Estnisch",
-    "esUS": "Spanisch (Lateinamerika)",
-    "enGB": "Englisch (Vereinigtes Königreich)",
-    "da": "Dänisch",
-    "ca": "Katalanisch"
+    "zhTW": "Chinesisch (Taiwan)"
 }

lang/languages-el.json

@@ -1,5 +1,4 @@
 {
-    "en": "Αγγλικά",
     "af": "Αφρικανικά",
     "bg": "Βουλγάρικα",
     "ca": "Καταλανικά",
@@ -7,6 +6,7 @@
     "da": "Δανέζικα",
     "de": "Γερμανικά",
     "el": "Ελληνικά",
+    "en": "Αγγλικά",
     "enGB": "Αγγλικά (Ηνωμένου Βασιλείου)",
     "eo": "Εσπεράντο",
     "es": "Ισπανικά",
@@ -39,4 +39,4 @@
     "vi": "Βιετναμέζικα",
     "zhCN": "Κινέζικα (Κίνας)",
     "zhTW": "Κινέζικα (Ταϊβάν)"
-}
+}

lang/languages-enGB.json

@@ -1,19 +1,29 @@
 {
-    "en": "English",
     "af": "Afrikaans",
     "az": "",
     "bg": "Bulgarian",
+    "ca": "Catalan",
     "cs": "Czech",
+    "da": "Danish",
     "de": "German",
     "el": "Greek",
+    "en": "English",
+    "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Spanish",
+    "esUS": "Spanish (Latin America)",
+    "et": "Estonian",
+    "fi": "Finnish",
     "fr": "French",
+    "frCA": "French (Canadian)",
+    "hr": "Croatian",
+    "hu": "Hungarian",
     "hy": "Armenian",
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
     "nb": "",
+    "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",
     "ptBR": "Portuguese (Brazil)",
@@ -25,15 +35,5 @@
     "tr": "Turkish",
     "vi": "Vietnamese",
     "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)",
-    "nl": "Dutch",
-    "hu": "Hungarian",
-    "hr": "Croatian",
-    "frCA": "French (Canadian)",
-    "fi": "Finnish",
-    "et": "Estonian",
-    "esUS": "Spanish (Latin America)",
-    "enGB": "English (United Kingdom)",
-    "da": "Danish",
-    "ca": "Catalan"
+    "zhTW": "Chinese (Taiwan)"
 }

lang/languages-eo.json

@@ -1,11 +1,11 @@
 {
-    "en": "Angla",
     "af": "Afrikansa",
     "az": "Azera",
     "bg": "Bulgara",
     "cs": "Ĉeĥa",
     "de": "Germana",
     "el": "Greka",
+    "en": "Angla",
     "eo": "Esperanto",
     "es": "Hispana",
     "fr": "Franca",

lang/languages-es.json

@@ -1,15 +1,17 @@
 {
-    "en": "Inglés",
     "af": "Afrikáans",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
+    "da": "Danés",
     "de": "Alemán",
     "el": "Griego",
+    "en": "Inglés",
     "enGB": "Inglés (Reino Unido)",
     "eo": "Esperanto",
     "es": "Español",
     "esUS": "Español (América Latina)",
+    "et": "Estonio",
     "fi": "Finlandés",
     "fr": "Francés",
     "frCA": "Francés (Canadiense)",
@@ -30,7 +32,5 @@
     "tr": "Turco",
     "vi": "Vietnamita",
     "zhCN": "Chino (China)",
-    "zhTW": "Chino (Taiwán)",
-    "et": "Estonio",
-    "da": "Danés"
+    "zhTW": "Chino (Taiwán)"
 }

lang/languages-esUS.json

@@ -1,11 +1,11 @@
 {
-    "en": "Inglés",
     "af": "Africano",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
     "de": "Alemán",
     "el": "Griego",
+    "en": "Inglés",
     "enGB": "Inglés",
     "eo": "Esperanto",
     "es": "Español",

lang/languages-et.json

@@ -1,33 +1,33 @@
 {
-  "en": "Inglise keel",
-  "af": "Afrikaani keel",
-  "bg": "Bulgaaria keel",
-  "ca": "Katalaani keel",
-  "cs": "Tšehhi keel",
-  "de": "Saksa keel",
-  "el": "Kreeka keel",
-  "enGB": "Inglise keel (Ühendkuningriik)",
-  "eo": "Esperanto keel",
-  "es": "Hispaania keel",
-  "esUS": "Hispaania keel (Ladina-Ameerika)",
-  "et": "Eesti keel",
-  "fi": "Soome keel",
-  "fr": "Prantsuse keel",
-  "frCA": "Prantsuse keel (Kanada)",
-  "hr": "Horvaadi keel",
-  "hu": "Ungari keel",
-  "hy": "Armeenia keel",
-  "it": "Itaalia keel",
-  "ja": "Jaapani keel",
-  "ko": "Korea keel",
-  "nl": "Hollandi keel",
-  "oc": "Oksitaani keel",
-  "pl": "Poola keel",
-  "ptBR": "Portigali keel (Brasiilia)",
-  "ru": "Vene keel",
-  "sv": "Roosi keel",
-  "tr": "Türgi keel",
-  "vi": "Vietnami keel",
-  "zhCN": "Hiina keel (Hiina)",
-  "zhTW": "Hiina keel (Tai)"
+    "af": "Afrikaani keel",
+    "bg": "Bulgaaria keel",
+    "ca": "Katalaani keel",
+    "cs": "Tšehhi keel",
+    "de": "Saksa keel",
+    "el": "Kreeka keel",
+    "en": "Inglise keel",
+    "enGB": "Inglise keel (Ühendkuningriik)",
+    "eo": "Esperanto keel",
+    "es": "Hispaania keel",
+    "esUS": "Hispaania keel (Ladina-Ameerika)",
+    "et": "Eesti keel",
+    "fi": "Soome keel",
+    "fr": "Prantsuse keel",
+    "frCA": "Prantsuse keel (Kanada)",
+    "hr": "Horvaadi keel",
+    "hu": "Ungari keel",
+    "hy": "Armeenia keel",
+    "it": "Itaalia keel",
+    "ja": "Jaapani keel",
+    "ko": "Korea keel",
+    "nl": "Hollandi keel",
+    "oc": "Oksitaani keel",
+    "pl": "Poola keel",
+    "ptBR": "Portigali keel (Brasiilia)",
+    "ru": "Vene keel",
+    "sv": "Roosi keel",
+    "tr": "Türgi keel",
+    "vi": "Vietnami keel",
+    "zhCN": "Hiina keel (Hiina)",
+    "zhTW": "Hiina keel (Tai)"
 }

lang/languages-eu.json

@@ -1,5 +1,4 @@
 {
-    "en": "Ingelesa",
     "af": "Afrikaans",
     "bg": "Bulgariera",
     "ca": "Katalana",
@@ -7,6 +6,7 @@
     "da": "Daniera",
     "de": "Alemana",
     "el": "Greziera",
+    "en": "Ingelesa",
     "enGB": "Ingelesa (Erresuma Batua)",
     "eo": "Esperantoa",
     "es": "Gaztelania",

lang/languages-fa.json

@@ -1,5 +1,4 @@
 {
-    "en": "انگلیسی",
     "af": "آفریقایی",
     "ar": "عربی",
     "bg": "بلغاری",
@@ -8,17 +7,18 @@
     "da": "دانمارکی",
     "de": "آلمانی",
     "el": "یونانی",
+    "en": "انگلیسی",
     "enGB": "انگلیسی (انگلستان)",
     "eo": "اسپرانتو",
     "es": "اسپانیایی",
     "esUS": "اسپانیایی (آمریکا لاتین)",
     "et": "استونیایی",
     "eu": "باسکایی",
+    "fa": "فارسی",
     "fi": "فنلاندی",
     "fr": "فرانسوی",
     "frCA": "فرانسوی (کانادا)",
     "he": "عبری",
-    "mr":"مراتی",
     "hr": "کرواتی",
     "hu": "بلغاری",
     "hy": "ارمنی",
@@ -28,15 +28,15 @@
     "kab": "کابیلی",
     "ko": "کره ای",
     "lt": "لیتوانیایی",
-    "ml": "مالایایی",
     "lv": "لتونیایی",
+    "ml": "مالایایی",
+    "mr": "مراتی",
     "nl": "هلندی",
     "oc": "اکسیتان(قدیمی)",
-    "fa": "فارسی",
     "pl": "لهستانی",
     "ptBR": "پرتغالی (برزیل)",
-    "ru": "روسی",
     "ro": "رومانیایی",
+    "ru": "روسی",
     "sc": "ساردینی",
     "sk": "اسلواکیایی",
     "sl": "اسلوونیایی",

lang/languages-fi.json

@@ -1,19 +1,29 @@
 {
-    "en": "englanti",
     "af": "afrikaans",
     "az": "",
     "bg": "bulgaria",
+    "ca": "katalaani",
     "cs": "tšekki",
+    "da": "tanska",
     "de": "saksa",
     "el": "kreikka",
+    "en": "englanti",
+    "enGB": "englanti (Yhdistynyt kuningaskunta)",
     "eo": "esperanto",
     "es": "espanja",
+    "esUS": "espanja (Latinalainen Amerikka)",
+    "et": "viro",
+    "fi": "suomi",
     "fr": "ranska",
+    "frCA": "ranska (Kanada)",
+    "hr": "kroaatti",
+    "hu": "unkari",
     "hy": "armenia",
     "it": "italia",
     "ja": "japani",
     "ko": "korea",
     "nb": "",
+    "nl": "hollanti",
     "oc": "oksitaani",
     "pl": "puola",
     "ptBR": "portugali (Brasilia)",
@@ -24,15 +34,5 @@
     "tr": "turkki",
     "vi": "vietnam",
     "zhCN": "kiina (Kiina)",
-    "zhTW": "kiina (Taiwan)",
-    "nl": "hollanti",
-    "hu": "unkari",
-    "hr": "kroaatti",
-    "frCA": "ranska (Kanada)",
-    "fi": "suomi",
-    "et": "viro",
-    "esUS": "espanja (Latinalainen Amerikka)",
-    "enGB": "englanti (Yhdistynyt kuningaskunta)",
-    "da": "tanska",
-    "ca": "katalaani"
+    "zhTW": "kiina (Taiwan)"
 }

lang/languages-fr.json

@@ -1,15 +1,17 @@
 {
-    "en": "Anglais",
     "af": "Afrikaans",
     "bg": "Bulgare",
     "ca": "Catalan",
     "cs": "Tchèque",
+    "da": "Danois",
     "de": "Allemand",
     "el": "Grec",
+    "en": "Anglais",
     "enGB": "Anglais (Royaume-Uni)",
     "eo": "Espéranto",
     "es": "Espagnol",
     "esUS": "Espagnol (Amérique latine)",
+    "et": "Estonien",
     "fi": "Finnois",
     "fr": "Français",
     "frCA": "Français (Canada)",
@@ -29,7 +31,5 @@
     "tr": "Turc",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
-    "zhTW": "Chinois (Taiwan)",
-    "et": "Estonien",
-    "da": "Danois"
+    "zhTW": "Chinois (Taiwan)"
 }

lang/languages-frCA.json

@@ -1,15 +1,17 @@
 {
-    "en": "Anglais",
     "af": "Africain",
     "bg": "Bulgare",
     "ca": "Catalan",
     "cs": "Tchèque",
+    "da": "Danois",
     "de": "Allemand",
     "el": "Grec",
+    "en": "Anglais",
     "enGB": "Anglais (Royaume-Uni)",
     "eo": "Espéranto",
     "es": "Espagnol",
     "esUS": "Espagnol (Amérique latine)",
+    "et": "Estonien",
     "fi": "Finnois",
     "fr": "Français",
     "frCA": "Français (Canadien)",
@@ -29,7 +31,5 @@
     "tr": "Turc",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
-    "zhTW": "Chinois (Taiwan)",
-    "et": "Estonien",
-    "da": "Danois"
+    "zhTW": "Chinois (Taiwan)"
 }

lang/languages-fy.json

@@ -1,5 +1,4 @@
 {
-    "en": "",
     "af": "",
     "bg": "",
     "ca": "",
@@ -7,6 +6,7 @@
     "da": "",
     "de": "",
     "el": "",
+    "en": "",
     "enGB": "",
     "eo": "",
     "es": "",

lang/languages-gl.json

@@ -1,5 +1,4 @@
 {
-    "en": "Inglés",
     "af": "Afrikans",
     "ar": "Árabe",
     "bg": "Búlgaro",
@@ -8,6 +7,7 @@
     "da": "Dinamarqués",
     "de": "Alemán",
     "el": "Grego",
+    "en": "Inglés",
     "enGB": "Inglés (Reino Unido)",
     "eo": "Esperanto",
     "es": "Español",
@@ -18,7 +18,6 @@
     "fr": "Francés",
     "frCA": "Francés (Canadá)",
     "he": "Hebreo",
-    "mr":"Marathi",
     "hr": "Croata",
     "hu": "Húngaro",
     "hy": "Armenio",
@@ -28,14 +27,15 @@
     "kab": "Cabila",
     "ko": "Coreano",
     "lt": "Lituano",
-    "ml": "Malayalam",
     "lv": "Letón",
+    "ml": "Malayalam",
+    "mr": "Marathi",
     "nl": "Holandés",
     "oc": "Occitano",
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
-    "ru": "Ruso",
     "ro": "Romanés",
+    "ru": "Ruso",
     "sc": "Sardo",
     "sk": "Eslovaco",
     "sl": "Esloveno",

lang/languages-he.json

@@ -1,5 +1,4 @@
 {
-    "en": "אנגלית",
     "af": "אפריקאית",
     "bg": "בולגרית",
     "ca": "קטלנית",
@@ -7,6 +6,7 @@
     "da": "דנית",
     "de": "גרמנית",
     "el": "יוונית",
+    "en": "אנגלית",
     "enGB": "אנגלית (בריטניה)",
     "eo": "אספרנטו",
     "es": "ספרדית",

lang/languages-hi.json

@@ -1,9 +1,4 @@
 {
-    "en": "अंग्रेज़ी",
-	"hi": "हिन्दी",
-	"mr":"मराठी",
-	"ml": "मलयालम",
-	"enGB": "अंग्रेज़ी (UK)",
     "af": "Afrikaans",
     "ar": "Arabic",
     "bg": "Bulgarian",
@@ -12,15 +7,19 @@
     "da": "Danish",
     "de": "German",
     "el": "Greek",
+    "en": "अंग्रेज़ी",
+    "enGB": "अंग्रेज़ी (UK)",
     "eo": "Esperanto",
     "es": "Spanish",
     "esUS": "Spanish (Latin America)",
     "et": "Estonian",
     "eu": "Basque",
+    "fa": "Persian",
     "fi": "Finnish",
     "fr": "French",
     "frCA": "French (Canadian)",
-    "he": "Hebrew", 
+    "he": "Hebrew",
+    "hi": "हिन्दी",
     "hr": "Croatian",
     "hu": "Hungarian",
     "hy": "Armenian",
@@ -31,14 +30,15 @@
     "ko": "Korean",
     "lt": "Lithuanian",
     "lv": "Latvian",
+    "ml": "मलयालम",
+    "mr": "मराठी",
     "nl": "Dutch",
     "oc": "Occitan",
-    "fa": "Persian",
     "pl": "Polish",
     "pt": "Portuguese",
     "ptBR": "Portuguese (Brazil)",
-    "ru": "Russian",
     "ro": "Romanian",
+    "ru": "Russian",
     "sc": "Sardinian",
     "sk": "Slovak",
     "sl": "Slovenian",

lang/languages-hr.json

@@ -1,11 +1,11 @@
 {
-    "en": "Engleski",
     "af": "Afrikanski",
     "az": "Ažerbejdžanski",
     "bg": "Bugarski",
     "cs": "Češki",
     "de": "Njemački",
     "el": "Grčki",
+    "en": "Engleski",
     "eo": "Esperanto",
     "es": "Španjolski",
     "fr": "Francuski",
@@ -25,4 +25,4 @@
     "tr": "Turski",
     "vi": "Vijetnamski",
     "zhCN": "Kineski (Kina)"
-}
+}

lang/languages-hu.json

@@ -1,15 +1,17 @@
 {
-    "en": "Angol",
     "af": "Afrikaans",
     "bg": "Bolgár",
     "ca": "Katalán",
     "cs": "Cseh",
+    "da": "Dán",
     "de": "Német",
     "el": "Görög",
+    "en": "Angol",
     "enGB": "Angol (Egyesült Királyság)",
     "eo": "Eszperantó",
     "es": "Spanyol",
     "esUS": "Spanyol (Latin-Amerika)",
+    "et": "Észt",
     "fi": "Finn",
     "fr": "Francia",
     "frCA": "Francia (kanadai)",
@@ -29,7 +31,5 @@
     "tr": "Török",
     "vi": "Vietnámi",
     "zhCN": "Kínai (Kína)",
-    "zhTW": "Kínai (Tajvan)",
-    "et": "Észt",
-    "da": "Dán"
+    "zhTW": "Kínai (Tajvan)"
 }

lang/languages-hy.json

@@ -1,11 +1,11 @@
 {
-    "en": "Անգլերեն",
     "af": "",
     "az": "",
     "bg": "Բուլղարերեն",
     "cs": "",
     "de": "Գերմաներեն ",
     "el": "",
+    "en": "Անգլերեն",
     "eo": "Էսպերանտո",
     "es": "Իսպաներեն",
     "fr": "Ֆրանսերեն",
@@ -24,4 +24,4 @@
     "tr": "Թուրքերեն",
     "vi": "",
     "zhCN": "Չիներեն"
-}
+}

lang/languages-id.json

@@ -1,5 +1,4 @@
 {
-    "en": "Bahasa Inggris - US",
     "af": "Bahasa Afrika",
     "bg": "Bahasa Bulgaria",
     "ca": "Bahasa Katalan",
@@ -7,6 +6,7 @@
     "da": "Bahasa Denmark",
     "de": "Bahasa Jerman",
     "el": "Bahasa Yunani",
+    "en": "Bahasa Inggris - US",
     "enGB": "Bahasa Inggris - UK",
     "eo": "Esperanto",
     "es": "Bahasa Spanyol",

lang/languages-is.json

@@ -1,5 +1,4 @@
 {
-    "en": "Enska",
     "af": "Afríkanska",
     "bg": "Búlgarska",
     "ca": "Katalónska",
@@ -7,6 +6,7 @@
     "da": "Danska",
     "de": "Þýska",
     "el": "Gríska",
+    "en": "Enska",
     "enGB": "Enska (Bretland)",
     "eo": "Esperantó",
     "es": "Spænska",

lang/languages-it.json

@@ -1,5 +1,4 @@
 {
-    "en": "Inglese",
     "af": "Afrikaans",
     "az": "Azero",
     "bg": "Bulgaro",
@@ -8,6 +7,7 @@
     "da": "Danese",
     "de": "Tedesco",
     "el": "Greco",
+    "en": "Inglese",
     "enGB": "Inglese (Regno Unito)",
     "eo": "Esperanto",
     "es": "Spagnolo",
@@ -18,7 +18,6 @@
     "fr": "Francese",
     "frCA": "Francese (Canada)",
     "he": "Ebraico",
-    "mr": "Marathi",
     "hr": "Croato",
     "hu": "Ungaro",
     "hy": "Armeno",
@@ -28,19 +27,20 @@
     "kab": "Kabyle",
     "ko": "Coreano",
     "lt": "Lituano",
-    "ml": "Malese",
     "lv": "Lettone",
+    "ml": "Malese",
+    "mr": "Marathi",
     "nl": "Olandese",
     "oc": "Occitano",
     "pl": "Polacco",
     "ptBR": "Portoghese (Brasile)",
-    "ru": "Russo",    
-    "ro": "Rumeno",    
+    "ro": "Rumeno",
+    "ru": "Russo",
     "sc": "Sardo",
     "sk": "Slovacco",
-    "sl": "Sloveno",    
+    "sl": "Sloveno",
     "sr": "Serbo",
-    "sv": "Svedese",    
+    "sv": "Svedese",
     "th": "Tailandese",
     "tr": "Turco",
     "uk": "Ucraino",

lang/languages-ja.json

@@ -1,5 +1,4 @@
 {
-    "en": "英語",
     "af": "アフリカーンス語",
     "ar": "アラビア語",
     "bg": "ブルガリア語",
@@ -8,6 +7,7 @@
     "da": "デンマーク語",
     "de": "ドイツ語",
     "el": "ギリシア語",
+    "en": "英語",
     "enGB": "英語 (英国)",
     "eo": "エスペラント語",
     "es": "スペイン語",
@@ -18,7 +18,6 @@
     "fr": "フランス語",
     "frCA": "フランス語 (カナダ)",
     "he": "ヘブライ語",
-    "mr": "マラーティー語",
     "hr": "クロアチア語",
     "hu": "ハンガリー語",
     "hy": "アルメニア語",
@@ -28,12 +27,13 @@
     "kab": "カビル語",
     "ko": "韓国語",
     "lt": "リトアニア語",
+    "mr": "マラーティー語",
     "nl": "オランダ語",
     "oc": "オック語",
     "pl": "ポーランド語",
     "ptBR": "ポルトガル語 (ブラジル)",
-    "ru": "ロシア語",
     "ro": "ルーマニア語",
+    "ru": "ロシア語",
     "sc": "サルデーニャ語",
     "sk": "スロバキア語",
     "sl": "スロベニア語",

lang/languages-ka.json

@@ -1,15 +1,17 @@
 {
-    "en": "ინგლისური",
     "af": "აფრიკული",
     "bg": "ბულგარული",
     "ca": "კატალონიური",
     "cs": "ჩეხური",
+    "da": "დანიური",
     "de": "გერმანული",
     "el": "ბერძნული",
+    "en": "ინგლისური",
     "enGB": "ინგლისური (დიდი ბრიტანეთი)",
     "eo": "ესტონური",
     "es": "ესპანური",
     "esUS": "ესპანური (ლათინური ამერიკა)",
+    "et": "ესტონური",
     "fi": "ფინური",
     "fr": "ფრანგული",
     "frCA": "ფრანგული (კანადური)",
@@ -30,7 +32,5 @@
     "tr": "თურქული",
     "vi": "ვიეტნამური",
     "zhCN": "ჩინური (ჩინეთი)",
-    "zhTW": "ჩინური (ტაივანი)",
-    "et": "ესტონური",
-    "da": "დანიური"
+    "zhTW": "ჩინური (ტაივანი)"
 }

lang/languages-kab.json

@@ -1,57 +1,57 @@
 {
-    "en": "Taglizit",
     "af": "Tafrikant",
+    "ar": "Taɛrabt",
     "az": "Tazirit",
     "bg": "Tabulgarit",
+    "ca": "Takaṭalant",
     "cs": "Taččikit",
+    "da": "Tadanit",
     "de": "Talmanit",
     "el": "Tagrigit",
+    "en": "Taglizit",
+    "enGB": "Tagnizit (Tagldit i ddukklen)",
     "eo": "Taspiṛantit",
     "es": "Taspanit",
+    "esUS": "Taspanit (Temrikt Talatinit)",
+    "et": "Tastunit",
+    "eu": "Tabaskit",
+    "fa": "Tafarisit",
+    "fi": "Tafinit",
     "fr": "Tafransist",
+    "frCA": "Tafṛansist (Kanada)",
+    "he": "Taɛbrit",
+    "hi": "Tahindit",
+    "hr": "Takrwasit",
+    "hu": "Tahungrit",
     "hy": "Tarminit",
+    "id": "Tandunizit",
     "it": "Taṭalyant",
     "ja": "Tajapunit",
-    "ko": "Takurit",
     "kab": "Taqbaylit",
+    "ko": "Takurit",
+    "lt": "Taliṭwanit",
+    "lv": "Talatviant",
+    "ml": "Tamalayalamt",
+    "mr": "Tamratit",
     "nb": "Tanurvijit Bukmal",
+    "nl": "Tahulandit",
     "oc": "Tuksitant",
     "pl": "Tapulunit",
+    "pt": "Taportugit",
     "ptBR": "Tapurtugit (Brazil)",
+    "ro": "Tarumanit",
     "ru": "Tarusit",
+    "sc": "Tasardit",
     "sk": "Tasluvakit",
     "sl": "Tasluvinit",
+    "sq": "Talbanit",
+    "sr": "Taserbit",
     "sv": "Taswidit",
+    "te": "Tatelugut",
+    "th": "Tayland",
     "tr": "Taṭurkit",
+    "uk": "Tukranit",
     "vi": "Tavyitnamit",
     "zhCN": "Tavyitnamit",
-    "ro": "Tarumanit",
-    "ar": "Taɛrabt",
-    "zhTW": "Tacinwat (Taiwan)",
-    "uk": "Tukranit",
-    "th": "Tayland",
-    "sc": "Tasardit",
-    "nl": "Tahulandit",
-    "lt": "Taliṭwanit",
-    "id": "Tandunizit",
-    "hu": "Tahungrit",
-    "hr": "Takrwasit",
-    "he": "Taɛbrit",
-    "frCA": "Tafṛansist (Kanada)",
-    "fi": "Tafinit",
-    "eu": "Tabaskit",
-    "et": "Tastunit",
-    "esUS": "Taspanit (Temrikt Talatinit)",
-    "enGB": "Tagnizit (Tagldit i ddukklen)",
-    "da": "Tadanit",
-    "ca": "Takaṭalant",
-    "mr": "Tamratit",
-    "ml": "Tamalayalamt",
-    "lv": "Talatviant",
-    "fa": "Tafarisit",
-    "pt": "Taportugit",
-    "sr": "Taserbit",
-    "sq": "Talbanit",
-    "hi": "Tahindit",
-    "te": "Tatelugut"
+    "zhTW": "Tacinwat (Taiwan)"
 }

lang/languages-km.json

@@ -1,11 +1,11 @@
 {
-    "en": "អង់គ្លេស",
     "af": "អាហ្វ្រិច",
     "az": "Azerbaijani",
     "bg": "ប៊ុលហ្គារី",
     "cs": "ឆេក",
     "de": "អាល្លឺម៉ង់",
     "el": "ក្រិក",
+    "en": "អង់គ្លេស",
     "eo": "Esperanto",
     "es": "អេស្ប៉ាញ",
     "fr": "បារាំង",
@@ -24,4 +24,4 @@
     "tr": "ទួរគី",
     "vi": "វៀតណាម",
     "zhCN": "ចិន (ចិន)"
-}
+}

lang/languages-ko.json

@@ -1,25 +1,25 @@
 {
-    "en": "영어",
     "af": "아프리칸스어",
     "ar": "아랍어",
     "az": "아제르바이잔어",
     "bg": "불가리어",
     "ca": "카탈루냐어",
-    "cs": "체코어",    
+    "cs": "체코어",
     "da": "덴마크어",
     "de": "독일어",
     "el": "그리스어",
+    "en": "영어",
     "enGB": "영어(영국)",
     "eo": "에스페란토어",
     "es": "스페인어",
     "esUS": "스페인어(라틴 아메리카)",
     "et": "에스토니아어",
     "eu": "바스크어",
+    "fa": "페르시아어",
     "fi": "핀란드어",
     "fr": "프랑스어",
     "frCA": "프랑스어(캐나다)",
     "he": "히브리어",
-    "mr":"마라티어",
     "hr": "크로아티아어",
     "hu": "헝가리어",
     "hy": "아르메니아어",
@@ -29,15 +29,15 @@
     "kab": "커바일어",
     "ko": "한국어",
     "lt": "리투아니아어",
-    "ml": "말라얄람어",
     "lv": "라트비아어",
+    "ml": "말라얄람어",
+    "mr": "마라티어",
     "nl": "네덜란드어",
     "oc": "오크어",
-    "fa": "페르시아어",
     "pl": "폴란드어",
     "ptBR": "포르투갈어(브라질)",
-    "ru": "러시아어",
     "ro": "루마니아어",
+    "ru": "러시아어",
     "sc": "사르데냐어",
     "sk": "슬로바키아어",
     "sl": "슬로베니아어",

lang/languages-lt.json

@@ -1,5 +1,4 @@
 {
-    "en": "Anglų",
     "af": "Afrikanų",
     "bg": "Bulgarų",
     "ca": "Katalanų",
@@ -7,6 +6,7 @@
     "da": "Danų",
     "de": "Vokiečių",
     "el": "Graikų",
+    "en": "Anglų",
     "enGB": "Anglų (Britų)",
     "eo": "Esperanto",
     "es": "Ispanų",
@@ -20,8 +20,8 @@
     "hy": "Armėnų",
     "it": "Italų",
     "ja": "Japonų",
-    "lt": "Lietuvių",
     "ko": "Korėjiečių",
+    "lt": "Lietuvių",
     "nl": "Olandų",
     "oc": "Oksitanų",
     "pl": "Lenkų",

lang/languages-lv.json

@@ -1,11 +1,11 @@
 {
-    "en": "angļu",
     "af": "āfrikāņu",
     "bg": "bulgāru",
     "ca": "kataloniešu",
     "cs": "čehu",
     "de": "vācu",
     "el": "grieķu",
+    "en": "angļu",
     "enGB": "angļu (Lielbritānija)",
     "eo": "esperanto",
     "es": "spāņu",

lang/languages-mn.json

@@ -1,5 +1,4 @@
 {
-    "en": "English",
     "af": "Afrikaans",
     "bg": "Bulgarian",
     "ca": "Catalan",
@@ -7,6 +6,7 @@
     "da": "Danish",
     "de": "German",
     "el": "Greek",
+    "en": "English",
     "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Spanish",
@@ -21,6 +21,7 @@
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
+    "mn": "Монгол",
     "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",
@@ -30,6 +31,5 @@
     "tr": "Turkish",
     "vi": "Vietnamese",
     "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)",
-    "mn": "Монгол"
+    "zhTW": "Chinese (Taiwan)"
 }

lang/languages-mr.json

@@ -1,19 +1,29 @@
 {
-    "en": "English",
     "af": "Afrikaans",
     "az": "",
     "bg": "Bulgarian",
+    "ca": "Catalan",
     "cs": "Czech",
+    "da": "Danish",
     "de": "German",
     "el": "Greek",
+    "en": "English",
+    "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Spanish",
+    "esUS": "Spanish (Latin America)",
+    "et": "Estonian",
+    "fi": "Finnish",
     "fr": "French",
+    "frCA": "French (Canadian)",
+    "hr": "Croatian",
+    "hu": "Hungarian",
     "hy": "Armenian",
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
     "nb": "",
+    "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",
     "ptBR": "Portuguese (Brazil)",
@@ -24,15 +34,5 @@
     "tr": "Turkish",
     "vi": "Vietnamese",
     "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)",
-    "nl": "Dutch",
-    "hu": "Hungarian",
-    "hr": "Croatian",
-    "frCA": "French (Canadian)",
-    "fi": "Finnish",
-    "et": "Estonian",
-    "esUS": "Spanish (Latin America)",
-    "enGB": "English (United Kingdom)",
-    "da": "Danish",
-    "ca": "Catalan"
+    "zhTW": "Chinese (Taiwan)"
 }

lang/languages-nb.json

@@ -1,14 +1,18 @@
 {
-    "en": "Engelsk",
     "af": "",
     "az": "",
     "bg": "",
     "cs": "Tsjekkisk",
+    "da": "Dansk",
     "de": "Tysk",
     "el": "Gresk",
+    "en": "Engelsk",
     "eo": "",
     "es": "Spansk",
+    "fi": "Finsk",
     "fr": "Fransk",
+    "hr": "Kroatisk",
+    "hu": "Ungarsk",
     "hy": "",
     "it": "Italiensk",
     "ja": "Japansk",
@@ -23,9 +27,5 @@
     "sv": "Svensk",
     "tr": "Tyrkisk",
     "vi": "Vietnamesisk",
-    "zhCN": "",
-    "da": "Dansk",
-    "hu": "Ungarsk",
-    "hr": "Kroatisk",
-    "fi": "Finsk"
+    "zhCN": ""
 }

lang/languages-nl.json

@@ -1,5 +1,4 @@
 {
-    "en": "Engels",
     "af": "Afrikaans",
     "az": "Azerbeidzjaans",
     "bg": "Bulgaars",
@@ -7,12 +6,13 @@
     "cs": "Tsjechisch",
     "da": "Deens",
     "de": "Duits",
-    "enGB": "Engels (Verenigd Koninkrijk)",
-    "et": "Estlands",
     "el": "Grieks",
+    "en": "Engels",
+    "enGB": "Engels (Verenigd Koninkrijk)",
     "eo": "Esperanto",
     "es": "Spaans",
     "esUS": "Spaans (Latijns Amerika)",
+    "et": "Estlands",
     "fi": "Fins",
     "fr": "Frans",
     "frCA": "Frans (Canadees)",

lang/languages-oc.json

@@ -1,5 +1,4 @@
 {
-    "en": "Anglés",
     "af": "Afrikaans",
     "ar": "Arabi",
     "bg": "Bulgar",
@@ -8,18 +7,19 @@
     "da": "Danés",
     "de": "Aleman",
     "el": "Grèc",
+    "en": "Anglés",
     "enGB": "Anglés (Reialme Unit)",
     "eo": "Esperanto",
     "es": "Castelhan",
     "esUS": "Espanhòl (America latina)",
     "et": "Estonian",
     "eu": "Basc",
+    "fa": "Persa",
     "fi": "Finés",
     "fr": "Francés",
     "frCA": "Francés (Canadian)",
     "he": "Ebrèu",
-    "hi": "Indi",     
-    "mr":"Marathi",
+    "hi": "Indi",
     "hr": "Croat",
     "hu": "Ongrés",
     "hy": "Armenian",
@@ -29,23 +29,23 @@
     "kab": "Cabil",
     "ko": "Corean",
     "lt": "Lituanian",
-    "ml": "Malaialam",
     "lv": "Leton",
+    "ml": "Malaialam",
+    "mr": "Marathi",
     "nl": "Neerlandés",
     "oc": "Occitan",
-    "fa": "Persa",    
     "pl": "Polonés",
-    "pt": "Portugués",    
+    "pt": "Portugués",
     "ptBR": "Portugués (Brasil)",
-    "ru": "Rus",
     "ro": "Romanian",
+    "ru": "Rus",
     "sc": "Sarde",
     "sk": "Eslovac",
     "sl": "Eslovèn",
+    "sq": "Albanés",
     "sr": "Sèrbe",
-    "sq": "Albanés",    
     "sv": "Suedés",
-    "te": "Telugu",    
+    "te": "Telugu",
     "th": "Tai",
     "tr": "Turc",
     "uk": "Ucraïnian",

lang/languages-pl.json

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

lang/languages-pt.json

@@ -1,32 +1,54 @@
 {
-    "en": "Inglês",
-    "af": "Africâner",
+    "af": "Africânder",
+    "ar": "Árabe",
     "bg": "Búlgaro",
     "ca": "Catalão",
     "cs": "Checo",
+    "da": "Dinamarquês",
     "de": "Alemão",
     "el": "Grego",
+    "en": "Inglês",
     "enGB": "Inglês (Reino Unido)",
     "eo": "Esperanto",
     "es": "Espanhol",
     "esUS": "Espanhol (América Latina)",
+    "et": "Estónio",
+    "eu": "Basco",
+    "fa": "Persa",
     "fi": "Finlandês",
     "fr": "Francês",
     "frCA": "Francês (Canadá)",
+    "he": "Hebraico",
+    "hi": "Hindu",
     "hr": "Croata",
     "hu": "Húngaro",
-    "hy": "Armênio",
+    "hy": "Arménio",
+    "id": "Indonésio",
     "it": "Italiano",
     "ja": "Japonês",
+    "kab": "Cabila",
     "ko": "Coreano",
+    "lt": "Lituano",
+    "lv": "Letão",
+    "ml": "Malaio",
+    "mr": "Marata",
     "nl": "Holandês",
     "oc": "Occitano",
-    "pl": "Polonês",
+    "pl": "Polaco",
     "pt": "Português",
     "ptBR": "Português (Brasil)",
+    "ro": "Romeno",
     "ru": "Russo",
+    "sc": "Sardo",
+    "sk": "Eslovaco",
+    "sl": "Esloveno",
+    "sq": "Albanês",
+    "sr": "Sérvio",
     "sv": "Sueco",
+    "te": "Telugu",
+    "th": "Tailandês",
     "tr": "Turco",
+    "uk": "Ucraniano",
     "vi": "Vietnamita",
     "zhCN": "Chinês (China)",
     "zhTW": "Chinês (Taiwan)"

lang/languages-ptBR.json

@@ -1,11 +1,11 @@
 {
-    "en": "Inglês",
     "af": "Africâner",
     "bg": "Búlgaro",
     "ca": "Catalão",
     "cs": "Checo",
     "de": "Alemão",
     "el": "Grego",
+    "en": "Inglês",
     "enGB": "Inglês (Reino Unido)",
     "eo": "Esperanto",
     "es": "Espanhol",
@@ -29,4 +29,4 @@
     "vi": "Vietnamita",
     "zhCN": "Chinês (China)",
     "zhTW": "Chinês (Taiwan)"
-}
+}

lang/languages-ro.json

@@ -1,5 +1,4 @@
 {
-    "en": "Engleză",
     "af": "Afrikaans",
     "ar": "Arabă",
     "bg": "Bulgară",
@@ -8,6 +7,7 @@
     "da": "Daneză",
     "de": "Germană",
     "el": "Greacă",
+    "en": "Engleză",
     "enGB": "Engleză (Regatul Unit)",
     "eo": "Esperanto",
     "es": "Spaniolă",
@@ -30,8 +30,8 @@
     "oc": "Occitană",
     "pl": "Poloneză",
     "ptBR": "Portugheză (Brazilia)",
-    "ru": "Rusă",
     "ro": "Română",
+    "ru": "Rusă",
     "sc": "Sardă",
     "sk": "Slovacă",
     "sl": "Slovenă",

lang/languages-ru.json

@@ -1,15 +1,17 @@
 {
-    "en": "Английский",
     "af": "Африкаанс",
     "bg": "Болгарский",
     "ca": "Каталонский",
     "cs": "Чешский",
+    "da": "Датский",
     "de": "Немецкий",
     "el": "Греческий",
+    "en": "Английский",
     "enGB": "Английский (Великобритания)",
     "eo": "Эсперанто",
     "es": "Испанский",
     "esUS": "Испанский (Латинская Америка)",
+    "et": "Эстонский",
     "fi": "Финский",
     "fr": "Французский",
     "frCA": "Французский (канадский)",
@@ -29,7 +31,5 @@
     "tr": "Турецкий",
     "vi": "Вьетнамский",
     "zhCN": "Китайский (Китай)",
-    "zhTW": "Китайский (Тайвань)",
-    "et": "Эстонский",
-    "da": "Датский"
+    "zhTW": "Китайский (Тайвань)"
 }

lang/languages-sc.json

@@ -1,5 +1,4 @@
 {
-    "en": "Inglesu",
     "af": "Afrikaans",
     "bg": "Bùlgaru",
     "ca": "Catalanu",
@@ -7,6 +6,7 @@
     "da": "Danesu",
     "de": "Tedescu",
     "el": "Gregu",
+    "en": "Inglesu",
     "enGB": "Inglesu (Rennu Unidu)",
     "eo": "Esperanto",
     "es": "Castillianu",

lang/languages-sk.json

@@ -1,5 +1,4 @@
 {
-    "en": "Angličtina",
     "af": "",
     "bg": "Bulharština",
     "ca": "Katalánština",
@@ -7,6 +6,7 @@
     "da": "Dánština",
     "de": "Nemčina",
     "el": "Gréčtina",
+    "en": "Angličtina",
     "enGB": "Angličtina (Spojené kráľovstvo)",
     "eo": "Esperanto",
     "es": "Španielčina",
@@ -32,4 +32,4 @@
     "vi": "Vietnamčina",
     "zhCN": "Čínština (Čína)",
     "zhTW": "Čínština (Taiwan)"
-}
+}

lang/languages-sl.json

@@ -1,11 +1,11 @@
 {
-    "en": "Angleščina",
     "af": "Afrikanščina",
     "az": "Azerbajdanščina",
     "bg": "Bolgarščina",
     "cs": "Češčina",
     "de": "Nemščina",
     "el": "Grščina",
+    "en": "Angleščina",
     "eo": "Esperanto",
     "es": "Španščina",
     "fr": "Francoščina",
@@ -24,4 +24,4 @@
     "tr": "Turščina",
     "vi": "Vietnamščina",
     "zhCN": "kitajščina (poenostavljena)"
-}
+}

lang/languages-sq.json

@@ -1,5 +1,4 @@
 {
-    "en": "Anglisht",
     "af": "Afrikaans",
     "ar": "Arabisht",
     "bg": "Bullgarisht",
@@ -8,18 +7,19 @@
     "da": "Danisht",
     "de": "Gjermanisht",
     "el": "Greqisht",
+    "en": "Anglisht",
     "enGB": "Anglisht (Mbretëria e Bashkuar)",
     "eo": "Esperanto",
     "es": "Spanjisht",
     "esUS": "Spanjisht (Amerikë Latine)",
     "et": "Estonisht",
     "eu": "Baskisht",
+    "fa": "Persisht",
     "fi": "Finlandisht",
     "fr": "Frëngjisht",
     "frCA": "Frëngjisht (Kebek)",
     "he": "Hebraisht",
     "hi": "Hindi",
-    "mr":"Maratisht",
     "hr": "Kroatisht",
     "hu": "Hungarisht",
     "hy": "Armenisht",
@@ -29,21 +29,21 @@
     "kab": "Kabilisht",
     "ko": "Koreançe",
     "lt": "Lituanisht",
-    "ml": "Malajalamisht",
     "lv": "Letonisht",
+    "ml": "Malajalamisht",
+    "mr": "Maratisht",
     "nl": "Holandisht",
     "oc": "Oçitanisht",
-    "fa": "Persisht",
     "pl": "Polonisht",
     "pt": "Portugalisht",
     "ptBR": "Portugalisht (Brazil)",
-    "ru": "Rusisht",
     "ro": "Rumanisht",
+    "ru": "Rusisht",
     "sc": "Sardenjisht",
     "sk": "Sllovakisht",
     "sl": "Sllovenisht",
-    "sr": "Serbisht",
     "sq": "Shqip",
+    "sr": "Serbisht",
     "sv": "Suedisht",
     "te": "Telugu",
     "th": "Tajlandisht",

lang/languages-sr.json

@@ -1,19 +1,29 @@
 {
-    "en": "Енглески",
     "af": "Африкански",
     "az": "Азербејџански",
     "bg": "Бугарски",
+    "ca": "Каталонски",
     "cs": "Чешки",
+    "da": "Дански",
     "de": "Њемачки",
     "el": "Грчки",
+    "en": "Енглески",
+    "enGB": "Енглески (Велика Британија)",
     "eo": "Есперанто",
     "es": "Шпански",
+    "esUS": "Шпански (Латинска Америка)",
+    "et": "Естонски",
+    "fi": "Фински",
     "fr": "Француски",
+    "frCA": "Француски (Канада)",
+    "hr": "Хрватски",
+    "hu": "Мађарски",
     "hy": "Јерменски",
     "it": "Италијански",
     "ja": "Јапански",
     "ko": "Корејски",
     "nb": "Норвешки Бокал",
+    "nl": "Холандски",
     "oc": "Окцитански",
     "pl": "Пољски",
     "ptBR": "Португалски (Бразил)",
@@ -25,15 +35,5 @@
     "tr": "Турски",
     "vi": "Вијетнамски",
     "zhCN": "Кинески (Кина)",
-    "zhTW": "Кинески (Тајван)",
-    "nl": "Холандски",
-    "hu": "Мађарски",
-    "hr": "Хрватски",
-    "frCA": "Француски (Канада)",
-    "fi": "Фински",
-    "et": "Естонски",
-    "esUS": "Шпански (Латинска Америка)",
-    "enGB": "Енглески (Велика Британија)",
-    "da": "Дански",
-    "ca": "Каталонски"
+    "zhTW": "Кинески (Тајван)"
 }

lang/languages-sv.json

@@ -1,19 +1,29 @@
 {
-    "en": "Engelska",
     "af": "Afrikaans",
     "az": "",
     "bg": "Bulgariska",
+    "ca": "Katalanska",
     "cs": "Tjeckiska",
+    "da": "Danska",
     "de": "Tyska",
     "el": "Grekiska",
+    "en": "Engelska",
+    "enGB": "Engelska (Storbritannien)",
     "eo": "Esperanto",
     "es": "Spanska",
+    "esUS": "Spanska (Latinamerika)",
+    "et": "Estniska",
+    "fi": "Finska",
     "fr": "Franska",
+    "frCA": "Franska (Kanada)",
+    "hr": "Kroatiska",
+    "hu": "Ungerska",
     "hy": "Armeniska",
     "it": "Italienska",
     "ja": "Japanska",
     "ko": "Koreanska",
     "nb": "Norska (Bokmål)",
+    "nl": "Nederländska",
     "oc": "Occitanska",
     "pl": "Polska",
     "ptBR": "Portugisiska (Brasilien)",
@@ -24,15 +34,5 @@
     "tr": "Turkiska",
     "vi": "Vietnamesiska",
     "zhCN": "Kinesiska (Kina)",
-    "zhTW": "Kinesiska (Taiwan)",
-    "nl": "Nederländska",
-    "hu": "Ungerska",
-    "hr": "Kroatiska",
-    "frCA": "Franska (Kanada)",
-    "fi": "Finska",
-    "et": "Estniska",
-    "esUS": "Spanska (Latinamerika)",
-    "enGB": "Engelska (Storbritannien)",
-    "da": "Danska",
-    "ca": "Katalanska"
+    "zhTW": "Kinesiska (Taiwan)"
 }