[pull] master from jitsi:master

README.md

@@ -27,7 +27,7 @@ And many more!
 
 ## Using Jitsi Meet
 
-Using Jitsi Meet is straightforward, as it's browser based. Head over to [meet.jit.si](https://meet.jit.si) and give it a try. It's anonymous, scalable and free to use. All browsers are supported! 
+Using Jitsi Meet is straightforward, as it's browser based. Head over to [meet.jit.si](https://meet.jit.si) and give it a try. It's scalable and free to use. All you need is a Google, Facebook or GitHub account in order to start a meeting. All browsers are supported!
 
 Using mobile? No problem, you can either use your mobile web browser or our fully-featured
 mobile apps:

config.js

@@ -378,7 +378,7 @@ var config = {
     // DEPRECATED. Use transcription.preferredLanguage instead.
     // preferredTranscribeLanguage: 'en-US',
 
-    // DEPRECATED. Use transcription.autoCaptionOnRecord instead.
+    // DEPRECATED. Use transcription.autoTranscribeOnRecord instead.
     // autoCaptionOnRecord: false,
 
     // Transcription options.
@@ -410,8 +410,8 @@ var config = {
     //     // Disable start transcription for all participants.
     //     disableStartForAll: false,
 
-    //     // Enables automatic turning on captions when recording is started
-    //     autoCaptionOnRecord: false,
+    //     // Enables automatic turning on transcribing when recording is started
+    //     autoTranscribeOnRecord: false,
     // },
 
     // Misc

css/_recording.scss

@@ -15,6 +15,10 @@
             font-size: 14px;
             margin-left: 16px;
             max-width: 70%;
+
+            &-no-space {
+                margin-left: 0;
+            }
         }
 
         &.space-top {

lang/main-ar.json

@@ -557,8 +557,6 @@
         "youtubeTerms": "شروط خدمة يوتيوب"
     },
     "lobby": {
-        "admit": "سمح بالدخول",
-        "admitAll": "سمح للجميع بالدخول",
         "allow": "اسمح",
         "backToKnockModeButton": "لا يوجد كلمة مرور، اطلب الإذن بالدخول بدلًا من ذلك.",
         "chat": "دردشة",
@@ -593,8 +591,6 @@
         "notificationTitle": "غرفة الانتظار",
         "passwordField": "أدخل كلمة الدخول إلى المُلتقى",
         "passwordJoinButton": "انضم",
-        "reject": "رفض",
-        "rejectAll": "رفض الكل",
         "title": "غرفة الانتظار",
         "toggleLabel": "فعِّل غرفة الانتظار"
     },
@@ -720,6 +716,8 @@
     },
     "participantsPane": {
         "actions": {
+            "admit": "سمح بالدخول",
+            "admitAll": "سمح للجميع بالدخول",
             "allow": "السماح للحاضرين بـ:",
             "allowVideo": "السماح بالفيديو",
             "askUnmute": "اطلب إعادة الصوت",
@@ -732,6 +730,7 @@
             "mute": "كتم الصوت",
             "muteAll": "كتم الكل",
             "muteEveryoneElse": "كتم صوت  الآخرين",
+            "reject": "رفض",
             "stopEveryonesVideo": "أوقف فيديو الجميع",
             "stopVideo": "أوقف الفيديو",
             "unblockEveryoneMicCamera": "قم بإلغاء حظر ميكروفون وكاميرا الجميع",

lang/main-bg.json

@@ -420,8 +420,6 @@
         "youtubeTerms": "Условия за ползване на YouTube"
     },
     "lobby": {
-        "admit": "Допусни",
-        "allow": "Разреши",
         "backToKnockModeButton": "Заявка за включване без парола",
         "dialogTitle": "Режим лоби",
         "disableDialogContent": "Режим Лоби е включен. Този решим защитава срещите Ви от случайни посетители. Искате ли да го изключите?",
@@ -450,7 +448,6 @@
         "notificationTitle": "Лоби",
         "passwordField": "Въведи парола за срещата",
         "passwordJoinButton": "Влез",
-        "reject": "Откажи",
         "title": "Лоби",
         "toggleLabel": "Включи лоби"
     },
@@ -521,6 +518,13 @@
         "suboptimalExperienceTitle": "Внимание",
         "unmute": "Пускане на микрофона"
     },
+    "participantsPane": {
+        "actions": {
+            "admit": "Допусни",
+            "allow": "Разреши",
+            "reject": "Откажи"
+        }
+    },
     "passwordDigitsOnly": "До {{number}} цифри",
     "passwordSetRemotely": "зададена от друг участник",
     "poweredby": "с подкрепата на",

lang/main-ca.json

@@ -561,8 +561,6 @@
         "youtubeTerms": "Condicions de servei de YouTube"
     },
     "lobby": {
-        "admit": "Admet",
-        "admitAll": "Admet tothom",
         "allow": "Permet",
         "backToKnockModeButton": "Demaneu per a unir-vos",
         "chat": "Xat",
@@ -597,8 +595,6 @@
         "notificationTitle": "Sala d'espera",
         "passwordField": "Introduïu la contrasenya de la reunió",
         "passwordJoinButton": "Entra",
-        "reject": "Rebuja",
-        "rejectAll": "Rebutja-ho tot",
         "title": "Sala d'espera",
         "toggleLabel": "Activa la sala d'espera"
     },
@@ -727,6 +723,8 @@
     },
     "participantsPane": {
         "actions": {
+            "admit": "Admet",
+            "admitAll": "Admet tothom",
             "allow": "Permet als assistents:",
             "allowVideo": "Permet el vídeo",
             "askUnmute": "Demanar l'activació el micròfon",
@@ -739,6 +737,7 @@
             "mute": "Silenciar",
             "muteAll": "Silencia tothom",
             "muteEveryoneElse": "Silenciar tothom",
+            "reject": "Rebuja",
             "stopEveryonesVideo": "Atura el vídeo a tothom",
             "stopVideo": "Atura el vídeo",
             "unblockEveryoneMicCamera": "Desbloquejar el micròfon i la càmera de tothom",

lang/main-cs.json

@@ -557,8 +557,6 @@
         "youtubeTerms": "Podmínky používání YouTube"
     },
     "lobby": {
-        "admit": "",
-        "admitAll": "",
         "allow": "Povolit",
         "backToKnockModeButton": "Žádné heslo, místo toho požádat o přijetí",
         "chat": "",
@@ -593,7 +591,6 @@
         "notificationTitle": "Předsálí",
         "passwordField": "Zadejte heslo setkání",
         "passwordJoinButton": "Vstoupit",
-        "reject": "Odmítnout",
         "title": "Předsálí",
         "toggleLabel": "Zapnout předsálí"
     },
@@ -719,22 +716,7 @@
     },
     "participantsPane": {
         "actions": {
-            "allow": "",
-            "allowVideo": "",
-            "askUnmute": "",
-            "audioModeration": "",
-            "blockEveryoneMicCamera": "",
-            "invite": "",
-            "moreModerationActions": "",
-            "moreModerationControls": "",
-            "moreParticipantOptions": "",
-            "mute": "",
-            "muteAll": "",
-            "muteEveryoneElse": "",
-            "stopEveryonesVideo": "",
-            "stopVideo": "",
-            "unblockEveryoneMicCamera": "",
-            "videoModeration": ""
+            "reject": "Odmítnout"
         },
         "close": "",
         "header": "",

lang/main-de.json

@@ -636,8 +636,6 @@
         "youtubeTerms": "YouTube-Nutzungsbedingungen"
     },
     "lobby": {
-        "admit": "Zulassen",
-        "admitAll": "Alle zulassen",
         "backToKnockModeButton": "Kein Passwort, stattdessen Beitritt anfragen",
         "chat": "Chat",
         "dialogTitle": "Lobbymodus",
@@ -671,8 +669,6 @@
         "notificationLobbyEnabled": "{{originParticipantName}} hat die Lobby aktiviert",
         "notificationTitle": "Lobby",
         "passwordJoinButton": "Beitreten",
-        "reject": "Ablehnen",
-        "rejectAll": "Alle ablehnen",
         "title": "Lobby",
         "toggleLabel": "Lobby aktivieren"
     },
@@ -807,6 +803,8 @@
     },
     "participantsPane": {
         "actions": {
+            "admit": "Zulassen",
+            "admitAll": "Alle zulassen",
             "allow": "Anwesenden erlauben:",
             "allowVideo": "Kamera einschalten",
             "askUnmute": "Anfragen, Stummschaltung aufzuheben",
@@ -819,6 +817,7 @@
             "mute": "Stummschalten",
             "muteAll": "Alle stummschalten",
             "muteEveryoneElse": "Alle anderen stummschalten",
+            "reject": "Ablehnen",
             "stopEveryonesVideo": "Alle Kameras ausschalten",
             "stopVideo": "Kamera ausschalten",
             "unblockEveryoneMicCamera": "Kamera und Mikrofon von allen entsperren",
@@ -918,7 +917,7 @@
         "joinWithoutAudio": "Ohne Ton beitreten",
         "keyboardShortcuts": "Tastaturkurzbefehle aktivieren",
         "linkCopied": "Link in die Zwischenablage kopiert",
-        "lookGood": "Ihr Mikrofon scheint zu funktionieren.",
+        "lookGood": "Alles scheint zu funktionieren.",
         "or": "oder",
         "premeeting": "Vorschau",
         "proceedAnyway": "Trotzdem fortsetzen",
@@ -1154,7 +1153,7 @@
     "toolbar": {
         "Settings": "Einstellungen",
         "accessibilityLabel": {
-            "Settings": "Einstellungen ein-/ausschalten",
+            "Settings": "Einstellungen einschalten",
             "audioOnly": "„Nur Audio“ ein-/ausschalten",
             "audioRoute": "Audiogerät auswählen",
             "boo": "Buhen",
@@ -1200,7 +1199,7 @@
             "moreActions": "Menü „Weitere Einstellungen“ ein-/ausschalten",
             "moreActionsMenu": "Menü „Weitere Einstellungen“",
             "moreOptions": "Menü „Weitere Optionen“",
-            "mute": "Mikrofon aktivieren / deaktivieren",
+            "mute": "Mikrofon deaktivieren",
             "muteEveryone": "Alle stummschalten",
             "muteEveryoneElse": "Alle anderen stummschalten",
             "muteEveryoneElsesVideoStream": "Alle anderen Kameras ausschalten",
@@ -1238,7 +1237,7 @@
             "toggleFilmstrip": "Miniaturansichten ein-/ausschalten",
             "unmute": "Stummschaltung aufheben",
             "videoblur": "Unscharfer Hintergrund ein-/ausschalten",
-            "videomute": "„Video stummschalten“ ein-/ausschalten",
+            "videomute": "Kamera stoppen",
             "videomuteGUMPending": "Verbinde Ihre Kamera",
             "videounmute": "Kamera einschalten"
         },
@@ -1287,7 +1286,7 @@
         "lowerYourHand": "Hand senken",
         "moreActions": "Weitere Einstellungen",
         "moreOptions": "Weitere Optionen",
-        "mute": "Stummschalten",
+        "mute": "Audio stummschalten",
         "muteEveryone": "Alle stummschalten",
         "muteEveryonesVideo": "Alle Kameras ausschalten",
         "muteGUMPending": "Verbinde Ihre Kamera",

lang/main-dsb.json

@@ -563,8 +563,6 @@
         "youtubeTerms": "wužywaŕske wustawki za youtube"
     },
     "lobby": {
-        "admit": "pśizwóliś",
-        "admitAll": "wšyknym pśizwólenje daś",
         "backToKnockModeButton": "mimo kodowego słowa, město togo wó pśistup pšosyś",
         "chat": "chat",
         "dialogTitle": "lobbyjowy modus",
@@ -598,8 +596,6 @@
         "notificationTitle": "lobby",
         "passwordField": "kodowe słowo za konferencu zapódaś",
         "passwordJoinButton": "pśistupiś",
-        "reject": "wótpokazaś",
-        "rejectAll": "wšykne wótpokazaś",
         "title": "",
         "toggleLabel": "lobby aktiwěrowaś / deaktiwěrowaś"
     },
@@ -730,6 +726,8 @@
     },
     "participantsPane": {
         "actions": {
+            "admit": "pśizwóliś",
+            "admitAll": "wšyknym pśizwólenje daś",
             "allow": "wobźělnikam pšawo daś:",
             "allowVideo": "kameru aktiwěrowaś",
             "askUnmute": "pšosbu wó anulěrowanje wuśišenja stajiś",
@@ -742,6 +740,7 @@
             "mute": "wuśišyś",
             "muteAll": "wšyknych wuśišyś",
             "muteEveryoneElse": "wšykne druge wuśišyś",
+            "reject": "wótpokazaś",
             "stopEveryonesVideo": "wšykne kamery wušaltowaś",
             "stopVideo": "kameru wušaltowaś",
             "unblockEveryoneMicCamera": "blokěrowane kamery a mikrofon wšyknych zasej aktiwěrowaś",

lang/main-el.json

@@ -580,8 +580,6 @@
         "youtubeTerms": "Όροι υπηρεσιών YouTube"
     },
     "lobby": {
-        "admit": "Αποδοχή",
-        "admitAll": "Αποδοχή όλων",
         "backToKnockModeButton": "Αίτημα εισόδου",
         "chat": "Συνομιλία",
         "dialogTitle": "Λειτουργία υποδοχής",
@@ -615,8 +613,6 @@
         "notificationTitle": "Υποδοχή",
         "passwordField": "Εισάγετε τον κωδικό σύσκεψης",
         "passwordJoinButton": "Συμμετοχή",
-        "reject": "Απόρριψη",
-        "rejectAll": "Απόρριψη όλων",
         "title": "Υποδοχή",
         "toggleLabel": "Ενεργοποίηση υποδοχής"
     },
@@ -745,6 +741,8 @@
     },
     "participantsPane": {
         "actions": {
+            "admit": "Αποδοχή",
+            "admitAll": "Αποδοχή όλων",
             "allow": "Επιτρέψτε στους συμμετέχοντες να:",
             "allowVideo": "Επιτρέψτε το βίντεο",
             "askUnmute": "Αίτηση για κατάργηση σίγησης",
@@ -757,6 +755,7 @@
             "mute": "Σίγηση",
             "muteAll": "Σίγηση όλων",
             "muteEveryoneElse": "Σίγηση όλων των άλλων",
+            "reject": "Απόρριψη",
             "stopEveryonesVideo": "Διακοπή όλων των βίντεο",
             "stopVideo": "Διακοπή του βίντεο",
             "unblockEveryoneMicCamera": "Επιτρέψτε τα μικρόφωνα και τις κάμερες όλων",

lang/main-eo.json

@@ -561,8 +561,6 @@
         "youtubeTerms": "Uzkondiĉoj de YouTube"
     },
     "lobby": {
-        "admit": "Akcepti",
-        "admitAll": "Akcepti ĉion",
         "allow": "Permesi",
         "backToKnockModeButton": "Petu por aliĝi",
         "chat": "Babilejo",
@@ -597,8 +595,6 @@
         "notificationTitle": "Atendejo",
         "passwordField": "Entajpu pasvorton de la renkontiĝo",
         "passwordJoinButton": "Aliĝi",
-        "reject": "Malakceptu",
-        "rejectAll": "Malakceptu ĉion",
         "title": "Atendejo",
         "toggleLabel": "Ŝaltu atendejon"
     },
@@ -725,6 +721,8 @@
     },
     "participantsPane": {
         "actions": {
+            "admit": "Akcepti",
+            "admitAll": "Akcepti ĉion",
             "allow": "Al la partoprenantoj permesi:",
             "allowVideo": "Permesi kameraon",
             "askUnmute": "Peti malsilentigi",
@@ -737,6 +735,7 @@
             "mute": "Silentigi",
             "muteAll": "Silentigi ĉiujn",
             "muteEveryoneElse": "Silentigi ĉiujn aliajn",
+            "reject": "Malakceptu",
             "stopEveryonesVideo": "Ĉesigu ĉies videaĵon",
             "stopVideo": "Ĉesigu la videaĵon",
             "unblockEveryoneMicCamera": "Malbloku ĉies mikrofonon kaj kameraon",