From 1c162a9658d1b1cdf1d558486541e71569a20c11 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Mon, 3 Dec 2018 06:01:19 +0000
Subject: [PATCH 001/163] Added option to use modal component without header
 border

---
 .../audio/audio-modal/component.jsx           |  17 +--
 .../components/audio/audio-modal/styles.scss  |   1 +
 .../ui/components/lock-viewers/component.jsx  |  17 +--
 .../ui/components/lock-viewers/styles.scss    |   2 +-
 .../ui/components/modal/simple/component.jsx  |  22 ++-
 .../ui/components/modal/simple/styles.scss    |   5 +
 .../ui/components/video-preview/component.jsx | 133 ++++++++----------
 .../ui/components/video-preview/styles.scss   |   2 +
 8 files changed, 95 insertions(+), 104 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
index cc9e6a3c83..437b894475 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import ModalBase from '/imports/ui/components/modal/base/component';
+import Modal from '/imports/ui/components/modal/simple/component';
 import Button from '/imports/ui/components/button/component';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import { styles } from './styles';
@@ -9,6 +9,7 @@ import AudioSettings from '../audio-settings/component';
 import EchoTest from '../echo-test/component';
 import Help from '../help/component';
 
+
 const propTypes = {
   intl: intlShape.isRequired,
   closeModal: PropTypes.func.isRequired,
@@ -392,10 +393,11 @@ class AudioModal extends Component {
     return (
       <span>
         {showPermissionsOvelay ? <PermissionsOverlay /> : null}
-        <ModalBase
+        <Modal
           overlayClassName={styles.overlay}
           className={styles.modal}
           onRequestClose={this.closeModal}
+          hideBorder
         >
           {!this.skipAudioOptions() ?
 
@@ -410,22 +412,13 @@ class AudioModal extends Component {
                   intl.formatMessage(intlMessages.audioChoiceLabel)}
                 </h3>
             }
-              <Button
-                data-test="modalBaseCloseButton"
-                className={styles.closeBtn}
-                label={intl.formatMessage(intlMessages.closeLabel)}
-                icon="close"
-                size="md"
-                hideLabel
-                onClick={this.closeModal}
-              />
             </header>
             : null
           }
           <div className={styles.content}>
             {this.renderContent()}
           </div>
-        </ModalBase>
+        </Modal>
       </span>
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/styles.scss
index a5befabada..c305dd7aff 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/styles.scss
@@ -118,6 +118,7 @@
   text-align: center;
   font-weight: 400;
   font-size: 1.3rem;
+  color: var(--color-background);
   white-space: normal;
 
   @include mq($small-only) {
diff --git a/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx b/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
index 7c89ec1f1b..0844a19521 100755
--- a/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
-import Button from '/imports/ui/components/button/component';
 import Toggle from '/imports/ui/components/switch/component';
 import cx from 'classnames';
-import ModalBase from '/imports/ui/components/modal/base/component';
+import Modal from '/imports/ui/components/modal/simple/component';
 import { styles } from './styles';
 
 const intlMessages = defineMessages({
@@ -75,24 +74,16 @@ class LockViewersComponent extends Component {
     const { intl, meeting } = this.props;
 
     return (
-      <ModalBase
+      <Modal
         overlayClassName={styles.overlay}
         className={styles.modal}
         onRequestClose={this.closeModal}
+        hideBorder
       >
 
         <div className={styles.container}>
           <div className={styles.header}>
             <div className={styles.title}>{intl.formatMessage(intlMessages.lockViewersTitle)}</div>
-            <Button
-              data-test="modalBaseCloseButton"
-              className={styles.closeBtn}
-              label={intl.formatMessage(intlMessages.closeLabel)}
-              icon="close"
-              size="md"
-              hideLabel
-              onClick={this.closeModal}
-            />
           </div>
           <div className={styles.description}>
             {`${intl.formatMessage(intlMessages.lockViewersDescription)}`}
@@ -243,7 +234,7 @@ class LockViewersComponent extends Component {
             </div>
           </div>
         </div>
-      </ModalBase>
+      </Modal>
     );
   }
 }
diff --git a/bigbluebutton-html5/imports/ui/components/lock-viewers/styles.scss b/bigbluebutton-html5/imports/ui/components/lock-viewers/styles.scss
index 078b36e6da..d853bc994f 100755
--- a/bigbluebutton-html5/imports/ui/components/lock-viewers/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/lock-viewers/styles.scss
@@ -9,7 +9,6 @@
 }
 
 .title {
-  position: relative;
   left: var(--title-position-left);
   color: var(--color-gray-dark);
   font-weight: bold;
@@ -24,6 +23,7 @@
 
 .container {
   margin: var(--modal-margin);
+  margin-top: 0;
   margin-bottom: var(--lg-padding-x);
 }
 
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
index 8c1ff95ce4..0310964efa 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
@@ -6,7 +6,7 @@ import ModalBase, { withModalState } from '../base/component';
 import { styles } from './styles';
 
 const propTypes = {
-  title: PropTypes.string.isRequired,
+  title: PropTypes.string,
   dismiss: PropTypes.shape({
     callback: PropTypes.func,
     label: PropTypes.string.isRequired,
@@ -36,6 +36,7 @@ class ModalSimple extends Component {
   render() {
     const {
       title,
+      hideBorder,
       dismiss,
       className,
       modalisOpen,
@@ -50,18 +51,29 @@ class ModalSimple extends Component {
         contentLabel={title}
         {...otherProps}
       >
-        <header className={styles.header}>
+        {hideBorder ? <header className={styles.headerNoBorder}>
           <h1 className={styles.title}>{title}</h1>
           <Button
             className={styles.dismiss}
             label={dismiss.label}
-            icon={'close'}
+            icon="close"
             circle
             hideLabel
             onClick={this.handleDismiss}
-            aria-describedby={'modalDismissDescription'}
+            aria-describedby="modalDismissDescription"
           />
-        </header>
+        </header> : <header className={styles.header}>
+            <h1 className={styles.title}>{title}</h1>
+            <Button
+              className={styles.dismiss}
+              label={dismiss.label}
+              icon="close"
+              circle
+              hideLabel
+              onClick={this.handleDismiss}
+              aria-describedby="modalDismissDescription"
+            />
+          </header>}
         <div className={styles.content}>
           {this.props.children}
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
index 082858dac0..dc3f9c01a8 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
@@ -22,6 +22,11 @@
   flex-shrink: 0;
 }
 
+.headerNoBorder {
+  display: flex;
+  flex-shrink: 0;
+}
+
 .title {
   @extend %text-elipsis;
   flex: 1;
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
index afcbab35d9..927aa400bf 100644
--- a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
-import ModalBase from '/imports/ui/components/modal/base/component';
 import { notify } from '/imports/ui/services/notification';
 import logger from '/imports/startup/client/logger';
+import Modal from '/imports/ui/components/modal/simple/component';
 import { styles } from './styles';
 
 const VIDEO_CONSTRAINTS = Meteor.settings.public.kurento.cameraConstraints;
@@ -175,82 +175,69 @@ class VideoPreview extends Component {
     } = this.props;
 
     return (
-      <span>
-        <ModalBase
-          overlayClassName={styles.overlay}
-          className={styles.modal}
-          onRequestClose={this.handleProceed}
-        >
-          <header
-            className={styles.header}
-          >
+      <Modal
+        overlayClassName={styles.overlay}
+        className={styles.modal}
+        onRequestClose={this.handleProceed}
+        hideBorder
+      >
+        <div className={styles.title}>
+          {intl.formatMessage(intlMessages.webcamSettingsTitle)}
+        </div>
+        <div className={styles.content}>
+          <div className={styles.col}>
+            <video
+              id="preview"
+              className={styles.preview}
+              ref={(ref) => { this.video = ref; }}
+              autoPlay
+              playsInline
+            />
+          </div>
+          <div className={styles.options}>
+            <label className={styles.label}>
+              {intl.formatMessage(intlMessages.cameraLabel)}
+            </label>
+            {this.state.availableWebcams && this.state.availableWebcams.length > 0 ? (
+              <select
+                value={this.state.webcamDeviceId}
+                className={styles.select}
+                onChange={this.handleSelectWebcam.bind(this)}
+              >
+                <option disabled>
+                  {intl.formatMessage(intlMessages.webcamOptionLabel)}
+                </option>
+                {this.state.availableWebcams.map((webcam, index) => (
+                  <option key={index} value={webcam.deviceId}>
+                    {webcam.label}
+                  </option>
+                  ))}
+              </select>
+              ) :
+              <select
+                className={styles.select}
+              >
+                <option disabled>
+                  {intl.formatMessage(intlMessages.webcamNotFoundLabel)}
+                </option>
+              </select>}
+          </div>
+        </div>
+        <div className={styles.footer}>
+          <div className={styles.actions}>
             <Button
-              className={styles.closeBtn}
-              label={intl.formatMessage(intlMessages.closeLabel)}
-              icon="close"
-              size="md"
-              hideLabel
+              label={intl.formatMessage(intlMessages.cancelLabel)}
               onClick={this.handleProceed}
             />
-          </header>
-          <h3 className={styles.title}>
-            {intl.formatMessage(intlMessages.webcamSettingsTitle)}
-          </h3>
-          <div className={styles.content}>
-            <div className={styles.col}>
-              <video
-                id="preview"
-                className={styles.preview}
-                ref={(ref) => { this.video = ref; }}
-                autoPlay
-                playsInline
-              />
-            </div>
-            <div className={styles.options}>
-              <label className={styles.label}>
-                {intl.formatMessage(intlMessages.cameraLabel)}
-              </label>
-              {this.state.availableWebcams && this.state.availableWebcams.length > 0 ? (
-                <select
-                  value={this.state.webcamDeviceId}
-                  className={styles.select}
-                  onChange={this.handleSelectWebcam.bind(this)}
-                >
-                  <option disabled>
-                    {intl.formatMessage(intlMessages.webcamOptionLabel)}
-                  </option>
-                  {this.state.availableWebcams.map((webcam, index) => (
-                    <option key={index} value={webcam.deviceId}>
-                      {webcam.label}
-                    </option>
-                  ))}
-                </select>
-              ) :
-                <select
-                  className={styles.select}
-                >
-                  <option disabled>
-                    {intl.formatMessage(intlMessages.webcamNotFoundLabel)}
-                  </option>
-                </select>}
-            </div>
+            <Button
+              color="primary"
+              label={intl.formatMessage(intlMessages.startSharingLabel)}
+              onClick={() => this.handleStartSharing()}
+              disabled={this.state.isStartSharingDisabled}
+            />
           </div>
-          <div className={styles.footer}>
-            <div className={styles.actions}>
-              <Button
-                label={intl.formatMessage(intlMessages.cancelLabel)}
-                onClick={this.handleProceed}
-              />
-              <Button
-                color="primary"
-                label={intl.formatMessage(intlMessages.startSharingLabel)}
-                onClick={() => this.handleStartSharing()}
-                disabled={this.state.isStartSharingDisabled}
-              />
-            </div>
-          </div>
-        </ModalBase>
-      </span>
+        </div>
+      </Modal>
     );
   }
 }
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss b/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
index b21e8649b2..33134178b8 100644
--- a/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
@@ -73,6 +73,8 @@
 }
 
 .title {
+  display: block;
+  color: var(--color-background);
   font-size: 1.4rem;
   text-align: center;
 }

From ebffcb0848fa1c81556e8e08e59d19aecaed1353 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Tue, 11 Dec 2018 18:37:31 -0200
Subject: [PATCH 002/163] Created property keepEvents at bbb-web to make redis
 record the events for all meetings

---
 .../core/BigBlueButtonActor.scala             |  8 +-
 .../common2/domain/Meeting2x.scala            |  2 +-
 .../bigbluebutton/common2/TestFixtures.scala  |  3 +-
 .../org/bigbluebutton/api/MeetingService.java | 16 +++-
 .../bigbluebutton/api/RecordingService.java   | 17 +++++
 .../bigbluebutton/api2/IBbbWebApiGWApp.java   |  3 +-
 .../bigbluebutton/api2/BbbWebApiGWApp.scala   |  5 +-
 bigbluebutton-config/bin/bbb-record           |  1 +
 .../meetings/server/modifiers/addMeeting.js   |  8 +-
 .../grails-app/conf/bigbluebutton.properties  |  3 +
 .../grails-app/conf/spring/resources.xml      |  1 +
 .../core/scripts/bigbluebutton.yml            |  1 +
 .../core/scripts/events/events.rb             | 74 +++++++++++++++++++
 .../core/scripts/rap-archive-worker.rb        | 24 ++++++
 record-and-playback/deploy.sh                 |  2 +
 15 files changed, 155 insertions(+), 13 deletions(-)
 create mode 100644 record-and-playback/core/scripts/events/events.rb

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
index b25a6170ff..e7336df09b 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -117,7 +117,13 @@ class BigBlueButtonActor(
       case None =>
         log.info("Create meeting request. meetingId={}", msg.body.props.meetingProp.intId)
 
-        val m = RunningMeeting(msg.body.props, outGW, eventBus)
+        // Check if we are keeping the events
+        var props =  msg.body.props.copy()
+        if (props.recordProp.keepEvents) {
+          val recordProp = msg.body.props.recordProp.copy(record = true)
+          props = msg.body.props.copy(recordProp = recordProp)
+        }
+        val m = RunningMeeting(props, outGW, eventBus)
 
         /** Subscribe to meeting and voice events. **/
         eventBus.subscribe(m.actorRef, m.props.meetingProp.intId)
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
index 7aef0a0086..a66975473b 100755
--- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
@@ -13,7 +13,7 @@ case class BreakoutProps(parentId: String, sequence: Int, freeJoin: Boolean, bre
 
 case class PasswordProp(moderatorPass: String, viewerPass: String)
 
-case class RecordProp(record: Boolean, autoStartRecording: Boolean, allowStartStopRecording: Boolean)
+case class RecordProp(record: Boolean, autoStartRecording: Boolean, allowStartStopRecording: Boolean, keepEvents: Boolean)
 
 case class WelcomeProp(welcomeMsgTemplate: String, welcomeMsg: String, modOnlyMessage: String)
 
diff --git a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
index ccfa4e929a..c339ae10cb 100755
--- a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
+++ b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
@@ -34,6 +34,7 @@ trait TestFixtures {
   val dialNumber = "613-555-1234"
   val maxUsers = 25
   val muteOnStart = false
+  val keepEvents = false
   val guestPolicy = "ALWAYS_ASK"
   val metadata: collection.immutable.Map[String, String] = Map("foo" -> "bar", "bar" -> "baz", "baz" -> "foo")
 
@@ -46,7 +47,7 @@ trait TestFixtures {
     userInactivityInspectTimerInMinutes = userInactivityInspectTimerInMinutes, userInactivityThresholdInMinutes = userInactivityInspectTimerInMinutes, userActivitySignResponseDelayInMinutes = userActivitySignResponseDelayInMinutes)
   val password = PasswordProp(moderatorPass = moderatorPassword, viewerPass = viewerPassword)
   val recordProp = RecordProp(record = record, autoStartRecording = autoStartRecording,
-    allowStartStopRecording = allowStartStopRecording)
+    allowStartStopRecording = allowStartStopRecording, keepEvents = keepEvents)
   val welcomeProp = WelcomeProp(welcomeMsgTemplate = welcomeMsgTemplate, welcomeMsg = welcomeMsg,
     modOnlyMessage = modOnlyMessage)
   val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index 825d0deea8..e5f6592359 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -107,6 +107,7 @@ public class MeetingService implements MessageListener {
   private StunTurnService stunTurnService;
   private RedisStorageService storeService;
   private CallbackUrlService callbackUrlService;
+  private boolean keepEvents;
 
   private ParamsProcessorUtil paramsProcessorUtil;
   private PresentationUrlDownloadService presDownloadService;
@@ -249,16 +250,20 @@ public class MeetingService implements MessageListener {
     return false;
   }
 
+  private boolean storeEvents(Meeting m) {
+    return m.isRecord() || keepEvents;
+  }
+
   private void handleCreateMeeting(Meeting m) {
     if (m.isBreakout()) {
       Meeting parent = meetings.get(m.getParentMeetingId());
       parent.addBreakoutRoom(m.getExternalId());
-      if (parent.isRecord()) {
+      if (storeEvents(parent)) {
         storeService.addBreakoutRoom(parent.getInternalId(), m.getInternalId());
       }
     }
 
-    if (m.isRecord()) {
+    if (storeEvents(m)) {
       Map<String, String> metadata = new TreeMap<>();
       metadata.putAll(m.getMetadata());
       // TODO: Need a better way to store these values for recordings
@@ -307,7 +312,7 @@ public class MeetingService implements MessageListener {
             m.getDialNumber(), m.getMaxUsers(), m.getMaxInactivityTimeoutMinutes(), m.getWarnMinutesBeforeMax(),
             m.getMeetingExpireIfNoUserJoinedInMinutes(), m.getmeetingExpireWhenLastUserLeftInMinutes(),
             m.getUserInactivityInspectTimerInMinutes(), m.getUserActivitySignResponseDelayInMinutes(),
-            m.getUserInactivityThresholdInMinutes(), m.getMuteOnStart());
+            m.getUserInactivityThresholdInMinutes(), m.getMuteOnStart(), keepEvents);
   }
 
   private String formatPrettyDate(Long timestamp) {
@@ -513,6 +518,7 @@ public class MeetingService implements MessageListener {
     if (m != null) {
       m.setForciblyEnded(true);
       processRecording(m);
+      if (keepEvents) recordingService.markAsEnded(m.getInternalId());
       destroyMeeting(m.getInternalId());
       meetings.remove(m.getInternalId());
       removeUserSessions(m.getInternalId());
@@ -976,4 +982,8 @@ public class MeetingService implements MessageListener {
   public void setStunTurnService(StunTurnService s) {
     stunTurnService = s;
   }
+
+  public void setKeepEvents(boolean value) {
+    keepEvents = value;
+  }
 }
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java
index 57d5f2761a..b94e7324dd 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java
@@ -126,6 +126,23 @@ public class RecordingService {
         }
     }
 
+    public void markAsEnded(String meetingId) {
+        String done = recordStatusDir + "/../ended/" + meetingId + ".done";
+
+        File doneFile = new File(done);
+        if (!doneFile.exists()) {
+            try {
+                doneFile.createNewFile();
+                if (!doneFile.exists())
+                    log.error("Failed to create " + done + " file.");
+            } catch (IOException e) {
+                log.error("Exception occured when trying to create {} file.", done);
+            }
+        } else {
+            log.error(done + " file already exists.");
+        }
+    }
+
     public List<RecordingMetadata> getRecordingsMetadata(List<String> recordIDs, List<String> states) {
         List<RecordingMetadata> recs = new ArrayList<>();
 
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
index 0fbd8f10d7..8e52ed5287 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
@@ -25,7 +25,8 @@ public interface IBbbWebApiGWApp {
                      Integer userInactivityInspectTimerInMinutes,
                      Integer userInactivityThresholdInMinutes,
                      Integer userActivitySignResponseDelayInMinutes,
-                     Boolean muteOnStart);
+                     Boolean muteOnStart,
+                     Boolean keepEvents);
 
   void registerUser(String meetingID, String internalUserId, String fullname, String role,
                     String externUserID, String authToken, String avatarURL,
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
index 6d62c007f4..8d07c1b698 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
@@ -90,7 +90,8 @@ class BbbWebApiGWApp(
                     userInactivityInspectTimerInMinutes:    java.lang.Integer,
                     userInactivityThresholdInMinutes:       java.lang.Integer,
                     userActivitySignResponseDelayInMinutes: java.lang.Integer,
-                    muteOnStart:                            java.lang.Boolean): Unit = {
+                    muteOnStart:                            java.lang.Boolean,
+                    keepEvents:                             java.lang.Boolean): Unit = {
 
     val meetingProp = MeetingProp(name = meetingName, extId = extMeetingId, intId = meetingId,
       isBreakout = isBreakout.booleanValue())
@@ -107,7 +108,7 @@ class BbbWebApiGWApp(
 
     val password = PasswordProp(moderatorPass = moderatorPass, viewerPass = viewerPass)
     val recordProp = RecordProp(record = recorded.booleanValue(), autoStartRecording = autoStartRecording.booleanValue(),
-      allowStartStopRecording = allowStartStopRecording.booleanValue())
+      allowStartStopRecording = allowStartStopRecording.booleanValue(), keepEvents = keepEvents.booleanValue())
     val breakoutProps = BreakoutProps(parentId = parentMeetingId, sequence = sequence.intValue(), freeJoin = freeJoin.booleanValue(), breakoutRooms = Vector())
     val welcomeProp = WelcomeProp(welcomeMsgTemplate = welcomeMsgTemplate, welcomeMsg = welcomeMsg,
       modOnlyMessage = modOnlyMessage)
diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record
index 146cda052f..8d45806aa6 100755
--- a/bigbluebutton-config/bin/bbb-record
+++ b/bigbluebutton-config/bin/bbb-record
@@ -355,6 +355,7 @@ if [ $DELETE ]; then
   echo "deleting: $MEETING_ID"
   # Remove the status files first to avoid issues with concurrent
   # recording processing
+  rm -f /var/bigbluebutton/recording/status/ended/$MEETING_ID*
   rm -f /var/bigbluebutton/recording/status/recorded/$MEETING_ID*
   rm -f /var/bigbluebutton/recording/status/archived/$MEETING_ID*
   rm -f /var/bigbluebutton/recording/status/sanity/$MEETING_ID*
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
index f8011fd0d3..7a0fce47ac 100644
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
@@ -1,5 +1,5 @@
 import flat from 'flat';
-import { check } from 'meteor/check';
+import { check, Match } from 'meteor/check';
 import Meetings from '/imports/api/meetings';
 import Logger from '/imports/startup/server/logger';
 
@@ -42,11 +42,11 @@ export default function addMeeting(meeting) {
       modOnlyMessage: String,
       welcomeMsgTemplate: String,
     },
-    recordProp: {
+    recordProp: Match.ObjectIncluding({
       allowStartStopRecording: Boolean,
       autoStartRecording: Boolean,
-      record: Boolean,
-    },
+      record: Boolean
+    }),
     password: {
       viewerPass: String,
       moderatorPass: String,
diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 6f0565c3c8..0e34ff06f4 100755
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -185,6 +185,9 @@ webcamsOnlyForModerator=false
 # Mute the meeting on start
 muteOnStart=false
 
+# Saves meeting events even if the meeting is not recorded
+keepEvents=false
+
 #----------------------------------------------------
 # This URL is where the BBB client is accessible. When a user sucessfully
 # enters a name and password, she is redirected here to load the client.
diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml
index 7a94317cf1..2fac9ab08f 100755
--- a/bigbluebutton-web/grails-app/conf/spring/resources.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml
@@ -44,6 +44,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         <property name="registeredUserCleanupTimerTask" ref="registeredUserCleanupTimerTask"/>
         <property name="gw" ref="bbbWebApiGWApp"/>
         <property name="callbackUrlService" ref="callbackUrlService"/>
+        <property name="keepEvents" value="${keepEvents}"/>
     </bean>
 
     <bean id="oldMessageReceivedGW" class="org.bigbluebutton.api2.bus.OldMessageReceivedGW">
diff --git a/record-and-playback/core/scripts/bigbluebutton.yml b/record-and-playback/core/scripts/bigbluebutton.yml
index 2d620d6ecc..b827afa435 100644
--- a/record-and-playback/core/scripts/bigbluebutton.yml
+++ b/record-and-playback/core/scripts/bigbluebutton.yml
@@ -13,6 +13,7 @@ redis_port: 6379
 
 # For PRODUCTION
 log_dir: /var/log/bigbluebutton
+events_dir: /var/bigbluebutton/events
 recording_dir: /var/bigbluebutton/recording
 published_dir: /var/bigbluebutton/published
 playback_host: 127.0.0.1
diff --git a/record-and-playback/core/scripts/events/events.rb b/record-and-playback/core/scripts/events/events.rb
new file mode 100644
index 0000000000..40df456a62
--- /dev/null
+++ b/record-and-playback/core/scripts/events/events.rb
@@ -0,0 +1,74 @@
+# Set encoding to utf-8
+# encoding: UTF-8
+#
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+#
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3.0 of the License, or (at your option)
+# any later version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+#
+
+require '../lib/recordandplayback'
+require 'logger'
+require 'trollop'
+require 'yaml'
+
+def keep_events(meeting_id, redis_host, redis_port, events_dir, break_timestamp)
+  BigBlueButton.logger.info("Keeping events for #{meeting_id}")
+  redis = BigBlueButton::RedisWrapper.new(redis_host, redis_port)
+  events_archiver = BigBlueButton::RedisEventsArchiver.new redis
+  events_xml = "#{events_dir}/#{meeting_id}/events.xml"
+  events = events_archiver.store_events(meeting_id, events_xml, break_timestamp)
+end
+
+################## START ################################
+
+opts = Trollop::options do
+  opt :meeting_id, "Meeting id with events to keep", type: :string
+  opt :break_timestamp, "Chapter break end timestamp", type: :integer
+end
+Trollop::die :meeting_id, "must be provided" if opts[:meeting_id].nil?
+
+meeting_id = opts[:meeting_id]
+break_timestamp = opts[:break_timestamp]
+
+# This script lives in scripts/archive/steps while bigbluebutton.yml lives in scripts/
+props = YAML::load(File.open('bigbluebutton.yml'))
+recording_dir = props['recording_dir']
+events_dir = props['events_dir']
+redis_host = props['redis_host']
+redis_port = props['redis_port']
+log_dir = props['log_dir']
+
+BigBlueButton.logger = Logger.new("#{log_dir}/events.log", 'daily')
+
+target_dir = "#{events_dir}/#{meeting_id}"
+events_xml = "#{target_dir}/events.xml"
+if not FileTest.directory?(target_dir)
+  FileUtils.mkdir_p target_dir
+  keep_events(meeting_id, redis_host, redis_port, events_dir, break_timestamp)
+  if not File.exist? "#{recording_dir}/status/recorded/#{meeting_id}.done"
+    # if the session was not recorded, it was not archived and the sanity
+    # script won't never run for this particular recording; it means that there's
+    # no script that will remove the keys from redis, so I have to do it here
+    # implementation copied from record-and-playback/core/scripts/sanity/sanity.rb
+    BigBlueButton.logger.info("Deleting keys")
+    redis = BigBlueButton::RedisWrapper.new(redis_host, redis_port)
+    events_archiver = BigBlueButton::RedisEventsArchiver.new redis
+    events_archiver.delete_events(meeting_id)
+  else
+    BigBlueButton.logger.info("Leaving the redis keys to be archived and removed by the sanity script")
+  end
+  FileUtils.rm "#{recording_dir}/status/ended/#{meeting_id}.done"
+end
diff --git a/record-and-playback/core/scripts/rap-archive-worker.rb b/record-and-playback/core/scripts/rap-archive-worker.rb
index e26aa1ceea..f0710555c3 100755
--- a/record-and-playback/core/scripts/rap-archive-worker.rb
+++ b/record-and-playback/core/scripts/rap-archive-worker.rb
@@ -92,6 +92,29 @@ def archive_recorded_meetings(recording_dir)
   end
 end
 
+def keep_events_from_ended_meeting(recording_dir)
+  ended_done_files = Dir.glob("#{recording_dir}/status/ended/*.done")
+  ended_done_files.each do |ended_done|
+    ended_done_base = File.basename(ended_done, '.done')
+    meeting_id = nil
+    break_timestamp = nil
+    if match = /^([0-9a-f]+-[0-9]+)$/.match(ended_done_base)
+      meeting_id = match[1]
+    elsif match = /^([0-9a-f]+-[0-9]+)-([0-9]+)$/.match(ended_done_base)
+      meeting_id = match[1]
+      break_timestamp = match[2]
+    else
+      BigBlueButton.logger.warn("Ended done file for #{ended_done_base} has invalid format")
+      next
+    end
+    if !break_timestamp.nil?
+      ret = BigBlueButton.exec_ret("ruby", "events/events.rb", "-m", meeting_id, '-b', break_timestamp)
+    else
+      ret = BigBlueButton.exec_ret("ruby", "events/events.rb", "-m", meeting_id)
+    end
+  end
+end
+
 begin
   props = YAML::load(File.open('bigbluebutton.yml'))
   redis_host = props['redis_host']
@@ -107,6 +130,7 @@ begin
 
   BigBlueButton.logger.debug("Running rap-archive-worker...")
   
+  keep_events_from_ended_meeting(recording_dir)
   archive_recorded_meetings(recording_dir)
 
   BigBlueButton.logger.debug("rap-archive-worker done")
diff --git a/record-and-playback/deploy.sh b/record-and-playback/deploy.sh
index 8f68c0b838..94243b2e66 100755
--- a/record-and-playback/deploy.sh
+++ b/record-and-playback/deploy.sh
@@ -40,10 +40,12 @@ function deploy_format() {
 
 deploy_format "presentation"
 
+sudo mkdir -p /var/bigbluebutton/events/
 sudo mkdir -p /var/bigbluebutton/playback/
 sudo mkdir -p /var/bigbluebutton/recording/raw/
 sudo mkdir -p /var/bigbluebutton/recording/process/
 sudo mkdir -p /var/bigbluebutton/recording/publish/
+sudo mkdir -p /var/bigbluebutton/recording/status/ended/
 sudo mkdir -p /var/bigbluebutton/recording/status/recorded/
 sudo mkdir -p /var/bigbluebutton/recording/status/archived/
 sudo mkdir -p /var/bigbluebutton/recording/status/processed/

From 5dfbafb30f13d0d194ccff90ead409224f154b43 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Tue, 11 Dec 2018 14:55:11 -0800
Subject: [PATCH 003/163] Implemented recording modal

---
 .../actions-dropdown/component.jsx            |  5 +-
 .../ui/components/recording/component.jsx     | 85 +++++++++++++++++++
 .../ui/components/recording/container.jsx     | 22 +++++
 .../ui/components/recording/styles.scss       | 58 +++++++++++++
 bigbluebutton-html5/package-lock.json         |  2 +-
 bigbluebutton-html5/private/locales/en.json   |  4 +
 6 files changed, 173 insertions(+), 3 deletions(-)
 create mode 100755 bigbluebutton-html5/imports/ui/components/recording/component.jsx
 create mode 100755 bigbluebutton-html5/imports/ui/components/recording/container.jsx
 create mode 100755 bigbluebutton-html5/imports/ui/components/recording/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 3264ef0d7a..1e25af4a5e 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -11,6 +11,7 @@ import PresentationUploaderContainer from '/imports/ui/components/presentation/p
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import getFromUserSettings from '/imports/ui/services/users-settings';
 import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
+import RecordingContainer from '/imports/ui/components/recording/container';
 import BreakoutRoom from '../create-breakout-room/component';
 import { styles } from '../styles';
 import ActionBarService from '../service';
@@ -114,9 +115,9 @@ class ActionsDropdown extends Component {
       allowStartStopRecording,
       isRecording,
       record,
-      toggleRecording,
       togglePollMenu,
       meetingIsBreakout,
+      mountModal,
       hasBreakoutRoom,
     } = this.props;
 
@@ -148,7 +149,7 @@ class ActionsDropdown extends Component {
           description={intl.formatMessage(isRecording ?
             intlMessages.stopRecording : intlMessages.startRecording)}
           key={this.recordId}
-          onClick={toggleRecording}
+          onClick={() => mountModal(<RecordingContainer />)}
         />
         : null),
       (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom ?
diff --git a/bigbluebutton-html5/imports/ui/components/recording/component.jsx b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
new file mode 100755
index 0000000000..49ec90132e
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
@@ -0,0 +1,85 @@
+import React, { Component } from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
+import Button from '/imports/ui/components/button/component';
+import Modal from '/imports/ui/components/modal/simple/component';
+import { styles } from './styles';
+
+const intlMessages = defineMessages({
+  startTitle: {
+    id: 'app.recording.startTitle',
+    description: 'start recording title',
+  },
+  stopTitle: {
+    id: 'app.recording.stopTitle',
+    description: 'stop recording title',
+  },
+  startDescription: {
+    id: 'app.recording.startDescription',
+    description: 'start recording description',
+  },
+  stopDescription: {
+    id: 'app.recording.stopDescription',
+    description: 'stop recording description',
+  },
+  yesLabel: {
+    id: 'app.audioModal.yes',
+    description: 'label for yes button',
+  },
+  noLabel: {
+    id: 'app.audioModal.no',
+    description: 'label for no button',
+  },
+});
+
+class RecordingComponent extends Component {
+  constructor(props) {
+    super(props);
+    const {
+      closeModal,
+      toggleRecording,
+    } = props;
+
+    this.closeModal = closeModal;
+    this.toggleRecording = toggleRecording;
+  }
+
+  render() {
+    const { intl, meeting } = this.props;
+
+    return (
+      <Modal
+        overlayClassName={styles.overlay}
+        className={styles.modal}
+        onRequestClose={this.closeModal}
+        hideBorder
+      >
+        <div className={styles.container}>
+          <div className={styles.header}>
+            <div className={styles.title}>{intl.formatMessage(!meeting.recordProp.recording ?
+            intlMessages.startTitle : intlMessages.stopTitle)}
+            </div>
+          </div>
+          <div className={styles.description}>
+            {`${intl.formatMessage(!meeting.recordProp.recording ? intlMessages.startDescription :
+            intlMessages.stopDescription)}`}
+          </div>
+          <div className={styles.footer}>
+            <Button
+              color="primary"
+              className={styles.button}
+              label={intl.formatMessage(intlMessages.yesLabel)}
+              onClick={() => this.toggleRecording()}
+            />
+            <Button
+              label={intl.formatMessage(intlMessages.noLabel)}
+              className={styles.button}
+              onClick={() => this.closeModal()}
+            />
+          </div>
+        </div>
+      </Modal>
+    );
+  }
+}
+
+export default injectIntl(RecordingComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/recording/container.jsx b/bigbluebutton-html5/imports/ui/components/recording/container.jsx
new file mode 100755
index 0000000000..21f445ca6f
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/recording/container.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import { makeCall } from '/imports/ui/services/api';
+import Meetings from '/imports/api/meetings';
+import Auth from '/imports/ui/services/auth';
+import RecordingComponent from './component';
+
+const RecordingContainer = props => <RecordingComponent {...props} />;
+
+export default withModalMounter(withTracker(({ mountModal }) => ({
+  closeModal() {
+    mountModal(null);
+  },
+
+  toggleRecording: () => {
+    makeCall('toggleRecording');
+    mountModal(null);
+  },
+
+  meeting: (Meetings.findOne({ meetingId: Auth.meetingID })),
+}))(RecordingContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/recording/styles.scss b/bigbluebutton-html5/imports/ui/components/recording/styles.scss
new file mode 100755
index 0000000000..a20ec2aa79
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/recording/styles.scss
@@ -0,0 +1,58 @@
+@import '/imports/ui/stylesheets/mixins/focus';
+@import '/imports/ui/stylesheets/variables/_all';
+@import "/imports/ui/components/modal/simple/styles";
+
+:root {
+  --description-margin: 3.5rem;
+}
+
+.title {
+  color: var(--color-gray-dark);
+  font-weight: 500;
+  font-size: var(--jumbo-padding-y);
+}
+
+.container {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding: 0;
+  margin-top: 0;
+  margin-right: var(--description-margin);
+  margin-left: var(--description-margin);
+  margin-bottom: var(--lg-padding-x);
+}
+
+.footer {
+  display:flex;
+}
+
+.button {
+  padding-right: var(--jumbo-padding-y);
+  padding-left: var(--jumbo-padding-y);
+  margin-right: var(--sm-padding-x);
+}
+
+.description {
+  text-align: center;
+  line-height: var(--line-height-base);
+  color: var(--color-gray);
+  margin-bottom: var(--jumbo-padding-y)
+}
+
+.modal {
+  @extend .modal;
+  padding: var(--sm-padding-y);
+}
+
+.overlay {
+  @extend .overlay;
+}
+
+.header {
+  margin: 0;
+  padding: 0;
+  border: none;
+  line-height: var(--title-position-left);
+  margin-bottom: var(--lg-padding-y);
+}
diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index e32ce74791..e4aa799c43 100755
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -9625,4 +9625,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 501771ad3f..99eddde50b 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -369,6 +369,10 @@
     "app.lock-viewers.PublicChatLabel": "Public Chat",
     "app.lock-viewers.PrivateChatLable": "Private Chat",
     "app.lock-viewers.Layout": "Layout",
+    "app.recording.startTitle": "Start recording",
+    "app.recording.stopTitle": "Stop recording",
+    "app.recording.startDescription": "At any time, click the icon again to stop the recording.",
+    "app.recording.stopDescription": "Are you sure you want to stop the recording of the session? You can resume recording the session at any time, by clicking the recording icon.",
     "app.videoPreview.cameraLabel": "Camera",
     "app.videoPreview.cancelLabel": "Cancel",
     "app.videoPreview.closeLabel": "Close",

From dec1fe481d204cfefd29063054afe72e3a5db789 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Thu, 13 Dec 2018 11:46:20 -0200
Subject: [PATCH 004/163] Not overriding record prop

---
 .../scala/org/bigbluebutton/core/BigBlueButtonActor.scala | 8 +-------
 .../org/bigbluebutton/core/running/RunningMeeting.scala   | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
index e7336df09b..b25a6170ff 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -117,13 +117,7 @@ class BigBlueButtonActor(
       case None =>
         log.info("Create meeting request. meetingId={}", msg.body.props.meetingProp.intId)
 
-        // Check if we are keeping the events
-        var props =  msg.body.props.copy()
-        if (props.recordProp.keepEvents) {
-          val recordProp = msg.body.props.recordProp.copy(record = true)
-          props = msg.body.props.copy(recordProp = recordProp)
-        }
-        val m = RunningMeeting(props, outGW, eventBus)
+        val m = RunningMeeting(msg.body.props, outGW, eventBus)
 
         /** Subscribe to meeting and voice events. **/
         eventBus.subscribe(m.actorRef, m.props.meetingProp.intId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
index 5fa69cd581..297b7ae89b 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
@@ -44,7 +44,8 @@ class RunningMeeting(val props: DefaultProps, outGW: OutMessageGateway,
     liveMeeting.guestsWaiting,
     GuestPolicy(props.usersProp.guestPolicy, SystemUser.ID))
 
-  val outMsgRouter = new OutMsgRouter(props.recordProp.record, outGW)
+  private val recordEvents = props.recordProp.record || props.recordProp.keepEvents
+  val outMsgRouter = new OutMsgRouter(recordEvents, outGW)
 
   val actorRef = context.actorOf(MeetingActor.props(props, eventBus, outMsgRouter, liveMeeting), props.meetingProp.intId)
 

From e365bedafb4ce4424779ceb82db6c7e947dc6311 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Thu, 13 Dec 2018 15:21:10 -0200
Subject: [PATCH 005/163] Copying events.xml from archived recordings

---
 .../core/scripts/events/events.rb             | 36 ++++++++++++-------
 .../core/scripts/rap-archive-worker.rb        |  2 +-
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/record-and-playback/core/scripts/events/events.rb b/record-and-playback/core/scripts/events/events.rb
index 40df456a62..78d174d79f 100644
--- a/record-and-playback/core/scripts/events/events.rb
+++ b/record-and-playback/core/scripts/events/events.rb
@@ -46,29 +46,39 @@ break_timestamp = opts[:break_timestamp]
 # This script lives in scripts/archive/steps while bigbluebutton.yml lives in scripts/
 props = YAML::load(File.open('bigbluebutton.yml'))
 recording_dir = props['recording_dir']
+raw_archive_dir = "#{recording_dir}/raw"
 events_dir = props['events_dir']
 redis_host = props['redis_host']
 redis_port = props['redis_port']
 log_dir = props['log_dir']
 
+raw_events_xml = "#{raw_archive_dir}/#{meeting_id}/events.xml"
+ended_done_file = "#{recording_dir}/status/ended/#{meeting_id}.done"
+recorded_done_file = "#{recording_dir}/status/recorded/#{meeting_id}.done"
+
 BigBlueButton.logger = Logger.new("#{log_dir}/events.log", 'daily')
 
+# Skip if is recorded and not archived yet
+if File.exist? recorded_done_file
+  BigBlueButton.logger.info("Temporarily skipping #{meeting_id} for archive to finish")
+  exit 0
+end
+
 target_dir = "#{events_dir}/#{meeting_id}"
-events_xml = "#{target_dir}/events.xml"
 if not FileTest.directory?(target_dir)
   FileUtils.mkdir_p target_dir
-  keep_events(meeting_id, redis_host, redis_port, events_dir, break_timestamp)
-  if not File.exist? "#{recording_dir}/status/recorded/#{meeting_id}.done"
-    # if the session was not recorded, it was not archived and the sanity
-    # script won't never run for this particular recording; it means that there's
-    # no script that will remove the keys from redis, so I have to do it here
-    # implementation copied from record-and-playback/core/scripts/sanity/sanity.rb
-    BigBlueButton.logger.info("Deleting keys")
-    redis = BigBlueButton::RedisWrapper.new(redis_host, redis_port)
-    events_archiver = BigBlueButton::RedisEventsArchiver.new redis
-    events_archiver.delete_events(meeting_id)
+  if File.exist? raw_events_xml
+    BigBlueButton.logger.info("Copying events from #{raw_events_xml}")
+    events_xml = "#{events_dir}/#{meeting_id}/events.xml"
+    FileUtils.cp(raw_events_xml, events_xml)
   else
-    BigBlueButton.logger.info("Leaving the redis keys to be archived and removed by the sanity script")
+    keep_events(meeting_id, redis_host, redis_port, events_dir, break_timestamp)
+    # we need to delete the keys here because the sanity phase might not
+    # automatically happen for this recording
+    BigBlueButton.logger.info("Deleting redis keys")
+    redis = BigBlueButton::RedisWrapper.new(redis_host, redis_port)
+    events_archiver = BigBlueButton::RedisEventsArchiver.new(redis)
+    events_archiver.delete_events(meeting_id)
   end
-  FileUtils.rm "#{recording_dir}/status/ended/#{meeting_id}.done"
+  FileUtils.rm ended_done_file
 end
diff --git a/record-and-playback/core/scripts/rap-archive-worker.rb b/record-and-playback/core/scripts/rap-archive-worker.rb
index f0710555c3..f8a27a9f09 100755
--- a/record-and-playback/core/scripts/rap-archive-worker.rb
+++ b/record-and-playback/core/scripts/rap-archive-worker.rb
@@ -130,8 +130,8 @@ begin
 
   BigBlueButton.logger.debug("Running rap-archive-worker...")
   
-  keep_events_from_ended_meeting(recording_dir)
   archive_recorded_meetings(recording_dir)
+  keep_events_from_ended_meeting(recording_dir)
 
   BigBlueButton.logger.debug("rap-archive-worker done")
 

From be60b0728407f303613bd7bfc76a06a7316647d2 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Fri, 21 Dec 2018 16:46:55 +0000
Subject: [PATCH 006/163] fix locales not being displayed properly

---
 .../imports/startup/client/intl.jsx           | 60 ++++++++++++++++---
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index 9ce3417c36..d9f1e1f3c4 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -1,9 +1,44 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { IntlProvider } from 'react-intl';
+import { IntlProvider, addLocaleData } from 'react-intl';
 import Settings from '/imports/ui/services/settings';
 import LoadingScreen from '/imports/ui/components/loading-screen/component';
 
+// currently supported locales.
+import en from 'react-intl/locale-data/en';
+import uk from 'react-intl/locale-data/uk';
+import zh from 'react-intl/locale-data/zh';
+import ru from 'react-intl/locale-data/ru';
+import de from 'react-intl/locale-data/de';
+import fr from 'react-intl/locale-data/fr';
+import pt from 'react-intl/locale-data/pt';
+import fa from 'react-intl/locale-data/fa';
+import tr from 'react-intl/locale-data/tr';
+import ja from 'react-intl/locale-data/ja';
+import km from 'react-intl/locale-data/km';
+import es from 'react-intl/locale-data/es';
+import id from 'react-intl/locale-data/id';
+import el from 'react-intl/locale-data/el';
+import it from 'react-intl/locale-data/it';
+
+addLocaleData([
+  ...en,
+  ...uk,
+  ...zh,
+  ...ru,
+  ...de,
+  ...fr,
+  ...pt,
+  ...fa,
+  ...tr,
+  ...ja,
+  ...km,
+  ...es,
+  ...id,
+  ...el,
+  ...it,
+]);
+
 const propTypes = {
   locale: PropTypes.string,
   children: PropTypes.element.isRequired,
@@ -29,14 +64,18 @@ class IntlStartup extends Component {
   }
 
   componentWillMount() {
-    this.fetchLocalizedMessages(this.props.locale);
+    const { locale } = this.props;
+    this.fetchLocalizedMessages(locale);
   }
 
   componentWillUpdate(nextProps) {
-    if (!this.state.fetching
-      && this.state.normalizedLocale
-      && nextProps.locale.toLowerCase() !== this.state.normalizedLocale.toLowerCase()) {
-      this.fetchLocalizedMessages(nextProps.locale);
+    const { fetching, normalizedLocale } = this.state;
+    const { locale } = nextProps;
+
+    if (!fetching
+      && normalizedLocale
+      && locale.toLowerCase() !== normalizedLocale.toLowerCase()) {
+      this.fetchLocalizedMessages(locale);
     }
   }
 
@@ -69,9 +108,12 @@ class IntlStartup extends Component {
   }
 
   render() {
-    return this.state.fetching ? <LoadingScreen /> : (
-      <IntlProvider locale={DEFAULT_LANGUAGE} messages={this.state.messages}>
-        {this.props.children}
+    const { fetching, normalizedLocale, messages } = this.state;
+    const { children } = this.props;
+
+    return fetching ? <LoadingScreen /> : (
+      <IntlProvider locale={normalizedLocale} messages={messages}>
+        {children}
       </IntlProvider>
     );
   }

From 6d4cca9306a38ffab938576f58a110bdc78f1b8b Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Fri, 21 Dec 2018 15:14:05 -0200
Subject: [PATCH 007/163] Fix audio in ios webview

---
 .../client/compatibility/sip.js               |  11 +-
 .../imports/api/audio/client/bridge/sip.js    |  12 +--
 .../ui/services/audio-manager/index.js        |  40 ++++---
 .../ios-webview-audio-polyfills.js            | 100 ++++++++++++++++++
 4 files changed, 141 insertions(+), 22 deletions(-)
 mode change 100755 => 100644 bigbluebutton-html5/client/compatibility/sip.js
 create mode 100644 bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js

diff --git a/bigbluebutton-html5/client/compatibility/sip.js b/bigbluebutton-html5/client/compatibility/sip.js
old mode 100755
new mode 100644
index 1c86225267..5c02062d96
--- a/bigbluebutton-html5/client/compatibility/sip.js
+++ b/bigbluebutton-html5/client/compatibility/sip.js
@@ -11564,6 +11564,13 @@ MediaHandler.prototype = Object.create(SIP.MediaHandler.prototype, {
     self.ready = false;
     methodName = self.hasOffer('remote') ? 'createAnswer' : 'createOffer';
 
+    if(constraints.offerToReceiveAudio) {
+      //Needed for Safari on webview
+      try {
+        pc.addTransceiver('audio');
+      } catch (e) {}
+    }
+
     return SIP.Utils.promisify(pc, methodName, true)(constraints)
       .catch(function methodError(e) {
         self.emit('peerConnection-' + methodName + 'Failed', e);
@@ -11611,7 +11618,9 @@ MediaHandler.prototype = Object.create(SIP.MediaHandler.prototype, {
     try {
       streams = [].concat(streams);
       streams.forEach(function (stream) {
-        this.peerConnection.addStream(stream);
+        try {
+          this.peerConnection.addStream(stream);
+        } catch (e) {}
       }, this);
     } catch(e) {
       this.logger.error('error adding stream');
diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 2961cfd2cb..47113af383 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -259,10 +259,8 @@ export default class SIPBridge extends BaseAudioBridge {
         },
       },
       RTCConstraints: {
-        mandatory: {
-          OfferToReceiveAudio: true,
-          OfferToReceiveVideo: false,
-        },
+        offerToReceiveAudio: true,
+        offerToReceiveVideo: false,
       },
     };
 
@@ -295,9 +293,9 @@ export default class SIPBridge extends BaseAudioBridge {
           });
         }
 
-        const mappedCause = cause in this.errorCodes ?
-          this.errorCodes[cause] :
-          this.baseErrorCodes.GENERIC_ERROR;
+        const mappedCause = cause in this.errorCodes
+          ? this.errorCodes[cause]
+          : this.baseErrorCodes.GENERIC_ERROR;
 
         return this.callback({
           status: this.baseCallStates.failed,
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 58e2eed1c8..f3b9a51299 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -8,6 +8,7 @@ import SIPBridge from '/imports/api/audio/client/bridge/sip';
 import logger from '/imports/startup/client/logger';
 import { notify } from '/imports/ui/services/notification';
 import browser from 'browser-detect';
+import iosWebviewAudioPolyfills from './ios-webview-audio-polyfills';
 
 const MEDIA = Meteor.settings.public.media;
 const MEDIA_TAG = MEDIA.mediaTag;
@@ -53,6 +54,7 @@ class AudioManager {
     this.userData = userData;
     this.initialized = true;
   }
+
   setAudioMessages(messages) {
     this.messages = messages;
   }
@@ -87,10 +89,14 @@ class AudioManager {
     this.isWaitingPermissions = false;
     this.devicesInitialized = false;
 
-    return Promise.all([
-      this.setDefaultInputDevice(),
-      this.setDefaultOutputDevice(),
-    ]).then(() => {
+    // Avoid ask microphone permission for "Listen Only"
+    const devicesInitializePromises = [];
+    if (this.isListenOnly == false) devicesInitializePromises.push(this.setDefaultInputDevice());
+    devicesInitializePromises.push(this.setDefaultOutputDevice());
+
+    return Promise.all(
+      devicesInitializePromises,
+    ).then(() => {
       this.devicesInitialized = true;
       this.isWaitingPermissions = false;
     }).catch((err) => {
@@ -150,6 +156,13 @@ class AudioManager {
       await this.askDevicesPermissions();
     }
 
+    // Call polyfills for webrtc client if navigator is "iOS Webview"
+    const userAgent = window.navigator.userAgent.toLocaleLowerCase();
+    if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1)
+       && userAgent.indexOf('safari') == -1) {
+      iosWebviewAudioPolyfills();
+    }
+
     // We need this until we upgrade to SIP 9x. See #4690
     const iceGatheringErr = 'ICE_TIMEOUT';
     const iceGatheringTimeout = new Promise((resolve, reject) => {
@@ -312,9 +325,9 @@ class AudioManager {
       this.listenOnlyAudioContext.close();
     }
 
-    this.listenOnlyAudioContext = window.AudioContext ?
-      new window.AudioContext() :
-      new window.webkitAudioContext();
+    this.listenOnlyAudioContext = window.AudioContext
+      ? new window.AudioContext()
+      : new window.webkitAudioContext();
 
     const dest = this.listenOnlyAudioContext.createMediaStreamDestination();
 
@@ -331,8 +344,8 @@ class AudioManager {
   }
 
   isUsingAudio() {
-    return this.isConnected || this.isConnecting ||
-      this.isHangingUp || this.isEchoTest;
+    return this.isConnected || this.isConnecting
+      || this.isHangingUp || this.isEchoTest;
   }
 
   setDefaultInputDevice() {
@@ -349,11 +362,10 @@ class AudioManager {
       return Promise.resolve(inputDevice);
     };
 
-    const handleChangeInputDeviceError = () =>
-      Promise.reject({
-        type: 'MEDIA_ERROR',
-        message: this.messages.error.MEDIA_ERROR,
-      });
+    const handleChangeInputDeviceError = () => Promise.reject({
+      type: 'MEDIA_ERROR',
+      message: this.messages.error.MEDIA_ERROR,
+    });
 
     if (!deviceId) {
       return this.bridge.setDefaultInputDevice()
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js b/bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js
new file mode 100644
index 0000000000..f4f8cc0eac
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js
@@ -0,0 +1,100 @@
+const iosWebviewAudioPolyfills = function () {
+  function shimRemoteStreamsAPI(window) {
+    if (!('getRemoteStreams' in window.RTCPeerConnection.prototype)) {
+      window.RTCPeerConnection.prototype.getRemoteStreams = function () {
+        return this._remoteStreams ? this._remoteStreams : [];
+      };
+    }
+    if (!('onaddstream' in window.RTCPeerConnection.prototype)) {
+      Object.defineProperty(window.RTCPeerConnection.prototype, 'onaddstream', {
+        get: function get() {
+          return this._onaddstream;
+        },
+        set: function set(f) {
+          const _this3 = this;
+
+          if (this._onaddstream) {
+            this.removeEventListener('addstream', this._onaddstream);
+            this.removeEventListener('track', this._onaddstreampoly);
+          }
+          this.addEventListener('addstream', this._onaddstream = f);
+          this.addEventListener('track', this._onaddstreampoly = function (e) {
+            e.streams.forEach((stream) => {
+              if (!_this3._remoteStreams) {
+                _this3._remoteStreams = [];
+              }
+              if (_this3._remoteStreams.includes(stream)) {
+                return;
+              }
+              _this3._remoteStreams.push(stream);
+              const event = new Event('addstream');
+              event.stream = stream;
+              _this3.dispatchEvent(event);
+            });
+          });
+        },
+      });
+      const origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+      window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+        const pc = this;
+        if (!this._onaddstreampoly) {
+          this.addEventListener('track', this._onaddstreampoly = function (e) {
+            e.streams.forEach((stream) => {
+              if (!pc._remoteStreams) {
+                pc._remoteStreams = [];
+              }
+              if (pc._remoteStreams.indexOf(stream) >= 0) {
+                return;
+              }
+              pc._remoteStreams.push(stream);
+              const event = new Event('addstream');
+              event.stream = stream;
+              pc.dispatchEvent(event);
+            });
+          });
+        }
+        return origSetRemoteDescription.apply(pc, arguments);
+      };
+    }
+  }
+
+  function shimCallbacksAPI(window) {
+    const prototype = window.RTCPeerConnection.prototype;
+    const createOffer = prototype.createOffer;
+    const setLocalDescription = prototype.setLocalDescription;
+    const setRemoteDescription = prototype.setRemoteDescription;
+
+    prototype.createOffer = function (successCallback, failureCallback) {
+      const options = arguments.length >= 2 ? arguments[2] : arguments[0];
+      const promise = createOffer.apply(this, [options]);
+      if (!failureCallback) {
+        return promise;
+      }
+      promise.then(successCallback, failureCallback);
+      return Promise.resolve();
+    };
+
+    prototype.setLocalDescription = function withCallback(description, successCallback, failureCallback) {
+      const promise = setLocalDescription.apply(this, [description]);
+      if (!failureCallback) {
+        return promise;
+      }
+      promise.then(successCallback, failureCallback);
+      return Promise.resolve();
+    };
+
+    prototype.setRemoteDescription = function withCallback(description, successCallback, failureCallback) {
+      const promise = setRemoteDescription.apply(this, [description]);
+      if (!failureCallback) {
+        return promise;
+      }
+      promise.then(successCallback, failureCallback);
+      return Promise.resolve();
+    };
+  }
+
+  shimCallbacksAPI(window);
+  shimRemoteStreamsAPI(window);
+};
+
+export default iosWebviewAudioPolyfills;

From 37471169c82de12460207037ff5b6c4d02bc3d66 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Fri, 21 Dec 2018 18:53:21 +0000
Subject: [PATCH 008/163] Impoved hideBorder implementation

---
 .../ui/components/modal/simple/component.jsx      | 15 ++-------------
 .../ui/components/modal/simple/styles.scss        | 10 ++++------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
index 0310964efa..fdca951196 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
@@ -51,7 +51,7 @@ class ModalSimple extends Component {
         contentLabel={title}
         {...otherProps}
       >
-        {hideBorder ? <header className={styles.headerNoBorder}>
+        <header className={hideBorder ? styles.headerNoBorder : styles.header}>
           <h1 className={styles.title}>{title}</h1>
           <Button
             className={styles.dismiss}
@@ -62,18 +62,7 @@ class ModalSimple extends Component {
             onClick={this.handleDismiss}
             aria-describedby="modalDismissDescription"
           />
-        </header> : <header className={styles.header}>
-            <h1 className={styles.title}>{title}</h1>
-            <Button
-              className={styles.dismiss}
-              label={dismiss.label}
-              icon="close"
-              circle
-              hideLabel
-              onClick={this.handleDismiss}
-              aria-describedby="modalDismissDescription"
-            />
-          </header>}
+        </header>
         <div className={styles.content}>
           {this.props.children}
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
index dc3f9c01a8..3f9893bab8 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
@@ -15,16 +15,14 @@
   padding: var(--line-height-computed) 0;
 }
 
-.header {
+.headerNoBorder, .header {
   display: flex;
-  padding: calc(var(--line-height-computed) / 2) 0;
-  border-bottom: var(--border-size) solid var(--color-gray-lighter);
   flex-shrink: 0;
 }
 
-.headerNoBorder {
-  display: flex;
-  flex-shrink: 0;
+.header {
+   padding: calc(var(--line-height-computed) / 2) 0;
+   border-bottom: var(--border-size) solid var(--color-gray-lighter);
 }
 
 .title {

From 00fa8b20270fb69552890a943c358a1882f43150 Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Wed, 26 Dec 2018 09:33:00 -0200
Subject: [PATCH 009/163] Fix z-index in presentation

---
 bigbluebutton-html5/imports/ui/components/media/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/media/styles.scss b/bigbluebutton-html5/imports/ui/components/media/styles.scss
index ebe9e92bf8..c5979df6bb 100644
--- a/bigbluebutton-html5/imports/ui/components/media/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/media/styles.scss
@@ -45,7 +45,7 @@
   --overlay-ratio: calc(16 / 9);
 
   @include mq($medium-up) {
-    z-index: 1;
+    z-index: 999;
     position: fixed;
     margin: 0;
     bottom: .8rem;

From 53c935b7eb799edefc63c33feaae30609308cd5f Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Thu, 27 Dec 2018 14:20:03 -0200
Subject: [PATCH 010/163] Add breakout room invitation feature

---
 .../server/methods/requestJoinURL.js          |  9 +-
 .../actions-dropdown/component.jsx            | 46 ++++++++-
 .../ui/components/actions-bar/component.jsx   |  6 ++
 .../ui/components/actions-bar/container.jsx   |  3 +
 .../create-breakout-room/component.jsx        | 99 ++++++++++++++++---
 .../ui/components/actions-bar/service.js      | 14 +++
 bigbluebutton-html5/private/locales/en.json   |  2 +
 7 files changed, 155 insertions(+), 24 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js b/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
index befaa746b7..7c680cd460 100755
--- a/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
+++ b/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
@@ -3,7 +3,7 @@ import { check } from 'meteor/check';
 import RedisPubSub from '/imports/startup/server/redis';
 import Breakouts from '/imports/api/breakouts';
 
-export default function requestJoinURL(credentials, { breakoutId }) {
+export default function requestJoinURL(credentials, { breakoutId, userId: id }) {
   const REDIS_CONFIG = Meteor.settings.private.redis;
   const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
 
@@ -12,16 +12,19 @@ export default function requestJoinURL(credentials, { breakoutId }) {
   check(meetingId, String);
   check(requesterUserId, String);
   check(requesterToken, String);
+  const userId = id || requesterUserId;
   const Breakout = Breakouts.findOne({ breakoutId });
-  const BreakoutUser = Breakout.users.filter(user => user.userId === requesterUserId).shift();
+  const BreakoutUser = Breakout.users.filter(user => user.userId === userId).shift();
+
   if (BreakoutUser) return BreakoutUser.redirectToHtml5JoinURL;
   const eventName = 'RequestBreakoutJoinURLReqMsg';
+
   return RedisPubSub.publishUserMessage(
     CHANNEL, eventName, meetingId, requesterUserId,
     {
       meetingId,
       breakoutId,
-      userId: requesterUserId,
+      userId,
     },
   );
 }
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index dc558fc24a..afee325a79 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -86,6 +86,10 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.actionsDropdown.createBreakoutRoomDesc',
     description: 'Description of create breakout room option',
   },
+  invitationItem: {
+    id: 'app.invitation.title',
+    description: 'invitation to breakout title',
+  },
 });
 
 class ActionsDropdown extends Component {
@@ -93,6 +97,8 @@ class ActionsDropdown extends Component {
     super(props);
     this.handlePresentationClick = this.handlePresentationClick.bind(this);
     this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
+    this.onCreateBreakouts = this.onCreateBreakouts.bind(this);
+    this.onInvitationUsers = this.onInvitationUsers.bind(this);
   }
 
   componentWillMount() {
@@ -118,6 +124,14 @@ class ActionsDropdown extends Component {
     }
   }
 
+  onCreateBreakouts() {
+    return this.handleCreateBreakoutRoomClick(false);
+  }
+
+  onInvitationUsers() {
+    return this.handleCreateBreakoutRoomClick(true);
+  }
+
   getAvailableActions() {
     const {
       intl,
@@ -129,6 +143,8 @@ class ActionsDropdown extends Component {
       toggleRecording,
       meetingIsBreakout,
       hasBreakoutRoom,
+      getUsersNotAssigned,
+      users,
     } = this.props;
 
     const {
@@ -140,6 +156,7 @@ class ActionsDropdown extends Component {
       stopRecording,
       createBreakoutRoom,
       createBreakoutRoomDesc,
+      invitationItem
     } = intlMessages;
 
     const {
@@ -193,7 +210,17 @@ class ActionsDropdown extends Component {
             label={formatMessage(createBreakoutRoom)}
             description={formatMessage(createBreakoutRoomDesc)}
             key={this.createBreakoutRoomId}
-            onClick={this.handleCreateBreakoutRoomClick}
+            onClick={this.onCreateBreakouts}
+          />
+        )
+        : null),
+      (isUserModerator && !meetingIsBreakout && hasBreakoutRoom && getUsersNotAssigned(users).length
+        ? (
+          <DropdownListItem
+            icon="rooms"
+            label={formatMessage(invitationItem)}
+            key={this.createBreakoutRoomId}
+            onClick={this.onInvitationUsers}
           />
         )
         : null),
@@ -205,19 +232,28 @@ class ActionsDropdown extends Component {
     mountModal(<PresentationUploaderContainer />);
   }
 
-  handleCreateBreakoutRoomClick() {
+  handleCreateBreakoutRoomClick(invitation) {
     const {
       createBreakoutRoom,
       mountModal,
       meetingName,
       users,
+      getUsersNotAssigned,
+      getBreakouts,
+      makeInvitation,
     } = this.props;
 
     mountModal(
       <BreakoutRoom
-        createBreakoutRoom={createBreakoutRoom}
-        meetingName={meetingName}
-        users={users}
+        {...{
+          createBreakoutRoom,
+          meetingName,
+          users,
+          getUsersNotAssigned,
+          invitation,
+          getBreakouts,
+          makeInvitation,
+        }}
       />,
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 213d75e779..13153a0f78 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -25,6 +25,9 @@ class ActionsBar extends React.PureComponent {
       hasBreakoutRoom,
       meetingName,
       users,
+      getUsersNotAssigned,
+      makeInvitation,
+      getBreakouts,
     } = this.props;
 
     const {
@@ -52,6 +55,9 @@ class ActionsBar extends React.PureComponent {
             hasBreakoutRoom,
             meetingName,
             users,
+            getUsersNotAssigned,
+            makeInvitation,
+            getBreakouts,
           }}
           />
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index c3c393cf22..302ebfdce1 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -40,5 +40,8 @@ export default withTracker(() => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
+    makeInvitation: Service.makeInvitation,
+    getBreakouts: Service.getBreakouts,
+    getUsersNotAssigned: Service.getUsersNotAssigned,
   };
 })(ActionsBarContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
index a10f95fd32..1692b68fb9 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
@@ -77,6 +77,14 @@ const intlMessages = defineMessages({
     id: 'app.audio.backLabel',
     description: 'Back label',
   },
+  invitationTitle: {
+    id: 'app.invitation.title',
+    description: 'invitation to breakout title',
+  },
+  invitationConfirm: {
+    id: 'app.invitation.confirm',
+    description: 'invitation to breakout cpnfirm button label',
+  },
 });
 const MIN_BREAKOUT_ROOMS = 2;
 const MAX_BREAKOUT_ROOMS = 8;
@@ -94,6 +102,7 @@ class BreakoutRoom extends Component {
     this.setFreeJoin = this.setFreeJoin.bind(this);
     this.getUserByRoom = this.getUserByRoom.bind(this);
     this.onAssignRandomly = this.onAssignRandomly.bind(this);
+    this.onInviteBreakout = this.onInviteBreakout.bind(this);
     this.renderUserItemByRoom = this.renderUserItemByRoom.bind(this);
     this.renderRoomsGrid = this.renderRoomsGrid.bind(this);
     this.renderBreakoutForm = this.renderBreakoutForm.bind(this);
@@ -103,8 +112,10 @@ class BreakoutRoom extends Component {
     this.renderMobile = this.renderMobile.bind(this);
     this.renderButtonSetLevel = this.renderButtonSetLevel.bind(this);
     this.renderSelectUserScreen = this.renderSelectUserScreen.bind(this);
+    this.renderTitle = this.renderTitle.bind(this);
     this.handleDismiss = this.handleDismiss.bind(this);
-
+    this.setInvitationConfig = this.setInvitationConfig.bind(this);
+    
     this.state = {
       numberOfRooms: MIN_BREAKOUT_ROOMS,
       seletedId: '',
@@ -119,7 +130,11 @@ class BreakoutRoom extends Component {
   }
 
   componentDidMount() {
+    const { invitation } = this.props;
     this.setRoomUsers();
+    if (invitation) {
+      this.setInvitationConfig();
+    }
   }
 
   componentDidUpdate(prevProps, prevstate) {
@@ -160,15 +175,42 @@ class BreakoutRoom extends Component {
     Session.set('isUserListOpen', true);
   }
 
+  onInviteBreakout() {
+    const { getBreakouts, makeInvitation } = this.props;
+    const { users } = this.state;
+    const breakouts = getBreakouts();
+    if (users.length === this.getUserByRoom(0).length) {
+      this.setState({ valid: false });
+      return;
+    }
+
+    users
+      .filter(u => u.room > 0)
+      .forEach((user) => {
+        const breakout = breakouts[user.room - 1];
+        makeInvitation(breakout.breakoutId, user.userId);
+      });
+
+    this.setState({ preventClosing: false });
+  }
+
   onAssignRandomly() {
     const { numberOfRooms } = this.state;
     return this.getUserByRoom(0)
       .forEach(user => this.changeUserRoom(user.userId, Math.floor(Math.random() * (numberOfRooms) + 1)));
   }
 
+  setInvitationConfig() {
+    const { getBreakouts } = this.props;
+    this.setState({
+      numberOfRooms: getBreakouts().length,
+      formFillLevel: 2,
+    });
+  }
+
   setRoomUsers() {
-    const { users } = this.props;
-    const roomUsers = users.map(user => ({
+    const { users, getUsersNotAssigned } = this.props;
+    const roomUsers = getUsersNotAssigned(users).map(user => ({
       userId: user.userId,
       userName: user.name,
       room: 0,
@@ -208,7 +250,7 @@ class BreakoutRoom extends Component {
 
   changeUserRoom(userId, room) {
     const { users } = this.state;
-    
+
     const idxUser = users.findIndex(user => user.userId === userId);
     users[idxUser].room = room;
     this.setState({ users });
@@ -285,11 +327,16 @@ class BreakoutRoom extends Component {
   }
 
   renderBreakoutForm() {
-    const { intl } = this.props;
+    const {
+      intl,
+      invitation,
+    } = this.props;
     const {
       numberOfRooms,
       durationTime,
     } = this.state;
+    if (invitation) return null;
+
     return (
       <div className={styles.breakoutSettings}>
         <label htmlFor="numberOfRooms">
@@ -341,7 +388,13 @@ class BreakoutRoom extends Component {
             </span>
           </div>
         </label>
-        <span className={styles.randomText} role="button" onClick={this.onAssignRandomly}>{intl.formatMessage(intlMessages.randomlyAssign)}</span>
+        <span 
+          className={styles.randomText}
+          role="button"
+          onClick={this.onAssignRandomly}
+        >
+          {intl.formatMessage(intlMessages.randomlyAssign)}
+        </span>
       </div>
     );
   }
@@ -363,7 +416,8 @@ class BreakoutRoom extends Component {
   }
 
   renderFreeJoinCheck() {
-    const { intl } = this.props;
+    const { intl, invitation } = this.props;
+    if (invitation) return null;
     const { freeJoin } = this.state;
     return (
       <label htmlFor="freeJoinCheckbox" className={styles.freeJoinLabel}>
@@ -416,7 +470,7 @@ class BreakoutRoom extends Component {
   }
 
   renderRoomSortList() {
-    const { intl } = this.props;
+    const { intl, invitation } = this.props;
     const { numberOfRooms } = this.state;
     const onClick = roomNumber => this.setState({ formFillLevel: 3, roomSelected: roomNumber });
     return (
@@ -440,7 +494,7 @@ class BreakoutRoom extends Component {
             ))
           }
         </span>
-        {this.renderButtonSetLevel(1, intl.formatMessage(intlMessages.backLabel))}
+        {invitation || this.renderButtonSetLevel(1, intl.formatMessage(intlMessages.backLabel))}
       </div>
     );
   }
@@ -482,8 +536,17 @@ class BreakoutRoom extends Component {
     );
   }
 
-  render() {
+  renderTitle() {
     const { intl } = this.props;
+    return (
+      <p className={styles.subTitle}>
+        {intl.formatMessage(intlMessages.breakoutRoomDesc)}
+      </p>
+    );
+  }
+
+  render() {
+    const { intl, invitation } = this.props;
     const { preventClosing } = this.state;
 
     const BROWSER_RESULTS = browser();
@@ -491,11 +554,17 @@ class BreakoutRoom extends Component {
 
     return (
       <Modal
-        title={intl.formatMessage(intlMessages.breakoutRoomTitle)}
+        title={
+          invitation
+            ? intl.formatMessage(intlMessages.invitationTitle)
+            : intl.formatMessage(intlMessages.breakoutRoomTitle)
+        }
         confirm={
           {
-            label: intl.formatMessage(intlMessages.confirmButton),
-            callback: this.onCreateBreakouts,
+            label: invitation
+              ? intl.formatMessage(intlMessages.invitationConfirm)
+              : intl.formatMessage(intlMessages.confirmButton),
+            callback: invitation ? this.onInviteBreakout : this.onCreateBreakouts,
           }
         }
         dismiss={{
@@ -505,9 +574,7 @@ class BreakoutRoom extends Component {
         preventClosing={preventClosing}
       >
         <div className={styles.content}>
-          <p className={styles.subTitle}>
-            {intl.formatMessage(intlMessages.breakoutRoomDesc)}
-          </p>
+          {invitation || this.renderTitle()}
           {isMobileBrowser ? this.renderMobile() : this.renderDesktop()}
         </div>
       </Modal>
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
index b62899a38e..095c99bd8d 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
@@ -26,6 +26,17 @@ const connectRecordingObserver = () => {
   // notify on load complete
   this.window.parent.postMessage({ response: 'readyToConnect' }, '*');
 };
+const getBreakouts = () => Breakouts.find({ parentMeetingId: Auth.meetingID })
+  .fetch()
+  .sort((a, b) => a.sequence - b.sequence);
+
+const getUsersNotAssigned = (users) => {
+  const breakouts = getBreakouts();
+  const breakoutUsers = breakouts
+    .reduce((acc, value) => [...acc, ...value.users], [])
+    .map(u => u.userId);
+  return users.filter(u => !breakoutUsers.includes(u.intId));
+};
 
 
 export default {
@@ -40,4 +51,7 @@ export default {
   toggleRecording: () => makeCall('toggleRecording'),
   processOutsideToggleRecording: arg => processOutsideToggleRecording(arg),
   createBreakoutRoom: (numberOfRooms, durationInMinutes, freeJoin = true, record = false) => makeCall('createBreakoutRoom', numberOfRooms, durationInMinutes, freeJoin, record),
+  makeInvitation: (breakoutId, userId) => makeCall('requestJoinURL', { breakoutId, userId }),
+  getBreakouts,
+  getUsersNotAssigned,
 };
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index e47b002d4f..5fd794b700 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -457,6 +457,8 @@
     "app.videoDock.webcamFocusDesc": "Focus the selected webcam",
     "app.videoDock.webcamUnfocusLabel": "Unfocus",
     "app.videoDock.webcamUnfocusDesc": "Unfocus the selected webcam",
+    "app.invitation.title": "Breakout room invitation",
+    "app.invitation.confirm": "Invite",
     "app.createBreakoutRoom.title": "Breakout Rooms",
     "app.createBreakoutRoom.breakoutRoomLabel": "Breakout Rooms {0}",
     "app.createBreakoutRoom.generatingURL": "Generating URL",

From 8564e53ffb164ca991032ea4e6c03d8300faf50a Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Thu, 27 Dec 2018 20:20:07 +0000
Subject: [PATCH 011/163] improve dropdown menu functionality

---
 .../ui/components/dropdown/component.jsx      | 49 +++++++++++++------
 .../user-dropdown/component.jsx               |  7 +--
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx
index 53d9ac4d0e..33a1b20f0d 100644
--- a/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/dropdown/component.jsx
@@ -53,7 +53,7 @@ const propTypes = {
 
 const defaultProps = {
   children: null,
-  isOpen: false,
+  keepOpen: null,
   onShow: noop,
   onHide: noop,
   autoFocus: false,
@@ -78,10 +78,12 @@ class Dropdown extends Component {
       onShow,
       onHide,
     } = this.props;
+    
+    const { isOpen } = this.state;
 
-    if (this.state.isOpen && !prevState.isOpen) { onShow(); }
+    if (isOpen && !prevState.isOpen) { onShow(); }
 
-    if (!this.state.isOpen && prevState.isOpen) { onHide(); }
+    if (!isOpen && prevState.isOpen) { onHide(); }
   }
 
   handleShow() {
@@ -99,16 +101,29 @@ class Dropdown extends Component {
   }
 
   handleWindowClick(event) {
+    const { keepOpen, onHide } = this.props;
+    const { isOpen } = this.state;
     const triggerElement = findDOMNode(this.trigger);
     const contentElement = findDOMNode(this.content);
-    const closeDropdown = this.props.isOpen && this.state.isOpen && triggerElement.contains(event.target);
-    const preventHide = this.props.isOpen && contentElement.contains(event.target) || !triggerElement;
-
-    if (closeDropdown) {
-      return this.props.onHide();
+    
+    if (keepOpen === null) {
+      if (triggerElement.contains(event.target)) {
+        return;
+      }
     }
 
-    if (contentElement && preventHide) {
+    if (triggerElement && triggerElement.contains(event.target)) {
+      if (keepOpen) return onHide();    
+      if (isOpen) return this.handleHide();
+    }
+    
+    if (keepOpen && isOpen && !contentElement.contains(event.target)) {
+      onHide();
+      this.handleHide();
+      return;
+    }
+    
+    if (keepOpen !== null) {
       return;
     }
 
@@ -116,7 +131,8 @@ class Dropdown extends Component {
   }
 
   handleToggle() {
-    return this.state.isOpen ? this.handleHide() : this.handleShow();
+    const { isOpen } = this.state;
+    return isOpen ? this.handleHide() : this.handleShow();
   }
 
   render() {
@@ -125,15 +141,18 @@ class Dropdown extends Component {
       className,
       style,
       intl,
+      keepOpen,
       ...otherProps
     } = this.props;
+    
+    const { isOpen } = this.state;
 
     let trigger = children.find(x => x.type === DropdownTrigger);
     let content = children.find(x => x.type === DropdownContent);
 
     trigger = React.cloneElement(trigger, {
       ref: (ref) => { this.trigger = ref; },
-      dropdownIsOpen: this.state.isOpen,
+      dropdownIsOpen: isOpen,
       dropdownToggle: this.handleToggle,
       dropdownShow: this.handleShow,
       dropdownHide: this.handleHide,
@@ -141,12 +160,14 @@ class Dropdown extends Component {
 
     content = React.cloneElement(content, {
       ref: (ref) => { this.content = ref; },
-      'aria-expanded': this.state.isOpen,
-      dropdownIsOpen: this.state.isOpen,
+      'aria-expanded': isOpen,
+      dropdownIsOpen: isOpen,
       dropdownToggle: this.handleToggle,
       dropdownShow: this.handleShow,
       dropdownHide: this.handleHide,
     });
+    
+    const showCloseBtn = (isOpen && keepOpen) || (isOpen && keepOpen === null);
 
     return (
       <div
@@ -162,7 +183,7 @@ class Dropdown extends Component {
       >
         {trigger}
         {content}
-        {this.state.isOpen ?
+        {showCloseBtn ?
           <Button
             className={styles.close}
             label={intl.formatMessage(intlMessages.close)}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index ccb9aa475b..b391012433 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -444,6 +444,7 @@ class UserDropdown extends Component {
       dropdownVisible,
       dropdownDirection,
       dropdownOffset,
+      showNestedOptions,
     } = this.state;
 
     const actions = this.getUsersActions();
@@ -452,8 +453,8 @@ class UserDropdown extends Component {
 
     userItemContentsStyle[styles.userItemContentsCompact] = compact;
     userItemContentsStyle[styles.dropdown] = true;
-    userItemContentsStyle[styles.userListItem] = !this.state.isActionsOpen;
-    userItemContentsStyle[styles.usertListItemWithMenu] = this.state.isActionsOpen;
+    userItemContentsStyle[styles.userListItem] = !isActionsOpen;
+    userItemContentsStyle[styles.usertListItemWithMenu] = isActionsOpen;
 
     const you = (user.isCurrent) ? intl.formatMessage(messages.you) : '';
 
@@ -505,7 +506,7 @@ class UserDropdown extends Component {
     return (
       <Dropdown
         ref={(ref) => { this.dropdown = ref; }}
-        isOpen={this.state.isActionsOpen}
+        keepOpen={isActionsOpen || showNestedOptions}
         onShow={this.onActionsShow}
         onHide={this.onActionsHide}
         className={userItemContentsStyle}

From 1529ff80434bdcda095a672b75a141b263314684 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Fri, 28 Dec 2018 09:51:41 -0200
Subject: [PATCH 012/163] Rename functions and variables

---
 .../server/methods/requestJoinURL.js          |  2 +-
 .../actions-dropdown/component.jsx            | 18 ++++++----
 .../ui/components/actions-bar/component.jsx   |  4 +--
 .../ui/components/actions-bar/container.jsx   |  2 +-
 .../create-breakout-room/component.jsx        | 36 +++++++++----------
 .../ui/components/actions-bar/service.js      |  2 +-
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js b/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
index 7c680cd460..93dde8d11b 100755
--- a/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
+++ b/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
@@ -16,7 +16,7 @@ export default function requestJoinURL(credentials, { breakoutId, userId: id })
   const Breakout = Breakouts.findOne({ breakoutId });
   const BreakoutUser = Breakout.users.filter(user => user.userId === userId).shift();
 
-  if (BreakoutUser) return BreakoutUser.redirectToHtml5JoinURL;
+  if (BreakoutUser) return null;
   const eventName = 'RequestBreakoutJoinURLReqMsg';
 
   return RedisPubSub.publishUserMessage(
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index afee325a79..5e6c7f664e 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -156,13 +156,18 @@ class ActionsDropdown extends Component {
       stopRecording,
       createBreakoutRoom,
       createBreakoutRoomDesc,
-      invitationItem
+      invitationItem,
     } = intlMessages;
 
     const {
       formatMessage,
     } = intl;
 
+    const CanInviteUsers = isUserModerator
+    && !meetingIsBreakout
+    && hasBreakoutRoom
+    && getUsersNotAssigned(users).length;
+
     return _.compact([
       (isUserPresenter
         ? (
@@ -214,7 +219,7 @@ class ActionsDropdown extends Component {
           />
         )
         : null),
-      (isUserModerator && !meetingIsBreakout && hasBreakoutRoom && getUsersNotAssigned(users).length
+      (CanInviteUsers
         ? (
           <DropdownListItem
             icon="rooms"
@@ -232,7 +237,7 @@ class ActionsDropdown extends Component {
     mountModal(<PresentationUploaderContainer />);
   }
 
-  handleCreateBreakoutRoomClick(invitation) {
+  handleCreateBreakoutRoomClick(isInvitation) {
     const {
       createBreakoutRoom,
       mountModal,
@@ -240,8 +245,9 @@ class ActionsDropdown extends Component {
       users,
       getUsersNotAssigned,
       getBreakouts,
-      makeInvitation,
+      sendInvitation,
     } = this.props;
+    console.error(this.props);
 
     mountModal(
       <BreakoutRoom
@@ -250,9 +256,9 @@ class ActionsDropdown extends Component {
           meetingName,
           users,
           getUsersNotAssigned,
-          invitation,
+          isInvitation,
           getBreakouts,
-          makeInvitation,
+          sendInvitation,
         }}
       />,
     );
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 13153a0f78..b3cd7737a9 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -26,7 +26,7 @@ class ActionsBar extends React.PureComponent {
       meetingName,
       users,
       getUsersNotAssigned,
-      makeInvitation,
+      sendInvitation,
       getBreakouts,
     } = this.props;
 
@@ -56,7 +56,7 @@ class ActionsBar extends React.PureComponent {
             meetingName,
             users,
             getUsersNotAssigned,
-            makeInvitation,
+            sendInvitation,
             getBreakouts,
           }}
           />
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index 302ebfdce1..c0d5c116fc 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -40,7 +40,7 @@ export default withTracker(() => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
-    makeInvitation: Service.makeInvitation,
+    sendInvitation: Service.sendInvitation,
     getBreakouts: Service.getBreakouts,
     getUsersNotAssigned: Service.getUsersNotAssigned,
   };
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
index 1692b68fb9..f36522cc85 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
@@ -79,11 +79,11 @@ const intlMessages = defineMessages({
   },
   invitationTitle: {
     id: 'app.invitation.title',
-    description: 'invitation to breakout title',
+    description: 'isInvitationto breakout title',
   },
   invitationConfirm: {
     id: 'app.invitation.confirm',
-    description: 'invitation to breakout cpnfirm button label',
+    description: 'isInvitationto breakout cpnfirm button label',
   },
 });
 const MIN_BREAKOUT_ROOMS = 2;
@@ -115,7 +115,7 @@ class BreakoutRoom extends Component {
     this.renderTitle = this.renderTitle.bind(this);
     this.handleDismiss = this.handleDismiss.bind(this);
     this.setInvitationConfig = this.setInvitationConfig.bind(this);
-    
+
     this.state = {
       numberOfRooms: MIN_BREAKOUT_ROOMS,
       seletedId: '',
@@ -130,9 +130,9 @@ class BreakoutRoom extends Component {
   }
 
   componentDidMount() {
-    const { invitation } = this.props;
+    const { isInvitation } = this.props;
     this.setRoomUsers();
-    if (invitation) {
+    if (isInvitation) {
       this.setInvitationConfig();
     }
   }
@@ -176,7 +176,7 @@ class BreakoutRoom extends Component {
   }
 
   onInviteBreakout() {
-    const { getBreakouts, makeInvitation } = this.props;
+    const { getBreakouts, sendInvitation } = this.props;
     const { users } = this.state;
     const breakouts = getBreakouts();
     if (users.length === this.getUserByRoom(0).length) {
@@ -188,7 +188,7 @@ class BreakoutRoom extends Component {
       .filter(u => u.room > 0)
       .forEach((user) => {
         const breakout = breakouts[user.room - 1];
-        makeInvitation(breakout.breakoutId, user.userId);
+        sendInvitation(breakout.breakoutId, user.userId);
       });
 
     this.setState({ preventClosing: false });
@@ -329,13 +329,13 @@ class BreakoutRoom extends Component {
   renderBreakoutForm() {
     const {
       intl,
-      invitation,
+      isInvitation,
     } = this.props;
     const {
       numberOfRooms,
       durationTime,
     } = this.state;
-    if (invitation) return null;
+    if (isInvitation) return null;
 
     return (
       <div className={styles.breakoutSettings}>
@@ -416,8 +416,8 @@ class BreakoutRoom extends Component {
   }
 
   renderFreeJoinCheck() {
-    const { intl, invitation } = this.props;
-    if (invitation) return null;
+    const { intl, isInvitation } = this.props;
+    if (isInvitation) return null;
     const { freeJoin } = this.state;
     return (
       <label htmlFor="freeJoinCheckbox" className={styles.freeJoinLabel}>
@@ -470,7 +470,7 @@ class BreakoutRoom extends Component {
   }
 
   renderRoomSortList() {
-    const { intl, invitation } = this.props;
+    const { intl, isInvitation } = this.props;
     const { numberOfRooms } = this.state;
     const onClick = roomNumber => this.setState({ formFillLevel: 3, roomSelected: roomNumber });
     return (
@@ -494,7 +494,7 @@ class BreakoutRoom extends Component {
             ))
           }
         </span>
-        {invitation || this.renderButtonSetLevel(1, intl.formatMessage(intlMessages.backLabel))}
+        { isInvitation || this.renderButtonSetLevel(1, intl.formatMessage(intlMessages.backLabel))}
       </div>
     );
   }
@@ -546,7 +546,7 @@ class BreakoutRoom extends Component {
   }
 
   render() {
-    const { intl, invitation } = this.props;
+    const { intl, isInvitation } = this.props;
     const { preventClosing } = this.state;
 
     const BROWSER_RESULTS = browser();
@@ -555,16 +555,16 @@ class BreakoutRoom extends Component {
     return (
       <Modal
         title={
-          invitation
+          isInvitation
             ? intl.formatMessage(intlMessages.invitationTitle)
             : intl.formatMessage(intlMessages.breakoutRoomTitle)
         }
         confirm={
           {
-            label: invitation
+            label: isInvitation
               ? intl.formatMessage(intlMessages.invitationConfirm)
               : intl.formatMessage(intlMessages.confirmButton),
-            callback: invitation ? this.onInviteBreakout : this.onCreateBreakouts,
+            callback: isInvitation ? this.onInviteBreakout : this.onCreateBreakouts,
           }
         }
         dismiss={{
@@ -574,7 +574,7 @@ class BreakoutRoom extends Component {
         preventClosing={preventClosing}
       >
         <div className={styles.content}>
-          {invitation || this.renderTitle()}
+          {isInvitation || this.renderTitle()}
           {isMobileBrowser ? this.renderMobile() : this.renderDesktop()}
         </div>
       </Modal>
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
index 095c99bd8d..07fbe1f810 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
@@ -51,7 +51,7 @@ export default {
   toggleRecording: () => makeCall('toggleRecording'),
   processOutsideToggleRecording: arg => processOutsideToggleRecording(arg),
   createBreakoutRoom: (numberOfRooms, durationInMinutes, freeJoin = true, record = false) => makeCall('createBreakoutRoom', numberOfRooms, durationInMinutes, freeJoin, record),
-  makeInvitation: (breakoutId, userId) => makeCall('requestJoinURL', { breakoutId, userId }),
+  sendInvitation: (breakoutId, userId) => makeCall('requestJoinURL', { breakoutId, userId }),
   getBreakouts,
   getUsersNotAssigned,
 };

From e66309dde15b290b9d8a3d350b664d1ca611a2ae Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Wed, 2 Jan 2019 15:31:57 -0200
Subject: [PATCH 013/163] Fix user rejoining to meeting when is ejected

---
 bigbluebutton-html5/imports/startup/client/base.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 5cd70b18d9..3a061b1314 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -45,11 +45,16 @@ class Base extends Component {
     this.updateLoadingState = this.updateLoadingState.bind(this);
   }
 
-  componentWillUpdate() {
-    const { approved } = this.props;
+  componentDidUpdate(prevProps) {
+    const { ejected, approved } = this.props;
     const { loading } = this.state;
 
     if (approved && loading) this.updateLoadingState(false);
+
+    if (prevProps.ejected || ejected) {
+      Session.set('codeError', '403');
+      Session.set('isMeetingEnded', true);
+    }
   }
 
   updateLoadingState(loading = false) {
@@ -173,6 +178,7 @@ const BaseContainer = withTracker(() => {
   const subscriptionsReady = subscriptionsHandlers.every(handler => handler.ready());
   return {
     approved: Users.findOne({ userId: Auth.userID, approved: true, guest: true }),
+    ejected: Users.findOne({ userId: Auth.userID, ejected: true }),
     meetingEnded: Session.get('isMeetingEnded'),
     locale,
     subscriptionsReady,

From 6101ca5c139eab1e4e789c913f80e685f0a1c0ee Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Fri, 14 Dec 2018 17:16:15 -0300
Subject: [PATCH 014/163] Close presentation via a button in the top corner

---
 .../ui/components/actions-bar/component.jsx   | 12 +++++
 .../ui/components/actions-bar/container.jsx   |  5 ++
 .../presentation-options/component.jsx        | 53 +++++++++++++++++++
 .../ui/components/actions-bar/styles.scss     | 14 +++--
 .../ui/components/presentation/component.jsx  | 29 +++++++++-
 .../presentation-close-button/component.jsx   | 38 +++++++++++++
 .../ui/components/presentation/styles.scss    | 17 ++++++
 bigbluebutton-html5/private/locales/en.json   |  3 ++
 .../private/locales/pt_BR.json                |  3 ++
 9 files changed, 169 insertions(+), 5 deletions(-)
 create mode 100755 bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
 create mode 100755 bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 213d75e779..c50a5c2123 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -6,6 +6,8 @@ import ActionsDropdown from './actions-dropdown/component';
 import AudioControlsContainer from '../audio/audio-controls/container';
 import JoinVideoOptionsContainer from '../video-provider/video-menu/container';
 
+import PresentationOptionsContainer from './presentation-options/component';
+
 class ActionsBar extends React.PureComponent {
   render() {
     const {
@@ -25,6 +27,8 @@ class ActionsBar extends React.PureComponent {
       hasBreakoutRoom,
       meetingName,
       users,
+      isLayoutSwapped,
+      toggleSwapLayout,
     } = this.props;
 
     const {
@@ -78,6 +82,14 @@ class ActionsBar extends React.PureComponent {
           }}
           />
         </div>
+        <div className={styles.right}>
+          { isLayoutSwapped ?
+            <PresentationOptionsContainer
+              toggleSwapLayout={toggleSwapLayout}
+            />
+            : null
+          }
+        </div>
       </div>
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index c3c393cf22..bd96616604 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -8,6 +8,8 @@ import Service from './service';
 import VideoService from '../video-provider/service';
 import { shareScreen, unshareScreen, isVideoBroadcasting } from '../screenshare/service';
 
+import MediaService, { getSwapLayout } from '../media/service';
+
 const ActionsBarContainer = props => <ActionsBar {...props} />;
 
 export default withTracker(() => {
@@ -40,5 +42,8 @@ export default withTracker(() => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
+    togglePollMenu,
+    isLayoutSwapped: getSwapLayout(),
+    toggleSwapLayout: MediaService.toggleSwapLayout,
   };
 })(ActionsBarContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
new file mode 100755
index 0000000000..a5e6e41de7
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import browser from 'browser-detect';
+import Button from '/imports/ui/components/button/component';
+import logger from '/imports/startup/client/logger';
+import { notify } from '/imports/ui/services/notification';
+import cx from 'classnames';
+import { styles } from '../styles';
+
+const propTypes = {
+  intl: intlShape.isRequired,
+  toggleSwapLayout: PropTypes.func.isRequired,
+};
+
+const intlMessages = defineMessages({
+  restorePresentationLabel: {
+    id: 'app.actionsBar.actionsDropdown.restorePresentationLabel',
+    description: 'Restore Presentation option label',
+  },
+  restorePresentationDesc: {
+    id: 'app.actionsBar.actionsDropdown.restorePresentationDesc',
+    description: 'button to restore presentation after it has been closed',
+  },
+});
+
+const BROWSER_RESULTS = browser();
+const isMobileBrowser = (BROWSER_RESULTS ? BROWSER_RESULTS.mobile : false) ||
+  (BROWSER_RESULTS && BROWSER_RESULTS.os ?
+    BROWSER_RESULTS.os.includes('Android') : // mobile flag doesn't always work
+    false);
+
+const PresentationOptionsContainer = ({
+  intl,
+  toggleSwapLayout
+}) => {
+
+  return <Button
+    className={cx(styles.button, styles.presentationButton)}
+    icon='presentation'
+    label={intl.formatMessage(intlMessages.restorePresentationLabel)}
+     description={intl.formatMessage(intlMessages.restorePresentationDesc)}
+    color="primary"
+    hideLabel
+    circle
+    size="lg"
+    onClick={toggleSwapLayout}
+    id='restore-presentation'
+  />
+};
+
+PresentationOptionsContainer.propTypes = propTypes;
+export default injectIntl(PresentationOptionsContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
index 7619bf7adc..31a39e4008 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
@@ -2,13 +2,15 @@
 
 .actionsbar,
 .left,
-.center {
+.center,
+.right {
   display: flex;
   flex-direction: row;
 }
 
 .left,
-.center {
+.center,
+.right {
   flex: 1;
   justify-content: center;
 
@@ -29,6 +31,12 @@
   }
 }
 
+.right {
+  position: absolute;
+  bottom: var(--sm-padding-x);
+  right: var(--sm-padding-x);
+}
+
 .centerWithActions {
   @include mq($xsmall-only) {
     justify-content: flex-end;
@@ -57,4 +65,4 @@
   span:hover {
     border: 1.5px solid rgba(255,255,255, .5) !important;
   }
-}
\ No newline at end of file
+}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 889ba8f50d..8570b69dd0 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -10,6 +10,8 @@ import PresentationToolbarContainer from './presentation-toolbar/container';
 import PresentationOverlayContainer from './presentation-overlay/container';
 import Slide from './slide/component';
 import { styles } from './styles.scss';
+import MediaService from '../media/service';
+import PresentationCloseButton from './presentation-close-button/component';
 
 export default class PresentationArea extends Component {
   constructor() {
@@ -314,6 +316,28 @@ export default class PresentationArea extends Component {
     );
   }
 
+  renderPresentationClose() {
+    if (!this.props.currentSlide || !MediaService.shouldEnableSwapLayout()) {
+      return null;
+    }
+
+    const adjustedSizes = this.calculateSize();
+    const marginRight = (this.state.presentationWidth - adjustedSizes.width) / 2.0;
+    const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
+
+    const style = {
+      right: `${marginRight}px`,
+      top: `${marginTop}px`,
+    };
+
+    return (
+      <PresentationCloseButton
+        innerStyle={style}
+        toggleSwapLayout={MediaService.toggleSwapLayout}
+      />
+    );
+  }
+
   renderPresentationToolbar() {
     if (!this.props.currentSlide) {
       return null;
@@ -357,8 +381,9 @@ export default class PresentationArea extends Component {
             ref={(ref) => { this.refWhiteboardArea = ref; }}
             className={styles.whiteboardSizeAvailable}
           />
-          {this.state.showSlide
-            ? this.renderPresentationArea()
+          { this.renderPresentationClose() }
+          {this.state.showSlide ?
+              this.renderPresentationArea()
             : null }
           {this.props.userIsPresenter || this.props.multiUser
             ? this.renderWhiteboardToolbar()
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
new file mode 100755
index 0000000000..6b76c16a0c
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import Button from '/imports/ui/components/button/component';
+import { styles } from '../styles';
+
+const intlMessages = defineMessages({
+  closePresentationLabel: {
+    id: 'app.presentation.close',
+    description: 'Close presentation label',
+  },
+});
+
+const ClosePresentationComponent = ({
+  intl,
+  innerStyle,
+  toggleSwapLayout,
+}) => {
+
+  return (
+    <div style={innerStyle} className={styles.topRight}>
+      <Button
+       role="button"
+       aria-labelledby="closeLabel"
+       aria-describedby="closeDesc"
+       color="default"
+       icon="close"
+       size="md"
+       onClick={toggleSwapLayout}
+       label={intl.formatMessage(intlMessages.closePresentationLabel)}
+       hideLabel
+       circle
+       className={styles.close}
+     />
+    </div>
+  );
+};
+
+export default injectIntl(ClosePresentationComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
index 3630dc43e4..a9315e8173 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
@@ -64,3 +64,20 @@
   right: 0;
   bottom: 0;
 }
+
+.topRight {
+  position: absolute;
+}
+
+.close {
+  i {
+    color: var(--toolbar-button-color);
+    font-weight: bold;
+  }
+  cursor: pointer;
+
+  button.span.button {
+    background-color: rgba(0,0,0,0.1);
+  }
+}
+
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index e47b002d4f..e2f4a7afb2 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -56,6 +56,7 @@
     "app.media.screenshare.safariNotSupported": "Screenshare is currently not supported by Safari. Please, use Firefox or Google Chrome.",
     "app.meeting.ended": "This session has ended",
     "app.meeting.endedMessage": "You will be forwarded back to the home screen",
+    "app.presentation.close": "Close presentation",
     "app.presentation.presentationToolbar.prevSlideLabel": "Previous slide",
     "app.presentation.presentationToolbar.prevSlideDesc": "Change the presentation to the previous slide",
     "app.presentation.presentationToolbar.nextSlideLabel": "Next slide",
@@ -163,6 +164,8 @@
     "app.actionsBar.camOffLabel": "Cam Off",
     "app.actionsBar.raiseLabel": "Raise",
     "app.actionsBar.label": "Actions Bar",
+    "app.actionsBar.actionsDropdown.restorePresentationLabel": "Restore Presentation",
+    "app.actionsBar.actionsDropdown.restorePresentationDesc": "Button to restore presentation after it has been closed",
     "app.submenu.application.applicationSectionTitle": "Application",
     "app.submenu.application.audioAlertLabel": "Audio Alerts for Chat",
     "app.submenu.application.pushAlertLabel": "Popup Alerts for Chat",
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
index 6450371462..20cb82d17f 100644
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -45,6 +45,7 @@
     "app.media.screenshare.safariNotSupported": "Atualmente, o compartilhamento de tela não é suportado pelo Safari. Por favor, use o Firefox ou o Google Chrome.",
     "app.meeting.ended": "Esta reunião terminou",
     "app.meeting.endedMessage": "Você será redirecionado para a tela inicial",
+    "app.presentation.close": "Fechar apresentação",
     "app.presentation.presentationToolbar.prevSlideLabel": "Slide anterior",
     "app.presentation.presentationToolbar.prevSlideDesc": "Mudar a apresentação para o slide anterior",
     "app.presentation.presentationToolbar.nextSlideLabel": "Próximo slide",
@@ -224,6 +225,8 @@
     "app.actionsBar.emojiMenu.thumbsDownLabel": "Negativo",
     "app.actionsBar.emojiMenu.thumbsDownDesc": "Mudar seu status para negativo",
     "app.actionsBar.currentStatusDesc": "status atual {0}",
+    "app.actionsBar.actionsDropdown.restorePresentationLabel": "Re-abrir apresentação",
+    "app.actionsBar.actionsDropdown.restorePresentationDesc": "Botão que re-abre a apresentação depois dela ser fechada",
     "app.audioNotification.audioFailedError1001": "Erro 1001: WebSocket desconectou",
     "app.audioNotification.audioFailedError1002": "Erro 1002: Não foi possível estabelecer a conexão WebSocket",
     "app.audioNotification.audioFailedError1003": "Erro 1003: Versão do navegador não suportada",

From 442eb9a472f1096889c24046946ec2c96bedd320 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Fri, 14 Dec 2018 17:22:59 -0300
Subject: [PATCH 015/163] Don't show presentation overlay when swappedw

---
 bigbluebutton-html5/imports/ui/components/media/container.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index 142205160b..207432a301 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -129,7 +129,7 @@ export default withModalMounter(withTracker(({ mountModal }) => {
 
   if (data.swapLayout) {
     data.floatingOverlay = true;
-    data.hideOverlay = hidePresentation;
+    data.hideOverlay = true; //hidePresentation;
   }
 
   MediaContainer.propTypes = propTypes;

From 094a0e4f3e368166ad1f7de41f3641ce1c617ba8 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Wed, 2 Jan 2019 14:45:53 -0300
Subject: [PATCH 016/163] Don't use camera button for swap anymore

---
 .../ui/components/actions-bar/container.jsx   |  1 -
 .../video-provider/video-menu/component.jsx   | 69 ++++++-------------
 .../video-provider/video-menu/container.jsx   | 22 +-----
 3 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index bd96616604..8df9b792ec 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -42,7 +42,6 @@ export default withTracker(() => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
-    togglePollMenu,
     isLayoutSwapped: getSwapLayout(),
     toggleSwapLayout: MediaService.toggleSwapLayout,
   };
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
index 88ed1f14a2..6440768d28 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
@@ -4,11 +4,6 @@ import _ from 'lodash';
 import cx from 'classnames';
 import Button from '/imports/ui/components/button/component';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
-import Dropdown from '/imports/ui/components/dropdown/component';
-import DropdownTrigger from '/imports/ui/components/dropdown/trigger/component';
-import DropdownContent from '/imports/ui/components/dropdown/content/component';
-import DropdownList from '/imports/ui/components/dropdown/list/component';
-import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
 import { styles } from './styles';
 
 const intlMessages = defineMessages({
@@ -36,53 +31,29 @@ const propTypes = {
 const JoinVideoOptions = ({
   intl,
   isSharingVideo,
-  videoItems,
   videoShareAllowed,
+  handleJoinVideo,
+  handleCloseVideo,
 }) => {
-  const menuItems = videoItems
-    .filter(item => !item.disabled)
-    .map(item =>
-      (
-        <DropdownListItem
-          key={_.uniqueId('video-menu-')}
-          className={styles.item}
-          description={item.description}
-          onClick={item.click}
-          tabIndex={-1}
-          id={item.id}
-        >
-          <img src={item.iconPath} className={styles.imageSize} alt="video menu icon" />
-          <span className={styles.label}>{item.label}</span>
-        </DropdownListItem>
-      ));
+
   return (
-    <Dropdown
-      autoFocus
-    >
-      <DropdownTrigger tabIndex={0}>
-        <Button
-          label={!videoShareAllowed ?
-            intl.formatMessage(intlMessages.videoMenuDisabled)
-            : intl.formatMessage(intlMessages.videoMenu)
-          }
-          className={cx(styles.button, isSharingVideo || styles.ghostButton)}
-          onClick={() => null}
-          hideLabel
-          aria-label={intl.formatMessage(intlMessages.videoMenuDesc)}
-          color={isSharingVideo ? 'primary' : 'default'}
-          icon={isSharingVideo ? 'video' : 'video_off'}
-          ghost={!isSharingVideo}
-          size="lg"
-          circle
-          disabled={!videoShareAllowed}
-        />
-      </DropdownTrigger>
-      <DropdownContent placement="top" >
-        <DropdownList horizontal>
-          {menuItems}
-        </DropdownList>
-      </DropdownContent>
-    </Dropdown>
+    <Button
+      label={!videoShareAllowed ?
+        intl.formatMessage(intlMessages.videoMenuDisabled)
+        :
+        intl.formatMessage(intlMessages.videoMenu)
+      }
+      className={cx(styles.button, isSharingVideo || styles.ghostButton)}
+      onClick={isSharingVideo ? handleCloseVideo : handleJoinVideo}
+      hideLabel
+      aria-label={intl.formatMessage(intlMessages.videoMenuDesc)}
+      color={isSharingVideo ? 'primary' : 'default'}
+      icon={isSharingVideo ? 'video' : 'video_off'}
+      ghost={!isSharingVideo}
+      size="lg"
+      circle
+      disabled={!videoShareAllowed}
+    />
   );
 };
 JoinVideoOptions.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
index 8e453a95ec..a20da734f6 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
@@ -38,26 +38,10 @@ const JoinVideoOptionsContainer = (props) => {
     mountModal,
     ...restProps
   } = props;
-  const videoItems = [
-    {
-      iconPath: `${baseName}/resources/images/video-menu/icon-swap.svg`,
-      description: intl.formatMessage(intlMessages.swapCamDesc),
-      label: intl.formatMessage(intlMessages.swapCam),
-      disabled: !swapLayoutAllowed,
-      click: toggleSwapLayout,
-      id: 'swap-button',
-    },
-    {
-      iconPath: `${baseName}/resources/images/video-menu/icon-webcam-off.svg`,
-      description: intl.formatMessage(intlMessages[isSharingVideo ? 'leaveVideo' : 'joinVideo']),
-      label: intl.formatMessage(intlMessages[isSharingVideo ? 'leaveVideo' : 'joinVideo']),
-      disabled: isDisabled && !isSharingVideo,
-      click: isSharingVideo ? handleCloseVideo : () => { mountModal(<VideoPreviewContainer />); },
-      id: isSharingVideo ? 'leave-video-button' : 'join-video-button',
-    },
-  ];
 
-  return <JoinVideoOptions {...{ videoItems, isSharingVideo, ...restProps }} />;
+  const mountPreview = () => { mountModal(<VideoPreviewContainer />); };
+
+  return <JoinVideoOptions {...{ handleJoinVideo: mountPreview, handleCloseVideo, isSharingVideo, ...restProps }} />;
 };
 
 export default withModalMounter(injectIntl(withTracker(() => ({

From c2646b78a25000f0b2bcb2162bfab3c74ad046b4 Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Thu, 3 Jan 2019 17:08:41 +0000
Subject: [PATCH 017/163] Add support for getDisplayMedia on Chrome

---
 .../resources/prod/lib/kurento-extension.js   | 80 ++++++++++++-------
 .../resources/prod/lib/kurento-utils.js       | 19 +++--
 .../client/compatibility/kurento-extension.js | 53 ++++++++----
 .../client/compatibility/kurento-utils.js     | 11 ++-
 4 files changed, 112 insertions(+), 51 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/kurento-extension.js b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
index 9062e0befb..a12210f4c2 100755
--- a/bigbluebutton-client/resources/prod/lib/kurento-extension.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
@@ -2,6 +2,7 @@ const isFirefox = typeof window.InstallTrigger !== 'undefined';
 const isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
 const isChrome = !!window.chrome && !isOpera;
 const isSafari = navigator.userAgent.indexOf('Safari') >= 0 && !isChrome;
+const hasDisplayMedia = typeof navigator.getDisplayMedia === 'function';
 const kurentoHandler = null;
 const SEND_ROLE = "send";
 const RECV_ROLE = "recv";
@@ -610,44 +611,63 @@ Kurento.normalizeCallback = function (callback) {
 
 // this function explains how to use above methods/objects
 window.getScreenConstraints = function (sendSource, callback) {
-  const screenConstraints = { video: {}, audio: false };
+  let screenConstraints = { video: {}, audio: false };
 
   // Limiting FPS to a range of 5-10 (5 ideal)
   screenConstraints.video.frameRate = { ideal: 5, max: 10 };
-
   screenConstraints.video.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
   screenConstraints.video.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
 
+  const optionalConstraints = [
+    { googCpuOveruseDetection: true },
+    { googCpuOveruseEncodeUsage: true },
+    { googCpuUnderuseThreshold: 55 },
+    { googCpuOveruseThreshold: 100 },
+    { googPayloadPadding: true },
+    { googScreencastMinBitrate: 600 },
+    { googHighStartBitrate: true },
+    { googHighBitrate: true },
+    { googVeryHighBitrate: true },
+  ];
+
   if (isChrome) {
-    getChromeScreenConstraints((constraints) => {
-      if (!constraints) {
-        document.dispatchEvent(new Event('installChromeExtension'));
-        return;
+    if (!hasDisplayMedia) {
+      getChromeScreenConstraints((constraints) => {
+        if (!constraints) {
+          document.dispatchEvent(new Event('installChromeExtension'));
+          return;
+        }
+
+        const sourceId = constraints.streamId;
+
+        kurentoManager.kurentoScreenshare.extensionInstalled = true;
+
+        // this statement sets gets 'sourceId" and sets "chromeMediaSourceId"
+        screenConstraints.video.chromeMediaSource = { exact: [sendSource] };
+        screenConstraints.video.chromeMediaSourceId = sourceId;
+        screenConstraints.optional = optionalConstraints;
+
+        console.log('getScreenConstraints for Chrome returns => ', screenConstraints);
+        // now invoking native getUserMedia API
+        callback(null, screenConstraints);
+      }, chromeExtension);
+    } else {
+      // Falls back to getDisplayMedia if the browser supports it
+      // The fine-grained constraints (e.g.: frameRate) are supposed to go into
+      // the MediaStream because getDisplayMedia does not support them,
+      // so they're passed differently
+      kurentoManager.kurentoScreenshare.extensionInstalled = true;
+      optionalConstraints.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
+      optionalConstraints.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
+      optionalConstraints.frameRate = { ideal: 5, max: 10 };
+
+      screenConstraints = {
+        video: true,
+        optional: optionalConstraints
       }
 
-      const sourceId = constraints.streamId;
-
-      kurentoManager.kurentoScreenshare.extensionInstalled = true;
-
-      // this statement sets gets 'sourceId" and sets "chromeMediaSourceId"
-      screenConstraints.video.chromeMediaSource = { exact: [sendSource] };
-      screenConstraints.video.chromeMediaSourceId = sourceId;
-      screenConstraints.optional = [
-        { googCpuOveruseDetection: true },
-        { googCpuOveruseEncodeUsage: true },
-        { googCpuUnderuseThreshold: 55 },
-        { googCpuOveruseThreshold: 100},
-        { googPayloadPadding: true },
-        { googScreencastMinBitrate: 600 },
-        { googHighStartBitrate: true },
-        { googHighBitrate: true },
-        { googVeryHighBitrate: true }
-      ];
-
-      console.log('getScreenConstraints for Chrome returns => ', screenConstraints);
-      // now invoking native getUserMedia API
       callback(null, screenConstraints);
-    }, chromeExtension);
+    }
   } else if (isFirefox) {
     screenConstraints.video.mediaSource = 'window';
 
@@ -735,6 +755,10 @@ window.checkIfIncognito = function(isIncognito, isNotIncognito = function () {})
 window.checkChromeExtInstalled = function (callback, chromeExtensionId) {
   callback = Kurento.normalizeCallback(callback);
 
+  if (hasDisplayMedia) {
+    return callback(true);
+  }
+
   if (typeof chrome === "undefined" || !chrome || !chrome.runtime) {
     // No API, so no extension for sure
     callback(false);
diff --git a/bigbluebutton-client/resources/prod/lib/kurento-utils.js b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
index d171093e87..0ed8162b17 100644
--- a/bigbluebutton-client/resources/prod/lib/kurento-utils.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
@@ -410,7 +410,16 @@ function WebRtcPeer(mode, options, callback) {
                     return callback(error);
                 constraints = [mediaConstraints];
                 constraints.unshift(constraints_);
-                getMedia(recursive.apply(undefined, constraints));
+                if (typeof navigator.getDisplayMedia === 'function') {
+                    navigator.getDisplayMedia(recursive.apply(undefined, constraints)).then(stream => {
+                        stream.getTracks()[0].applyConstraints(constraints[0].optional).then(() => {
+                            videoStream = stream;
+                            start();
+                        }).catch(callback);
+                    }).catch(callback);
+                } else {
+                    getMedia(recursive.apply(undefined, constraints));
+                }
             }, guid);
         }
     } else {
@@ -1045,7 +1054,7 @@ module.exports = function(stream, options) {
   harker.setInterval = function(i) {
     interval = i;
   };
-  
+
   harker.stop = function() {
     running = false;
     harker.emit('volume_change', -100, threshold);
@@ -1063,12 +1072,12 @@ module.exports = function(stream, options) {
   // and emit events if changed
   var looper = function() {
     setTimeout(function() {
-    
+
       //check if stop has been called
       if(!running) {
         return;
       }
-      
+
       var currentVolume = getMaxVolume(analyser, fftBins);
 
       harker.emit('volume_change', currentVolume, threshold);
@@ -4359,4 +4368,4 @@ WildEmitter.mixin = function (constructor) {
 WildEmitter.mixin(WildEmitter);
 
 },{}]},{},[2])(2)
-});
\ No newline at end of file
+});
diff --git a/bigbluebutton-html5/client/compatibility/kurento-extension.js b/bigbluebutton-html5/client/compatibility/kurento-extension.js
index 84ba9475d2..ddf9d6d4b7 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-extension.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-extension.js
@@ -3,6 +3,7 @@ const isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
 const isChrome = !!window.chrome && !isOpera;
 const isSafari = navigator.userAgent.indexOf('Safari') >= 0 && !isChrome;
 const isElectron = navigator.userAgent.toLowerCase().indexOf(' electron/') > -1;
+const hasDisplayMedia = typeof navigator.getDisplayMedia === 'function';
 const kurentoHandler = null;
 
 Kurento = function (
@@ -620,7 +621,7 @@ Kurento.normalizeCallback = function (callback) {
 
 // this function explains how to use above methods/objects
 window.getScreenConstraints = function (sendSource, callback) {
-  const screenConstraints = { video: {}, audio: false };
+  let screenConstraints = { video: {}, audio: false };
 
   // Limiting FPS to a range of 5-10 (5 ideal)
   screenConstraints.video.frameRate = { ideal: 5, max: 10 };
@@ -669,25 +670,43 @@ window.getScreenConstraints = function (sendSource, callback) {
   }
 
   if (isChrome) {
-    const extensionKey = kurentoManager.getChromeExtensionKey();
-    getChromeScreenConstraints(extensionKey).then((constraints) => {
-      if (!constraints) {
-        document.dispatchEvent(new Event('installChromeExtension'));
-        return;
+    if (!hasDisplayMedia) {
+      const extensionKey = kurentoManager.getChromeExtensionKey();
+      getChromeScreenConstraints(extensionKey).then((constraints) => {
+        if (!constraints) {
+          document.dispatchEvent(new Event('installChromeExtension'));
+          return;
+        }
+
+        const sourceId = constraints.streamId;
+
+        kurentoManager.kurentoScreenshare.extensionInstalled = true;
+
+        // this statement sets gets 'sourceId" and sets "chromeMediaSourceId"
+        screenConstraints.video.chromeMediaSource = { exact: [sendSource] };
+        screenConstraints.video.chromeMediaSourceId = sourceId;
+        screenConstraints.optional = optionalConstraints;
+
+        console.log('getScreenConstraints for Chrome returns => ', screenConstraints);
+        return callback(null, screenConstraints);
+      });
+    } else {
+      // Falls back to getDisplayMedia if the browser supports it
+      // The fine-grained constraints (e.g.: frameRate) are supposed to go into
+      // the MediaStream because getDisplayMedia does not support them,
+      // so they're passed differently
+      kurentoManager.kurentoScreenshare.extensionInstalled = true;
+      optionalConstraints.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
+      optionalConstraints.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
+      optionalConstraints.frameRate = { ideal: 5, max: 10 };
+
+      screenConstraints = {
+        video: true,
+        optional: optionalConstraints
       }
 
-      const sourceId = constraints.streamId;
-
-      kurentoManager.kurentoScreenshare.extensionInstalled = true;
-
-      // this statement sets gets 'sourceId" and sets "chromeMediaSourceId"
-      screenConstraints.video.chromeMediaSource = { exact: [sendSource] };
-      screenConstraints.video.chromeMediaSourceId = sourceId;
-      screenConstraints.optional = optionalConstraints;
-
-      console.log('getScreenConstraints for Chrome returns => ', screenConstraints);
       return callback(null, screenConstraints);
-    });
+    }
   }
 
   if (isFirefox) {
diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index aaeaaecbb9..f0b00c3d5e 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -432,7 +432,16 @@ function WebRtcPeer(mode, options, callback) {
                     return callback(error);
                 constraints = [mediaConstraints];
                 constraints.unshift(constraints_);
-                getMedia(recursive.apply(undefined, constraints));
+                if (typeof navigator.getDisplayMedia === 'function') {
+                    navigator.getDisplayMedia(recursive.apply(undefined, constraints)).then(stream => {
+                        stream.getTracks()[0].applyConstraints(constraints[0].optional).then(() => {
+                            videoStream = stream;
+                            start();
+                        }).catch(callback);
+                    }).catch(callback);
+                } else {
+                    getMedia(recursive.apply(undefined, constraints));
+                }
             }, guid);
         }
     } else {

From c1aacc8823a95369c0ab056a09df0e4af102511b Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Thu, 3 Jan 2019 15:14:45 -0200
Subject: [PATCH 018/163] Add custom font feature and define desktop version to
 14px

---
 .../imports/ui/components/app/component.jsx   | 12 +--
 .../ui/components/settings/component.jsx      | 73 ++++++++++++++-----
 .../submenus/application/component.jsx        | 52 ++++++++++---
 .../submenus/application/container.jsx        | 20 -----
 .../private/config/settings.yml               |  5 +-
 5 files changed, 103 insertions(+), 59 deletions(-)
 delete mode 100644 bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index a4b497ffa8..4fccbb1cd8 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -15,6 +15,9 @@ import ChatAlertContainer from '../chat/alert/container';
 import { styles } from './styles';
 
 const MOBILE_MEDIA = 'only screen and (max-width: 40em)';
+const APP_CONFIG = Meteor.settings.public.app;
+const DESKTOP_FONT_SIZE = APP_CONFIG.desktopFont;
+const MOBILE_FONT_SIZE = APP_CONFIG.mobileFont;
 
 const intlMessages = defineMessages({
   userListLabel: {
@@ -36,7 +39,6 @@ const intlMessages = defineMessages({
 });
 
 const propTypes = {
-  fontSize: PropTypes.string,
   navbar: PropTypes.element,
   sidebar: PropTypes.element,
   media: PropTypes.element,
@@ -49,7 +51,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-  fontSize: '16px',
   navbar: null,
   sidebar: null,
   media: null,
@@ -70,13 +71,14 @@ class App extends Component {
   }
 
   componentDidMount() {
-    const { locale, fontSize } = this.props;
+    const { locale } = this.props;
+    const BROWSER_RESULTS = browser();
+    const isMobileBrowser = BROWSER_RESULTS.mobile || BROWSER_RESULTS.os.includes('Android');
 
     Modal.setAppElement('#app');
     document.getElementsByTagName('html')[0].lang = locale;
-    document.getElementsByTagName('html')[0].style.fontSize = fontSize;
+    document.getElementsByTagName('html')[0].style.fontSize = isMobileBrowser ? MOBILE_FONT_SIZE : DESKTOP_FONT_SIZE;
 
-    const BROWSER_RESULTS = browser();
     const body = document.getElementsByTagName('body')[0];
     if (BROWSER_RESULTS && BROWSER_RESULTS.name) {
       body.classList.add(`browser-${BROWSER_RESULTS.name}`);
diff --git a/bigbluebutton-html5/imports/ui/components/settings/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/component.jsx
index 7f7e6a3f7d..fd0dc75ec8 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/component.jsx
@@ -1,10 +1,12 @@
 import React, { Component } from 'react';
 import Modal from '/imports/ui/components/modal/fullscreen/component';
-import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
+import {
+  Tab, Tabs, TabList, TabPanel,
+} from 'react-tabs';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import ClosedCaptions from '/imports/ui/components/settings/submenus/closed-captions/component';
 import DataSaving from '/imports/ui/components/settings/submenus/data-saving/component';
-import Application from '/imports/ui/components/settings/submenus/application/container';
+import Application from '/imports/ui/components/settings/submenus/application/component';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 
@@ -61,20 +63,43 @@ const intlMessages = defineMessages({
 
 const propTypes = {
   intl: intlShape.isRequired,
-  dataSaving: PropTypes.object.isRequired,
-  application: PropTypes.object.isRequired,
-  cc: PropTypes.object.isRequired,
-  participants: PropTypes.object.isRequired,
+  dataSaving: PropTypes.shape({
+    viewParticipantsWebcams: PropTypes.bool,
+    viewScreenshare: PropTypes.bool,
+  }).isRequired,
+  application: PropTypes.shape({
+    chatAudioAlerts: PropTypes.bool,
+    chatPushAlerts: PropTypes.bool,
+    fallbackLocale: PropTypes.string,
+    fontSize: PropTypes.string,
+    locale: PropTypes.string,
+  }).isRequired,
+  cc: PropTypes.shape({
+    backgroundColor: PropTypes.string,
+    enabled: PropTypes.bool,
+    fontColor: PropTypes.string,
+    fontFamily: PropTypes.string,
+    fontSize: PropTypes.string,
+    takeOwnership: PropTypes.bool,
+  }).isRequired,
+  participants: PropTypes.shape({
+    layout: PropTypes.bool,
+    lockAll: PropTypes.bool,
+    microphone: PropTypes.bool,
+    muteAll: PropTypes.bool,
+    privateChat: PropTypes.bool,
+    publicChat: PropTypes.bool,
+  }).isRequired,
   updateSettings: PropTypes.func.isRequired,
-  availableLocales: PropTypes.object.isRequired,
+  availableLocales: PropTypes.objectOf(PropTypes.array).isRequired,
   mountModal: PropTypes.func.isRequired,
-  locales: PropTypes.array.isRequired,
 };
 
 class Settings extends Component {
   static setHtmlFontSize(size) {
     document.getElementsByTagName('html')[0].style.fontSize = size;
   }
+
   constructor(props) {
     super(props);
 
@@ -104,7 +129,8 @@ class Settings extends Component {
   }
 
   componentWillMount() {
-    this.props.availableLocales.then((locales) => {
+    const { availableLocales } = this.props;
+    availableLocales.then((locales) => {
       this.setState({ availableLocales: locales });
     });
   }
@@ -123,12 +149,17 @@ class Settings extends Component {
 
   renderModalContent() {
     const { intl } = this.props;
-
+    const {
+      selectedTab,
+      availableLocales,
+      current,
+      locales,
+    } = this.state;
     return (
       <Tabs
         className={styles.tabs}
         onSelect={this.handleSelectTab}
-        selectedIndex={this.state.selectedTab}
+        selectedIndex={selectedTab}
         role="presentation"
         selectedTabPanelClassName={styles.selectedTab}
       >
@@ -170,9 +201,9 @@ class Settings extends Component {
         </TabList>
         <TabPanel className={styles.tabPanel}>
           <Application
-            availableLocales={this.state.availableLocales}
+            availableLocales={availableLocales}
             handleUpdateSettings={this.handleUpdateSettings}
-            settings={this.state.current.application}
+            settings={current.application}
           />
         </TabPanel>
         {/* <TabPanel className={styles.tabPanel}> */}
@@ -183,14 +214,14 @@ class Settings extends Component {
         {/* </TabPanel> */}
         <TabPanel className={styles.tabPanel}>
           <ClosedCaptions
-            settings={this.state.current.cc}
+            settings={current.cc}
             handleUpdateSettings={this.handleUpdateSettings}
-            locales={this.props.locales}
+            locales={locales}
           />
         </TabPanel>
         <TabPanel className={styles.tabPanel}>
           <DataSaving
-            settings={this.state.current.dataSaving}
+            settings={current.dataSaving}
             handleUpdateSettings={this.handleUpdateSettings}
           />
         </TabPanel>
@@ -205,18 +236,22 @@ class Settings extends Component {
       </Tabs>
     );
   }
+
   render() {
     const {
       intl,
       mountModal,
     } = this.props;
-
+    const {
+      current,
+      saved,
+    } = this.state;
     return (
       <Modal
         title={intl.formatMessage(intlMessages.SettingsLabel)}
         confirm={{
           callback: () => {
-            this.updateSettings(this.state.current);
+            this.updateSettings(current);
             // router.push(location.pathname); // TODO 4767
             /* We need to use mountModal(null) here to prevent submenu state updates,
             *  from re-opening the modal.
@@ -228,7 +263,7 @@ class Settings extends Component {
         }}
         dismiss={{
           callback: () => {
-            Settings.setHtmlFontSize(this.state.saved.application.fontSize);
+            Settings.setHtmlFontSize(saved.application.fontSize);
             mountModal(null);
           },
           label: intl.formatMessage(intlMessages.CancelLabel),
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
index 9605cf4f5d..04cea4df29 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
@@ -1,13 +1,12 @@
 import React from 'react';
-import Button from '/imports/ui/components/button/component';
 import cx from 'classnames';
+import Button from '/imports/ui/components/button/component';
 import Toggle from '/imports/ui/components/switch/component';
 import { defineMessages, injectIntl } from 'react-intl';
 import BaseMenu from '../base/component';
 import { styles } from '../styles';
 
 const MIN_FONTSIZE = 0;
-const MAX_FONTSIZE = 4;
 
 const intlMessages = defineMessages({
   applicationSectionTitle: {
@@ -61,6 +60,10 @@ const intlMessages = defineMessages({
 });
 
 class ApplicationMenu extends BaseMenu {
+  static setHtmlFontSize(size) {
+    document.getElementsByTagName('html')[0].style.fontSize = size;
+  }
+
   constructor(props) {
     super(props);
 
@@ -69,41 +72,66 @@ class ApplicationMenu extends BaseMenu {
       settings: props.settings,
       isLargestFontSize: false,
       isSmallestFontSize: false,
+      fontSizes: [
+        '12px',
+        '14px',
+        '16px',
+        '18px',
+        '20px',
+      ],
     };
   }
 
+  componentDidMount() {
+    this.setInitialFontSize();
+  }
+
+  setInitialFontSize() {
+    const { fontSizes } = this.state;
+    const clientFont = document.getElementsByTagName('html')[0].style.fontSize;
+    const hasFont = fontSizes.includes(clientFont);
+    if (!hasFont) {
+      fontSizes.push(clientFont);
+      fontSizes.sort();
+    }
+    const fontIndex = fontSizes.indexOf(clientFont);
+    this.changeFontSize(clientFont);
+    this.setState({
+      isSmallestFontSize: fontIndex <= MIN_FONTSIZE,
+      isLargestFontSize: fontIndex >= (fontSizes.length - 1),
+      fontSizes,
+    });
+  }
+
   handleUpdateFontSize(size) {
     const obj = this.state;
     obj.settings.fontSize = size;
     this.handleUpdateSettings(this.state.settingsName, obj.settings);
   }
 
-  setHtmlFontSize(size) {
-    document.getElementsByTagName('html')[0].style.fontSize = size;
-  }
-
   changeFontSize(size) {
     const obj = this.state;
     obj.settings.fontSize = size;
     this.setState(obj, () => {
-      this.setHtmlFontSize(this.state.settings.fontSize);
+      ApplicationMenu.setHtmlFontSize(this.state.settings.fontSize);
       this.handleUpdateFontSize(this.state.settings.fontSize);
     });
   }
 
   handleIncreaseFontSize() {
     const currentFontSize = this.state.settings.fontSize;
-    const availableFontSizes = this.props.fontSizes;
-    const canIncreaseFontSize = availableFontSizes.indexOf(currentFontSize) < MAX_FONTSIZE;
-    const fs = canIncreaseFontSize ? availableFontSizes.indexOf(currentFontSize) + 1 : MAX_FONTSIZE;
+    const availableFontSizes = this.state.fontSizes;
+    const maxFontSize = availableFontSizes.length - 1;
+    const canIncreaseFontSize = availableFontSizes.indexOf(currentFontSize) < maxFontSize;
+    const fs = canIncreaseFontSize ? availableFontSizes.indexOf(currentFontSize) + 1 : maxFontSize;
     this.changeFontSize(availableFontSizes[fs]);
-    if (fs === MAX_FONTSIZE) this.setState({ isLargestFontSize: true });
+    if (fs === maxFontSize) this.setState({ isLargestFontSize: true });
     this.setState({ isSmallestFontSize: false });
   }
 
   handleDecreaseFontSize() {
     const currentFontSize = this.state.settings.fontSize;
-    const availableFontSizes = this.props.fontSizes;
+    const availableFontSizes = this.state.fontSizes;
     const canDecreaseFontSize = availableFontSizes.indexOf(currentFontSize) > MIN_FONTSIZE;
     const fs = canDecreaseFontSize ? availableFontSizes.indexOf(currentFontSize) - 1 : MIN_FONTSIZE;
     this.changeFontSize(availableFontSizes[fs]);
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx
deleted file mode 100644
index b9011514dd..0000000000
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/container.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { withTracker } from 'meteor/react-meteor-data';
-import Application from './component';
-
-
-const ApplicationContainer = ({ children, ...props }) => (
-  <Application {...props}>
-    {children}
-  </Application>
-);
-
-export default withTracker(() => ({
-  fontSizes: [
-    '12px',
-    '14px',
-    '16px',
-    '18px',
-    '20px',
-  ],
-}))(ApplicationContainer);
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 69808d4d0b..d8e7dbacf2 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -1,7 +1,7 @@
 public:
   app:
-    mobileFont: 16
-    desktopFont: 14
+    mobileFont: 16px
+    desktopFont: 14px
     audioChatNotification: false
     autoJoin: true
     showParticipantsOnLogin: true
@@ -20,7 +20,6 @@ public:
       application:
         chatAudioAlerts: false
         chatPushAlerts: false
-        fontSize: 16px
         fallbackLocale: en
       audio:
         inputDeviceId: undefined

From 38a91e45592989b97c09544e5403def4d78d15d8 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Thu, 3 Jan 2019 15:55:10 -0200
Subject: [PATCH 019/163] rename settings variables

---
 bigbluebutton-html5/imports/ui/components/app/component.jsx | 4 ++--
 bigbluebutton-html5/private/config/settings.yml             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 4fccbb1cd8..687f5eb9ac 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -16,8 +16,8 @@ import { styles } from './styles';
 
 const MOBILE_MEDIA = 'only screen and (max-width: 40em)';
 const APP_CONFIG = Meteor.settings.public.app;
-const DESKTOP_FONT_SIZE = APP_CONFIG.desktopFont;
-const MOBILE_FONT_SIZE = APP_CONFIG.mobileFont;
+const DESKTOP_FONT_SIZE = APP_CONFIG.desktopFontSize;
+const MOBILE_FONT_SIZE = APP_CONFIG.mobileFontSize;
 
 const intlMessages = defineMessages({
   userListLabel: {
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index d8e7dbacf2..b2fbb0475d 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -1,7 +1,7 @@
 public:
   app:
-    mobileFont: 16px
-    desktopFont: 14px
+    mobileFontSize: 16px
+    desktopFontSize: 14px
     audioChatNotification: false
     autoJoin: true
     showParticipantsOnLogin: true

From 04ec52111ad1ab20767e5fe7f079d56dcdc75aef Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Thu, 3 Jan 2019 18:17:13 +0000
Subject: [PATCH 020/163] Reorganized the gDP code a bit to also support Edge

---
 .../resources/prod/lib/kurento-extension.js   | 38 ++++++++++--------
 .../resources/prod/lib/kurento-utils.js       |  5 ++-
 .../client/compatibility/kurento-extension.js | 40 +++++++++++--------
 .../client/compatibility/kurento-utils.js     |  5 ++-
 4 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/kurento-extension.js b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
index a12210f4c2..dab7affe01 100755
--- a/bigbluebutton-client/resources/prod/lib/kurento-extension.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
@@ -618,6 +618,23 @@ window.getScreenConstraints = function (sendSource, callback) {
   screenConstraints.video.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
   screenConstraints.video.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
 
+  const getDisplayMediaConstraints = function () {
+    // The fine-grained constraints (e.g.: frameRate) are supposed to go into
+    // the MediaStream because getDisplayMedia does not support them,
+    // so they're passed differently
+    kurentoManager.kurentoScreenshare.extensionInstalled = true;
+    optionalConstraints.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
+    optionalConstraints.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
+    optionalConstraints.frameRate = { ideal: 5, max: 10 };
+
+    let gDPConstraints = {
+      video: true,
+      optional: optionalConstraints
+    }
+
+    return gDPConstraints;
+  };
+
   const optionalConstraints = [
     { googCpuOveruseDetection: true },
     { googCpuOveruseEncodeUsage: true },
@@ -652,21 +669,7 @@ window.getScreenConstraints = function (sendSource, callback) {
         callback(null, screenConstraints);
       }, chromeExtension);
     } else {
-      // Falls back to getDisplayMedia if the browser supports it
-      // The fine-grained constraints (e.g.: frameRate) are supposed to go into
-      // the MediaStream because getDisplayMedia does not support them,
-      // so they're passed differently
-      kurentoManager.kurentoScreenshare.extensionInstalled = true;
-      optionalConstraints.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
-      optionalConstraints.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
-      optionalConstraints.frameRate = { ideal: 5, max: 10 };
-
-      screenConstraints = {
-        video: true,
-        optional: optionalConstraints
-      }
-
-      callback(null, screenConstraints);
+      return callback(null, getDisplayMediaConstraints());
     }
   } else if (isFirefox) {
     screenConstraints.video.mediaSource = 'window';
@@ -674,12 +677,15 @@ window.getScreenConstraints = function (sendSource, callback) {
     console.log('getScreenConstraints for Firefox returns => ', screenConstraints);
     // now invoking native getUserMedia API
     callback(null, screenConstraints);
-  } else if (isSafari) {
+  } else if (isSafari && !hasDisplayMedia) {
     screenConstraints.video.mediaSource = 'screen';
 
     console.log('getScreenConstraints for Safari returns => ', screenConstraints);
     // now invoking native getUserMedia API
     callback(null, screenConstraints);
+  } else if (hasDisplayMedia) {
+    // Falls back to getDisplayMedia if the browser supports it
+    return callback(null, getDisplayMediaConstraints());
   }
 };
 
diff --git a/bigbluebutton-client/resources/prod/lib/kurento-utils.js b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
index 0ed8162b17..78ea0604b7 100644
--- a/bigbluebutton-client/resources/prod/lib/kurento-utils.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
@@ -415,7 +415,10 @@ function WebRtcPeer(mode, options, callback) {
                         stream.getTracks()[0].applyConstraints(constraints[0].optional).then(() => {
                             videoStream = stream;
                             start();
-                        }).catch(callback);
+                        }).catch(() => {
+                          videoStream = stream;
+                          start();
+                        });
                     }).catch(callback);
                 } else {
                     getMedia(recursive.apply(undefined, constraints));
diff --git a/bigbluebutton-html5/client/compatibility/kurento-extension.js b/bigbluebutton-html5/client/compatibility/kurento-extension.js
index ddf9d6d4b7..229771c9f8 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-extension.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-extension.js
@@ -644,6 +644,23 @@ window.getScreenConstraints = function (sendSource, callback) {
     });
   };
 
+  const getDisplayMediaConstraints = function () {
+    // The fine-grained constraints (e.g.: frameRate) are supposed to go into
+    // the MediaStream because getDisplayMedia does not support them,
+    // so they're passed differently
+    kurentoManager.kurentoScreenshare.extensionInstalled = true;
+    optionalConstraints.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
+    optionalConstraints.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
+    optionalConstraints.frameRate = { ideal: 5, max: 10 };
+
+    let gDPConstraints = {
+      video: true,
+      optional: optionalConstraints
+    }
+
+    return gDPConstraints;
+  };
+
   const optionalConstraints = [
     { googCpuOveruseDetection: true },
     { googCpuOveruseEncodeUsage: true },
@@ -691,21 +708,7 @@ window.getScreenConstraints = function (sendSource, callback) {
         return callback(null, screenConstraints);
       });
     } else {
-      // Falls back to getDisplayMedia if the browser supports it
-      // The fine-grained constraints (e.g.: frameRate) are supposed to go into
-      // the MediaStream because getDisplayMedia does not support them,
-      // so they're passed differently
-      kurentoManager.kurentoScreenshare.extensionInstalled = true;
-      optionalConstraints.width = { max: kurentoManager.kurentoScreenshare.vid_max_width };
-      optionalConstraints.height = { max: kurentoManager.kurentoScreenshare.vid_max_height };
-      optionalConstraints.frameRate = { ideal: 5, max: 10 };
-
-      screenConstraints = {
-        video: true,
-        optional: optionalConstraints
-      }
-
-      return callback(null, screenConstraints);
+      return callback(null, getDisplayMediaConstraints());
     }
   }
 
@@ -717,9 +720,14 @@ window.getScreenConstraints = function (sendSource, callback) {
     return callback(null, screenConstraints);
   }
 
+  // Falls back to getDisplayMedia if the browser supports it
+  if (hasDisplayMedia) {
+    return callback(null, getDisplayMediaConstraints());
+  }
+
   if (isSafari) {
     // At this time (version 11.1), Safari doesn't support screenshare.
-    document.dispatchEvent(new Event('safariScreenshareNotSupported'));
+    return document.dispatchEvent(new Event('safariScreenshareNotSupported'));
   }
 };
 
diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index f0b00c3d5e..501bd14876 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -437,7 +437,10 @@ function WebRtcPeer(mode, options, callback) {
                         stream.getTracks()[0].applyConstraints(constraints[0].optional).then(() => {
                             videoStream = stream;
                             start();
-                        }).catch(callback);
+                        }).catch(() => {
+                          videoStream = stream;
+                          start();
+                        });
                     }).catch(callback);
                 } else {
                     getMedia(recursive.apply(undefined, constraints));

From eb5c061e8f0bd3f6f050198d0f0c261ad798cbda Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Thu, 3 Jan 2019 18:14:35 +0000
Subject: [PATCH 021/163] Implemented recording timer

---
 .../api/meetings/server/eventHandlers.js      |  2 +
 .../server/handlers/recordingTimerChange.js   | 23 ++++++++
 .../actions-dropdown/component.jsx            | 26 ---------
 .../ui/components/actions-bar/container.jsx   | 14 -----
 .../ui/components/actions-bar/service.js      | 26 ---------
 .../ui/components/nav-bar/component.jsx       | 57 ++++++++++++++++++-
 .../ui/components/nav-bar/container.jsx       | 13 ++++-
 .../nav-bar/recording-indicator/component.jsx | 22 ++++++-
 .../nav-bar/recording-indicator/styles.scss   | 54 +++++++++++++++---
 .../imports/ui/components/nav-bar/service.js  | 29 ++++++++++
 .../ui/components/recording/component.jsx     | 27 +++++++--
 .../ui/components/recording/container.jsx     |  3 +-
 .../imports/ui/components/toast/container.jsx |  9 +--
 .../private/config/settings.yml               |  2 +-
 14 files changed, 215 insertions(+), 92 deletions(-)
 create mode 100755 bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
 mode change 100644 => 100755 bigbluebutton-html5/imports/ui/components/toast/container.jsx

diff --git a/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js b/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js
index a489f44738..e0fbf321e6 100644
--- a/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js
@@ -6,6 +6,7 @@ import handleMeetingDestruction from './handlers/meetingDestruction';
 import handleMeetingLocksChange from './handlers/meetingLockChange';
 import handleUserLockChange from './handlers/userLockChange';
 import handleRecordingStatusChange from './handlers/recordingStatusChange';
+import handleRecordingTimerChange from './handlers/recordingTimerChange';
 import handleChangeWebcamOnlyModerator from './handlers/webcamOnlyModerator';
 
 RedisPubSub.on('MeetingCreatedEvtMsg', handleMeetingCreation);
@@ -15,4 +16,5 @@ RedisPubSub.on('MeetingDestroyedEvtMsg', handleMeetingDestruction);
 RedisPubSub.on('LockSettingsInMeetingChangedEvtMsg', handleMeetingLocksChange);
 RedisPubSub.on('UserLockedInMeetingEvtMsg', handleUserLockChange);
 RedisPubSub.on('RecordingStatusChangedEvtMsg', handleRecordingStatusChange);
+RedisPubSub.on('UpdateRecordingTimerEvtMsg', handleRecordingTimerChange);
 RedisPubSub.on('WebcamsOnlyForModeratorChangedEvtMsg', handleChangeWebcamOnlyModerator);
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
new file mode 100755
index 0000000000..28cb2c4ffb
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
@@ -0,0 +1,23 @@
+import { check } from 'meteor/check';
+import Meetings from '/imports/api/meetings';
+import Logger from '/imports/startup/server/logger';
+
+export default function handleRecordingStatusChange({ body }, meetingId) {
+  const { time } = body;
+
+  const selector = {
+    meetingId,
+  };
+
+  const modifier = {
+    $set: { 'recordProp.time': time },
+  };
+
+  const cb = (err) => {
+    if (err) {
+      Logger.error(`Changing recording time: ${err}`);
+    }
+  };
+
+  return Meetings.upsert(selector, modifier, cb);
+}
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 1e25af4a5e..fa53c39b39 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -9,12 +9,9 @@ import DropdownList from '/imports/ui/components/dropdown/list/component';
 import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
 import PresentationUploaderContainer from '/imports/ui/components/presentation/presentation-uploader/container';
 import { withModalMounter } from '/imports/ui/components/modal/service';
-import getFromUserSettings from '/imports/ui/services/users-settings';
 import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
-import RecordingContainer from '/imports/ui/components/recording/container';
 import BreakoutRoom from '../create-breakout-room/component';
 import { styles } from '../styles';
-import ActionBarService from '../service';
 
 const propTypes = {
   isUserPresenter: PropTypes.bool.isRequired,
@@ -91,14 +88,6 @@ class ActionsDropdown extends Component {
     this.createBreakoutRoomId = _.uniqueId('action-item-');
   }
 
-  componentDidMount() {
-    if (Meteor.settings.public.allowOutsideCommands.toggleRecording ||
-      getFromUserSettings('outsideToggleRecording', false)) {
-      ActionBarService.connectRecordingObserver();
-      window.addEventListener('message', ActionBarService.processOutsideToggleRecording);
-    }
-  }
-
   componentWillUpdate(nextProps) {
     const { isUserPresenter: isPresenter } = nextProps;
     const { isUserPresenter: wasPresenter, mountModal } = this.props;
@@ -112,12 +101,8 @@ class ActionsDropdown extends Component {
       intl,
       isUserPresenter,
       isUserModerator,
-      allowStartStopRecording,
-      isRecording,
-      record,
       togglePollMenu,
       meetingIsBreakout,
-      mountModal,
       hasBreakoutRoom,
     } = this.props;
 
@@ -141,17 +126,6 @@ class ActionsDropdown extends Component {
           onClick={this.handlePresentationClick}
         />
         : null),
-      (record && isUserModerator && allowStartStopRecording ?
-        <DropdownListItem
-          icon="record"
-          label={intl.formatMessage(isRecording ?
-            intlMessages.stopRecording : intlMessages.startRecording)}
-          description={intl.formatMessage(isRecording ?
-            intlMessages.stopRecording : intlMessages.startRecording)}
-          key={this.recordId}
-          onClick={() => mountModal(<RecordingContainer />)}
-        />
-        : null),
       (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom ?
         <DropdownListItem
           icon="rooms"
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index da38b1bec2..9b45847331 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -2,8 +2,6 @@ import React from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
 import { Session } from 'meteor/session';
 import getFromUserSettings from '/imports/ui/services/users-settings';
-import Meetings from '/imports/api/meetings';
-import Auth from '/imports/ui/services/auth';
 import ActionsBar from './component';
 import Service from './service';
 import VideoService from '../video-provider/service';
@@ -29,18 +27,6 @@ export default withTracker(() => {
     return showPoll ? show() : hide();
   };
 
-  Meetings.find({ meetingId: Auth.meetingID }).observeChanges({
-    changed: (id, fields) => {
-      if (fields.recordProp && fields.recordProp.recording) {
-        this.window.parent.postMessage({ response: 'recordingStarted' }, '*');
-      }
-
-      if (fields.recordProp && !fields.recordProp.recording) {
-        this.window.parent.postMessage({ response: 'recordingStopped' }, '*');
-      }
-    },
-  });
-
   return {
     isUserPresenter: Service.isUserPresenter(),
     isUserModerator: Service.isUserModerator(),
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
index 1e673ea031..44d8a4357b 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
@@ -4,32 +4,7 @@ import { makeCall } from '/imports/ui/services/api';
 import Meetings from '/imports/api/meetings';
 import Breakouts from '/imports/api/breakouts';
 
-const processOutsideToggleRecording = (e) => {
-  switch (e.data) {
-    case 'c_record': {
-      makeCall('toggleRecording');
-      break;
-    }
-    case 'c_recording_status': {
-      const recordingState = Meetings.findOne({ meetingId: Auth.meetingID }).recordProp.recording;
-      const recordingMessage = recordingState ? 'recordingStarted' : 'recordingStopped';
-      this.window.parent.postMessage({ response: recordingMessage }, '*');
-      break;
-    }
-    default: {
-      // console.log(e.data);
-    }
-  }
-};
-
-const connectRecordingObserver = () => {
-  // notify on load complete
-  this.window.parent.postMessage({ response: 'readyToConnect' }, '*');
-};
-
-
 export default {
-  connectRecordingObserver: () => connectRecordingObserver(),
   isUserPresenter: () => Users.findOne({ userId: Auth.userID }).presenter,
   isUserModerator: () => Users.findOne({ userId: Auth.userID }).moderator,
   recordSettingsList: () => Meetings.findOne({ meetingId: Auth.meetingID }).recordProp,
@@ -37,6 +12,5 @@ export default {
   meetingName: () => Meetings.findOne({ meetingId: Auth.meetingID }).meetingProp.name,
   hasBreakoutRoom: () => Breakouts.find({ parentMeetingId: Auth.meetingID }).fetch().length > 0,
   toggleRecording: () => makeCall('toggleRecording'),
-  processOutsideToggleRecording: arg => processOutsideToggleRecording(arg),
   createBreakoutRoom: (numberOfRooms, durationInMinutes, freeJoin = true, record = false) => makeCall('createBreakoutRoom', numberOfRooms, durationInMinutes, freeJoin, record),
 };
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index d4a16804c4..4853e0f831 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -11,11 +11,13 @@ import DropdownList from '/imports/ui/components/dropdown/list/component';
 import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
+import getFromUserSettings from '/imports/ui/services/users-settings';
 import { defineMessages, injectIntl } from 'react-intl';
 import { styles } from './styles.scss';
 import Button from '../button/component';
 import RecordingIndicator from './recording-indicator/component';
 import SettingsDropdownContainer from './settings-dropdown/container';
+import ActionBarService from './service';
 
 const intlMessages = defineMessages({
   toggleUserListLabel: {
@@ -42,22 +44,30 @@ const intlMessages = defineMessages({
     id: 'app.navBar.recording.off',
     description: 'label for indicator when the session is not being recorded',
   },
+  startTitle: {
+    id: 'app.recording.startTitle',
+    description: 'start recording title',
+  },
+  stopTitle: {
+    id: 'app.recording.stopTitle',
+    description: 'stop recording title',
+  },
 });
 
 const propTypes = {
   presentationTitle: PropTypes.string,
   hasUnreadMessages: PropTypes.bool,
-  beingRecorded: PropTypes.object,
+  beingRecorded: PropTypes.objectOf(PropTypes.any),
   shortcuts: PropTypes.string,
 };
 
 const defaultProps = {
   presentationTitle: 'Default Room Title',
   hasUnreadMessages: false,
-  beingRecorded: false,
+  beingRecorded: null,
   shortcuts: '',
 };
-
+const interval = null;
 const openBreakoutJoinConfirmation = (breakout, breakoutName, mountModal) =>
   mountModal(<BreakoutJoinConfirmation
     breakout={breakout}
@@ -74,18 +84,36 @@ class NavBar extends PureComponent {
     this.state = {
       isActionsOpen: false,
       didSendBreakoutInvite: false,
+      time: (props.beingRecorded.time ? props.beingRecorded.time : 0),
     };
 
+    this.incrementTime = this.incrementTime.bind(this);
     this.handleToggleUserList = this.handleToggleUserList.bind(this);
   }
 
+  componentDidMount() {
+    if (Meteor.settings.public.allowOutsideCommands.toggleRecording ||
+      getFromUserSettings('outsideToggleRecording', false)) {
+      ActionBarService.connectRecordingObserver();
+      window.addEventListener('message', ActionBarService.processOutsideToggleRecording);
+    }
+  }
+
   componentDidUpdate(oldProps) {
     const {
       breakouts,
       isBreakoutRoom,
       mountModal,
+      beingRecorded,
     } = this.props;
 
+    if (!beingRecorded.recording) {
+      clearInterval(this.interval);
+      this.interval = null;
+    } else if (this.interval === null) {
+      this.interval = setInterval(this.incrementTime, 1000);
+    }
+
     const hadBreakouts = oldProps.breakouts.length;
     const hasBreakouts = breakouts.length;
 
@@ -108,6 +136,10 @@ class NavBar extends PureComponent {
     }
   }
 
+  componentWillUnmount() {
+    clearInterval(interval);
+  }
+
   handleToggleUserList() {
     this.props.toggleUserList();
   }
@@ -122,6 +154,16 @@ class NavBar extends PureComponent {
     });
   }
 
+  incrementTime() {
+    const { beingRecorded } = this.props;
+
+    if (beingRecorded.time > this.state.time) {
+      this.setState({ time: beingRecorded.time + 1 });
+    } else {
+      this.setState({ time: this.state.time + 1 });
+    }
+  }
+
   renderPresentationTitle() {
     const {
       breakouts,
@@ -178,10 +220,15 @@ class NavBar extends PureComponent {
       isExpanded,
       intl,
       shortcuts: TOGGLE_USERLIST_AK,
+      mountModal,
     } = this.props;
 
     const recordingMessage = beingRecorded.recording ? 'recordingIndicatorOn' : 'recordingIndicatorOff';
 
+    if (!this.interval) {
+      this.interval = setInterval(this.incrementTime, 1000);
+    }
+
     const toggleBtnClasses = {};
     toggleBtnClasses[styles.btn] = true;
     toggleBtnClasses[styles.btnWithNotificationDot] = hasUnreadMessages;
@@ -214,6 +261,10 @@ class NavBar extends PureComponent {
           <RecordingIndicator
             {...beingRecorded}
             title={intl.formatMessage(intlMessages[recordingMessage])}
+            buttonTitle={(!beingRecorded.recording ? intl.formatMessage(intlMessages.startTitle) :
+               intl.formatMessage(intlMessages.stopTitle))}
+            mountModal={mountModal}
+            time={this.state.time}
           />
         </div>
         <div className={styles.right}>
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
index 25a03f5159..bd22dfa7f3 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
@@ -25,7 +25,6 @@ export default withTracker(() => {
 
   let meetingTitle;
   let meetingRecorded;
-
   const meetingId = Auth.meetingID;
   const meetingObject = Meetings.findOne({
     meetingId,
@@ -51,6 +50,18 @@ export default withTracker(() => {
       .some(receiverID => ChatService.hasUnreadMessages(receiverID));
   };
 
+  Meetings.find({ meetingId: Auth.meetingID }).observeChanges({
+    changed: (id, fields) => {
+      if (fields.recordProp && fields.recordProp.recording) {
+        this.window.parent.postMessage({ response: 'recordingStarted' }, '*');
+      }
+
+      if (fields.recordProp && !fields.recordProp.recording) {
+        this.window.parent.postMessage({ response: 'recordingStopped' }, '*');
+      }
+    },
+  });
+
   const breakouts = Service.getBreakouts();
   const currentUserId = Auth.userID;
 
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
index d4f2b2dcd4..b005473115 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
@@ -1,8 +1,13 @@
 import React from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
+import Button from '/imports/ui/components/button/component';
+import RecordingContainer from '/imports/ui/components/recording/container';
+import humanizeSeconds from '/imports/utils/humanizeSeconds';
 import { styles } from './styles';
+import cx from 'classnames';
 
 const RecordingIndicator = ({
-  record, title, recording,
+  record, title, recording, buttonTitle, mountModal, time,
 }) => {
   if (!record) return null;
 
@@ -11,7 +16,20 @@ const RecordingIndicator = ({
       aria-label={title}
       className={styles.recordState}
     >
-      <div className={recording ? styles.recordIndicator : styles.notRecording} />
+      <div className={styles.border}>
+        <Button
+          label={buttonTitle}
+          hideLabel
+          ghost
+          className={cx(styles.btn, recording ? styles.recordIndicator : styles.notRecording)}
+          onClick={() => {
+            mountModal(<RecordingContainer />);
+          }}
+        />
+      </div>
+      <div className={styles.presentationTitle}>
+        {recording ? humanizeSeconds(time) : <div>{buttonTitle}</div>}
+      </div>
     </div>
   );
 };
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/styles.scss
index 9b90b3c10b..097a52de7c 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/styles.scss
@@ -3,35 +3,73 @@
 %baseIndicator {
   position: relative;
   display: inline-block;
-  width: var(--font-size-base);
-  height: var(--font-size-base);
+  width: var(--font-size-large);
+  height: var(--font-size-large);
   border-radius: 50%;
   border: 1px solid var(--color-white);
 
   &:after {
     content: '';
-    width: calc(var(--font-size-base) / 2);
-    height: calc(var(--font-size-base) / 2);
+    width: calc(var(--font-size-large) / 2);
+    height: calc(var(--font-size-large) / 2);
     position: absolute;
     top: 50%;
     left: 50%;
-    margin-top: calc((var(--font-size-base) / -4));
-    margin-left: calc((var(--font-size-base) / -4));
+    margin-top: calc((var(--font-size-large) / -4));
+    margin-left: calc((var(--font-size-large) / -4));
     border-radius: 50%;
     background-color: var(--color-danger);
   }
 }
 
+.border {
+  border: 1px solid var(--color-white);
+  border-radius: 50%;
+}
+
 .recordIndicator {
   @extend %baseIndicator;
 }
 
+.btn {
+  border-radius: 50%;
+  display: block;
+  padding: 0;
+
+  &:hover,
+  &:focus {
+    background-color: transparent !important;
+    color: var(--color-white) !important;
+    opacity: .75;
+  }
+}
+
+.presentationTitle {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-weight: 200;
+  color: var(--color-white);
+  font-size: var(--font-size-base);
+  margin: 0;
+  padding: 0;
+  margin-left: var(--sm-padding-x);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 30vw;
+
+  > [class^="icon-bbb-"] {
+    font-size: 75%;
+  }
+}
+
 .notRecording {
   @extend %baseIndicator;
-  border: 1px solid var(--color-gray);
+  border: 1px solid var(--color-white);
 
   &:after {
-    background-color: var(--color-gray);
+    background-color: var(--color-white);
   }
 }
 
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/service.js b/bigbluebutton-html5/imports/ui/components/nav-bar/service.js
index 56522370cb..857da9f740 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/service.js
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/service.js
@@ -1,8 +1,37 @@
+import Auth from '/imports/ui/services/auth';
 import Breakouts from '/imports/api/breakouts';
+import { makeCall } from '/imports/ui/services/api';
+import Meetings from '/imports/api/meetings';
 
 const getBreakouts = () => Breakouts.find({}, { sort: { sequence: 1 } }).fetch();
 
+const processOutsideToggleRecording = (e) => {
+  switch (e.data) {
+    case 'c_record': {
+      makeCall('toggleRecording');
+      break;
+    }
+    case 'c_recording_status': {
+      const recordingState = Meetings.findOne({ meetingId: Auth.meetingID }).recordProp.recording;
+      const recordingMessage = recordingState ? 'recordingStarted' : 'recordingStopped';
+      this.window.parent.postMessage({ response: recordingMessage }, '*');
+      break;
+    }
+    default: {
+      // console.log(e.data);
+    }
+  }
+};
+
+
+const connectRecordingObserver = () => {
+  // notify on load complete
+  this.window.parent.postMessage({ response: 'readyToConnect' }, '*');
+};
+
 export default {
+  connectRecordingObserver: () => connectRecordingObserver(),
+  processOutsideToggleRecording: arg => processOutsideToggleRecording(arg),
   getBreakouts,
 };
 
diff --git a/bigbluebutton-html5/imports/ui/components/recording/component.jsx b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
index 49ec90132e..34f408f5e8 100755
--- a/bigbluebutton-html5/imports/ui/components/recording/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
@@ -1,5 +1,6 @@
-import React, { Component } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
 import Modal from '/imports/ui/components/modal/simple/component';
 import { styles } from './styles';
@@ -31,7 +32,18 @@ const intlMessages = defineMessages({
   },
 });
 
-class RecordingComponent extends Component {
+const propTypes = {
+  intl: intlShape.isRequired,
+  closeModal: PropTypes.func.isRequired,
+  toggleRecording: PropTypes.func.isRequired,
+  recordingStatus: PropTypes.bool,
+};
+
+const defaultProps = {
+  recordingStatus: false,
+};
+
+class RecordingComponent extends React.PureComponent {
   constructor(props) {
     super(props);
     const {
@@ -44,7 +56,7 @@ class RecordingComponent extends Component {
   }
 
   render() {
-    const { intl, meeting } = this.props;
+    const { intl, recordingStatus } = this.props;
 
     return (
       <Modal
@@ -55,12 +67,12 @@ class RecordingComponent extends Component {
       >
         <div className={styles.container}>
           <div className={styles.header}>
-            <div className={styles.title}>{intl.formatMessage(!meeting.recordProp.recording ?
+            <div className={styles.title}>{intl.formatMessage(!recordingStatus ?
             intlMessages.startTitle : intlMessages.stopTitle)}
             </div>
           </div>
           <div className={styles.description}>
-            {`${intl.formatMessage(!meeting.recordProp.recording ? intlMessages.startDescription :
+            {`${intl.formatMessage(!recordingStatus ? intlMessages.startDescription :
             intlMessages.stopDescription)}`}
           </div>
           <div className={styles.footer}>
@@ -82,4 +94,7 @@ class RecordingComponent extends Component {
   }
 }
 
+RecordingComponent.propTypes = propTypes;
+RecordingComponent.defaultProps = defaultProps;
+
 export default injectIntl(RecordingComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/recording/container.jsx b/bigbluebutton-html5/imports/ui/components/recording/container.jsx
index 21f445ca6f..72815e90b4 100755
--- a/bigbluebutton-html5/imports/ui/components/recording/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/recording/container.jsx
@@ -18,5 +18,6 @@ export default withModalMounter(withTracker(({ mountModal }) => ({
     mountModal(null);
   },
 
-  meeting: (Meetings.findOne({ meetingId: Auth.meetingID })),
+  recordingStatus: (Meetings.findOne({ meetingId: Auth.meetingID }).recordProp.recording),
+
 }))(RecordingContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/toast/container.jsx b/bigbluebutton-html5/imports/ui/components/toast/container.jsx
old mode 100644
new mode 100755
index 9be9f2073c..1e742bb847
--- a/bigbluebutton-html5/imports/ui/components/toast/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/toast/container.jsx
@@ -55,13 +55,14 @@ export default injectIntl(injectNotify(withTracker(({ notify, intl }) => {
 
   const meetingId = Auth.meetingID;
 
-  Meetings.find({ meetingId }).observeChanges({
-    changed: (id, fields) => {
-      if (fields.recordProp && fields.recordProp.recording) {
+  Meetings.find({ meetingId }).observe({
+    changed: (newDocument, oldDocument) => {
+      if (newDocument.recordProp && newDocument.recordProp.recording && 
+        newDocument.recordProp.recording!== oldDocument.recordProp.recording) {
         notify(intl.formatMessage(intlMessages.notificationRecordingStart), 'success', 'record');
       }
 
-      if (fields.recordProp && !fields.recordProp.recording) {
+      if (newDocument.recordProp && !newDocument.recordProp.recording) {
         notify(intl.formatMessage(intlMessages.notificationRecordingStop), 'error', 'record');
       }
     },
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 057222f99f..7ad08ab4d7 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -99,7 +99,7 @@ public:
     enableListenOnly: false
     autoShareWebcam: false
   allowOutsideCommands:
-    toggleRecording: false
+    toggleRecording: true
     toggleSelfVoice: false
   poll:
     max_custom: 5

From 09147faaaceddee6ba055ad7cd5a7843632a8c04 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Thu, 3 Jan 2019 20:50:43 +0000
Subject: [PATCH 022/163] Fixed conflicts after merge

---
 .../actions-dropdown/component.jsx            | 35 ++++----------
 .../ui/components/nav-bar/component.jsx       | 12 +++--
 bigbluebutton-html5/package-lock.json         | 46 +++++++++----------
 3 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 28dc1c66c2..a32951cb60 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -19,10 +19,6 @@ const propTypes = {
   intl: intlShape.isRequired,
   mountModal: PropTypes.func.isRequired,
   isUserModerator: PropTypes.bool.isRequired,
-  allowStartStopRecording: PropTypes.bool.isRequired,
-  isRecording: PropTypes.bool.isRequired,
-  record: PropTypes.bool.isRequired,
-  toggleRecording: PropTypes.func.isRequired,
   meetingIsBreakout: PropTypes.bool.isRequired,
   hasBreakoutRoom: PropTypes.bool.isRequired,
   createBreakoutRoom: PropTypes.func.isRequired,
@@ -60,14 +56,6 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.actionsDropdown.stopDesktopShareDesc',
     description: 'adds context to stop desktop share option',
   },
-  startRecording: {
-    id: 'app.actionsBar.actionsDropdown.startRecording',
-    description: 'start recording option',
-  },
-  stopRecording: {
-    id: 'app.actionsBar.actionsDropdown.stopRecording',
-    description: 'stop recording option',
-  },
   pollBtnLabel: {
     id: 'app.actionsBar.actionsDropdown.pollBtnLabel',
     description: 'poll menu toggle button label',
@@ -113,7 +101,6 @@ class ActionsDropdown extends Component {
       intl,
       isUserPresenter,
       isUserModerator,
-      togglePollMenu,
       meetingIsBreakout,
       hasBreakoutRoom,
     } = this.props;
@@ -123,10 +110,6 @@ class ActionsDropdown extends Component {
       pollBtnDesc,
       presentationLabel,
       presentationDesc,
-      startRecording,
-      stopRecording,
-      createBreakoutRoom,
-      createBreakoutRoomDesc,
     } = intlMessages;
 
     const {
@@ -160,14 +143,16 @@ class ActionsDropdown extends Component {
           />
         )
         : null),
-      (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom ?
-        <DropdownListItem
-          icon="rooms"
-          label={intl.formatMessage(intlMessages.createBreakoutRoom)}
-          description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
-          key={this.createBreakoutRoomId}
-          onClick={this.handleCreateBreakoutRoomClick}
-        />
+      (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom
+        ? (
+          <DropdownListItem
+            icon="rooms"
+            label={intl.formatMessage(intlMessages.createBreakoutRoom)}
+            description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
+            key={this.createBreakoutRoomId}
+            onClick={this.handleCreateBreakoutRoomClick}
+          />
+        )
         : null),
     ]);
   }
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index aed64411a9..ff9ff408ce 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -59,7 +59,7 @@ const intlMessages = defineMessages({
 const propTypes = {
   presentationTitle: PropTypes.string,
   hasUnreadMessages: PropTypes.bool,
-  recordProps: PropTypes.objectOf(PropTypes.bool),
+  recordProps: PropTypes.objectOf(PropTypes.any),
   shortcuts: PropTypes.string,
 };
 
@@ -122,6 +122,7 @@ class NavBar extends PureComponent {
     } else if (this.interval === null) {
       this.interval = setInterval(this.incrementTime, 1000);
     }
+
     const {
       didSendBreakoutInvite,
     } = this.state;
@@ -177,11 +178,12 @@ class NavBar extends PureComponent {
 
   incrementTime() {
     const { recordProps } = this.props;
+    const { time } = this.state;
 
-    if (recordProps.time > this.state.time) {
+    if (recordProps.time > time) {
       this.setState({ time: recordProps.time + 1 });
     } else {
-      this.setState({ time: this.state.time + 1 });
+      this.setState({ time: time + 1 });
     }
   }
 
@@ -253,6 +255,8 @@ class NavBar extends PureComponent {
 
     const recordingMessage = recordProps.recording ? 'recordingIndicatorOn' : 'recordingIndicatorOff';
 
+    const { time } = this.state;
+
     if (!this.interval) {
       this.interval = setInterval(this.incrementTime, 1000);
     }
@@ -292,7 +296,7 @@ class NavBar extends PureComponent {
             buttonTitle={(!recordProps.recording ? intl.formatMessage(intlMessages.startTitle) :
                intl.formatMessage(intlMessages.stopTitle))}
             mountModal={mountModal}
-            time={this.state.time}
+            time= {time}
           />
         </div>
         <div className={styles.right}>
diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index 9b7031b8ba..098dac430e 100644
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -791,7 +791,7 @@
     },
     "callsites": {
       "version": "0.2.0",
-      "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
       "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
       "dev": true
     },
@@ -802,7 +802,7 @@
     },
     "camelcase-keys": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "requires": {
         "camelcase": "^2.0.0",
@@ -922,7 +922,7 @@
       "dependencies": {
         "slice-ansi": {
           "version": "0.0.4",
-          "resolved": "http://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
           "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
           "dev": true
         }
@@ -2858,7 +2858,7 @@
     },
     "is-builtin-module": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "requires": {
         "builtin-modules": "^1.0.0"
@@ -3825,7 +3825,7 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -4031,7 +4031,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "requires": {
         "camelcase-keys": "^2.0.0",
@@ -4643,7 +4643,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
         "minimist": "0.0.8"
@@ -4719,7 +4719,7 @@
     },
     "next-tick": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
     },
     "nice-try": {
@@ -4758,7 +4758,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         }
       }
@@ -5087,12 +5087,12 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
-      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "requires": {
         "lcid": "^1.0.0"
@@ -5100,7 +5100,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
@@ -5204,7 +5204,7 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
@@ -5254,7 +5254,7 @@
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
     "pinkie": {
@@ -5811,7 +5811,7 @@
     },
     "readable-stream": {
       "version": "2.3.6",
-      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
         "core-util-is": "~1.0.0",
@@ -6020,7 +6020,7 @@
     },
     "require-uncached": {
       "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
@@ -6493,7 +6493,7 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
@@ -6605,7 +6605,7 @@
     },
     "string_decoder": {
       "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
         "safe-buffer": "~5.1.0"
@@ -6624,7 +6624,7 @@
     },
     "strip-ansi": {
       "version": "3.0.1",
-      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
         "ansi-regex": "^2.0.0"
@@ -6640,7 +6640,7 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
@@ -6726,7 +6726,7 @@
     },
     "tar": {
       "version": "2.2.1",
-      "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "requires": {
         "block-stream": "*",
@@ -6762,7 +6762,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
@@ -7419,7 +7419,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
         "string-width": "^1.0.1",

From 17ccd17e5435a20d77a21711761c73b37e897533 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Thu, 3 Jan 2019 21:09:00 +0000
Subject: [PATCH 023/163] Fixed focus on record button

---
 .../imports/ui/components/nav-bar/component.jsx    | 14 ++++++--------
 .../nav-bar/recording-indicator/component.jsx      |  4 ++--
 bigbluebutton-html5/private/config/settings.yml    |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index ff9ff408ce..b90ed8e86f 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -75,8 +75,6 @@ const defaultProps = {
   shortcuts: '',
 };
 
-const interval = null;
-
 const openBreakoutJoinConfirmation = (breakout, breakoutName, mountModal) => mountModal(
   <BreakoutJoinConfirmation
     breakout={breakout}
@@ -101,8 +99,8 @@ class NavBar extends PureComponent {
   }
 
   componentDidMount() {
-    if (Meteor.settings.public.allowOutsideCommands.toggleRecording ||
-      getFromUserSettings('outsideToggleRecording', false)) {
+    if (Meteor.settings.public.allowOutsideCommands.toggleRecording
+      || getFromUserSettings('outsideToggleRecording', false)) {
       ActionBarService.connectRecordingObserver();
       window.addEventListener('message', ActionBarService.processOutsideToggleRecording);
     }
@@ -154,7 +152,7 @@ class NavBar extends PureComponent {
   }
 
   componentWillUnmount() {
-    clearInterval(interval);
+    clearInterval(this.interval);
   }
 
   handleToggleUserList() {
@@ -293,10 +291,10 @@ class NavBar extends PureComponent {
           <RecordingIndicator
             {...recordProps}
             title={intl.formatMessage(intlMessages[recordingMessage])}
-            buttonTitle={(!recordProps.recording ? intl.formatMessage(intlMessages.startTitle) :
-               intl.formatMessage(intlMessages.stopTitle))}
+            buttonTitle={(!recordProps.recording ? intl.formatMessage(intlMessages.startTitle)
+              : intl.formatMessage(intlMessages.stopTitle))}
             mountModal={mountModal}
-            time= {time}
+            time={time}
           />
         </div>
         <div className={styles.right}>
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
index b005473115..7da7efadae 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
@@ -1,10 +1,9 @@
 import React from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
 import RecordingContainer from '/imports/ui/components/recording/container';
 import humanizeSeconds from '/imports/utils/humanizeSeconds';
-import { styles } from './styles';
 import cx from 'classnames';
+import { styles } from './styles';
 
 const RecordingIndicator = ({
   record, title, recording, buttonTitle, mountModal, time,
@@ -24,6 +23,7 @@ const RecordingIndicator = ({
           className={cx(styles.btn, recording ? styles.recordIndicator : styles.notRecording)}
           onClick={() => {
             mountModal(<RecordingContainer />);
+            document.activeElement.blur();
           }}
         />
       </div>
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index e3ba3056e5..69808d4d0b 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -100,7 +100,7 @@ public:
     enableListenOnly: false
     autoShareWebcam: false
   allowOutsideCommands:
-    toggleRecording: true
+    toggleRecording: false
     toggleSelfVoice: false
   poll:
     max_custom: 5

From 8ff95dbaacda6cf9e02234db70b45dcf6ae3f826 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Thu, 3 Jan 2019 23:22:17 +0000
Subject: [PATCH 024/163] Added margin to chat-window

---
 bigbluebutton-html5/imports/ui/components/app/styles.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss
index f5ad8b2ed2..a4ba150fc5 100755
--- a/bigbluebutton-html5/imports/ui/components/app/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss
@@ -9,6 +9,7 @@
   --bars-padding: calc(var(--lg-padding-x) - .45rem); // -.45 so user-list and chat title is aligned with the presentation title
   --userlist-handle-width: 5px; // 5px so user-list and chat resize handle render as the same size
   --poll-pane-min-width: 20em;
+  --chat-margin-right: 0.1em;
 }
 
 .main {
@@ -126,6 +127,7 @@
 .chat {
   @extend %full-page;
 
+  margin-right: var(--chat-margin-right);
   order: 2;
   height: 100%;
   @include mq($small-only) {

From 697b8da8039b796789db42324dbd0c1e5ce480fa Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Fri, 4 Jan 2019 18:29:41 +0000
Subject: [PATCH 025/163] Moved margin to presentation

---
 .../imports/ui/components/app/styles.scss                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss
index a4ba150fc5..5448515e76 100755
--- a/bigbluebutton-html5/imports/ui/components/app/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss
@@ -9,7 +9,7 @@
   --bars-padding: calc(var(--lg-padding-x) - .45rem); // -.45 so user-list and chat title is aligned with the presentation title
   --userlist-handle-width: 5px; // 5px so user-list and chat resize handle render as the same size
   --poll-pane-min-width: 20em;
-  --chat-margin-right: 0.1em;
+  --panel-margin-left: 0.1em;
 }
 
 .main {
@@ -62,6 +62,8 @@
   @extend %full-page;
   order: 3;
 
+  margin-left: var(--panel-margin-left);
+
   &:before,
   &:after {
     content: '';
@@ -96,7 +98,7 @@
   @extend %text-elipsis;
 
   z-index: 2;
-  overflow: visible;  
+  overflow: visible;
   order: 1;
 
   @include mq($small-only) {
@@ -127,7 +129,6 @@
 .chat {
   @extend %full-page;
 
-  margin-right: var(--chat-margin-right);
   order: 2;
   height: 100%;
   @include mq($small-only) {
@@ -178,7 +179,7 @@
   order: 2;
   flex-direction: row;
   position: relative;
-
+  margin-left: var(--panel-margin-right);
   @include mq($portrait) {
     flex-direction: column;
   }

From b41761350da7eb888e18f8c5cee5f358bb10d317 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Fri, 4 Jan 2019 21:32:59 +0000
Subject: [PATCH 026/163] Improved checks for record time

---
 .../api/meetings/server/handlers/recordingTimerChange.js     | 4 ++++
 .../imports/ui/components/nav-bar/component.jsx              | 5 ++++-
 .../imports/ui/components/recording/styles.scss              | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
index 28cb2c4ffb..764dc0f8c9 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
@@ -5,6 +5,10 @@ import Logger from '/imports/startup/server/logger';
 export default function handleRecordingStatusChange({ body }, meetingId) {
   const { time } = body;
 
+  check(body, {
+    time: Number,
+  });
+
   const selector = {
     meetingId,
   };
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index b90ed8e86f..36efa8b713 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -59,7 +59,10 @@ const intlMessages = defineMessages({
 const propTypes = {
   presentationTitle: PropTypes.string,
   hasUnreadMessages: PropTypes.bool,
-  recordProps: PropTypes.objectOf(PropTypes.any),
+  recordProps: PropTypes.shape({
+    time: PropTypes.number,
+    recording: PropTypes.bool,
+  }),
   shortcuts: PropTypes.string,
 };
 
diff --git a/bigbluebutton-html5/imports/ui/components/recording/styles.scss b/bigbluebutton-html5/imports/ui/components/recording/styles.scss
index a20ec2aa79..494cec7540 100755
--- a/bigbluebutton-html5/imports/ui/components/recording/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/recording/styles.scss
@@ -8,7 +8,7 @@
 
 .title {
   color: var(--color-gray-dark);
-  font-weight: 500;
+  font-weight: var(--headings-font-weight);
   font-size: var(--jumbo-padding-y);
 }
 

From 35ace3e32a9ed2a649371a54e9b497e5539a10cd Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Mon, 7 Jan 2019 14:26:23 -0200
Subject: [PATCH 027/163] Add error description on error screen

---
 .../ui/components/error-screen/component.jsx  | 13 +++++++-
 .../ui/components/error-screen/styles.scss    | 32 +++++++++++++++++--
 .../ui/components/join-handler/component.jsx  | 12 +++----
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
index 53c405e37f..d515c08ee4 100644
--- a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
@@ -4,6 +4,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { Meteor } from 'meteor/meteor';
 import Button from '/imports/ui/components/button/component';
 import logoutRouteHandler from '/imports/utils/logoutRouteHandler';
+import { Session } from 'meteor/session';
 import { styles } from './styles';
 
 const intlMessages = defineMessages({
@@ -55,18 +56,28 @@ class ErrorScreen extends React.PureComponent {
 
     return (
       <div className={styles.background}>
-        <h1>
+        <h1 className={styles.codeError}>
           {code}
         </h1>
         <h1 className={styles.message}>
           {formatedMessage}
         </h1>
+        <div className={styles.separator} />
         <div>
           {children}
         </div>
+        {
+          !Session.get('JoinErrorMessage') || (
+          <div className={styles.sessionMessage}>
+            {console.error(Session.get('JoinErrorMessage'))}
+            {Session.get('JoinErrorMessage')}
+          </div>)
+        }
         <div>
           <Button
             size="sm"
+            color="primary"
+            className={styles.button}
             onClick={logoutRouteHandler}
             label={intl.formatMessage(intlMessages.leave)}
           />
diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss b/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
index 336d81c519..40ca1700f0 100644
--- a/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
@@ -19,7 +19,35 @@
 }
 
 .message {
-  text-transform: uppercase;
+  margin: 0;
+  text-transform: capitalize;
+  color: var(--color-gray-light);
   font-size: 1.25rem;
-  font-weight: 600;
+  font-weight: 400;
 }
+
+.sessionMessage {
+  @extend .message;
+  font-size: var(--font-size-small);
+  margin-bottom: 1.5rem;
+}
+
+.codeError {
+  margin: 0;
+  font-size: 5rem;
+  color: var(--color-white);
+}
+
+.separator {
+  height: 0;
+  width: 5rem;
+  border: 1px solid var(--color-gray-lighter);
+  margin: 1.5rem 0 1.5rem 0;
+  align-self: center;
+  opacity: .75;
+}
+
+.button {
+  width: 11vw;
+  height: 3vh;
+}
\ No newline at end of file
diff --git a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
index 0a7ecf0d06..13d7413800 100644
--- a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
@@ -13,6 +13,7 @@ const propTypes = {
 };
 
 const APP_CONFIG = Meteor.settings.public.app;
+const { showParticipantsOnLogin } = APP_CONFIG;
 
 class JoinHandler extends Component {
   static setError(codeError) {
@@ -108,27 +109,26 @@ class JoinHandler extends Component {
     const fetchContent = await fetch(url, { credentials: 'same-origin' });
     const parseToJson = await fetchContent.json();
     const { response } = parseToJson;
+
     setLogoutURL(response);
+
     if (response.returncode !== 'FAILED') {
       await setAuth(response);
       await setCustomData(response);
       setLogoURL(response);
       logUserInfo();
 
-      const { showParticipantsOnLogin } = APP_CONFIG;
-
-      if (showParticipantsOnLogin) {
+      if (showParticipantsOnLogin && !deviceInfo.type().isPhone) {
         Session.set('openPanel', 'chat');
         Session.set('idChatOpen', '');
-        if (deviceInfo.type().isPhone) Session.set('openPanel', '');
       } else {
         Session.set('openPanel', '');
       }
 
-
       logger.info(`User successfully went through main.joinRouteHandler with [${JSON.stringify(response)}].`);
     } else {
-      const e = new Error('Session not found');
+      const e = new Error(response.message);
+      Session.set('JoinErrorMessage', response.message);
       logger.error(`User faced [${e}] on main.joinRouteHandler. Error was:`, JSON.stringify(response));
     }
     this.changeToJoin(true);

From bb4a83900c946e4d681eda3474e4f3a584f059eb Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Mon, 7 Jan 2019 15:12:28 -0300
Subject: [PATCH 028/163] Fullscreen button for videos, presentation and
 screenshare

---
 .../imports/ui/components/media/container.jsx |  6 ++-
 .../ui/components/presentation/component.jsx  | 27 ++++++++++++-
 .../ui/components/screenshare/component.jsx   | 22 ++++++++++-
 .../fullscreen-button/component.jsx           | 38 +++++++++++++++++++
 .../ui/components/video-provider/styles.scss  | 24 ++++++++++++
 .../video-provider/video-list/styles.scss     |  1 +
 .../video-list/video-list-item/component.jsx  |  9 +++++
 .../video-provider/video-menu/component.jsx   |  1 -
 8 files changed, 123 insertions(+), 5 deletions(-)
 create mode 100755 bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index 207432a301..8b710465b0 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -129,7 +129,11 @@ export default withModalMounter(withTracker(({ mountModal }) => {
 
   if (data.swapLayout) {
     data.floatingOverlay = true;
-    data.hideOverlay = true; //hidePresentation;
+    data.hideOverlay = true;
+  }
+
+  if (data.isScreensharing) {
+    data.floatingOverlay = false;
   }
 
   MediaContainer.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 8570b69dd0..39a8432788 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -12,6 +12,7 @@ import Slide from './slide/component';
 import { styles } from './styles.scss';
 import MediaService from '../media/service';
 import PresentationCloseButton from './presentation-close-button/component';
+import FullscreenButton from '../video-provider/fullscreen-button/component';
 
 export default class PresentationArea extends Component {
   constructor() {
@@ -326,8 +327,8 @@ export default class PresentationArea extends Component {
     const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
 
     const style = {
-      right: `${marginRight}px`,
-      top: `${marginTop}px`,
+      right: `${marginRight - 102}px`,
+      top: `${marginTop - 102}px`,
     };
 
     return (
@@ -338,6 +339,27 @@ export default class PresentationArea extends Component {
     );
   }
 
+  renderPresentationFullscreen() {
+    const full = () => {
+      if (!this.refPresentationArea) {
+        return;
+      }
+
+      this.refPresentationArea.requestFullscreen();
+    };
+
+    const adjustedSizes = this.calculateSize();
+    const marginRight = (this.state.presentationWidth - adjustedSizes.width) / 2.0;
+    const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
+
+    const style = {
+      right: `${marginRight}px`,
+      bottom: `${marginTop}px`,
+    };
+
+    return <FullscreenButton innerStyle={style} handleFullscreen={full} />;
+  }
+
   renderPresentationToolbar() {
     if (!this.props.currentSlide) {
       return null;
@@ -382,6 +404,7 @@ export default class PresentationArea extends Component {
             className={styles.whiteboardSizeAvailable}
           />
           { this.renderPresentationClose() }
+          { this.renderPresentationFullscreen() }
           {this.state.showSlide ?
               this.renderPresentationArea()
             : null }
diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
index 906e66c6aa..6eece8818d 100755
--- a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
@@ -1,5 +1,7 @@
 import React from 'react';
 
+import FullscreenButton from '../video-provider/fullscreen-button/component';
+
 import { styles } from './styles';
 
 export default class ScreenshareComponent extends React.Component {
@@ -27,10 +29,28 @@ export default class ScreenshareComponent extends React.Component {
     this.setState({ loaded: true });
   }
 
+  renderFullscreenButton() {
+    const full = () => {
+      if (!this.videoTag) {
+        return;
+      }
+
+      this.videoTag.requestFullscreen();
+    };
+    return <FullscreenButton handleFullscreen={full} />;
+  }
+
   render() {
+
+    const style = {
+      right: 0,
+      bottom: 0,
+    };
+
     return (
       [!this.state.loaded ? (<div key="screenshareArea" className={styles.connecting} />) : null,
-        (<video key="screenshareVideo" id="screenshareVideo" style={{ maxHeight: '100%', width: '100%' }} autoPlay playsInline onLoadedData={this.onVideoLoad} />)]
+        this.renderFullscreenButton(),
+        (<video key="screenshareVideo" id="screenshareVideo" style={{ maxHeight: '100%', width: '100%' }} autoPlay playsInline onLoadedData={this.onVideoLoad} ref={(ref) => { this.videoTag = ref; }} />)]
     );
   }
 }
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
new file mode 100755
index 0000000000..64fadeaeec
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import Button from '/imports/ui/components/button/component';
+import { styles } from '../styles';
+
+const intlMessages = defineMessages({
+  fullscreenButton: {
+    id: 'app.fullscreenButton.label',
+    description: 'Fullscreen label',
+  },
+});
+
+const FullscreenButtonComponent = ({
+  intl,
+  handleFullscreen,
+  innerStyle,
+}) => {
+
+  return (
+    <div style={innerStyle} className={styles.fullscreenButton}>
+      <Button
+       role="button"
+       aria-labelledby="fullscreenButtonLabel"
+       aria-describedby="fullscreenButtonDesc"
+       color="default"
+       icon="fullscreen"
+       size="sm"
+       onClick={handleFullscreen}
+       label={intl.formatMessage(intlMessages.fullscreenButton)}
+       hideLabel
+       circle
+       className={styles.button}
+     />
+    </div>
+  );
+};
+
+export default injectIntl(FullscreenButtonComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
index 0138f13af0..8324d1dca8 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
@@ -16,3 +16,27 @@
 //	 bottom: 0;
 //   }
 // }
+
+.fullscreenButton {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  // z-index: 2;
+
+  padding: 0;
+
+  background-color: #ff000000;
+}
+
+.button {
+
+  span, span:active, span:hover {
+    background-color: #ff000000;
+
+    border: 0;
+
+    i {
+      font-weight: bold;
+    }
+  }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
index 3e42276c40..67f473e4fb 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
@@ -118,6 +118,7 @@
   align-items: center;
   height: 1.25rem;
   z-index: 2;
+  width: 80%;
 }
 
 .dropdown {
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
index 47299f08ed..5ddb23387c 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
@@ -11,6 +11,7 @@ import DropdownListItem from '/imports/ui/components/dropdown/list/item/componen
 import Icon from '/imports/ui/components/icon/component';
 import Button from '/imports/ui/components/button/component';
 import VideoListItemStats from './video-list-item-stats/component';
+import FullscreenButton from '../../fullscreen-button/component';
 import { styles } from '../styles';
 
 const intlMessages = defineMessages({
@@ -94,6 +95,13 @@ class VideoListItem extends Component {
     ]);
   }
 
+  renderFullscreenButton() {
+    const full = () => {
+      this.videoTag.requestFullscreen();
+    };
+    return <FullscreenButton handleFullscreen={full} />;
+  }
+
   render() {
     const { showStats, stats } = this.state;
     const { user } = this.props;
@@ -129,6 +137,7 @@ class VideoListItem extends Component {
           { user.isListenOnly ? <Icon className={styles.voice} iconName="listen" /> : null }
         </div>
         { showStats ? <VideoListItemStats toggleStats={this.toggleStats} stats={stats} /> : null }
+        { this.renderFullscreenButton() }
       </div>
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
index 6440768d28..4fa900f54b 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
@@ -25,7 +25,6 @@ const intlMessages = defineMessages({
 const propTypes = {
   intl: intlShape.isRequired,
   isSharingVideo: PropTypes.bool.isRequired,
-  videoItems: PropTypes.arrayOf(PropTypes.object).isRequired,
 };
 
 const JoinVideoOptions = ({

From 2a4abad6ccd34171c05f1c726c81554b5e947421 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Mon, 7 Jan 2019 15:16:36 -0300
Subject: [PATCH 029/163] New presentation close button style as per Tyler's
 suggestions

---
 .../ui/components/presentation/component.jsx     |  4 ++--
 .../presentation-close-button/component.jsx      |  3 +--
 .../ui/components/presentation/styles.scss       | 16 ++++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 39a8432788..1fb55d8bb4 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -327,8 +327,8 @@ export default class PresentationArea extends Component {
     const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
 
     const style = {
-      right: `${marginRight - 102}px`,
-      top: `${marginTop - 102}px`,
+      right: `${marginRight - 82}px`,
+      top: `${marginTop - 82}px`,
     };
 
     return (
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
index 6b76c16a0c..57df06cac9 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
@@ -24,11 +24,10 @@ const ClosePresentationComponent = ({
        aria-describedby="closeDesc"
        color="default"
        icon="close"
-       size="md"
+       size="sm"
        onClick={toggleSwapLayout}
        label={intl.formatMessage(intlMessages.closePresentationLabel)}
        hideLabel
-       circle
        className={styles.close}
      />
     </div>
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
index a9315e8173..61491fe1f2 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
@@ -67,17 +67,29 @@
 
 .topRight {
   position: absolute;
+  padding: 80px;
+}
+
+.topRight .close {
+  display: none;
+  transition: 1s;
+}
+
+.topRight:hover .close {
+  display: initial;
 }
 
 .close {
+  background-color: var(--btn-primary-bg);
+  padding: 0;
   i {
-    color: var(--toolbar-button-color);
+    color: white;
     font-weight: bold;
   }
   cursor: pointer;
 
   button.span.button {
-    background-color: rgba(0,0,0,0.1);
+    background-color: var(--btn-primary-bg);
   }
 }
 

From e413d0a5c369222200e01d60f3f54fdaae0ec403 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Wed, 12 Dec 2018 18:10:27 -0200
Subject: [PATCH 030/163] Included shared notes feature

---
 .../imports/ui/components/app/styles.scss     |  1 +
 .../imports/ui/components/note/component.jsx  | 66 +++++++++++++++
 .../imports/ui/components/note/container.jsx  | 33 ++++++++
 .../imports/ui/components/note/service.js     | 82 +++++++++++++++++++
 .../imports/ui/components/note/styles.scss    | 73 +++++++++++++++++
 .../ui/components/panel-manager/component.jsx | 66 +++++++++++++++
 .../user-list/user-list-content/component.jsx |  6 ++
 .../user-notes/component.jsx                  | 67 +++++++++++++++
 .../user-list-content/user-notes/styles.scss  | 64 +++++++++++++++
 .../private/config/settings.yml               |  6 ++
 bigbluebutton-html5/private/locales/en.json   |  4 +
 11 files changed, 468 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/ui/components/note/component.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/note/container.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/note/service.js
 create mode 100644 bigbluebutton-html5/imports/ui/components/note/styles.scss
 create mode 100644 bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss
index f5ad8b2ed2..012a51c504 100755
--- a/bigbluebutton-html5/imports/ui/components/app/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss
@@ -123,6 +123,7 @@
 
 .poll,
 .breakoutRoom,
+.note,
 .chat {
   @extend %full-page;
 
diff --git a/bigbluebutton-html5/imports/ui/components/note/component.jsx b/bigbluebutton-html5/imports/ui/components/note/component.jsx
new file mode 100644
index 0000000000..5f26668489
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/note/component.jsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Session } from 'meteor/session';
+import { defineMessages, injectIntl } from 'react-intl';
+import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component';
+import Button from '/imports/ui/components/button/component';
+import { styles } from './styles';
+
+const intlMessages = defineMessages({
+  hideNoteLabel: {
+    id: 'app.note.hideNoteLabel',
+    description: 'Label for hiding note button',
+  },
+});
+
+const propTypes = {
+  url: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  intl: PropTypes.shape({
+    formatMessage: PropTypes.func.isRequired,
+  }).isRequired,
+};
+
+const defaultProps = {
+};
+
+const Note = (props) => {
+  const {
+    url,
+    title,
+    intl,
+  } = props;
+
+  return (
+    <div
+      data-test="note"
+      className={styles.note}
+    >
+      <header className={styles.header}>
+        <div
+          data-test="noteTitle"
+          className={styles.title}
+        >
+          <Button
+            onClick={() => {
+              Session.set('openPanel', 'userlist');
+            }}
+            aria-label={intl.formatMessage(intlMessages.hideNoteLabel)}
+            label={title}
+            icon="left_arrow"
+            className={styles.hideBtn}
+          />
+        </div>
+      </header>
+      <iframe
+        title="etherpad"
+        src={url}
+      />
+    </div>
+  );
+};
+
+Note.propTypes = propTypes;
+Note.defaultProps = defaultProps;
+
+export default injectWbResizeEvent(injectIntl(Note));
diff --git a/bigbluebutton-html5/imports/ui/components/note/container.jsx b/bigbluebutton-html5/imports/ui/components/note/container.jsx
new file mode 100644
index 0000000000..7dbce79df9
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/note/container.jsx
@@ -0,0 +1,33 @@
+import React, { Component } from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
+import { withTracker } from 'meteor/react-meteor-data';
+import Note from './component';
+import NoteService from './service';
+
+const intlMessages = defineMessages({
+  title: {
+    id: 'app.note.title',
+    description: 'Shared notes title',
+  },
+});
+
+class NoteContainer extends Component {
+  componentDidMount() {}
+  render() {
+    return (
+      <Note {...this.props}>
+        {this.props.children}
+      </Note>
+    );
+  }
+}
+
+export default injectIntl(withTracker(({ params, intl }) => {
+  const title = intl.formatMessage(intlMessages.title);
+  const url = NoteService.getNoteURL();
+
+  return {
+    title,
+    url,
+  };
+})(NoteContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/note/service.js b/bigbluebutton-html5/imports/ui/components/note/service.js
new file mode 100644
index 0000000000..194ab6fd17
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/note/service.js
@@ -0,0 +1,82 @@
+import Users from '/imports/api/users';
+import Auth from '/imports/ui/services/auth';
+import Settings from '/imports/ui/services/settings';
+
+const NOTE_CONFIG = Meteor.settings.public.note;
+
+/**
+ * Calculate a 32 bit FNV-1a hash
+ * Found here: https://gist.github.com/vaiorabbit/5657561
+ * Ref.: http://isthe.com/chongo/tech/comp/fnv/
+ *
+ * @param {string} str the input value
+ * @param {boolean} [asString=false] set to true to return the hash value as
+ *     8-digit hex string instead of an integer
+ * @param {integer} [seed] optionally pass the hash of the previous chunk
+ * @returns {integer | string}
+ */
+const hashFNV32a = (str, asString, seed) => {
+  var i, l,
+    hval = (seed === undefined) ? 0x811c9dc5 : seed;
+
+  for (i = 0, l = str.length; i < l; i++) {
+    hval ^= str.charCodeAt(i);
+    hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+  }
+  if (asString) {
+    return ("0000000" + (hval >>> 0).toString(16)).substr(-8);
+  }
+  return hval >>> 0;
+}
+
+const generateNoteId = () => {
+  const meetingId = Auth.meetingID;
+  const noteId = hashFNV32a(meetingId, true);
+  return noteId;
+};
+
+const getUserName = () => {
+  const userId = Auth.userID;
+  const User = Users.findOne({ userId });
+  const userName = User.name;
+  return userName;
+};
+
+const getUserColor = () => {
+  const userId = Auth.userID;
+  const User = Users.findOne({ userId });
+  const userColor = User.color;
+  return userColor;
+};
+
+const getLang = () => {
+  const locale = Settings.application.locale;
+  const lang = locale.toLowerCase();
+  return lang;
+};
+
+const getNoteParams = () => {
+  let config = NOTE_CONFIG.config;
+  config.userName = getUserName();
+  config.userColor = getUserColor();
+  config.lang = getLang();
+
+  let params = [];
+  for (var key in config) {
+    if (config.hasOwnProperty(key)) {
+      params.push(key + '=' + encodeURIComponent(config[key]));
+    }
+  }
+  return params.join('&');
+}
+
+const getNoteURL = () => {
+  const noteId = generateNoteId();
+  const params = getNoteParams();
+  let url = NOTE_CONFIG.url + '/p/' + noteId + '?' + params;
+  return url;
+};
+
+export default {
+  getNoteURL,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/note/styles.scss b/bigbluebutton-html5/imports/ui/components/note/styles.scss
new file mode 100644
index 0000000000..3ff1e2405b
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/note/styles.scss
@@ -0,0 +1,73 @@
+@import "/imports/ui/stylesheets/mixins/focus";
+@import "/imports/ui/stylesheets/variables/_all";
+
+.note {
+  background-color: #fff;
+  padding: var(--md-padding-x);
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  justify-content: space-around;
+  overflow: hidden;
+  height: 100vh;
+  transform: translateZ(0);
+}
+
+.header {
+  display: flex;
+  flex-direction: row;
+  align-items: left;
+  flex-shrink: 0;
+
+  a {
+    @include elementFocus(var(--color-primary));
+    padding-bottom: var(--sm-padding-y);
+    padding-left: var(--sm-padding-y);
+    text-decoration: none;
+    display: block;
+  }
+
+  [class^="icon-bbb-"],
+  [class*=" icon-bbb-"] {
+    font-size: 85%;
+  }
+}
+
+.title {
+  @extend %text-elipsis;
+  flex: 1;
+
+  & > button, button:hover {
+    margin-top: 0;
+    padding-top: 0;
+    border-top: 0;
+  }
+}
+
+.hideBtn {
+  position: relative;
+  background-color: white;
+  display: block;
+  margin: 4px;
+  margin-bottom: 2px;
+  padding-left: 0px;
+
+  > i {
+    color: black;
+  }
+
+  &:hover {
+    background-color: #fff;
+  }
+}
+
+iframe {
+  display: flex;
+  flex-flow: column;
+  flex-grow: 1;
+  flex-shrink: 1;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  border-style: none;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
index f33368bc7a..02ee43e057 100644
--- a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import BreakoutRoomContainer from '/imports/ui/components/breakout-room/container';
 import UserListContainer from '/imports/ui/components/user-list/container';
 import ChatContainer from '/imports/ui/components/chat/container';
+import NoteContainer from '/imports/ui/components/note/container';
 import PollContainer from '/imports/ui/components/poll/container';
 import { defineMessages, injectIntl } from 'react-intl';
 import Resizable from 're-resizable';
@@ -14,6 +15,10 @@ const intlMessages = defineMessages({
     id: 'app.chat.label',
     description: 'Aria-label for Chat Section',
   },
+  noteLabel: {
+    id: 'app.note.label',
+    description: 'Aria-label for Note Section',
+  },
   userListLabel: {
     id: 'app.userList.label',
     description: 'Aria-label for Userlist Nav',
@@ -36,6 +41,10 @@ const USERLIST_MAX_WIDTH_PX = 240;
 const CHAT_MIN_WIDTH = 150;
 const CHAT_MAX_WIDTH = 350;
 
+// I like big notes and I can not lie
+const NOTE_MIN_WIDTH = 400;
+const NOTE_MAX_WIDTH = 800;
+
 class PanelManager extends Component {
   constructor() {
     super();
@@ -45,10 +54,12 @@ class PanelManager extends Component {
     this.breakoutroomKey = _.uniqueId('breakoutroom-');
     this.chatKey = _.uniqueId('chat-');
     this.pollKey = _.uniqueId('poll-');
+    this.noteKey = _.uniqueId('note-');
 
     this.state = {
       chatWidth: 340,
       userlistWidth: 180,
+      noteWidth: 400,
     };
   }
 
@@ -149,6 +160,53 @@ class PanelManager extends Component {
     );
   }
 
+  renderNote() {
+    const { intl, enableResize } = this.props;
+
+    return (
+      <section
+        className={styles.note}
+        aria-label={intl.formatMessage(intlMessages.noteLabel)}
+        key={enableResize ? null : this.noteKey}
+      >
+        <NoteContainer />
+      </section>
+    );
+  }
+
+  renderNoteResizable() {
+    const { noteWidth } = this.state;
+
+    const resizableEnableOptions = {
+      top: false,
+      right: true,
+      bottom: false,
+      left: false,
+      topRight: false,
+      bottomRight: false,
+      bottomLeft: false,
+      topLeft: false,
+    };
+
+    return (
+      <Resizable
+        minWidth={NOTE_MIN_WIDTH}
+        maxWidth={NOTE_MAX_WIDTH}
+        ref={(node) => { this.resizableNote = node; }}
+        enable={resizableEnableOptions}
+        key={this.noteKey}
+        size={{ width: noteWidth }}
+        onResizeStop={(e, direction, ref, d) => {
+          this.setState({
+            noteWidth: noteWidth + d.width,
+          });
+        }}
+      >
+        {this.renderNote()}
+      </Resizable>
+    );
+  }
+
   renderPoll() {
     return (
       <div className={styles.poll} key={this.pollKey}>
@@ -183,6 +241,14 @@ class PanelManager extends Component {
       }
     }
 
+    if (openPanel === 'note') {
+      if (enableResize) {
+        resizablePanels.push(this.renderNoteResizable());
+      } else {
+        panels.push(this.renderNote());
+      }
+    }
+
     if (openPanel === 'poll') {
       if (enableResize) {
         resizablePanels.push(this.renderPoll());
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
index 17188a23ad..7132e18dff 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { styles } from './styles';
 import UserParticipantsContainer from './user-participants/container';
 import UserMessages from './user-messages/component';
+import UserNotes from './user-notes/component';
 import UserPolls from './user-polls/component';
 import BreakoutRoomItem from './breakout-room/component';
 
@@ -83,6 +84,11 @@ class UserContent extends PureComponent {
             roving,
           }}
         />
+        <UserNotes
+          {...{
+            intl,
+          }}
+        />
         <UserPolls
           isPresenter={currentUser.isPresenter}
           {...{
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
new file mode 100644
index 0000000000..e5f3f4bcd9
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
@@ -0,0 +1,67 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+import Icon from '/imports/ui/components/icon/component';
+import { Session } from 'meteor/session';
+import { styles } from './styles';
+
+const propTypes = {
+  intl: PropTypes.shape({
+    formatMessage: PropTypes.func.isRequired,
+  }).isRequired,
+};
+
+const intlMessages = defineMessages({
+  notesTitle: {
+    id: 'app.userList.notesTitle',
+    description: 'Title for the notes list',
+  },
+  noteTitle: {
+    id: 'app.note.title',
+    description: 'Title for the shared note',
+  },
+});
+
+class UserNotes extends PureComponent {
+  render() {
+    const {
+      intl,
+    } = this.props;
+
+    if (!Meteor.settings.public.note.enabled) return null;
+
+    const toggleNotePanel = () => {
+      Session.set(
+        'openPanel',
+        Session.get('openPanel') === 'note'
+          ? 'userlist'
+          : 'note',
+      );
+    };
+
+    return (
+      <div className={styles.messages}>
+        {
+          <h2 className={styles.smallTitle}>
+            {intl.formatMessage(intlMessages.notesTitle)}
+          </h2>
+        }
+        <div className={styles.scrollableList}>
+          <div
+            role='button'
+            tabIndex={0}
+            className={styles.noteLink}
+            onClick={toggleNotePanel}
+          >
+            <Icon iconName='copy' className={styles.icon} />
+            <span className={styles.label} >{intl.formatMessage(intlMessages.noteTitle)}</span>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+UserNotes.propTypes = propTypes;
+
+export default injectIntl(UserNotes);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss
new file mode 100644
index 0000000000..46ff4e00a8
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss
@@ -0,0 +1,64 @@
+@import "../../styles.scss";
+@import "/imports/ui/stylesheets/variables/_all";
+
+
+$list-item-bg-hover: darken(#F3F6F9, 7%);
+$item-focus-border: #92BCEA;
+
+.smallTitle {
+    font-size: var(--font-size-small);
+    font-weight: 600;
+    text-transform: uppercase;
+    padding: 0 var(--sm-padding-x);
+    color: var(--color-gray-light);
+    margin-bottom: var(--sm-padding-x);
+    margin-top: var(--sm-padding-x);
+}
+
+.scrollableList {
+    margin-left: 0.45rem;
+    margin-bottom: 1px;
+    outline: none;
+}
+
+.noteLink {
+    @extend %list-item;
+
+    cursor: pointer;
+    display: flex;
+    flex-flow: row;
+    flex-grow: 0;
+    flex-shrink: 0;
+    padding-top: var(--lg-padding-y);
+    padding-bottom: var(--lg-padding-y);
+    padding-left: var(--lg-padding-y);
+    text-decoration: none;
+    width: 100%;
+    color: var(--color-gray-dark);
+    background-color: var(--color-off-white);
+
+    > i {
+        display: flex;
+        font-size: 175%;
+        color: #8B9AA8;
+        flex: 0 0 2.2rem;
+    }
+
+    > span {
+        font-size: 0.9rem;
+        font-weight: 400;
+        color: black;
+        position: relative;
+        flex-grow: 1;
+        line-height: 2;
+        text-align: left;
+        padding-left: var(--lg-padding-y);
+        text-overflow: ellipsis;
+    }
+
+    &:active {
+        background-color: $list-item-bg-hover;
+        box-shadow: inset 0 0 0 var(--border-size) $item-focus-border, inset 1px 0 0 1px $item-focus-border;
+        outline: none;
+    }
+}
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 69808d4d0b..f5f5c775ad 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -120,6 +120,12 @@ public:
     storage_key: UNREAD_CHATS
     system_messages_keys:
       chat_clear: PUBLIC_CHAT_CLEAR
+  note:
+    enabled: false
+    url: ETHERPAD_HOST
+    config:
+      showControls: true
+      rtl: false
   layout:
     autoSwapLayout: false
     hidePresentation: false
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 14b1e25d38..55bdc2a6eb 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -18,9 +18,13 @@
     "app.chat.label": "Chat",
     "app.chat.emptyLogLabel": "Chat log empty",
     "app.chat.clearPublicChatMessage": "The public chat history was cleared by a moderator",
+    "app.note.title": "Shared Notes",
+    "app.note.label": "Note",
+    "app.note.hideNoteLabel": "Hide note",
     "app.userList.usersTitle": "Users",
     "app.userList.participantsTitle": "Participants",
     "app.userList.messagesTitle": "Messages",
+    "app.userList.notesTitle": "Notes",
     "app.userList.presenter": "Presenter",
     "app.userList.you": "You",
     "app.userList.locked": "Locked",

From a8517638c00779c114515e5c889ae43ba4fa8e42 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Thu, 13 Dec 2018 10:44:48 -0200
Subject: [PATCH 031/163] Shared notes title and extra config

---
 .../user-list/user-list-content/user-notes/component.jsx    | 6 +++---
 bigbluebutton-html5/private/config/settings.yml             | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
index e5f3f4bcd9..f30be95693 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
@@ -16,9 +16,9 @@ const intlMessages = defineMessages({
     id: 'app.userList.notesTitle',
     description: 'Title for the notes list',
   },
-  noteTitle: {
+  title: {
     id: 'app.note.title',
-    description: 'Title for the shared note',
+    description: 'Title for the shared notes',
   },
 });
 
@@ -54,7 +54,7 @@ class UserNotes extends PureComponent {
             onClick={toggleNotePanel}
           >
             <Icon iconName='copy' className={styles.icon} />
-            <span className={styles.label} >{intl.formatMessage(intlMessages.noteTitle)}</span>
+            <span className={styles.label} >{intl.formatMessage(intlMessages.title)}</span>
           </div>
         </div>
       </div>
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index f5f5c775ad..7af5f976c8 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -124,6 +124,7 @@ public:
     enabled: false
     url: ETHERPAD_HOST
     config:
+      noColors: true
       showControls: true
       rtl: false
   layout:

From e54823d1743808f1ce6b8478936dbc2cd93bb2c5 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Tue, 8 Jan 2019 14:46:24 +0000
Subject: [PATCH 032/163] fix presentation positioning when data saving is
 enabled

---
 .../imports/ui/components/media/container.jsx          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index 142205160b..eb6ca0ce21 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -7,7 +7,6 @@ import { notify } from '/imports/ui/services/notification';
 import VideoService from '/imports/ui/components/video-provider/service';
 import getFromUserSettings from '/imports/ui/services/users-settings';
 import { withModalMounter } from '/imports/ui/components/modal/service';
-import VideoPreviewContainer from '/imports/ui/components/video-preview/container';
 import Media from './component';
 import MediaService, { getSwapLayout } from './service';
 import PresentationPodsContainer from '../presentation-pod/container';
@@ -80,8 +79,9 @@ class MediaContainer extends Component {
 
     const chromeErrorElement = (
       <div>
-        {intl.formatMessage(intlMessages.chromeExtensionError)}{' '}
-        <a href={CHROME_EXTENSION_LINK} target="_blank">
+        {intl.formatMessage(intlMessages.chromeExtensionError)}
+        {' '}
+        <a href={CHROME_EXTENSION_LINK} target="_blank" rel="noopener noreferrer">
           {intl.formatMessage(intlMessages.chromeExtensionErrorLink)}
         </a>
       </div>
@@ -99,7 +99,7 @@ class MediaContainer extends Component {
   }
 }
 
-export default withModalMounter(withTracker(({ mountModal }) => {
+export default withModalMounter(withTracker(() => {
   const { dataSaving } = Settings;
   const { viewParticipantsWebcams, viewScreenshare } = dataSaving;
 
@@ -118,7 +118,7 @@ export default withModalMounter(withTracker(({ mountModal }) => {
   }
 
   const usersVideo = VideoService.getAllUsersVideo();
-  if (MediaService.shouldShowOverlay() && usersVideo.length) {
+  if (MediaService.shouldShowOverlay() && usersVideo.length && viewParticipantsWebcams) {
     data.floatingOverlay = usersVideo.length < 2;
     data.hideOverlay = usersVideo.length === 0;
   }

From a5f15b2e1c1408d401b41be60428963a891214be Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Tue, 8 Jan 2019 16:38:26 -0200
Subject: [PATCH 033/163] Add 400 bad request status to error screen

---
 .../ui/components/authenticated-handler/component.jsx     | 1 +
 .../imports/ui/components/error-screen/component.jsx      | 8 +++++---
 .../imports/ui/components/join-handler/component.jsx      | 8 ++++++--
 bigbluebutton-html5/private/locales/en.json               | 1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx
index abd07e1821..45e0543431 100644
--- a/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx
@@ -65,6 +65,7 @@ class AuthenticatedHandler extends Component {
   }
 
   componentDidMount() {
+    if (Session.get('codeError')) return this.changeState(true);
     AuthenticatedHandler.authenticatedRouteHandler((value, error) => {
       if (error) AuthenticatedHandler.setError(error);
       this.changeState(true);
diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
index d515c08ee4..4602f1f8c0 100644
--- a/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/component.jsx
@@ -19,6 +19,9 @@ const intlMessages = defineMessages({
   401: {
     id: 'app.error.401',
   },
+  400: {
+    id: 'app.error.400',
+  },
   leave: {
     id: 'app.error.leaveLabel',
     description: 'aria-label for leaving',
@@ -67,10 +70,9 @@ class ErrorScreen extends React.PureComponent {
           {children}
         </div>
         {
-          !Session.get('JoinErrorMessage') || (
+          !Session.get('errorMessageDescription') || (
           <div className={styles.sessionMessage}>
-            {console.error(Session.get('JoinErrorMessage'))}
-            {Session.get('JoinErrorMessage')}
+            {Session.get('errorMessageDescription')}
           </div>)
         }
         <div>
diff --git a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
index 13d7413800..29a9234d14 100644
--- a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
@@ -42,8 +42,10 @@ class JoinHandler extends Component {
   async fetchToken() {
     const urlParams = new URLSearchParams(window.location.search);
     const sessionToken = urlParams.get('sessionToken');
+
     if (!sessionToken) {
-      JoinHandler.setError('404');
+      JoinHandler.setError('400');
+      Session.set('errorMessageDescription', 'Session token was not provided');
     }
 
     // Old credentials stored in memory were being used when joining a new meeting
@@ -128,7 +130,9 @@ class JoinHandler extends Component {
       logger.info(`User successfully went through main.joinRouteHandler with [${JSON.stringify(response)}].`);
     } else {
       const e = new Error(response.message);
-      Session.set('JoinErrorMessage', response.message);
+      console.error(Session.get('codeError'));
+      console.error(!Session.get('codeError'));
+      if (!Session.get('codeError')) Session.set('errorMessageDescription', response.message);
       logger.error(`User faced [${e}] on main.joinRouteHandler. Error was:`, JSON.stringify(response));
     }
     this.changeToJoin(true);
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index d944bf09b1..d1c56b2541 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -337,6 +337,7 @@
     "app.error.404": "Not found",
     "app.error.401": "Unauthorized",
     "app.error.403": "Forbidden",
+    "app.error.400": "Bad Request",
     "app.error.leaveLabel": "Log in again",
     "app.guest.waiting": "Waiting for approval to join",
     "app.toast.breakoutRoomEnded": "The breakout room ended. Please rejoin in the audio.",

From cd3f47abdaeb8ce248beeb01c0c2b96e9df186e6 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Tue, 8 Jan 2019 16:58:46 -0200
Subject: [PATCH 034/163] Remove unnecessary consoles

---
 .../imports/ui/components/join-handler/component.jsx            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
index 29a9234d14..0064b02d21 100644
--- a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
@@ -130,8 +130,6 @@ class JoinHandler extends Component {
       logger.info(`User successfully went through main.joinRouteHandler with [${JSON.stringify(response)}].`);
     } else {
       const e = new Error(response.message);
-      console.error(Session.get('codeError'));
-      console.error(!Session.get('codeError'));
       if (!Session.get('codeError')) Session.set('errorMessageDescription', response.message);
       logger.error(`User faced [${e}] on main.joinRouteHandler. Error was:`, JSON.stringify(response));
     }

From dd89bed5e8bd3e4be660a9c2a170f092423cecad Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Tue, 8 Jan 2019 14:17:11 -0800
Subject: [PATCH 035/163] Added checks to meetingId

---
 .../meetings/server/handlers/recordingTimerChange.js   |  2 ++
 .../imports/ui/components/nav-bar/component.jsx        | 10 +++++++---
 .../imports/ui/components/nav-bar/container.jsx        |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
index 764dc0f8c9..7f79759927 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingTimerChange.js
@@ -5,6 +5,8 @@ import Logger from '/imports/startup/server/logger';
 export default function handleRecordingStatusChange({ body }, meetingId) {
   const { time } = body;
 
+  check(meetingId, String);
+
   check(body, {
     time: Number,
   });
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index 36efa8b713..4f908c1fbc 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -19,7 +19,6 @@ import { styles } from './styles.scss';
 import Button from '../button/component';
 import RecordingIndicator from './recording-indicator/component';
 import SettingsDropdownContainer from './settings-dropdown/container';
-import ActionBarService from './service';
 
 const intlMessages = defineMessages({
   toggleUserListLabel: {
@@ -102,10 +101,15 @@ class NavBar extends PureComponent {
   }
 
   componentDidMount() {
+    const {
+      processOutsideToggleRecording,
+      connectRecordingObserver,
+    } = this.props;
+
     if (Meteor.settings.public.allowOutsideCommands.toggleRecording
       || getFromUserSettings('outsideToggleRecording', false)) {
-      ActionBarService.connectRecordingObserver();
-      window.addEventListener('message', ActionBarService.processOutsideToggleRecording);
+      connectRecordingObserver();
+      window.addEventListener('message', processOutsideToggleRecording);
     }
   }
 
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
index 09a2c2885c..a496dbef81 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
@@ -64,6 +64,7 @@ export default withTracker(() => {
 
   const breakouts = Service.getBreakouts();
   const currentUserId = Auth.userID;
+  const { connectRecordingObserver, processOutsideToggleRecording } = Service;
 
   const isExpanded = Session.get('isUserListOpen');
 
@@ -71,6 +72,8 @@ export default withTracker(() => {
     isExpanded,
     breakouts,
     currentUserId,
+    processOutsideToggleRecording,
+    connectRecordingObserver,
     meetingId,
     presentationTitle: meetingTitle,
     hasUnreadMessages: checkUnreadMessages(),

From fa70c04375c483c5274d66f54203d72b3c8ece18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Francisco=20Siebel?= <jfsiebel@gmail.com>
Date: Wed, 9 Jan 2019 09:36:14 -0200
Subject: [PATCH 036/163] add welcome message and moderator only message to
 save/copy chat feature and fix a race condition bug when clearing the chat.
 close #6314

---
 .../server/modifiers/clearGroupChatMsg.js     | 25 +++++++------
 .../imports/ui/components/chat/service.js     | 36 ++++++++++++++++---
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js b/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
index 940ffc29ca..172a200f3a 100644
--- a/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
+++ b/bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
@@ -11,20 +11,19 @@ export default function clearGroupChatMsg(meetingId, chatId) {
   if (chatId) {
     GroupChatMsg.remove({ meetingId, chatId }, () => {
       Logger.info(`Cleared GroupChatMsg (${meetingId}, ${chatId})`);
+      const clearMsg = {
+        color: '0',
+        timestamp: Date.now(),
+        correlationId: `${PUBLIC_CHAT_SYSTEM_ID}-${Date.now()}`,
+        sender: {
+          id: PUBLIC_CHAT_SYSTEM_ID,
+          name: '',
+        },
+        message: CHAT_CLEAR_MESSAGE,
+      };
+
+      return addGroupChatMsg(meetingId, PUBLIC_GROUP_CHAT_ID, clearMsg);
     });
-
-    const clearMsg = {
-      color: '0',
-      timestamp: Date.now(),
-      correlationId: `${PUBLIC_CHAT_SYSTEM_ID}-${Date.now()}`,
-      sender: {
-        id: PUBLIC_CHAT_SYSTEM_ID,
-        name: '',
-      },
-      message: CHAT_CLEAR_MESSAGE,
-    };
-
-    return addGroupChatMsg(meetingId, PUBLIC_GROUP_CHAT_ID, clearMsg);
   }
 
   if (meetingId) {
diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 2dcf0e5dd8..7fa5eb8483 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -18,6 +18,7 @@ const PUBLIC_CHAT_ID = CHAT_CONFIG.public_id;
 const PUBLIC_GROUP_CHAT_ID = CHAT_CONFIG.public_group_id;
 const PRIVATE_CHAT_TYPE = CHAT_CONFIG.type_private;
 const PUBLIC_CHAT_USER_ID = CHAT_CONFIG.system_userid;
+const PUBLIC_CHAT_CLEAR = CHAT_CONFIG.system_messages_keys.chat_clear;
 
 const ScrollCollection = new Mongo.Collection(null);
 
@@ -248,8 +249,35 @@ const htmlDecode = (input) => {
 };
 
 // Export the chat as [Hour:Min] user: message
-const exportChat = messageList => (
-  messageList.map((message) => {
+const exportChat = (messageList) => {
+  const { welcomeProp } = getMeeting();
+  const { isModerator, logTime } = getUser(Auth.userID);
+  const { welcomeMsg, modOnlyMessage } = welcomeProp;
+
+  const clearMessage = messageList.filter(message => message.message === PUBLIC_CHAT_CLEAR);
+
+  const hasClearMessage = clearMessage.length;
+
+  if (!hasClearMessage || (hasClearMessage && clearMessage[0].timestamp < logTime)) {
+    messageList.push({
+      timestamp: logTime,
+      message: welcomeMsg,
+      type: SYSTEM_CHAT_TYPE,
+      sender: PUBLIC_CHAT_USER_ID,
+    });
+    if (isModerator) {
+      messageList.push({
+        timestamp: logTime + 1,
+        message: modOnlyMessage,
+        type: SYSTEM_CHAT_TYPE,
+        sender: PUBLIC_CHAT_USER_ID,
+      });
+    }
+  }
+
+  messageList.sort((a, b) => a.timestamp - b.timestamp);
+
+  return messageList.map((message) => {
     const date = new Date(message.timestamp);
     const hour = date.getHours().toString().padStart(2, 0);
     const min = date.getMinutes().toString().padStart(2, 0);
@@ -259,8 +287,8 @@ const exportChat = messageList => (
     }
     const userName = message.sender === PUBLIC_CHAT_USER_ID ? '' : `${getUser(message.sender).name} :`;
     return `${hourMin} ${userName} ${htmlDecode(message.message)}`;
-  }).join('\n')
-);
+  }).join('\n');
+};
 
 const setNotified = (chatType, item) => {
   const notified = Storage.getItem('notified');

From a0fac637e8c292a8e06d09e2fad85c7fa97fc27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Francisco=20Siebel?= <jfsiebel@gmail.com>
Date: Wed, 9 Jan 2019 09:41:52 -0200
Subject: [PATCH 037/163] remove moderator message in save/copy

---
 .../imports/ui/components/chat/service.js            | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 7fa5eb8483..70c6c3b152 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -251,8 +251,8 @@ const htmlDecode = (input) => {
 // Export the chat as [Hour:Min] user: message
 const exportChat = (messageList) => {
   const { welcomeProp } = getMeeting();
-  const { isModerator, logTime } = getUser(Auth.userID);
-  const { welcomeMsg, modOnlyMessage } = welcomeProp;
+  const { logTime } = getUser(Auth.userID);
+  const { welcomeMsg } = welcomeProp;
 
   const clearMessage = messageList.filter(message => message.message === PUBLIC_CHAT_CLEAR);
 
@@ -265,14 +265,6 @@ const exportChat = (messageList) => {
       type: SYSTEM_CHAT_TYPE,
       sender: PUBLIC_CHAT_USER_ID,
     });
-    if (isModerator) {
-      messageList.push({
-        timestamp: logTime + 1,
-        message: modOnlyMessage,
-        type: SYSTEM_CHAT_TYPE,
-        sender: PUBLIC_CHAT_USER_ID,
-      });
-    }
   }
 
   messageList.sort((a, b) => a.timestamp - b.timestamp);

From 5d45cb8214eec03733c3194fa33fcabab05aa249 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Wed, 9 Jan 2019 07:59:16 -0800
Subject: [PATCH 038/163] Removed margin when user panel is closed

---
 .../imports/ui/components/app/component.jsx                | 6 ++++--
 bigbluebutton-html5/imports/ui/components/app/styles.scss  | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index a4b497ffa8..d8d7904a38 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -192,14 +192,16 @@ class App extends Component {
 
   render() {
     const {
-      customStyle, customStyleUrl, micsLocked,
+      customStyle, customStyleUrl, micsLocked, openPanel,
     } = this.props;
 
+    console.log(openPanel);
+
     return (
       <main className={styles.main}>
         <NotificationsBarContainer />
         <section className={styles.wrapper}>
-          <div className={styles.content}>
+          <div className={openPanel ? styles.content : styles.noPanelContent}>
             {this.renderNavBar()}
             {this.renderMedia()}
             {this.renderActionsBar()}
diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss
index 5448515e76..0cd870e402 100755
--- a/bigbluebutton-html5/imports/ui/components/app/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss
@@ -58,12 +58,10 @@
   }
 }
 
-.content {
+.content, .noPanelContent {
   @extend %full-page;
   order: 3;
 
-  margin-left: var(--panel-margin-left);
-
   &:before,
   &:after {
     content: '';
@@ -92,6 +90,9 @@
   }
 }
 
+.content{
+  margin-left: var(--panel-margin-left);
+}
 
 .userList {
   @extend %full-page;

From dbad55e74ee9005f6433c03f733525718f31627c Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Wed, 9 Jan 2019 18:03:46 +0000
Subject: [PATCH 039/163] Refactored note styles

---
 .../imports/ui/components/note/styles.scss    |  6 +-
 .../user-list-content/user-notes/styles.scss  | 94 +++++++++----------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/note/styles.scss b/bigbluebutton-html5/imports/ui/components/note/styles.scss
index 3ff1e2405b..8f9be377f1 100644
--- a/bigbluebutton-html5/imports/ui/components/note/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/note/styles.scss
@@ -2,7 +2,7 @@
 @import "/imports/ui/stylesheets/variables/_all";
 
 .note {
-  background-color: #fff;
+  background-color: var(--color-white);
   padding: var(--md-padding-x);
   display: flex;
   flex-grow: 1;
@@ -46,7 +46,7 @@
 
 .hideBtn {
   position: relative;
-  background-color: white;
+  background-color: var(--color-white);
   display: block;
   margin: 4px;
   margin-bottom: 2px;
@@ -57,7 +57,7 @@
   }
 
   &:hover {
-    background-color: #fff;
+    background-color: var(--color-white);
   }
 }
 
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss
index 46ff4e00a8..e5b4e621d6 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss
@@ -1,64 +1,60 @@
 @import "../../styles.scss";
 @import "/imports/ui/stylesheets/variables/_all";
 
-
-$list-item-bg-hover: darken(#F3F6F9, 7%);
-$item-focus-border: #92BCEA;
-
 .smallTitle {
-    font-size: var(--font-size-small);
-    font-weight: 600;
-    text-transform: uppercase;
-    padding: 0 var(--sm-padding-x);
-    color: var(--color-gray-light);
-    margin-bottom: var(--sm-padding-x);
-    margin-top: var(--sm-padding-x);
+  font-size: var(--font-size-small);
+  font-weight: 600;
+  text-transform: uppercase;
+  padding: 0 var(--sm-padding-x);
+  color: var(--color-gray-light);
+  margin-bottom: var(--sm-padding-x);
+  margin-top: var(--sm-padding-x);
 }
 
 .scrollableList {
-    margin-left: 0.45rem;
-    margin-bottom: 1px;
-    outline: none;
+  margin-left: 0.45rem;
+  margin-bottom: 1px;
+  outline: none;
 }
 
 .noteLink {
-    @extend %list-item;
+  @extend %list-item;
 
-    cursor: pointer;
+  cursor: pointer;
+  display: flex;
+  flex-flow: row;
+  flex-grow: 0;
+  flex-shrink: 0;
+  padding-top: var(--lg-padding-y);
+  padding-bottom: var(--lg-padding-y);
+  padding-left: var(--lg-padding-y);
+  text-decoration: none;
+  width: 100%;
+  color: var(--color-gray-dark);
+  background-color: var(--color-off-white);
+
+  > i {
     display: flex;
-    flex-flow: row;
-    flex-grow: 0;
-    flex-shrink: 0;
-    padding-top: var(--lg-padding-y);
-    padding-bottom: var(--lg-padding-y);
-    padding-left: var(--lg-padding-y);
-    text-decoration: none;
-    width: 100%;
-    color: var(--color-gray-dark);
-    background-color: var(--color-off-white);
+    font-size: 175%;
+    color: var(--color-gray-light);
+    flex: 0 0 2.2rem;
+  }
 
-    > i {
-        display: flex;
-        font-size: 175%;
-        color: #8B9AA8;
-        flex: 0 0 2.2rem;
-    }
+  > span {
+      font-size: 0.9rem;
+      font-weight: 400;
+      color: black;
+      position: relative;
+      flex-grow: 1;
+      line-height: 2;
+      text-align: left;
+      padding-left: var(--lg-padding-y);
+      text-overflow: ellipsis;
+  }
 
-    > span {
-        font-size: 0.9rem;
-        font-weight: 400;
-        color: black;
-        position: relative;
-        flex-grow: 1;
-        line-height: 2;
-        text-align: left;
-        padding-left: var(--lg-padding-y);
-        text-overflow: ellipsis;
-    }
-
-    &:active {
-        background-color: $list-item-bg-hover;
-        box-shadow: inset 0 0 0 var(--border-size) $item-focus-border, inset 1px 0 0 1px $item-focus-border;
-        outline: none;
-    }
+  &:active {
+    background-color: var(--list-item-bg-hover);
+    box-shadow: inset 0 0 0 var(--border-size) var(--item-focus-border), inset 1px 0 0 1px var(--item-focus-border);
+    outline: none;
+  }
 }

From 299861d383b10c4f6bfbef1471ad430bdd5c5647 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Wed, 9 Jan 2019 18:06:23 +0000
Subject: [PATCH 040/163] Injecting title directly in note

---
 .../imports/ui/components/note/component.jsx  |  8 +++++---
 .../imports/ui/components/note/container.jsx  | 19 ++++---------------
 .../user-notes/component.jsx                  |  4 ++--
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/note/component.jsx b/bigbluebutton-html5/imports/ui/components/note/component.jsx
index 5f26668489..f9e52d4e60 100644
--- a/bigbluebutton-html5/imports/ui/components/note/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/note/component.jsx
@@ -11,11 +11,14 @@ const intlMessages = defineMessages({
     id: 'app.note.hideNoteLabel',
     description: 'Label for hiding note button',
   },
+  title: {
+    id: 'app.note.title',
+    description: 'Title for the shared notes',
+  },
 });
 
 const propTypes = {
   url: PropTypes.string.isRequired,
-  title: PropTypes.string.isRequired,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
   }).isRequired,
@@ -27,7 +30,6 @@ const defaultProps = {
 const Note = (props) => {
   const {
     url,
-    title,
     intl,
   } = props;
 
@@ -46,7 +48,7 @@ const Note = (props) => {
               Session.set('openPanel', 'userlist');
             }}
             aria-label={intl.formatMessage(intlMessages.hideNoteLabel)}
-            label={title}
+            label={intl.formatMessage(intlMessages.title)}
             icon="left_arrow"
             className={styles.hideBtn}
           />
diff --git a/bigbluebutton-html5/imports/ui/components/note/container.jsx b/bigbluebutton-html5/imports/ui/components/note/container.jsx
index 7dbce79df9..61c5ff25cb 100644
--- a/bigbluebutton-html5/imports/ui/components/note/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/note/container.jsx
@@ -1,18 +1,9 @@
-import React, { Component } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import React, { PureComponent } from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
 import Note from './component';
 import NoteService from './service';
 
-const intlMessages = defineMessages({
-  title: {
-    id: 'app.note.title',
-    description: 'Shared notes title',
-  },
-});
-
-class NoteContainer extends Component {
-  componentDidMount() {}
+class NoteContainer extends PureComponent {
   render() {
     return (
       <Note {...this.props}>
@@ -22,12 +13,10 @@ class NoteContainer extends Component {
   }
 }
 
-export default injectIntl(withTracker(({ params, intl }) => {
-  const title = intl.formatMessage(intlMessages.title);
+export default withTracker(() => {
   const url = NoteService.getNoteURL();
 
   return {
-    title,
     url,
   };
-})(NoteContainer));
+})(NoteContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
index f30be95693..d62c0e00b1 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages } from 'react-intl';
 import Icon from '/imports/ui/components/icon/component';
 import { Session } from 'meteor/session';
 import { styles } from './styles';
@@ -64,4 +64,4 @@ class UserNotes extends PureComponent {
 
 UserNotes.propTypes = propTypes;
 
-export default injectIntl(UserNotes);
+export default UserNotes;

From a246eaa8158ea4786b899ef77eb003a1a1d30026 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Wed, 9 Jan 2019 18:09:05 +0000
Subject: [PATCH 041/163] Calling for current user only once

---
 .../imports/ui/components/note/service.js     | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/note/service.js b/bigbluebutton-html5/imports/ui/components/note/service.js
index 194ab6fd17..2ecc932791 100644
--- a/bigbluebutton-html5/imports/ui/components/note/service.js
+++ b/bigbluebutton-html5/imports/ui/components/note/service.js
@@ -16,10 +16,9 @@ const NOTE_CONFIG = Meteor.settings.public.note;
  * @returns {integer | string}
  */
 const hashFNV32a = (str, asString, seed) => {
-  var i, l,
-    hval = (seed === undefined) ? 0x811c9dc5 : seed;
+  let hval = (seed === undefined) ? 0x811c9dc5 : seed;
 
-  for (i = 0, l = str.length; i < l; i++) {
+  for (let i = 0, l = str.length; i < l; i++) {
     hval ^= str.charCodeAt(i);
     hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
   }
@@ -35,30 +34,23 @@ const generateNoteId = () => {
   return noteId;
 };
 
-const getUserName = () => {
-  const userId = Auth.userID;
-  const User = Users.findOne({ userId });
-  const userName = User.name;
-  return userName;
-};
-
-const getUserColor = () => {
-  const userId = Auth.userID;
-  const User = Users.findOne({ userId });
-  const userColor = User.color;
-  return userColor;
-};
-
 const getLang = () => {
   const locale = Settings.application.locale;
   const lang = locale.toLowerCase();
   return lang;
 };
 
+const getCurrentUser = () => {
+  const userId = Auth.userID;
+  const User = Users.findOne({ userId });
+  return User;
+};
+
 const getNoteParams = () => {
   let config = NOTE_CONFIG.config;
-  config.userName = getUserName();
-  config.userColor = getUserColor();
+  const User = getCurrentUser();
+  config.userName = User.name;
+  config.userColor = User.color;
   config.lang = getLang();
 
   let params = [];

From 381b28714ea17546d7f957848e97eeb5f2eb8611 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Wed, 9 Jan 2019 12:50:24 -0800
Subject: [PATCH 042/163] Removed console log

---
 bigbluebutton-html5/imports/ui/components/app/component.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index d8d7904a38..2c63876413 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -195,8 +195,6 @@ class App extends Component {
       customStyle, customStyleUrl, micsLocked, openPanel,
     } = this.props;
 
-    console.log(openPanel);
-
     return (
       <main className={styles.main}>
         <NotificationsBarContainer />

From 02e72e9a966741ce2acee3373610b54b19c4dd10 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Wed, 9 Jan 2019 16:03:34 -0500
Subject: [PATCH 043/163] Update tooltip for multi-user mode

Closes #6333
---
 bigbluebutton-html5/private/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 253ab9b93c..fd0cb41f0c 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -456,8 +456,8 @@
     "app.whiteboard.toolbar.color.silver": "Silver",
     "app.whiteboard.toolbar.undo": "Undo annotation",
     "app.whiteboard.toolbar.clear": "Clear all annotations",
-    "app.whiteboard.toolbar.multiUserOn": "Turn multi-user mode on",
-    "app.whiteboard.toolbar.multiUserOff": "Turn multi-user mode off",
+    "app.whiteboard.toolbar.multiUserOn": "Turn multi-user whiteboard on",
+    "app.whiteboard.toolbar.multiUserOff": "Turn multi-user whiteboard off",
     "app.whiteboard.toolbar.fontSize": "Font Size List",
     "app.feedback.title": "You have logged out of the conference",
     "app.feedback.subtitle": "We'd love to hear about your experience with BigBlueButton (optional)",

From 3fbcb84bb222715eae418675f098be8f10cd2f01 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Wed, 9 Jan 2019 16:13:47 -0500
Subject: [PATCH 044/163] Change label of hand tool in whiteboard tools

Closes #6297
---
 bigbluebutton-html5/private/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index fd0cb41f0c..46ed71f02d 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -431,7 +431,7 @@
     "app.sfu.noAvailableCodec2203": "Error 2203: Server could not find an appropriate codec",
     "app.meeting.endNotification.ok.label": "OK",
     "app.whiteboard.toolbar.tools": "Tools",
-    "app.whiteboard.toolbar.tools.hand": "Hand",
+    "app.whiteboard.toolbar.tools.hand": "Pan",
     "app.whiteboard.toolbar.tools.pencil": "Pencil",
     "app.whiteboard.toolbar.tools.rectangle": "Rectangle",
     "app.whiteboard.toolbar.tools.triangle": "Triangle",

From 7e304e086634f8720d081e4caf4d61cc610f3f35 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Wed, 9 Jan 2019 21:43:54 +0000
Subject: [PATCH 045/163] add Bulgarian locale to addLocaleData

---
 bigbluebutton-html5/imports/startup/client/intl.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index d9f1e1f3c4..b400dc9894 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -20,6 +20,8 @@ import es from 'react-intl/locale-data/es';
 import id from 'react-intl/locale-data/id';
 import el from 'react-intl/locale-data/el';
 import it from 'react-intl/locale-data/it';
+import bg from 'react-intl/locale-data/bg';
+
 
 addLocaleData([
   ...en,
@@ -37,6 +39,7 @@ addLocaleData([
   ...id,
   ...el,
   ...it,
+  ...bg,
 ]);
 
 const propTypes = {

From 471c2427584cdc9ceacae240cdcbd1bf3115f8bf Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Wed, 9 Jan 2019 14:07:37 -0800
Subject: [PATCH 046/163] Fixed toasts from popping up on lock settings change

---
 .../imports/ui/components/toast/container.jsx              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/toast/container.jsx b/bigbluebutton-html5/imports/ui/components/toast/container.jsx
index 1e742bb847..592910f4e3 100755
--- a/bigbluebutton-html5/imports/ui/components/toast/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/toast/container.jsx
@@ -57,12 +57,13 @@ export default injectIntl(injectNotify(withTracker(({ notify, intl }) => {
 
   Meetings.find({ meetingId }).observe({
     changed: (newDocument, oldDocument) => {
-      if (newDocument.recordProp && newDocument.recordProp.recording && 
-        newDocument.recordProp.recording!== oldDocument.recordProp.recording) {
+      if (newDocument.recordProp && newDocument.recordProp.recording
+        && newDocument.recordProp.recording !== oldDocument.recordProp.recording) {
         notify(intl.formatMessage(intlMessages.notificationRecordingStart), 'success', 'record');
       }
 
-      if (newDocument.recordProp && !newDocument.recordProp.recording) {
+      if (newDocument.recordProp && !newDocument.recordProp.recording
+        && newDocument.recordProp.recording !== oldDocument.recordProp.recording) {
         notify(intl.formatMessage(intlMessages.notificationRecordingStop), 'error', 'record');
       }
     },

From 7cc318d68bf1a2741086d733c55934bc50dd1cd1 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Wed, 9 Jan 2019 18:13:21 -0600
Subject: [PATCH 047/163] Use /etc/bigbluebutton/bbb-conf/apply-config.sh for
 applying local config options

---
 bigbluebutton-config/bin/bbb-conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index cc3fb40568..213df05909 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1947,6 +1947,15 @@ if [ -n "$HOST" ]; then
                sed -i "s/<image width=\"\([0-9]*\)\" height=\"\([0-9]*\)\" alt=\"\([^\"]*\)\">\(http[s]*\):\/\/[^\/]*\/\(.*\)/<image width=\"\1\" height=\"\2\" alt=\"\3\">\4:\/\/$HOST\/\5/g" \
                 '{}' \;
 
+        #
+        # Apply any local configuration options (if exists)
+	#
+        if [ -x /etc/bigbluebutton/bbb-conf/apply-config.sh ]; then
+                echo "Applying local configuration options: "
+                /etc/bigbluebutton/bbb-conf/apply-config.sh
+		echo
+        fi
+
 	echo "Restarting the BigBlueButton $BIGBLUEBUTTON_RELEASE ..."
 	stop_bigbluebutton
 	echo

From b29800f438bd78e3835602a1aad4334e167f2956 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Wed, 9 Jan 2019 19:20:02 -0500
Subject: [PATCH 048/163] Format message for applying local changes

---
 bigbluebutton-config/bin/bbb-conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 213df05909..641f4b4ca7 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1951,7 +1951,7 @@ if [ -n "$HOST" ]; then
         # Apply any local configuration options (if exists)
 	#
         if [ -x /etc/bigbluebutton/bbb-conf/apply-config.sh ]; then
-                echo "Applying local configuration options: "
+                echo -n "Applying local configuration options: "
                 /etc/bigbluebutton/bbb-conf/apply-config.sh
 		echo
         fi

From 824b6c83c9e29181c320b029966a54adbe83a64f Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Thu, 10 Jan 2019 10:12:33 -0200
Subject: [PATCH 049/163] Extra config to be used with generic Etherpad servers

---
 bigbluebutton-html5/private/config/settings.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index a0658e3d6c..f53ff108bd 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -123,6 +123,8 @@ public:
     enabled: false
     url: ETHERPAD_HOST
     config:
+      showLineNumbers: false
+      showChat: false
       noColors: true
       showControls: true
       rtl: false

From f11fed7bd74f6858d626599857235da789c43ea9 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Thu, 10 Jan 2019 16:10:45 +0000
Subject: [PATCH 050/163] add take presenter role to actions menu

---
 .../actions-dropdown/component.jsx            | 31 ++++++++++++++++---
 .../ui/components/actions-bar/component.jsx   |  2 ++
 .../ui/components/actions-bar/container.jsx   |  4 +++
 bigbluebutton-html5/private/locales/en.json   |  2 ++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index a32951cb60..5f3666b743 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -25,6 +25,7 @@ const propTypes = {
   meetingName: PropTypes.string.isRequired,
   shortcuts: PropTypes.string.isRequired,
   users: PropTypes.arrayOf(PropTypes.object).isRequired,
+  handleTakePresenter: PropTypes.func.isRequired,
 };
 
 const intlMessages = defineMessages({
@@ -72,20 +73,28 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.actionsDropdown.createBreakoutRoomDesc',
     description: 'Description of create breakout room option',
   },
+  takePresenter: {
+    id: 'app.actionsBar.actionsDropdown.takePresenter',
+    description: 'Label for take presenter role option',
+  },
+  takePresenterDesc: {
+    id: 'app.actionsBar.actionsDropdown.takePresenterDesc',
+    description: 'Description of take presenter role option',
+  },
 });
 
 class ActionsDropdown extends Component {
   constructor(props) {
     super(props);
-    this.handlePresentationClick = this.handlePresentationClick.bind(this);
-    this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
-  }
 
-  componentWillMount() {
     this.presentationItemId = _.uniqueId('action-item-');
     this.recordId = _.uniqueId('action-item-');
     this.pollId = _.uniqueId('action-item-');
     this.createBreakoutRoomId = _.uniqueId('action-item-');
+    this.takePresenterId = _.uniqueId('action-item-');
+
+    this.handlePresentationClick = this.handlePresentationClick.bind(this);
+    this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
   }
 
   componentWillUpdate(nextProps) {
@@ -103,6 +112,7 @@ class ActionsDropdown extends Component {
       isUserModerator,
       meetingIsBreakout,
       hasBreakoutRoom,
+      handleTakePresenter,
     } = this.props;
 
     const {
@@ -110,6 +120,8 @@ class ActionsDropdown extends Component {
       pollBtnDesc,
       presentationLabel,
       presentationDesc,
+      takePresenter,
+      takePresenterDesc,
     } = intlMessages;
 
     const {
@@ -117,6 +129,17 @@ class ActionsDropdown extends Component {
     } = intl;
 
     return _.compact([
+      (!isUserPresenter
+        ? (
+          <DropdownListItem
+            icon="presentation"
+            label={formatMessage(takePresenter)}
+            description={formatMessage(takePresenterDesc)}
+            key={this.takePresenterId}
+            onClick={() => handleTakePresenter()}
+          />
+        )
+        : null),
       (isUserPresenter
         ? (
           <DropdownListItem
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 213d75e779..861dcdcb55 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -25,6 +25,7 @@ class ActionsBar extends React.PureComponent {
       hasBreakoutRoom,
       meetingName,
       users,
+      handleTakePresenter,
     } = this.props;
 
     const {
@@ -52,6 +53,7 @@ class ActionsBar extends React.PureComponent {
             hasBreakoutRoom,
             meetingName,
             users,
+            handleTakePresenter,
           }}
           />
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index c3c393cf22..1eb98197de 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -3,6 +3,7 @@ import { withTracker } from 'meteor/react-meteor-data';
 import getFromUserSettings from '/imports/ui/services/users-settings';
 import Meetings from '/imports/api/meetings';
 import Auth from '/imports/ui/services/auth';
+import { makeCall } from '/imports/ui/services/api';
 import ActionsBar from './component';
 import Service from './service';
 import VideoService from '../video-provider/service';
@@ -23,6 +24,8 @@ export default withTracker(() => {
     },
   });
 
+  const takePresenterRole = (userId) => { makeCall('assignPresenter', userId); };
+
   return {
     isUserPresenter: Service.isUserPresenter(),
     isUserModerator: Service.isUserModerator(),
@@ -40,5 +43,6 @@ export default withTracker(() => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
+    handleTakePresenter: () => takePresenterRole(Auth.userID),
   };
 })(ActionsBarContainer);
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 46ed71f02d..cfbb3261d9 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -249,6 +249,8 @@
     "app.actionsBar.actionsDropdown.pollBtnDesc": "Toggles poll pane",
     "app.actionsBar.actionsDropdown.createBreakoutRoom": "Create breakout rooms",
     "app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "create breakouts for split the current meeting ",
+    "app.actionsBar.actionsDropdown.takePresenter": "Take presenter role",
+    "app.actionsBar.actionsDropdown.takePresenterDesc": "assigns yourself as new presenter",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "Set Status",
     "app.actionsBar.emojiMenu.awayLabel": "Away",
     "app.actionsBar.emojiMenu.awayDesc": "Change your status to away",

From 0fc148af55acee154396e5b4c17e0e9825234554 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Thu, 10 Jan 2019 18:25:08 +0000
Subject: [PATCH 051/163] add create breakout room option to user manage menu

---
 .../user-options/component.jsx                | 51 +++++++++++++++++--
 .../user-options/container.jsx                |  7 +++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
index 0db0a225fd..0258ee61a4 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
@@ -10,6 +10,7 @@ import DropdownContent from '/imports/ui/components/dropdown/content/component';
 import DropdownList from '/imports/ui/components/dropdown/list/component';
 import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
 import LockViewersContainer from '/imports/ui/components/lock-viewers/container';
+import BreakoutRoom from '/imports/ui/components/actions-bar/create-breakout-room/component';
 import { styles } from './styles';
 
 const propTypes = {
@@ -21,6 +22,9 @@ const propTypes = {
   toggleMuteAllUsersExceptPresenter: PropTypes.func.isRequired,
   toggleStatus: PropTypes.func.isRequired,
   mountModal: PropTypes.func.isRequired,
+  users: PropTypes.arrayOf(Object).isRequired,
+  meetingName: PropTypes.string.isRequired,
+  createBreakoutRoom: PropTypes.func.isRequired,
 };
 
 const intlMessages = defineMessages({
@@ -68,6 +72,14 @@ const intlMessages = defineMessages({
     id: 'app.userList.userOptions.muteAllExceptPresenterDesc',
     description: 'Mute all except presenter description',
   },
+  createBreakoutRoom: {
+    id: 'app.actionsBar.actionsDropdown.createBreakoutRoom',
+    description: 'Create breakout room option',
+  },
+  createBreakoutRoomDesc: {
+    id: 'app.actionsBar.actionsDropdown.createBreakoutRoomDesc',
+    description: 'Description of create breakout room option',
+  },
 });
 
 class UserOptions extends PureComponent {
@@ -78,9 +90,16 @@ class UserOptions extends PureComponent {
       isUserOptionsOpen: false,
     };
 
+    this.clearStatusId = _.uniqueId('list-item-');
+    this.muteId = _.uniqueId('list-item-');
+    this.muteAllId = _.uniqueId('list-item-');
+    this.lockId = _.uniqueId('list-item-');
+    this.createBreakoutId = _.uniqueId('list-item-');
+
     this.onActionsShow = this.onActionsShow.bind(this);
     this.onActionsHide = this.onActionsHide.bind(this);
     this.alterMenu = this.alterMenu.bind(this);
+    this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
   }
 
   componentWillMount() {
@@ -95,33 +114,40 @@ class UserOptions extends PureComponent {
 
     this.menuItems = _.compact([
       (<DropdownListItem
-        key={_.uniqueId('list-item-')}
+        key={this.clearStatusId}
         icon="clear_status"
         label={intl.formatMessage(intlMessages.clearAllLabel)}
         description={intl.formatMessage(intlMessages.clearAllDesc)}
         onClick={toggleStatus}
       />),
       (<DropdownListItem
-        key={_.uniqueId('list-item-')}
+        key={this.muteAllId}
         icon="mute"
         label={intl.formatMessage(intlMessages.muteAllLabel)}
         description={intl.formatMessage(intlMessages.muteAllDesc)}
         onClick={toggleMuteAllUsers}
       />),
       (<DropdownListItem
-        key={_.uniqueId('list-item-')}
+        key={this.muteId}
         icon="mute"
         label={intl.formatMessage(intlMessages.muteAllExceptPresenterLabel)}
         description={intl.formatMessage(intlMessages.muteAllExceptPresenterDesc)}
         onClick={toggleMuteAllUsersExceptPresenter}
       />),
       (<DropdownListItem
-        key={_.uniqueId('list-item-')}
+        key={this.lockId}
         icon="lock"
         label={intl.formatMessage(intlMessages.lockViewersLabel)}
         description={intl.formatMessage(intlMessages.lockViewersDesc)}
         onClick={() => mountModal(<LockViewersContainer />)}
       />),
+      (<DropdownListItem
+        key={this.createBreakoutId}
+        icon="rooms"
+        label={intl.formatMessage(intlMessages.createBreakoutRoom)}
+        description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
+        onClick={() => this.handleCreateBreakoutRoomClick()}
+      />),
     ]);
 
     if (isMeetingMuted) {
@@ -148,6 +174,23 @@ class UserOptions extends PureComponent {
     });
   }
 
+  handleCreateBreakoutRoomClick() {
+    const {
+      createBreakoutRoom,
+      mountModal,
+      meetingName,
+      users,
+    } = this.props;
+
+    mountModal(
+      <BreakoutRoom
+        createBreakoutRoom={createBreakoutRoom}
+        meetingName={meetingName}
+        users={users}
+      />,
+    );
+  }
+
   alterMenu() {
     const {
       intl,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
index 24d71cfeff..9dc4b2ee88 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Auth from '/imports/ui/services/auth';
+import Service from '/imports/ui/components/actions-bar/service';
 import UserOptions from './component';
 
 
@@ -10,6 +11,9 @@ const propTypes = {
   muteAllExceptPresenter: PropTypes.func.isRequired,
   setEmojiStatus: PropTypes.func.isRequired,
   meeting: PropTypes.shape({}).isRequired,
+  currentUser: PropTypes.shape({
+    isModerator: PropTypes.bool.isRequired,
+  }).isRequired,
 };
 
 export default class UserOptionsContainer extends PureComponent {
@@ -59,6 +63,9 @@ export default class UserOptionsContainer extends PureComponent {
             toggleMuteAllUsersExceptPresenter={this.muteAllUsersExceptPresenter}
             toggleStatus={this.handleClearStatus}
             isMeetingMuted={meetingMuted}
+            createBreakoutRoom={Service.createBreakoutRoom}
+            meetingName={Service.meetingName()}
+            users={Service.users()}
           />) : null
     );
   }

From 484403f4c1dddcdadf65a6e86865e0733a413dd9 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Thu, 10 Jan 2019 18:51:19 +0000
Subject: [PATCH 052/163] fix console error for array elements missing keys

---
 .../create-breakout-room/component.jsx            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
index a10f95fd32..67b63837b8 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
@@ -116,6 +116,10 @@ class BreakoutRoom extends Component {
       preventClosing: true,
       valid: true,
     };
+
+    this.breakoutFormId = _.uniqueId('breakout-form-');
+    this.freeJoinId = _.uniqueId('free-join-check-');
+    this.btnLevelId = _.uniqueId('btn-set-level-');
   }
 
   componentDidMount() {
@@ -208,7 +212,7 @@ class BreakoutRoom extends Component {
 
   changeUserRoom(userId, room) {
     const { users } = this.state;
-    
+
     const idxUser = users.findIndex(user => user.userId === userId);
     users[idxUser].room = room;
     this.setState({ users });
@@ -251,7 +255,7 @@ class BreakoutRoom extends Component {
     };
 
     return (
-      <div className={styles.boxContainer}>
+      <div className={styles.boxContainer} key="rooms-grid-">
         <label htmlFor="BreakoutRoom" className={!valid ? styles.changeToWarn : null}>
           <p
             className={styles.freeJoinLabel}
@@ -277,7 +281,7 @@ class BreakoutRoom extends Component {
               <div className={styles.breakoutBox} onDrop={drop(value)} onDragOver={allowDrop}>
                 {this.renderUserItemByRoom(value)}
               </div>
-             </label>
+            </label>
           ))
         }
       </div>
@@ -291,7 +295,7 @@ class BreakoutRoom extends Component {
       durationTime,
     } = this.state;
     return (
-      <div className={styles.breakoutSettings}>
+      <div className={styles.breakoutSettings} key={this.breakoutFormId}>
         <label htmlFor="numberOfRooms">
           <p className={styles.labelText}>{intl.formatMessage(intlMessages.numberOfRooms)}</p>
           <select
@@ -366,7 +370,7 @@ class BreakoutRoom extends Component {
     const { intl } = this.props;
     const { freeJoin } = this.state;
     return (
-      <label htmlFor="freeJoinCheckbox" className={styles.freeJoinLabel}>
+      <label htmlFor="freeJoinCheckbox" className={styles.freeJoinLabel} key={this.freeJoinId}>
         <input
           type="checkbox"
           className={styles.freeJoinCheckbox}
@@ -478,6 +482,7 @@ class BreakoutRoom extends Component {
         size="lg"
         label={label}
         onClick={() => this.setState({ formFillLevel: level })}
+        key={this.btnLevelId}
       />
     );
   }

From 219cad32346d78d9c5d8d3d15dfec7c1285c3f76 Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Thu, 10 Jan 2019 19:25:23 -0200
Subject: [PATCH 053/163] Verify if Safari can generate iceCandidates else
 askDevicesPermission

---
 .../ui/services/audio-manager/index.js        | 30 +++++++++++++++++--
 .../ios-webview-audio-polyfills.js            |  2 +-
 .../imports/utils/safari-webrtc.js            | 28 +++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)
 rename bigbluebutton-html5/imports/{ui/services/audio-manager => utils}/ios-webview-audio-polyfills.js (99%)
 create mode 100644 bigbluebutton-html5/imports/utils/safari-webrtc.js

diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index f3b9a51299..590547dfac 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -8,7 +8,8 @@ import SIPBridge from '/imports/api/audio/client/bridge/sip';
 import logger from '/imports/startup/client/logger';
 import { notify } from '/imports/ui/services/notification';
 import browser from 'browser-detect';
-import iosWebviewAudioPolyfills from './ios-webview-audio-polyfills';
+import iosWebviewAudioPolyfills from '../../../utils/ios-webview-audio-polyfills';
+import { canGenerateIceCandidates } from '../../../utils/safari-webrtc';
 
 const MEDIA = Meteor.settings.public.media;
 const MEDIA_TAG = MEDIA.mediaTag;
@@ -138,6 +139,7 @@ class AudioManager {
   }
 
   async joinListenOnly(retries = 0) {
+    console.warn('joinListenOnly');
     this.isListenOnly = true;
     this.isEchoTest = false;
     const { name } = browser();
@@ -150,12 +152,36 @@ class AudioManager {
       inputStream: this.createListenOnlyStream(),
     };
 
+    
     // Webkit ICE restrictions demand a capture device permission to release
     // host candidates
     if (name === 'safari') {
-      await this.askDevicesPermissions();
+      console.warn('safari');
+      let hasIceCandidates = false;
+
+      console.warn('-----------------TESTANDO');
+
+      await canGenerateIceCandidates().then(a => {
+        //All right
+        console.warn('-----------------entrou');
+        hasIceCandidates = true;
+      }).catch(e => {
+        console.warn('-----------------catch');
+        hasIceCandidates = false;
+      });
+
+      if(!hasIceCandidates) {
+        console.warn('-----------------askDevicesPermissions');
+        await this.askDevicesPermissions();
+      } else {
+        console.warn('-----------------NOT askDevicesPermissions');
+      }
+
     }
 
+    console.warn('----------------continuou');
+    
+
     // Call polyfills for webrtc client if navigator is "iOS Webview"
     const userAgent = window.navigator.userAgent.toLocaleLowerCase();
     if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1)
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js b/bigbluebutton-html5/imports/utils/ios-webview-audio-polyfills.js
similarity index 99%
rename from bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js
rename to bigbluebutton-html5/imports/utils/ios-webview-audio-polyfills.js
index f4f8cc0eac..7a5a550b31 100644
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/ios-webview-audio-polyfills.js
+++ b/bigbluebutton-html5/imports/utils/ios-webview-audio-polyfills.js
@@ -4,7 +4,7 @@ const iosWebviewAudioPolyfills = function () {
       window.RTCPeerConnection.prototype.getRemoteStreams = function () {
         return this._remoteStreams ? this._remoteStreams : [];
       };
-    }
+    } 
     if (!('onaddstream' in window.RTCPeerConnection.prototype)) {
       Object.defineProperty(window.RTCPeerConnection.prototype, 'onaddstream', {
         get: function get() {
diff --git a/bigbluebutton-html5/imports/utils/safari-webrtc.js b/bigbluebutton-html5/imports/utils/safari-webrtc.js
new file mode 100644
index 0000000000..652e4b840e
--- /dev/null
+++ b/bigbluebutton-html5/imports/utils/safari-webrtc.js
@@ -0,0 +1,28 @@
+export function canGenerateIceCandidates() {
+    
+    return new Promise((resolve, reject) => {
+		pc = new RTCPeerConnection({iceServers: [ {urls:'stun:stun.l.google.com:19302'}  ]});
+		countIceCandidates = 0;
+
+		try{ pc.addTransceiver('audio'); } catch (e) {}
+
+		pc.onicecandidate = function (e) {
+			if(countIceCandidates) return;
+			if (e.candidate) {
+				countIceCandidates++;
+				resolve(true);
+			}
+		}
+
+		pc.onicegatheringstatechange  = function(e) {
+			if(e.currentTarget.iceGatheringState == 'complete' && countIceCandidates == 0) reject(true);
+		}
+		
+		setTimeout(function(){ 
+			if(!countIceCandidates) reject(true);
+		}, 3000);
+
+		p = pc.createOffer({offerToReceiveVideo: true});
+		p.then( answer => {pc.setLocalDescription(answer) ; } )
+	});
+};

From ec49bdfda24a6240df5ec5e39f001150804e1e0b Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Thu, 10 Jan 2019 19:43:30 -0200
Subject: [PATCH 054/163] Nothing changed, this commit is really necessary
 because for some unknown reason all editors change whole file when save file,
 even editing in vi

---
 .../client/compatibility/kurento-utils.js     | 654 +++++++++---------
 1 file changed, 327 insertions(+), 327 deletions(-)

diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index aaeaaecbb9..7bdb5f471b 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -1194,180 +1194,180 @@ if (typeof Object.create === 'function') {
 // Does nothing at all.
 
 },{}],11:[function(require,module,exports){
-/*!
- * @name JavaScript/NodeJS Merge v1.2.0
- * @author yeikos
- * @repository https://github.com/yeikos/js.merge
-
- * Copyright 2014 yeikos - MIT license
- * https://raw.github.com/yeikos/js.merge/master/LICENSE
- */
-
-;(function(isNode) {
-
-	/**
-	 * Merge one or more objects 
-	 * @param bool? clone
-	 * @param mixed,... arguments
-	 * @return object
-	 */
-
-	var Public = function(clone) {
-
-		return merge(clone === true, false, arguments);
-
-	}, publicName = 'merge';
-
-	/**
-	 * Merge two or more objects recursively 
-	 * @param bool? clone
-	 * @param mixed,... arguments
-	 * @return object
-	 */
-
-	Public.recursive = function(clone) {
-
-		return merge(clone === true, true, arguments);
-
-	};
-
-	/**
-	 * Clone the input removing any reference
-	 * @param mixed input
-	 * @return mixed
-	 */
-
-	Public.clone = function(input) {
-
-		var output = input,
-			type = typeOf(input),
-			index, size;
-
-		if (type === 'array') {
-
-			output = [];
-			size = input.length;
-
-			for (index=0;index<size;++index)
-
-				output[index] = Public.clone(input[index]);
-
-		} else if (type === 'object') {
-
-			output = {};
-
-			for (index in input)
-
-				output[index] = Public.clone(input[index]);
-
-		}
-
-		return output;
-
-	};
-
-	/**
-	 * Merge two objects recursively
-	 * @param mixed input
-	 * @param mixed extend
-	 * @return mixed
-	 */
-
-	function merge_recursive(base, extend) {
-
-		if (typeOf(base) !== 'object')
-
-			return extend;
-
-		for (var key in extend) {
-
-			if (typeOf(base[key]) === 'object' && typeOf(extend[key]) === 'object') {
-
-				base[key] = merge_recursive(base[key], extend[key]);
-
-			} else {
-
-				base[key] = extend[key];
-
-			}
-
-		}
-
-		return base;
-
-	}
-
-	/**
-	 * Merge two or more objects
-	 * @param bool clone
-	 * @param bool recursive
-	 * @param array argv
-	 * @return object
-	 */
-
-	function merge(clone, recursive, argv) {
-
-		var result = argv[0],
-			size = argv.length;
-
-		if (clone || typeOf(result) !== 'object')
-
-			result = {};
-
-		for (var index=0;index<size;++index) {
-
-			var item = argv[index],
-
-				type = typeOf(item);
-
-			if (type !== 'object') continue;
-
-			for (var key in item) {
-
-				var sitem = clone ? Public.clone(item[key]) : item[key];
-
-				if (recursive) {
-
-					result[key] = merge_recursive(result[key], sitem);
-
-				} else {
-
-					result[key] = sitem;
-
-				}
-
-			}
-
-		}
-
-		return result;
-
-	}
-
-	/**
-	 * Get type of variable
-	 * @param mixed input
-	 * @return string
-	 *
-	 * @see http://jsperf.com/typeofvar
-	 */
-
-	function typeOf(input) {
-
-		return ({}).toString.call(input).slice(8, -1).toLowerCase();
-
-	}
-
-	if (isNode) {
-
-		module.exports = Public;
-
-	} else {
-
-		window[publicName] = Public;
-
-	}
-
+/*!
+ * @name JavaScript/NodeJS Merge v1.2.0
+ * @author yeikos
+ * @repository https://github.com/yeikos/js.merge
+
+ * Copyright 2014 yeikos - MIT license
+ * https://raw.github.com/yeikos/js.merge/master/LICENSE
+ */
+
+;(function(isNode) {
+
+	/**
+	 * Merge one or more objects 
+	 * @param bool? clone
+	 * @param mixed,... arguments
+	 * @return object
+	 */
+
+	var Public = function(clone) {
+
+		return merge(clone === true, false, arguments);
+
+	}, publicName = 'merge';
+
+	/**
+	 * Merge two or more objects recursively 
+	 * @param bool? clone
+	 * @param mixed,... arguments
+	 * @return object
+	 */
+
+	Public.recursive = function(clone) {
+
+		return merge(clone === true, true, arguments);
+
+	};
+
+	/**
+	 * Clone the input removing any reference
+	 * @param mixed input
+	 * @return mixed
+	 */
+
+	Public.clone = function(input) {
+
+		var output = input,
+			type = typeOf(input),
+			index, size;
+
+		if (type === 'array') {
+
+			output = [];
+			size = input.length;
+
+			for (index=0;index<size;++index)
+
+				output[index] = Public.clone(input[index]);
+
+		} else if (type === 'object') {
+
+			output = {};
+
+			for (index in input)
+
+				output[index] = Public.clone(input[index]);
+
+		}
+
+		return output;
+
+	};
+
+	/**
+	 * Merge two objects recursively
+	 * @param mixed input
+	 * @param mixed extend
+	 * @return mixed
+	 */
+
+	function merge_recursive(base, extend) {
+
+		if (typeOf(base) !== 'object')
+
+			return extend;
+
+		for (var key in extend) {
+
+			if (typeOf(base[key]) === 'object' && typeOf(extend[key]) === 'object') {
+
+				base[key] = merge_recursive(base[key], extend[key]);
+
+			} else {
+
+				base[key] = extend[key];
+
+			}
+
+		}
+
+		return base;
+
+	}
+
+	/**
+	 * Merge two or more objects
+	 * @param bool clone
+	 * @param bool recursive
+	 * @param array argv
+	 * @return object
+	 */
+
+	function merge(clone, recursive, argv) {
+
+		var result = argv[0],
+			size = argv.length;
+
+		if (clone || typeOf(result) !== 'object')
+
+			result = {};
+
+		for (var index=0;index<size;++index) {
+
+			var item = argv[index],
+
+				type = typeOf(item);
+
+			if (type !== 'object') continue;
+
+			for (var key in item) {
+
+				var sitem = clone ? Public.clone(item[key]) : item[key];
+
+				if (recursive) {
+
+					result[key] = merge_recursive(result[key], sitem);
+
+				} else {
+
+					result[key] = sitem;
+
+				}
+
+			}
+
+		}
+
+		return result;
+
+	}
+
+	/**
+	 * Get type of variable
+	 * @param mixed input
+	 * @return string
+	 *
+	 * @see http://jsperf.com/typeofvar
+	 */
+
+	function typeOf(input) {
+
+		return ({}).toString.call(input).slice(8, -1).toLowerCase();
+
+	}
+
+	if (isNode) {
+
+		module.exports = Public;
+
+	} else {
+
+		window[publicName] = Public;
+
+	}
+
 })(typeof module === 'object' && module && typeof module.exports === 'object' && module.exports);
 },{}],12:[function(require,module,exports){
 /**
@@ -4265,159 +4265,159 @@ uuid.unparse = unparse;
 module.exports = uuid;
 
 },{"./rng":22}],24:[function(require,module,exports){
-/*
-WildEmitter.js is a slim little event emitter by @henrikjoreteg largely based
-on @visionmedia's Emitter from UI Kit.
-
-Why? I wanted it standalone.
-
-I also wanted support for wildcard emitters like this:
-
-emitter.on('*', function (eventName, other, event, payloads) {
-
-});
-
-emitter.on('somenamespace*', function (eventName, payloads) {
-
-});
-
-Please note that callbacks triggered by wildcard registered events also get
-the event name as the first argument.
-*/
-
-module.exports = WildEmitter;
-
-function WildEmitter() { }
-
-WildEmitter.mixin = function (constructor) {
-    var prototype = constructor.prototype || constructor;
-
-    prototype.isWildEmitter= true;
-
-    // Listen on the given `event` with `fn`. Store a group name if present.
-    prototype.on = function (event, groupName, fn) {
-        this.callbacks = this.callbacks || {};
-        var hasGroup = (arguments.length === 3),
-            group = hasGroup ? arguments[1] : undefined,
-            func = hasGroup ? arguments[2] : arguments[1];
-        func._groupName = group;
-        (this.callbacks[event] = this.callbacks[event] || []).push(func);
-        return this;
-    };
-
-    // Adds an `event` listener that will be invoked a single
-    // time then automatically removed.
-    prototype.once = function (event, groupName, fn) {
-        var self = this,
-            hasGroup = (arguments.length === 3),
-            group = hasGroup ? arguments[1] : undefined,
-            func = hasGroup ? arguments[2] : arguments[1];
-        function on() {
-            self.off(event, on);
-            func.apply(this, arguments);
-        }
-        this.on(event, group, on);
-        return this;
-    };
-
-    // Unbinds an entire group
-    prototype.releaseGroup = function (groupName) {
-        this.callbacks = this.callbacks || {};
-        var item, i, len, handlers;
-        for (item in this.callbacks) {
-            handlers = this.callbacks[item];
-            for (i = 0, len = handlers.length; i < len; i++) {
-                if (handlers[i]._groupName === groupName) {
-                    //console.log('removing');
-                    // remove it and shorten the array we're looping through
-                    handlers.splice(i, 1);
-                    i--;
-                    len--;
-                }
-            }
-        }
-        return this;
-    };
-
-    // Remove the given callback for `event` or all
-    // registered callbacks.
-    prototype.off = function (event, fn) {
-        this.callbacks = this.callbacks || {};
-        var callbacks = this.callbacks[event],
-            i;
-
-        if (!callbacks) return this;
-
-        // remove all handlers
-        if (arguments.length === 1) {
-            delete this.callbacks[event];
-            return this;
-        }
-
-        // remove specific handler
-        i = callbacks.indexOf(fn);
-        callbacks.splice(i, 1);
-        if (callbacks.length === 0) {
-            delete this.callbacks[event];
-        }
-        return this;
-    };
-
-    /// Emit `event` with the given args.
-    // also calls any `*` handlers
-    prototype.emit = function (event) {
-        this.callbacks = this.callbacks || {};
-        var args = [].slice.call(arguments, 1),
-            callbacks = this.callbacks[event],
-            specialCallbacks = this.getWildcardCallbacks(event),
-            i,
-            len,
-            item,
-            listeners;
-
-        if (callbacks) {
-            listeners = callbacks.slice();
-            for (i = 0, len = listeners.length; i < len; ++i) {
-                if (!listeners[i]) {
-                    break;
-                }
-                listeners[i].apply(this, args);
-            }
-        }
-
-        if (specialCallbacks) {
-            len = specialCallbacks.length;
-            listeners = specialCallbacks.slice();
-            for (i = 0, len = listeners.length; i < len; ++i) {
-                if (!listeners[i]) {
-                    break;
-                }
-                listeners[i].apply(this, [event].concat(args));
-            }
-        }
-
-        return this;
-    };
-
-    // Helper for for finding special wildcard event handlers that match the event
-    prototype.getWildcardCallbacks = function (eventName) {
-        this.callbacks = this.callbacks || {};
-        var item,
-            split,
-            result = [];
-
-        for (item in this.callbacks) {
-            split = item.split('*');
-            if (item === '*' || (split.length === 2 && eventName.slice(0, split[0].length) === split[0])) {
-                result = result.concat(this.callbacks[item]);
-            }
-        }
-        return result;
-    };
-
-};
-
-WildEmitter.mixin(WildEmitter);
+/*
+WildEmitter.js is a slim little event emitter by @henrikjoreteg largely based
+on @visionmedia's Emitter from UI Kit.
+
+Why? I wanted it standalone.
+
+I also wanted support for wildcard emitters like this:
+
+emitter.on('*', function (eventName, other, event, payloads) {
+
+});
+
+emitter.on('somenamespace*', function (eventName, payloads) {
+
+});
+
+Please note that callbacks triggered by wildcard registered events also get
+the event name as the first argument.
+*/
+
+module.exports = WildEmitter;
+
+function WildEmitter() { }
+
+WildEmitter.mixin = function (constructor) {
+    var prototype = constructor.prototype || constructor;
+
+    prototype.isWildEmitter= true;
+
+    // Listen on the given `event` with `fn`. Store a group name if present.
+    prototype.on = function (event, groupName, fn) {
+        this.callbacks = this.callbacks || {};
+        var hasGroup = (arguments.length === 3),
+            group = hasGroup ? arguments[1] : undefined,
+            func = hasGroup ? arguments[2] : arguments[1];
+        func._groupName = group;
+        (this.callbacks[event] = this.callbacks[event] || []).push(func);
+        return this;
+    };
+
+    // Adds an `event` listener that will be invoked a single
+    // time then automatically removed.
+    prototype.once = function (event, groupName, fn) {
+        var self = this,
+            hasGroup = (arguments.length === 3),
+            group = hasGroup ? arguments[1] : undefined,
+            func = hasGroup ? arguments[2] : arguments[1];
+        function on() {
+            self.off(event, on);
+            func.apply(this, arguments);
+        }
+        this.on(event, group, on);
+        return this;
+    };
+
+    // Unbinds an entire group
+    prototype.releaseGroup = function (groupName) {
+        this.callbacks = this.callbacks || {};
+        var item, i, len, handlers;
+        for (item in this.callbacks) {
+            handlers = this.callbacks[item];
+            for (i = 0, len = handlers.length; i < len; i++) {
+                if (handlers[i]._groupName === groupName) {
+                    //console.log('removing');
+                    // remove it and shorten the array we're looping through
+                    handlers.splice(i, 1);
+                    i--;
+                    len--;
+                }
+            }
+        }
+        return this;
+    };
+
+    // Remove the given callback for `event` or all
+    // registered callbacks.
+    prototype.off = function (event, fn) {
+        this.callbacks = this.callbacks || {};
+        var callbacks = this.callbacks[event],
+            i;
+
+        if (!callbacks) return this;
+
+        // remove all handlers
+        if (arguments.length === 1) {
+            delete this.callbacks[event];
+            return this;
+        }
+
+        // remove specific handler
+        i = callbacks.indexOf(fn);
+        callbacks.splice(i, 1);
+        if (callbacks.length === 0) {
+            delete this.callbacks[event];
+        }
+        return this;
+    };
+
+    /// Emit `event` with the given args.
+    // also calls any `*` handlers
+    prototype.emit = function (event) {
+        this.callbacks = this.callbacks || {};
+        var args = [].slice.call(arguments, 1),
+            callbacks = this.callbacks[event],
+            specialCallbacks = this.getWildcardCallbacks(event),
+            i,
+            len,
+            item,
+            listeners;
+
+        if (callbacks) {
+            listeners = callbacks.slice();
+            for (i = 0, len = listeners.length; i < len; ++i) {
+                if (!listeners[i]) {
+                    break;
+                }
+                listeners[i].apply(this, args);
+            }
+        }
+
+        if (specialCallbacks) {
+            len = specialCallbacks.length;
+            listeners = specialCallbacks.slice();
+            for (i = 0, len = listeners.length; i < len; ++i) {
+                if (!listeners[i]) {
+                    break;
+                }
+                listeners[i].apply(this, [event].concat(args));
+            }
+        }
+
+        return this;
+    };
+
+    // Helper for for finding special wildcard event handlers that match the event
+    prototype.getWildcardCallbacks = function (eventName) {
+        this.callbacks = this.callbacks || {};
+        var item,
+            split,
+            result = [];
+
+        for (item in this.callbacks) {
+            split = item.split('*');
+            if (item === '*' || (split.length === 2 && eventName.slice(0, split[0].length) === split[0])) {
+                result = result.concat(this.callbacks[item]);
+            }
+        }
+        return result;
+    };
+
+};
+
+WildEmitter.mixin(WildEmitter);
 
 },{}]},{},[2])(2)
 });

From 7c2f2d5592711d18c68ef0cd3b997dbbbcbe18f0 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Thu, 10 Jan 2019 16:48:53 -0600
Subject: [PATCH 055/163] Moved apply-config.sh to before restart

---
 bigbluebutton-config/bin/bbb-conf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 641f4b4ca7..e31d013a87 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -357,6 +357,15 @@ stop_bigbluebutton () {
 }
 
 start_bigbluebutton () {
+        #
+        # Apply any local configuration options (if exists)
+        #
+        if [ -x /etc/bigbluebutton/bbb-conf/apply-config.sh ]; then
+                echo -n "Applying /etc/bigbluebutton/bbb-conf/apply-config.sh : "
+                /etc/bigbluebutton/bbb-conf/apply-config.sh
+                echo
+        fi
+
     echo "Starting BigBlueButton"
     if command -v systemctl >/dev/null; then
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
@@ -1947,15 +1956,6 @@ if [ -n "$HOST" ]; then
                sed -i "s/<image width=\"\([0-9]*\)\" height=\"\([0-9]*\)\" alt=\"\([^\"]*\)\">\(http[s]*\):\/\/[^\/]*\/\(.*\)/<image width=\"\1\" height=\"\2\" alt=\"\3\">\4:\/\/$HOST\/\5/g" \
                 '{}' \;
 
-        #
-        # Apply any local configuration options (if exists)
-	#
-        if [ -x /etc/bigbluebutton/bbb-conf/apply-config.sh ]; then
-                echo -n "Applying local configuration options: "
-                /etc/bigbluebutton/bbb-conf/apply-config.sh
-		echo
-        fi
-
 	echo "Restarting the BigBlueButton $BIGBLUEBUTTON_RELEASE ..."
 	stop_bigbluebutton
 	echo

From 87b4306e7fa7ec6b36d6ca8143a41ca7d227d658 Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Thu, 10 Jan 2019 21:22:14 -0200
Subject: [PATCH 056/163] Add tryGenerateIceCandidates to verify and ask media
 permission if necessary

---
 .../imports/utils/safari-webrtc.js            | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/utils/safari-webrtc.js b/bigbluebutton-html5/imports/utils/safari-webrtc.js
index 652e4b840e..685be90f71 100644
--- a/bigbluebutton-html5/imports/utils/safari-webrtc.js
+++ b/bigbluebutton-html5/imports/utils/safari-webrtc.js
@@ -10,19 +10,37 @@ export function canGenerateIceCandidates() {
 			if(countIceCandidates) return;
 			if (e.candidate) {
 				countIceCandidates++;
-				resolve(true);
+				resolve();
 			}
 		}
-
+		
 		pc.onicegatheringstatechange  = function(e) {
-			if(e.currentTarget.iceGatheringState == 'complete' && countIceCandidates == 0) reject(true);
+			if(e.currentTarget.iceGatheringState == 'complete' && countIceCandidates == 0) reject();
 		}
 		
 		setTimeout(function(){ 
-			if(!countIceCandidates) reject(true);
+			if(!countIceCandidates) reject();
 		}, 3000);
 
 		p = pc.createOffer({offerToReceiveVideo: true});
 		p.then( answer => {pc.setLocalDescription(answer) ; } )
 	});
 };
+
+export function tryGenerateIceCandidates() {
+	return new Promise((resolve, reject) => {
+		canGenerateIceCandidates().then(ok => {
+			resolve();
+		}).catch(e => {
+			navigator.mediaDevices.getUserMedia({audio: true, video: false}).then(function (stream) {
+				canGenerateIceCandidates().then(ok => {
+					resolve();
+				}).catch(e => {
+					reject();
+				});
+			}).catch(e => {
+				reject();
+			});
+		});
+	});
+};
\ No newline at end of file

From fdf50b3ab7dcfb0cba095521004812919db441c4 Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Thu, 10 Jan 2019 21:24:25 -0200
Subject: [PATCH 057/163] Validade if Safari can send ICE Candidates before
 open RTC to receive video

---
 .../components/video-provider/component.jsx   | 19 +++++++++++--
 .../ui/services/audio-manager/index.js        | 28 ++-----------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index c33607a68a..cb2eb2723e 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -6,6 +6,8 @@ import { fetchWebRTCMappedStunTurnServers } from '/imports/utils/fetchStunTurnSe
 import ReconnectingWebSocket from 'reconnecting-websocket';
 import logger from '/imports/startup/client/logger';
 import { Session } from 'meteor/session';
+import browser from 'browser-detect';
+import { tryGenerateIceCandidates } from '../../../utils/safari-webrtc';
 
 import VideoService from './service';
 import VideoList from './video-list/component';
@@ -193,7 +195,7 @@ class VideoProvider extends Component {
     this.ws.close();
   }
 
-  onWsMessage(msg) {
+  async onWsMessage(msg) {
     const parsedMessage = JSON.parse(msg.data);
 
     this.logger('debug', `Received new message '${parsedMessage.id}'`, { topic: 'ws', message: parsedMessage });
@@ -204,8 +206,19 @@ class VideoProvider extends Component {
         break;
 
       case 'playStart':
-        this.handlePlayStart(parsedMessage);
-        break;
+      // Webkit ICE restrictions demand a capture device permission to release
+      // host candidates
+      if (browser().name === 'safari') {
+        try {
+          await tryGenerateIceCandidates();
+        } catch(e) {
+          //TODO Warn user about connection problemns
+          console.error('Not possible to generate ICE Candidates');
+        };
+      }
+      
+      this.handlePlayStart(parsedMessage);
+      break;
 
       case 'playStop':
         this.handlePlayStop(parsedMessage);
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 590547dfac..30f94ca9dd 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -9,7 +9,7 @@ import logger from '/imports/startup/client/logger';
 import { notify } from '/imports/ui/services/notification';
 import browser from 'browser-detect';
 import iosWebviewAudioPolyfills from '../../../utils/ios-webview-audio-polyfills';
-import { canGenerateIceCandidates } from '../../../utils/safari-webrtc';
+import { tryGenerateIceCandidates } from '../../../utils/safari-webrtc';
 
 const MEDIA = Meteor.settings.public.media;
 const MEDIA_TAG = MEDIA.mediaTag;
@@ -139,7 +139,6 @@ class AudioManager {
   }
 
   async joinListenOnly(retries = 0) {
-    console.warn('joinListenOnly');
     this.isListenOnly = true;
     this.isEchoTest = false;
     const { name } = browser();
@@ -156,32 +155,9 @@ class AudioManager {
     // Webkit ICE restrictions demand a capture device permission to release
     // host candidates
     if (name === 'safari') {
-      console.warn('safari');
-      let hasIceCandidates = false;
-
-      console.warn('-----------------TESTANDO');
-
-      await canGenerateIceCandidates().then(a => {
-        //All right
-        console.warn('-----------------entrou');
-        hasIceCandidates = true;
-      }).catch(e => {
-        console.warn('-----------------catch');
-        hasIceCandidates = false;
-      });
-
-      if(!hasIceCandidates) {
-        console.warn('-----------------askDevicesPermissions');
-        await this.askDevicesPermissions();
-      } else {
-        console.warn('-----------------NOT askDevicesPermissions');
-      }
-
+      await tryGenerateIceCandidates();
     }
 
-    console.warn('----------------continuou');
-    
-
     // Call polyfills for webrtc client if navigator is "iOS Webview"
     const userAgent = window.navigator.userAgent.toLocaleLowerCase();
     if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1)

From 954f7862d6798af327d6c44d087a290e341cce46 Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Thu, 10 Jan 2019 21:25:39 -0200
Subject: [PATCH 058/163] Fix video receive on Safari (and ios webview) without
 media grant

---
 .../client/compatibility/kurento-utils.js     | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index 7bdb5f471b..78189e499c 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -193,6 +193,15 @@ function WebRtcPeer(mode, options, callback) {
     });
     if (!pc) {
         pc = new RTCPeerConnection(configuration);
+
+        //Add Transceiver for Webview on IOS
+        const userAgent = window.navigator.userAgent.toLocaleLowerCase();
+        if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1) && userAgent.indexOf('safari') == -1) {
+            try {
+                pc.addTransceiver('video');
+            } catch(e) {}
+        }
+        
         if (useDataChannels && !dataChannel) {
             var dcId = 'WebRtcPeer-' + self.id;
             var dcOptions = undefined;
@@ -258,6 +267,19 @@ function WebRtcPeer(mode, options, callback) {
     };
     this.generateOffer = function (callback) {
         callback = callback.bind(this);
+
+        pc.onicegatheringstatechange = function (event) {
+            if(event.target.iceGatheringState == "complete") {
+                var localDescription = pc.localDescription;
+                // logger.debug('Local description set', localDescription.sdp);
+                if (multistream && usePlanB) {
+                    localDescription = interop.toUnifiedPlan(localDescription);
+                    logger.debug('offer::origPlanB->UnifiedPlan', dumpSDP(localDescription));
+                }
+                callback(null, localDescription.sdp, self.processAnswer.bind(self));
+            }
+        }
+
         var offerAudio = true;
         var offerVideo = true;
         if (mediaConstraints) {
@@ -274,15 +296,7 @@ function WebRtcPeer(mode, options, callback) {
             // logger.debug('Created SDP offer');
             offer = mangleSdpToAddSimulcast(offer);
             return pc.setLocalDescription(offer);
-        }).then(function () {
-            var localDescription = pc.localDescription;
-            // logger.debug('Local description set', localDescription.sdp);
-            if (multistream && usePlanB) {
-                localDescription = interop.toUnifiedPlan(localDescription);
-                logger.debug('offer::origPlanB->UnifiedPlan', dumpSDP(localDescription));
-            }
-            callback(null, localDescription.sdp, self.processAnswer.bind(self));
-        }).catch(callback);
+        });
     };
     this.getLocalSessionDescriptor = function () {
         return pc.localDescription;

From 3a2b8f969ffe120b15d6dd6bb3e5dcd0714cbab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Francisco=20Siebel?= <jfsiebel@gmail.com>
Date: Fri, 11 Jan 2019 10:56:54 -0200
Subject: [PATCH 059/163] fix lock don't updating user list. close #6524

---
 .../user-list-content/user-participants/component.jsx         | 4 +---
 .../user-participants/user-list-item/component.jsx            | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
index 193691654b..6e79c92d51 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
@@ -129,8 +129,6 @@ class UserParticipants extends Component {
 
     let index = -1;
 
-    const { meetingId } = meeting;
-
     return users.map(u => (
       <CSSTransition
         classNames={listTransition}
@@ -148,7 +146,7 @@ class UserParticipants extends Component {
               currentUser,
               compact,
               isBreakoutRoom,
-              meetingId,
+              meeting,
               getAvailableActions,
               normalizeEmojiName,
               isMeetingLocked,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
index 1bafe9249b..7566c932d5 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
@@ -41,13 +41,15 @@ class UserListItem extends PureComponent {
       intl,
       isBreakoutRoom,
       isMeetingLocked,
-      meetingId,
+      meeting,
       normalizeEmojiName,
       removeUser,
       setEmojiStatus,
       toggleVoice,
     } = this.props;
 
+    const { meetingId } = meeting;
+
     const contents = (<UserDropdown
       {...{
         assignPresenter,

From 8629fb48e490d4e6fb269e6f900f59b7bc0846d6 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Fri, 11 Jan 2019 10:48:31 -0500
Subject: [PATCH 060/163] Reduce the width of shared notes default width

.. to match the default width of chat module. Closes #6529
---
 .../imports/ui/components/panel-manager/component.jsx       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
index 02ee43e057..aa27506968 100644
--- a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
@@ -41,8 +41,8 @@ const USERLIST_MAX_WIDTH_PX = 240;
 const CHAT_MIN_WIDTH = 150;
 const CHAT_MAX_WIDTH = 350;
 
-// I like big notes and I can not lie
-const NOTE_MIN_WIDTH = 400;
+// Variables for resizing shared notes.
+const NOTE_MIN_WIDTH = 340;
 const NOTE_MAX_WIDTH = 800;
 
 class PanelManager extends Component {
@@ -59,7 +59,7 @@ class PanelManager extends Component {
     this.state = {
       chatWidth: 340,
       userlistWidth: 180,
-      noteWidth: 400,
+      noteWidth: 340,
     };
   }
 

From 265e23af4bd7ed1a8f2dcf6df040d473cf04bbe6 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Fri, 11 Jan 2019 11:02:19 -0500
Subject: [PATCH 061/163] Reuse variable when setting default noteWidth

---
 .../imports/ui/components/panel-manager/component.jsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
index aa27506968..874cb03d27 100644
--- a/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/panel-manager/component.jsx
@@ -59,7 +59,7 @@ class PanelManager extends Component {
     this.state = {
       chatWidth: 340,
       userlistWidth: 180,
-      noteWidth: 340,
+      noteWidth: NOTE_MIN_WIDTH,
     };
   }
 

From a821fef9c257847ddee697db6882ca4ebc18fed1 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Thu, 10 Jan 2019 14:58:42 -0800
Subject: [PATCH 062/163] Fixed echo test bug

---
 .../ui/components/modal/simple/component.jsx       | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
old mode 100644
new mode 100755
index fdca951196..8f1da7a80b
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
@@ -24,15 +24,6 @@ const defaultProps = {
 };
 
 class ModalSimple extends Component {
-  constructor(props) {
-    super(props);
-    this.handleDismiss = this.handleDismiss.bind(this);
-  }
-
-  handleDismiss() {
-    this.props.modalHide(this.props.dismiss.callback);
-  }
-
   render() {
     const {
       title,
@@ -40,6 +31,7 @@ class ModalSimple extends Component {
       dismiss,
       className,
       modalisOpen,
+      onRequestClose,
       ...otherProps
     } = this.props;
 
@@ -47,7 +39,7 @@ class ModalSimple extends Component {
       <ModalBase
         isOpen={modalisOpen}
         className={cx(className, styles.modal)}
-        onRequestClose={this.handleDismiss}
+        onRequestClose={onRequestClose}
         contentLabel={title}
         {...otherProps}
       >
@@ -59,7 +51,7 @@ class ModalSimple extends Component {
             icon="close"
             circle
             hideLabel
-            onClick={this.handleDismiss}
+            onClick={onRequestClose}
             aria-describedby="modalDismissDescription"
           />
         </header>

From 620505907047ff31b824f6a1274f5d7dc1ebd104 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Fri, 11 Jan 2019 19:15:31 +0000
Subject: [PATCH 063/163] edit formatted string / use ternary operator / omit
 passing Auth.userId

---
 .../actions-dropdown/component.jsx            | 21 ++++++++-----------
 .../ui/components/actions-bar/container.jsx   |  4 ++--
 bigbluebutton-html5/private/locales/en.json   |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 5f3666b743..8ea2f72627 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -129,17 +129,6 @@ class ActionsDropdown extends Component {
     } = intl;
 
     return _.compact([
-      (!isUserPresenter
-        ? (
-          <DropdownListItem
-            icon="presentation"
-            label={formatMessage(takePresenter)}
-            description={formatMessage(takePresenterDesc)}
-            key={this.takePresenterId}
-            onClick={() => handleTakePresenter()}
-          />
-        )
-        : null),
       (isUserPresenter
         ? (
           <DropdownListItem
@@ -153,7 +142,15 @@ class ActionsDropdown extends Component {
             }}
           />
         )
-        : null),
+        : (
+          <DropdownListItem
+            icon="presentation"
+            label={formatMessage(takePresenter)}
+            description={formatMessage(takePresenterDesc)}
+            key={this.takePresenterId}
+            onClick={() => handleTakePresenter()}
+          />
+        )),
       (isUserPresenter
         ? (
           <DropdownListItem
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index 1eb98197de..b4cd87cf57 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -24,7 +24,7 @@ export default withTracker(() => {
     },
   });
 
-  const takePresenterRole = (userId) => { makeCall('assignPresenter', userId); };
+  const takePresenterRole = () => { makeCall('assignPresenter', Auth.userID); };
 
   return {
     isUserPresenter: Service.isUserPresenter(),
@@ -43,6 +43,6 @@ export default withTracker(() => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
-    handleTakePresenter: () => takePresenterRole(Auth.userID),
+    handleTakePresenter: () => takePresenterRole(),
   };
 })(ActionsBarContainer);
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index cfbb3261d9..93c91b147b 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -250,7 +250,7 @@
     "app.actionsBar.actionsDropdown.createBreakoutRoom": "Create breakout rooms",
     "app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "create breakouts for split the current meeting ",
     "app.actionsBar.actionsDropdown.takePresenter": "Take presenter role",
-    "app.actionsBar.actionsDropdown.takePresenterDesc": "assigns yourself as new presenter",
+    "app.actionsBar.actionsDropdown.takePresenterDesc": "Assign yourself as the new presenter",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "Set Status",
     "app.actionsBar.emojiMenu.awayLabel": "Away",
     "app.actionsBar.emojiMenu.awayDesc": "Change your status to away",

From d90bf00414225763d7c1bfdedfad3054d545434c Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Fri, 11 Jan 2019 21:16:37 +0000
Subject: [PATCH 064/163] when breakout rooms started hide create menu option

---
 .../user-options/component.jsx                | 112 +++++++++---------
 .../user-options/container.jsx                |  79 ++++--------
 2 files changed, 83 insertions(+), 108 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
index 0258ee61a4..ff7d1bffc3 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
@@ -25,6 +25,8 @@ const propTypes = {
   users: PropTypes.arrayOf(Object).isRequired,
   meetingName: PropTypes.string.isRequired,
   createBreakoutRoom: PropTypes.func.isRequired,
+  meetingIsBreakout: PropTypes.bool.isRequired,
+  hasBreakoutRoom: PropTypes.bool.isRequired,
 };
 
 const intlMessages = defineMessages({
@@ -102,59 +104,6 @@ class UserOptions extends PureComponent {
     this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
   }
 
-  componentWillMount() {
-    const {
-      intl,
-      isMeetingMuted,
-      mountModal,
-      toggleStatus,
-      toggleMuteAllUsers,
-      toggleMuteAllUsersExceptPresenter,
-    } = this.props;
-
-    this.menuItems = _.compact([
-      (<DropdownListItem
-        key={this.clearStatusId}
-        icon="clear_status"
-        label={intl.formatMessage(intlMessages.clearAllLabel)}
-        description={intl.formatMessage(intlMessages.clearAllDesc)}
-        onClick={toggleStatus}
-      />),
-      (<DropdownListItem
-        key={this.muteAllId}
-        icon="mute"
-        label={intl.formatMessage(intlMessages.muteAllLabel)}
-        description={intl.formatMessage(intlMessages.muteAllDesc)}
-        onClick={toggleMuteAllUsers}
-      />),
-      (<DropdownListItem
-        key={this.muteId}
-        icon="mute"
-        label={intl.formatMessage(intlMessages.muteAllExceptPresenterLabel)}
-        description={intl.formatMessage(intlMessages.muteAllExceptPresenterDesc)}
-        onClick={toggleMuteAllUsersExceptPresenter}
-      />),
-      (<DropdownListItem
-        key={this.lockId}
-        icon="lock"
-        label={intl.formatMessage(intlMessages.lockViewersLabel)}
-        description={intl.formatMessage(intlMessages.lockViewersDesc)}
-        onClick={() => mountModal(<LockViewersContainer />)}
-      />),
-      (<DropdownListItem
-        key={this.createBreakoutId}
-        icon="rooms"
-        label={intl.formatMessage(intlMessages.createBreakoutRoom)}
-        description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
-        onClick={() => this.handleCreateBreakoutRoomClick()}
-      />),
-    ]);
-
-    if (isMeetingMuted) {
-      this.alterMenu();
-    }
-  }
-
   componentDidUpdate(prevProps) {
     const { isMeetingMuted } = this.props;
     if (prevProps.isMeetingMuted !== isMeetingMuted) {
@@ -230,8 +179,63 @@ class UserOptions extends PureComponent {
   }
 
   render() {
-    const { intl } = this.props;
     const { isUserOptionsOpen } = this.state;
+    const {
+      intl,
+      isMeetingMuted,
+      mountModal,
+      toggleStatus,
+      toggleMuteAllUsers,
+      toggleMuteAllUsersExceptPresenter,
+      meetingIsBreakout,
+      hasBreakoutRoom,
+    } = this.props;
+
+    this.menuItems = _.compact([
+      (<DropdownListItem
+        key={this.clearStatusId}
+        icon="clear_status"
+        label={intl.formatMessage(intlMessages.clearAllLabel)}
+        description={intl.formatMessage(intlMessages.clearAllDesc)}
+        onClick={toggleStatus}
+      />),
+      (<DropdownListItem
+        key={this.muteAllId}
+        icon="mute"
+        label={intl.formatMessage(intlMessages.muteAllLabel)}
+        description={intl.formatMessage(intlMessages.muteAllDesc)}
+        onClick={toggleMuteAllUsers}
+      />),
+      (<DropdownListItem
+        key={this.muteId}
+        icon="mute"
+        label={intl.formatMessage(intlMessages.muteAllExceptPresenterLabel)}
+        description={intl.formatMessage(intlMessages.muteAllExceptPresenterDesc)}
+        onClick={toggleMuteAllUsersExceptPresenter}
+      />),
+      (<DropdownListItem
+        key={this.lockId}
+        icon="lock"
+        label={intl.formatMessage(intlMessages.lockViewersLabel)}
+        description={intl.formatMessage(intlMessages.lockViewersDesc)}
+        onClick={() => mountModal(<LockViewersContainer />)}
+      />),
+      (!meetingIsBreakout && !hasBreakoutRoom
+        ? (
+          <DropdownListItem
+            key={this.createBreakoutId}
+            icon="rooms"
+            label={intl.formatMessage(intlMessages.createBreakoutRoom)}
+            description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
+            onClick={() => this.handleCreateBreakoutRoomClick()}
+          />
+        ) : null
+      ),
+    ]);
+
+    if (isMeetingMuted) {
+      this.alterMenu();
+    }
 
     return (
       <Dropdown
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
index 9dc4b2ee88..3981361e6f 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
@@ -1,10 +1,10 @@
-import React, { PureComponent } from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import React from 'react';
 import PropTypes from 'prop-types';
 import Auth from '/imports/ui/services/auth';
 import Service from '/imports/ui/components/actions-bar/service';
 import UserOptions from './component';
 
-
 const propTypes = {
   users: PropTypes.arrayOf(Object).isRequired,
   muteAllUsers: PropTypes.func.isRequired,
@@ -16,59 +16,30 @@ const propTypes = {
   }).isRequired,
 };
 
-export default class UserOptionsContainer extends PureComponent {
-  constructor(props) {
-    super(props);
+const UserOptionsContainer = props => <UserOptions {...props} />;
 
-    const { meeting } = this.props;
+export default withTracker((props) => {
+  const {
+    meeting,
+    users,
+    setEmojiStatus,
+    muteAllExceptPresenter,
+    muteAllUsers,
+  } = props;
 
-    this.state = {
-      meetingMuted: meeting.voiceProp.muteOnStart,
-    };
-
-    this.muteMeeting = this.muteMeeting.bind(this);
-    this.muteAllUsersExceptPresenter = this.muteAllUsersExceptPresenter.bind(this);
-    this.handleClearStatus = this.handleClearStatus.bind(this);
-  }
-
-  muteMeeting() {
-    const { muteAllUsers } = this.props;
-    muteAllUsers(Auth.userID);
-  }
-
-  muteAllUsersExceptPresenter() {
-    const { muteAllExceptPresenter } = this.props;
-    muteAllExceptPresenter(Auth.userID);
-  }
-
-  handleClearStatus() {
-    const { users, setEmojiStatus } = this.props;
-
-    users.forEach((id) => {
-      setEmojiStatus(id, 'none');
-    });
-  }
-
-  render() {
-    const { currentUser } = this.props;
-    const currentUserIsModerator = currentUser.isModerator;
-
-    const { meetingMuted } = this.state;
-
-    return (
-      currentUserIsModerator
-        ? (
-          <UserOptions
-            toggleMuteAllUsers={this.muteMeeting}
-            toggleMuteAllUsersExceptPresenter={this.muteAllUsersExceptPresenter}
-            toggleStatus={this.handleClearStatus}
-            isMeetingMuted={meetingMuted}
-            createBreakoutRoom={Service.createBreakoutRoom}
-            meetingName={Service.meetingName()}
-            users={Service.users()}
-          />) : null
-    );
-  }
-}
+  return {
+    toggleMuteAllUsers: () => muteAllUsers(Auth.userID),
+    toggleMuteAllUsersExceptPresenter: () => muteAllExceptPresenter(Auth.userID),
+    toggleStatus: () => users.forEach(id => setEmojiStatus(id, 'none')),
+    isMeetingMuted: meeting.voiceProp.muteOnStart,
+    isUserPresenter: Service.isUserPresenter(),
+    isUserModerator: Service.isUserModerator(),
+    createBreakoutRoom: Service.createBreakoutRoom,
+    meetingIsBreakout: Service.meetingIsBreakout(),
+    hasBreakoutRoom: Service.hasBreakoutRoom(),
+    meetingName: Service.meetingName(),
+    users: Service.users(),
+  };
+})(UserOptionsContainer);
 
 UserOptionsContainer.propTypes = propTypes;

From afb812b531cf0b2fbd56b21dff83db4bdc4da97d Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Sat, 12 Jan 2019 00:20:04 +0000
Subject: [PATCH 065/163] WIP end meeting menu

---
 .../logout-confirmation/component.jsx         |  91 ---------------
 .../logout-confirmation/container.jsx         |  27 -----
 .../components/logout-confirmation/service.js |  20 ----
 .../logout-confirmation/styles.scss           |   8 --
 .../ui/components/meeting-ended/component.jsx |   4 -
 .../nav-bar/settings-dropdown/component.jsx   | 107 +++++++++++-------
 .../nav-bar/settings-dropdown/container.jsx   |   3 +-
 .../nav-bar/settings-dropdown/service.js      |  16 ++-
 .../ui/components/recording/component.jsx     |  13 ++-
 bigbluebutton-html5/private/locales/en.json   |  13 +--
 10 files changed, 98 insertions(+), 204 deletions(-)
 delete mode 100755 bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx
 delete mode 100755 bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx
 delete mode 100644 bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js
 delete mode 100644 bigbluebutton-html5/imports/ui/components/logout-confirmation/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx
deleted file mode 100755
index e6d34c39f8..0000000000
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
-import Button from '/imports/ui/components/button/component';
-import Modal from '/imports/ui/components/modal/fullscreen/component';
-import { styles } from './styles';
-
-const propTypes = {
-  handleEndMeeting: PropTypes.func.isRequired,
-  confirmLeaving: PropTypes.func.isRequired,
-  intl: PropTypes.shape({
-    formatMessage: PropTypes.func.isRequired,
-  }).isRequired,
-  showEndMeeting: PropTypes.bool.isRequired,
-};
-
-const intlMessages = defineMessages({
-  title: {
-    id: 'app.leaveConfirmation.title',
-    description: 'Leave session modal title',
-  },
-  message: {
-    id: 'app.leaveConfirmation.message',
-    description: 'message for leaving session',
-  },
-  confirmLabel: {
-    id: 'app.leaveConfirmation.confirmLabel',
-    description: 'Confirmation button label',
-  },
-  confirmDesc: {
-    id: 'app.leaveConfirmation.confirmDesc',
-    description: 'adds context to confim option',
-  },
-  dismissLabel: {
-    id: 'app.leaveConfirmation.dismissLabel',
-    description: 'Dismiss button label',
-  },
-  dismissDesc: {
-    id: 'app.leaveConfirmation.dismissDesc',
-    description: 'adds context to dismiss option',
-  },
-  endMeetingLabel: {
-    id: 'app.leaveConfirmation.endMeetingLabel',
-    description: 'End meeting button label',
-  },
-  endMeetingAriaLabel: {
-    id: 'app.leaveConfirmation.endMeetingAriaLabel',
-    description: 'End meeting button aria label',
-  },
-  endMeetingDesc: {
-    id: 'app.leaveConfirmation.endMeetingDesc',
-    description: 'adds context to end meeting option',
-  },
-});
-
-
-const LeaveConfirmation = ({
-  intl,
-  handleEndMeeting,
-  showEndMeeting,
-  confirmLeaving,
-}) => (
-  <Modal
-    title={intl.formatMessage(intlMessages.title)}
-    confirm={{
-      callback: confirmLeaving,
-      label: intl.formatMessage(intlMessages.confirmLabel),
-      description: intl.formatMessage(intlMessages.confirmDesc),
-    }}
-    dismiss={{
-      callback: () => null,
-      label: intl.formatMessage(intlMessages.dismissLabel),
-      description: intl.formatMessage(intlMessages.dismissDesc),
-    }}
-  >
-    {intl.formatMessage(intlMessages.message)}
-    {showEndMeeting ?
-      <Button
-        className={styles.endMeeting}
-        label={intl.formatMessage(intlMessages.endMeetingLabel)}
-        onClick={handleEndMeeting}
-        aria-describedby="modalEndMeetingDesc"
-      /> : null
-    }
-    <div id="modalEndMeetingDesc" hidden>{intl.formatMessage(intlMessages.endMeetingDesc)}</div>
-  </Modal>
-);
-
-LeaveConfirmation.propTypes = propTypes;
-
-export default injectIntl(LeaveConfirmation);
diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx b/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx
deleted file mode 100755
index 0e215ec5e8..0000000000
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/container.jsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import { meetingIsBreakout } from '/imports/ui/components/app/service';
-import { withTracker } from 'meteor/react-meteor-data';
-import { Session } from 'meteor/session';
-
-import LogoutConfirmation from './component';
-import {
-  isModerator,
-  endMeeting,
-} from './service';
-
-const LogoutConfirmationContainer = props => (
-  <LogoutConfirmation {...props} />
-);
-
-export default withTracker(() => {
-  const confirmLeaving = () => {
-    Session.set('isMeetingEnded', true);
-    Session.set('codeError', '430');
-  };
-
-  return {
-    showEndMeeting: !meetingIsBreakout() && isModerator(),
-    handleEndMeeting: endMeeting,
-    confirmLeaving,
-  };
-})(LogoutConfirmationContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js b/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js
deleted file mode 100644
index 972a8ca9c0..0000000000
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/service.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { makeCall } from '/imports/ui/services/api/index';
-import Users from '/imports/api/users';
-import mapUser from '/imports/ui/services/user/mapUser';
-import Auth from '/imports/ui/services/auth';
-
-const endMeeting = () => {
-  makeCall('endMeeting', Auth.credentials);
-};
-
-const isModerator = () => {
-  const currentUserId = Auth.userID;
-  const currentUser = Users.findOne({ userId: currentUserId });
-
-  return (currentUser) ? mapUser(currentUser).isModerator : null;
-};
-
-export {
-  endMeeting,
-  isModerator,
-};
diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/styles.scss b/bigbluebutton-html5/imports/ui/components/logout-confirmation/styles.scss
deleted file mode 100644
index 2e94a07520..0000000000
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/styles.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-%btn {
-  flex: 0 1 48%;
-}
-
-.endMeeting {
-  @extend %btn;
-  margin-left: 5rem;
-}
diff --git a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
index f16754c6ee..a8d07b4d80 100755
--- a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
@@ -47,10 +47,6 @@ const intlMessage = defineMessages({
     id: 'app.feedback.textarea',
     description: 'placeholder for textarea',
   },
-  confirmLabel: {
-    id: 'app.leaveConfirmation.confirmLabel',
-    description: 'Confirmation button label',
-  },
   confirmDesc: {
     id: 'app.leaveConfirmation.confirmDesc',
     description: 'adds context to confim option',
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index bc3a659924..1d5f258316 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import _ from 'lodash';
 import { withModalMounter } from '/imports/ui/components/modal/service';
-import LogoutConfirmationContainer from '/imports/ui/components/logout-confirmation/container';
+import EndMeetingConfirmationContainer from '/imports/ui/components/end-meeting-confirmation/container';
 import AboutContainer from '/imports/ui/components/about/container';
 import SettingsMenuContainer from '/imports/ui/components/settings/container';
 import Button from '/imports/ui/components/button/component';
@@ -14,6 +14,7 @@ import DropdownListItem from '/imports/ui/components/dropdown/list/item/componen
 import DropdownListSeparator from '/imports/ui/components/dropdown/list/separator/component';
 import ShortcutHelpComponent from '/imports/ui/components/shortcut-help/component';
 import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
+import logoutRouteHandler from '/imports/utils/logoutRouteHandler';
 
 import { styles } from '../styles';
 
@@ -78,6 +79,14 @@ const intlMessages = defineMessages({
     id: 'app.navBar.settingsDropdown.helpDesc',
     description: 'Describes help option',
   },
+  endMeetingLabel: {
+    id: 'app.navBar.settingsDropdown.endMeetingLabel',
+    description: 'End meeting options label',
+  },
+  endMeetingDesc: {
+    id: 'app.navBar.settingsDropdown.endMeetingDesc',
+    description: 'Describes settings option closing the current meeting',
+  },
 });
 
 class SettingsDropdown extends PureComponent {
@@ -93,7 +102,9 @@ class SettingsDropdown extends PureComponent {
   }
 
   componentWillMount() {
-    const { intl, mountModal, isAndroid } = this.props;
+    const {
+      intl, mountModal, isAndroid, handleToggleFullscreen, isModerator,
+    } = this.props;
     const { fullscreenLabel, fullscreenDesc, fullscreenIcon } = this.checkFullscreen(this.props);
     const { showHelpButton: helpButton } = Meteor.settings.public.app;
 
@@ -102,45 +113,55 @@ class SettingsDropdown extends PureComponent {
       icon={fullscreenIcon}
       label={fullscreenLabel}
       description={fullscreenDesc}
-      onClick={this.props.handleToggleFullscreen}
+      onClick={handleToggleFullscreen}
     />),
-      (<DropdownListItem
+    (<DropdownListItem
+      key={_.uniqueId('list-item-')}
+      icon="settings"
+      label={intl.formatMessage(intlMessages.settingsLabel)}
+      description={intl.formatMessage(intlMessages.settingsDesc)}
+      onClick={() => mountModal(<SettingsMenuContainer />)}
+    />),
+    (<DropdownListItem
+      key={_.uniqueId('list-item-')}
+      icon="about"
+      label={intl.formatMessage(intlMessages.aboutLabel)}
+      description={intl.formatMessage(intlMessages.aboutDesc)}
+      onClick={() => mountModal(<AboutContainer />)}
+    />),
+    !helpButton ? null
+      : (
+        <DropdownListItem
+          key={_.uniqueId('list-item-')}
+          icon="help"
+          label={intl.formatMessage(intlMessages.helpLabel)}
+          description={intl.formatMessage(intlMessages.helpDesc)}
+          onClick={() => window.open('https://bigbluebutton.org/videos/')}
+        />
+      ),
+    (<DropdownListItem
+      key={_.uniqueId('list-item-')}
+      icon="shortcuts"
+      label={intl.formatMessage(intlMessages.hotkeysLabel)}
+      description={intl.formatMessage(intlMessages.hotkeysDesc)}
+      onClick={() => mountModal(<ShortcutHelpComponent />)}
+    />),
+    (<DropdownListSeparator key={_.uniqueId('list-separator-')} />),
+    !isModerator ? null
+      : (<DropdownListItem
         key={_.uniqueId('list-item-')}
-        icon="settings"
-        label={intl.formatMessage(intlMessages.settingsLabel)}
-        description={intl.formatMessage(intlMessages.settingsDesc)}
-        onClick={() => mountModal(<SettingsMenuContainer />)}
-      />),
-      (<DropdownListItem
-        key={_.uniqueId('list-item-')}
-        icon="about"
-        label={intl.formatMessage(intlMessages.aboutLabel)}
-        description={intl.formatMessage(intlMessages.aboutDesc)}
-        onClick={() => mountModal(<AboutContainer />)}
-      />),
-      !helpButton ? null :
-      (<DropdownListItem
-        key={_.uniqueId('list-item-')}
-        icon="help"
-        label={intl.formatMessage(intlMessages.helpLabel)}
-        description={intl.formatMessage(intlMessages.helpDesc)}
-        onClick={() => window.open('https://bigbluebutton.org/videos/')}
-      />),
-      (<DropdownListItem
-        key={_.uniqueId('list-item-')}
-        icon="shortcuts"
-        label={intl.formatMessage(intlMessages.hotkeysLabel)}
-        description={intl.formatMessage(intlMessages.hotkeysDesc)}
-        onClick={() => mountModal(<ShortcutHelpComponent />)}
-      />),
-      (<DropdownListSeparator key={_.uniqueId('list-separator-')} />),
-      (<DropdownListItem
-        key={_.uniqueId('list-item-')}
-        icon="logout"
-        label={intl.formatMessage(intlMessages.leaveSessionLabel)}
-        description={intl.formatMessage(intlMessages.leaveSessionDesc)}
-        onClick={() => mountModal(<LogoutConfirmationContainer />)}
+        icon="application"
+        label={intl.formatMessage(intlMessages.endMeetingLabel)}
+        description={intl.formatMessage(intlMessages.endMeetingDesc)}
+        onClick={() => mountModal(<EndMeetingConfirmationContainer />)}
       />),
+    (<DropdownListItem
+      key={_.uniqueId('list-item-')}
+      icon="logout"
+      label={intl.formatMessage(intlMessages.leaveSessionLabel)}
+      description={intl.formatMessage(intlMessages.leaveSessionDesc)}
+      onClick={logoutRouteHandler}
+    />),
     ]);
 
     // Removes fullscreen button if not on Android
@@ -150,8 +171,9 @@ class SettingsDropdown extends PureComponent {
   }
 
   componentWillReceiveProps(nextProps) {
+    const { isAndroid } = this.props;
     // Alters fullscreen button's label
-    if (this.props.isAndroid) {
+    if (isAndroid) {
       this.alterMenu(nextProps);
     }
   }
@@ -189,6 +211,7 @@ class SettingsDropdown extends PureComponent {
 
   alterMenu(props) {
     const { fullscreenLabel, fullscreenDesc, fullscreenIcon } = this.checkFullscreen(props);
+    const { handleToggleFullscreen } = this.props;
 
     const newFullScreenButton = (
       <DropdownListItem
@@ -196,7 +219,7 @@ class SettingsDropdown extends PureComponent {
         icon={fullscreenIcon}
         label={fullscreenLabel}
         description={fullscreenDesc}
-        onClick={this.props.handleToggleFullscreen}
+        onClick={handleToggleFullscreen}
       />
     );
     this.menuItems = this.menuItems.slice(1);
@@ -209,10 +232,12 @@ class SettingsDropdown extends PureComponent {
       shortcuts: OPEN_OPTIONS_AK,
     } = this.props;
 
+    const { isSettingOpen } = this.state;
+
     return (
       <Dropdown
         autoFocus
-        isOpen={this.state.isSettingOpen}
+        isOpen={isSettingOpen}
         onShow={this.onActionsShow}
         onHide={this.onActionsHide}
       >
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
index 9036ae76a5..c0203657b9 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import browser from 'browser-detect';
 import SettingsDropdown from './component';
-import { toggleFullScreen } from './service';
+import { toggleFullScreen, isModerator } from './service';
 
 export default class SettingsDropdownContainer extends PureComponent {
   constructor(props) {
@@ -60,6 +60,7 @@ export default class SettingsDropdownContainer extends PureComponent {
         handleToggleFullscreen={handleToggleFullscreen}
         isFullScreen={isFullScreen}
         isAndroid={isAndroid}
+        isModerator={isModerator()}
       />
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
index 66eaee82f6..747763974e 100644
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
@@ -1,4 +1,8 @@
-toggleFullScreen = () => {
+import Users from '/imports/api/users';
+import mapUser from '/imports/ui/services/user/mapUser';
+import Auth from '/imports/ui/services/auth';
+
+const toggleFullScreen = () => {
   const element = document.documentElement;
 
   if (document.fullscreenElement
@@ -26,6 +30,16 @@ toggleFullScreen = () => {
   }
 };
 
+const isModerator = () => {
+  const currentUserId = Auth.userID;
+  const currentUser = Users.findOne({ userId: currentUserId });
+
+  console.error(currentUser)
+  return (currentUser) ? mapUser(currentUser).isModerator : null;
+};
+
+
 export {
+  isModerator,
   toggleFullScreen,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/recording/component.jsx b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
index 34f408f5e8..a025153d93 100755
--- a/bigbluebutton-html5/imports/ui/components/recording/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
@@ -67,13 +67,18 @@ class RecordingComponent extends React.PureComponent {
       >
         <div className={styles.container}>
           <div className={styles.header}>
-            <div className={styles.title}>{intl.formatMessage(!recordingStatus ?
-            intlMessages.startTitle : intlMessages.stopTitle)}
+            <div className={styles.title}>
+              {
+                intl.formatMessage(!recordingStatus
+                  ? intlMessages.startTitle
+                  : intlMessages.stopTitle)
+              }
             </div>
           </div>
           <div className={styles.description}>
-            {`${intl.formatMessage(!recordingStatus ? intlMessages.startDescription :
-            intlMessages.stopDescription)}`}
+            {`${intl.formatMessage(!recordingStatus
+              ? intlMessages.startDescription
+              : intlMessages.stopDescription)}`}
           </div>
           <div className={styles.footer}>
             <Button
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 46ed71f02d..38a1ffdd2e 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -142,21 +142,20 @@
     "app.navBar.settingsDropdown.hotkeysDesc": "Listing of available hotkeys",
     "app.navBar.settingsDropdown.helpLabel": "Help",
     "app.navBar.settingsDropdown.helpDesc": "Links user to video tutorials",
+    "app.navBar.settingsDropdown.endMeetingDesc": "Terminates the current meeting",
+    "app.navBar.settingsDropdown.endMeetingLabel": "End Meeting",
     "app.navBar.userListToggleBtnLabel": "User list toggle",
     "app.navBar.toggleUserList.ariaLabel": "Users and Messages Toggle",
     "app.navBar.toggleUserList.newMessages": "with new message notification",
     "app.navBar.recording": "This session is being recorded",
     "app.navBar.recording.on": "Recording",
     "app.navBar.recording.off": "Not recording",
-    "app.leaveConfirmation.title": "Leave Session",
-    "app.leaveConfirmation.message": "Do you want to leave this meeting?",
     "app.leaveConfirmation.confirmLabel": "Leave",
     "app.leaveConfirmation.confirmDesc": "Logs you out of the meeting",
-    "app.leaveConfirmation.dismissLabel": "Cancel",
-    "app.leaveConfirmation.dismissDesc": "Closes and rejects the leave confirmation",
-    "app.leaveConfirmation.endMeetingLabel": "Yes and close the session",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Leave and end the session",
-    "app.leaveConfirmation.endMeetingDesc": "Closes and end meeting confirmation",
+    "app.endMeeting.title": "End meeting",
+    "app.endMeeting.description": "Are you sure you want to end this session?",
+    "app.endMeeting.yesLabel": "Yes",
+    "app.endMeeting.noLabel": "No",
     "app.about.title": "About",
     "app.about.version": "Client Build:",
     "app.about.copyright": "Copyright:",

From e3ae0397c4a23824bed98246396124ed846b969d Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Mon, 14 Jan 2019 09:15:49 -0200
Subject: [PATCH 066/163] Fix button for mobile on error screen

---
 .../imports/ui/components/error-screen/styles.scss            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss b/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
index 40ca1700f0..a329f8a7c0 100644
--- a/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/error-screen/styles.scss
@@ -48,6 +48,6 @@
 }
 
 .button {
-  width: 11vw;
-  height: 3vh;
+  width: 9rem;
+  height: 2rem;
 }
\ No newline at end of file

From 1767d87f608deb89996fd3e457dd88d5a02671c5 Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Mon, 14 Jan 2019 10:03:19 -0200
Subject: [PATCH 067/163] Copy ice servers from kurento-utils.js and Close
 peerConnection

---
 .../imports/utils/safari-webrtc.js            | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/utils/safari-webrtc.js b/bigbluebutton-html5/imports/utils/safari-webrtc.js
index 685be90f71..4d569dc6df 100644
--- a/bigbluebutton-html5/imports/utils/safari-webrtc.js
+++ b/bigbluebutton-html5/imports/utils/safari-webrtc.js
@@ -1,7 +1,25 @@
+const iceServersList = [
+	{urls:"stun:stun.l.google.com:19302"},
+	{urls:"stun:stun1.l.google.com:19302"},
+	{urls:"stun:stun2.l.google.com:19302"},
+	{urls:"stun:stun3.l.google.com:19302"},
+	{urls:"stun:stun4.l.google.com:19302"},
+	{urls:"stun:stun.ekiga.net"},
+	{urls:"stun:stun.ideasip.com"},
+	{urls:"stun:stun.schlund.de"},
+	{urls:"stun:stun.stunprotocol.org:3478"},
+	{urls:"stun:stun.voiparound.com"},
+	{urls:"stun:stun.voipbuster.com"},
+	{urls:"stun:stun.voipstunt.com"},
+	{urls:"stun:stun.voxgratia.org"},
+	{urls:"stun:stun.services.mozilla.com"}
+	];
+
+
 export function canGenerateIceCandidates() {
     
     return new Promise((resolve, reject) => {
-		pc = new RTCPeerConnection({iceServers: [ {urls:'stun:stun.l.google.com:19302'}  ]});
+		pc = new RTCPeerConnection({iceServers: iceServersList});
 		countIceCandidates = 0;
 
 		try{ pc.addTransceiver('audio'); } catch (e) {}
@@ -18,7 +36,8 @@ export function canGenerateIceCandidates() {
 			if(e.currentTarget.iceGatheringState == 'complete' && countIceCandidates == 0) reject();
 		}
 		
-		setTimeout(function(){ 
+		setTimeout(function(){
+			pc.close();
 			if(!countIceCandidates) reject();
 		}, 3000);
 

From 3ccddd60d54985fade775cdcd36101b23edb5a84 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Mon, 14 Jan 2019 10:23:41 -0200
Subject: [PATCH 068/163] Remove left overs from merge

---
 .../imports/ui/components/actions-bar/component.jsx         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 928913db32..e628c45c5e 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -25,13 +25,10 @@ class ActionsBar extends React.PureComponent {
       hasBreakoutRoom,
       meetingName,
       users,
-<<<<<<< HEAD
       getUsersNotAssigned,
       sendInvitation,
       getBreakouts,
-=======
       handleTakePresenter,
->>>>>>> upstream/master
     } = this.props;
 
     const {
@@ -59,13 +56,10 @@ class ActionsBar extends React.PureComponent {
             hasBreakoutRoom,
             meetingName,
             users,
-<<<<<<< HEAD
             getUsersNotAssigned,
             sendInvitation,
             getBreakouts,
-=======
             handleTakePresenter,
->>>>>>> upstream/master
           }}
           />
         </div>

From a9989e110776da53e40e26df222a3a6c3f1e1ce0 Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Mon, 14 Jan 2019 11:23:35 -0200
Subject: [PATCH 069/163] Fix chat alert (push and audio) #6430

---
 .../server/handlers/validateAuthToken.js      |   1 +
 .../api/users/server/modifiers/addUser.js     |   1 -
 .../chat/alert/audio-alert/component.jsx      |  14 +-
 .../ui/components/chat/alert/component.jsx    | 297 ++++++++----------
 .../ui/components/chat/alert/container.jsx    |  14 +-
 .../chat/alert/push-alert/component.jsx       |  21 +-
 .../imports/ui/components/chat/component.jsx  |   2 +
 .../imports/ui/components/chat/container.jsx  |   2 +-
 .../imports/ui/components/chat/service.js     |  88 +++---
 .../user-list/chat-list-item/component.jsx    |  14 +-
 .../ui/components/user-list/component.jsx     |  60 ++--
 .../ui/components/user-list/container.jsx     |   4 +-
 .../ui/components/user-list/service.js        |  80 ++---
 .../user-list/user-list-content/component.jsx |   6 +-
 .../user-messages/component.jsx               |  55 ++--
 .../user-dropdown/component.jsx               |   2 +-
 .../imports/ui/services/user/mapUser.js       |   2 +-
 17 files changed, 324 insertions(+), 339 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
index 9fdd768003..1150da0792 100644
--- a/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
+++ b/bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
@@ -40,6 +40,7 @@ export default function handleValidateAuthToken({ body }, meetingId) {
     $set: {
       validated: valid,
       approved: !waitForApproval,
+      loginTime: Date.now(),
     },
   };
 
diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
index 67f3bd1d7c..86882d05ef 100755
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
@@ -78,7 +78,6 @@ export default function addUser(meetingId, user) {
         roles: [ROLE_VIEWER.toLowerCase()],
         sortName: user.name.trim().toLowerCase(),
         color,
-        logTime: Date.now(),
       },
       flat(user),
     ),
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
index fad03755af..1cf0f5c948 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/audio-alert/component.jsx
@@ -1,41 +1,33 @@
 import React from 'react';
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 
 const propTypes = {
   play: PropTypes.bool.isRequired,
-  count: PropTypes.number.isRequired,
 };
 
 class ChatAudioAlert extends React.Component {
   constructor(props) {
     super(props);
     this.audio = new Audio(`${Meteor.settings.public.app.basename}/resources/sounds/notify.mp3`);
-
     this.handleAudioLoaded = this.handleAudioLoaded.bind(this);
     this.playAudio = this.playAudio.bind(this);
-    this.componentDidUpdate = _.debounce(this.playAudio, 2000);
   }
 
   componentDidMount() {
     this.audio.addEventListener('loadedmetadata', this.handleAudioLoaded);
   }
 
-  shouldComponentUpdate(nextProps) {
-    return nextProps.count > this.props.count;
-  }
-
   componentWillUnmount() {
     this.audio.removeEventListener('loadedmetadata', this.handleAudioLoaded);
   }
 
   handleAudioLoaded() {
-    this.componentDidUpdate = _.debounce(this.playAudio, this.audio.duration * 1000);
+    this.componentDidUpdate = this.playAudio;
   }
 
   playAudio() {
-    if (!this.props.play) return;
-
+    const { play } = this.props;
+    if (!play) return;
     this.audio.play();
   }
 
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
index 2c9408a392..1ada36c3a4 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
@@ -10,9 +10,10 @@ import Service from '../service';
 import { styles } from '../styles';
 
 const propTypes = {
-  disableNotify: PropTypes.bool.isRequired,
-  openChats: PropTypes.arrayOf(PropTypes.object).isRequired,
-  disableAudio: PropTypes.bool.isRequired,
+  pushAlertDisabled: PropTypes.bool.isRequired,
+  activeChats: PropTypes.arrayOf(PropTypes.object).isRequired,
+  audioAlertDisabled: PropTypes.bool.isRequired,
+  joinTimestamp: PropTypes.number.isRequired,
 };
 
 const intlMessages = defineMessages({
@@ -34,51 +35,103 @@ const intlMessages = defineMessages({
   },
 });
 
-const PUBLIC_KEY = 'public';
-const PRIVATE_KEY = 'private';
+const ALERT_INTERVAL = 5000; // 5 seconds
+const ALERT_DURATION = 4000; // 4 seconds
 
 class ChatAlert extends PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      notified: Service.getNotified(PRIVATE_KEY),
-      publicNotified: Service.getNotified(PUBLIC_KEY),
+      lastAlertTimestamp: props.joinTimestamp,
+      lastAlertTimestampByChat: {},
+      pendingNotificationsByChat: {},
     };
   }
 
-  componentWillReceiveProps(nextProps) {
+  componentDidUpdate(prevProps) {
     const {
-      openChats,
-      disableNotify,
+      pushAlertDisabled,
+      activeChats,
+      joinTimestamp,
     } = this.props;
 
-    if (nextProps.disableNotify === false && disableNotify === true) {
-      const loadMessages = {};
-      openChats
-        .forEach((c) => {
-          loadMessages[c.id] = c.unreadCounter;
-        });
-      this.setState({ notified: loadMessages });
+    const {
+      lastAlertTimestamp,
+      lastAlertTimestampByChat,
+      pendingNotificationsByChat,
+    } = this.state;
+    // Avoid alerting messages received before enabling alerts
+    if (prevProps.pushAlertDisabled && !pushAlertDisabled) {
+      const lastMessageTimestamp = Service.getLastMessageTimestampFromChatList(activeChats);
+      this.setLastAlertTimestamp(lastMessageTimestamp);
       return;
     }
 
-    const notifiedToClear = {};
-    openChats
-      .filter(c => c.unreadCounter === 0)
-      .forEach((c) => {
-        notifiedToClear[c.id] = 0;
+
+    // Keep track of messages that was not alerted yet
+    const unalertedMessagesByChatId = {};
+
+    activeChats
+      .filter(chat => chat.id !== Session.get('idChatOpen'))
+      .filter(chat => chat.unreadCounter > 0)
+      .forEach((chat) => {
+        const chatId = (chat.id === 'public') ? 'MAIN-PUBLIC-GROUP-CHAT' : chat.id;
+        const thisChatUnreadMessages = UnreadMessages.getUnreadMessages(chatId);
+
+        unalertedMessagesByChatId[chatId] = thisChatUnreadMessages.filter((msg) => {
+          const messageChatId = (msg.chatId === 'MAIN-PUBLIC-GROUP-CHAT') ? msg.chatId : msg.sender;
+          const retorno = (msg
+            && msg.timestamp > lastAlertTimestamp
+            && msg.timestamp > joinTimestamp
+            && msg.timestamp > (lastAlertTimestampByChat[messageChatId] || 0)
+          );
+          return retorno;
+        });
+
+        if (!unalertedMessagesByChatId[chatId].length) delete unalertedMessagesByChatId[chatId];
       });
 
-    this.setState(({ notified }) => ({
-      notified: {
-        ...notified,
-        ...notifiedToClear,
-      },
-    }), () => {
-      Service.setNotified(PRIVATE_KEY, this.state.notified);
+    const lastUnalertedMessageTimestampByChat = {};
+    Object.keys(unalertedMessagesByChatId).forEach((chatId) => {
+      lastUnalertedMessageTimestampByChat[chatId] = unalertedMessagesByChatId[chatId]
+        .reduce(Service.maxTimestampReducer, 0);
     });
+
+    // Keep track of chats that need to be alerted now (considering alert interval)
+    const chatsWithPendingAlerts = Object.keys(lastUnalertedMessageTimestampByChat)
+      .filter(chatId => lastUnalertedMessageTimestampByChat[chatId]
+        > ((lastAlertTimestampByChat[chatId] || 0) + ALERT_INTERVAL)
+        && !(chatId in pendingNotificationsByChat));
+
+    if (!chatsWithPendingAlerts.length) return;
+
+    const newPendingNotificationsByChat = Object.assign({},
+      ...chatsWithPendingAlerts.map(chatId => ({ [chatId]: unalertedMessagesByChatId[chatId] })));
+
+    // Mark messages as alerted
+    const newLastAlertTimestampByChat = { ...lastAlertTimestampByChat };
+
+    chatsWithPendingAlerts.forEach(
+      (chatId) => {
+        newLastAlertTimestampByChat[chatId] = lastUnalertedMessageTimestampByChat[chatId];
+      },
+    );
+
+    this.setChatMessagesState(newPendingNotificationsByChat, newLastAlertTimestampByChat);
   }
 
+  setLastAlertTimestamp(newLastAlertTimestamp) {
+    const { lastAlertTimestamp } = this.state;
+    if (newLastAlertTimestamp > 0 && lastAlertTimestamp !== newLastAlertTimestamp) {
+      this.setState({ lastAlertTimestamp: newLastAlertTimestamp });
+    }
+  }
+
+  setChatMessagesState(pendingNotificationsByChat, lastAlertTimestampByChat) {
+    this.setState({ pendingNotificationsByChat, lastAlertTimestampByChat });
+  }
+
+
   mapContentText(message) {
     const {
       intl,
@@ -86,12 +139,13 @@ class ChatAlert extends PureComponent {
     const contentMessage = message
       .map((content) => {
         if (content.text === 'PUBLIC_CHAT_CLEAR') return intl.formatMessage(intlMessages.publicChatClear);
-        /* this code is to remove html tags that come in the server's messangens */
+        /* this code is to remove html tags that come in the server's messages */
         const tempDiv = document.createElement('div');
         tempDiv.innerHTML = content.text;
         const textWithoutTag = tempDiv.innerText;
         return textWithoutTag;
       });
+
     return contentMessage;
   }
 
@@ -102,155 +156,64 @@ class ChatAlert extends PureComponent {
         <div className={styles.contentMessage}>
           {
             this.mapContentText(message)
-            .reduce((acc, text) => [...acc, (<br />), text], []).splice(1)
+              .reduce((acc, text) => [...acc, (<br key={_.uniqueId('br_')} />), text], [])
           }
         </div>
       </div>
     );
   }
 
-  notifyPrivateChat() {
-    const {
-      disableNotify,
-      openChats,
-      intl,
-    } = this.props;
-
-    if (disableNotify) return;
-
-    const hasUnread = ({ unreadCounter }) => unreadCounter > 0;
-    const isNotNotified = ({ id, unreadCounter }) => unreadCounter !== this.state.notified[id];
-    const isPrivate = ({ id }) => id !== PUBLIC_KEY;
-    const thisChatClosed = ({ id }) => !Session.equals('idChatOpen', id);
-
-    const chatsNotify = openChats
-      .filter(hasUnread)
-      .filter(isNotNotified)
-      .filter(isPrivate)
-      .filter(thisChatClosed)
-      .map(({
-        id,
-        name,
-        unreadCounter,
-        ...rest
-      }) => ({
-        ...rest,
-        name,
-        unreadCounter,
-        id,
-        message: intl.formatMessage(intlMessages.appToastChatPrivate),
-      }));
-
-    return (
-      <span>
-        {
-        chatsNotify.map(({ id, message, name }) => {
-          const getChatmessages = UnreadMessages.getUnreadMessages(id)
-          .filter(({ fromTime, fromUserId }) => fromTime > (this.state.notified[fromUserId] || 0));
-
-          const reduceMessages = Service
-            .reduceAndMapGroupMessages(getChatmessages);
-
-          if (!reduceMessages.length) return null;
-
-          const flatMessages = _.flatten(reduceMessages
-            .map(msg => this.createMessage(name, msg.content)));
-          const limitingMessages = flatMessages;
-
-          return (<ChatPushAlert
-            key={_.uniqueId('id-')}
-            chatId={id}
-            content={limitingMessages}
-            message={<span >{message}</span>}
-            onOpen={() => {
-              this.setState(({ notified }) => ({
-                notified: {
-                  ...notified,
-                  [id]: new Date().getTime(),
-                },
-              }), () => {
-                Service.setNotified(PRIVATE_KEY, this.state.notified);
-              });
-            }}
-          />);
-        })
-        }
-      </span>
-    );
-  }
-
-  notifyPublicChat() {
-    const {
-      publicUserId,
-      intl,
-      disableNotify,
-    } = this.props;
-
-    const publicUnread = UnreadMessages.getUnreadMessages(publicUserId);
-    const publicUnreadReduced = Service.reduceAndMapGroupMessages(publicUnread);
-
-    if (disableNotify) return;
-    if (!Service.hasUnreadMessages(publicUserId)) return;
-    if (Session.equals('idChatOpen', PUBLIC_KEY)) return;
-
-    const checkIfBeenNotified = ({ sender, time }) =>
-      time > (this.state.publicNotified[sender.id] || 0);
-
-    const chatsNotify = publicUnreadReduced
-      .map(msg => ({
-        ...msg,
-        sender: {
-          name: msg.sender ? msg.sender.name : intl.formatMessage(intlMessages.appToastChatSystem),
-          ...msg.sender,
-        },
-      }))
-      .filter(checkIfBeenNotified);
-    return (
-      <span>
-        {
-        chatsNotify.map(({ sender, time, content }) =>
-            (<ChatPushAlert
-              key={time}
-              chatId={PUBLIC_KEY}
-              name={sender.name}
-              message={
-                <span >
-                  { intl.formatMessage(intlMessages.appToastChatPublic) }
-                </span>
-              }
-              content={this.createMessage(sender.name, content)}
-              onOpen={() => {
-                this.setState(({ notified, publicNotified }) => ({
-                  ...notified,
-                  publicNotified: {
-                    ...publicNotified,
-                    [sender.id]: time,
-                  },
-                }), () => {
-                  Service.setNotified(PUBLIC_KEY, this.state.publicNotified);
-                });
-              }}
-            />))
-        }
-      </span>
-    );
-  }
-
   render() {
     const {
-      openChats,
-      disableAudio,
+      audioAlertDisabled,
+      pushAlertDisabled,
+      intl,
     } = this.props;
-    const unreadMessagesCount = openChats
-      .map(chat => chat.unreadCounter)
-      .reduce((a, b) => a + b, 0);
-    const shouldPlayAudio = !disableAudio && unreadMessagesCount > 0;
+    const {
+      pendingNotificationsByChat,
+    } = this.state;
+
+    const shouldPlay = Object.keys(pendingNotificationsByChat).length > 0;
 
     return (
       <span>
-        <ChatAudioAlert play={shouldPlayAudio} count={unreadMessagesCount} />
-        { this.notifyPublicChat() }
-        { this.notifyPrivateChat() }
+        {!audioAlertDisabled ? <ChatAudioAlert play={shouldPlay} /> : null}
+        {
+          !pushAlertDisabled
+            ? Object.keys(pendingNotificationsByChat)
+              .map((chatId) => {
+                // Only display the latest group of messages (up to 5 messages)
+                const reducedMessage = Service
+                  .reduceAndMapGroupMessages(pendingNotificationsByChat[chatId].slice(-5)).pop();
+
+                if (!reducedMessage) return null;
+
+                const content = this
+                  .createMessage(reducedMessage.sender.name, reducedMessage.content);
+
+                return (
+                  <ChatPushAlert
+                    key={chatId}
+                    chatId={chatId}
+                    content={content}
+                    title={
+                      (chatId === 'MAIN-PUBLIC-GROUP-CHAT')
+                        ? <span>{intl.formatMessage(intlMessages.appToastChatPublic)}</span>
+                        : <span>{intl.formatMessage(intlMessages.appToastChatPrivate)}</span>
+                    }
+                    onOpen={
+                      () => {
+                        let pendingNotifications = pendingNotificationsByChat;
+                        delete pendingNotifications[chatId];
+                        pendingNotifications = { ...pendingNotifications };
+                        this.setState({ pendingNotificationsByChat: pendingNotifications });
+                      }}
+                    alertDuration={ALERT_DURATION}
+                  />
+                );
+              })
+            : null
+        }
       </span>
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
index bddf44f912..35ba003d35 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/container.jsx
@@ -3,6 +3,9 @@ import { withTracker } from 'meteor/react-meteor-data';
 import UserListService from '/imports/ui/components/user-list/service';
 import Settings from '/imports/ui/services/settings';
 import ChatAlert from './component';
+import ChatService from '/imports/ui/components/chat/service.js';
+import Auth from '/imports/ui/services/auth';
+import Users from '/imports/api/users';
 
 const ChatAlertContainer = props => (
   <ChatAlert {...props} />
@@ -10,12 +13,13 @@ const ChatAlertContainer = props => (
 
 export default withTracker(() => {
   const AppSettings = Settings.application;
-  const openChats = UserListService.getOpenChats();
-
+  const activeChats = UserListService.getActiveChats();
+  const loginTime = Users.findOne({ userId: Auth.userID }).loginTime;
   return {
-    disableAudio: !AppSettings.chatAudioAlerts,
-    disableNotify: !AppSettings.chatPushAlerts,
-    openChats,
+    audioAlertDisabled: !AppSettings.chatAudioAlerts,
+    pushAlertDisabled: !AppSettings.chatPushAlerts,
+    activeChats,
     publicUserId: Meteor.settings.public.chat.public_group_id,
+    joinTimestamp: loginTime,
   };
 })(memo(ChatAlertContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
index 562f7a0db1..96aa4184bd 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/push-alert/component.jsx
@@ -4,37 +4,37 @@ import _ from 'lodash';
 import injectNotify from '/imports/ui/components/toast/inject-notify/component';
 import { Session } from 'meteor/session';
 
-const ALERT_INTERVAL = 2000; // 2 seconds
-const ALERT_LIFETIME = 4000; // 4 seconds
 
 const propTypes = {
   notify: PropTypes.func.isRequired,
   onOpen: PropTypes.func.isRequired,
   chatId: PropTypes.string.isRequired,
-  message: PropTypes.node.isRequired,
+  title: PropTypes.node.isRequired,
   content: PropTypes.node.isRequired,
+  alertDuration: PropTypes.number.isRequired,
 };
 
 class ChatPushAlert extends PureComponent {
-  static link(message, chatId) {
+  static link(title, chatId) {
     return (
       <div
+        key={chatId}
         role="button"
-        aria-label={message}
+        aria-label={title}
         tabIndex={0}
         onClick={() => {
           Session.set('openPanel', 'chat');
           Session.set('idChatOpen', chatId);
         }}
       >
-        { message }
+        {title}
       </div>
     );
   }
 
   constructor(props) {
     super(props);
-    this.showNotify = _.debounce(this.showNotify.bind(this), ALERT_INTERVAL);
+    this.showNotify = this.showNotify.bind(this);
 
     this.componentDidMount = this.showNotify;
     this.componentDidUpdate = this.showNotify;
@@ -45,15 +45,16 @@ class ChatPushAlert extends PureComponent {
       notify,
       onOpen,
       chatId,
-      message,
+      title,
       content,
+      alertDuration,
     } = this.props;
 
     return notify(
-      ChatPushAlert.link(message, chatId),
+      ChatPushAlert.link(title, chatId),
       'info',
       'chat',
-      { onOpen, autoClose: ALERT_LIFETIME },
+      { onOpen, autoClose: alertDuration },
       ChatPushAlert.link(content, chatId),
       true,
     );
diff --git a/bigbluebutton-html5/imports/ui/components/chat/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/component.jsx
index 1554d7f32f..2d01504907 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/component.jsx
@@ -56,6 +56,7 @@ const Chat = (props) => {
         >
           <Button
             onClick={() => {
+              Session.set('idChatOpen', '');
               Session.set('openPanel', 'userlist');
             }}
             aria-label={intl.formatMessage(intlMessages.hideChatLabel, { 0: title })}
@@ -75,6 +76,7 @@ const Chat = (props) => {
                 hideLabel
                 onClick={() => {
                   actions.handleClosePrivateChat(chatID);
+                  Session.set('idChatOpen', '');
                   Session.set('openPanel', 'userlist');
                 }}
                 aria-label={intl.formatMessage(intlMessages.closeChatLabel, { 0: title })}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
index a3406225cb..2adffa0939 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
@@ -59,7 +59,7 @@ export default injectIntl(withTracker(({ intl }) => {
 
     messages = ChatService.getPublicGroupMessages();
 
-    const time = user.logTime;
+    const time = user.loginTime;
     const welcomeId = `welcome-msg-${time}`;
 
     const welcomeMsg = {
diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 70c6c3b152..90b5a7a4cf 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -92,16 +92,13 @@ const reduceGroupMessages = (previous, current) => {
   return previous.concat(currentMessage);
 };
 
-const reduceAndMapGroupMessages = messages =>
-  (messages.reduce(reduceGroupMessages, []).map(mapGroupMessage));
+const reduceAndMapGroupMessages = messages => (messages
+  .reduce(reduceGroupMessages, []).map(mapGroupMessage));
 
 const getPublicGroupMessages = () => {
   const publicGroupMessages = GroupChatMsg.find({
     chatId: PUBLIC_GROUP_CHAT_ID,
-  }, {
-    sort: ['timestamp'],
-  }).fetch();
-
+  }, { sort: ['timestamp'] }).fetch();
   return publicGroupMessages;
 };
 
@@ -123,9 +120,7 @@ const getPrivateGroupMessages = () => {
 
     messages = GroupChatMsg.find({
       chatId,
-    }, {
-      sort: ['timestamp'],
-    }).fetch();
+    }, { sort: ['timestamp'] }).fetch();
   }
 
   return reduceAndMapGroupMessages(messages, []);
@@ -141,8 +136,8 @@ const isChatLocked = (receiverID) => {
     const isPubChatLocked = meeting.lockSettingsProp.disablePubChat;
     const isPrivChatLocked = meeting.lockSettingsProp.disablePrivChat;
 
-    return mapUser(user).isLocked &&
-      ((isPublic && isPubChatLocked) || (!isPublic && isPrivChatLocked));
+    return mapUser(user).isLocked
+      && ((isPublic && isPubChatLocked) || (!isPublic && isPrivChatLocked));
   }
 
   return false;
@@ -206,11 +201,10 @@ const getScrollPosition = (receiverID) => {
   return scroll.position;
 };
 
-const updateScrollPosition =
-  position => ScrollCollection.upsert(
-    { receiver: Session.get('idChatOpen') },
-    { $set: { position } },
-  );
+const updateScrollPosition = position => ScrollCollection.upsert(
+  { receiver: Session.get('idChatOpen') },
+  { $set: { position } },
+);
 
 const updateUnreadMessage = (timestamp) => {
   const chatID = Session.get('idChatOpen') || PUBLIC_CHAT_ID;
@@ -251,16 +245,16 @@ const htmlDecode = (input) => {
 // Export the chat as [Hour:Min] user: message
 const exportChat = (messageList) => {
   const { welcomeProp } = getMeeting();
-  const { logTime } = getUser(Auth.userID);
+  const { loginTime } = getUser(Auth.userID);
   const { welcomeMsg } = welcomeProp;
 
   const clearMessage = messageList.filter(message => message.message === PUBLIC_CHAT_CLEAR);
 
   const hasClearMessage = clearMessage.length;
 
-  if (!hasClearMessage || (hasClearMessage && clearMessage[0].timestamp < logTime)) {
+  if (!hasClearMessage || (hasClearMessage && clearMessage[0].timestamp < loginTime)) {
     messageList.push({
-      timestamp: logTime,
+      timestamp: loginTime,
       message: welcomeMsg,
       type: SYSTEM_CHAT_TYPE,
       sender: PUBLIC_CHAT_USER_ID,
@@ -282,28 +276,38 @@ const exportChat = (messageList) => {
   }).join('\n');
 };
 
-const setNotified = (chatType, item) => {
-  const notified = Storage.getItem('notified');
-  const key = 'notified';
-  const userChat = { [chatType]: item };
-  if (notified) {
-    Storage.setItem(key, {
-      ...notified,
-      ...userChat,
-    });
-    return;
+const getUnreadMessagesFromChatId = chatId => UnreadMessages.getUnreadMessages(chatId);
+
+const getAllMessages = (chatID) => {
+  const filter = {
+    sender: { $ne: Auth.userID },
+  };
+  if (chatID === PUBLIC_GROUP_CHAT_ID) {
+    filter.chatId = { $eq: chatID };
+  } else {
+    const privateChat = GroupChat.findOne({ users: { $all: [chatID, Auth.userID] } });
+
+    filter.chatId = { $ne: PUBLIC_GROUP_CHAT_ID };
+
+    if (privateChat) {
+      filter.chatId = privateChat.chatId;
+    }
   }
-  Storage.setItem(key, {
-    ...userChat,
-  });
+  const messages = GroupChatMsg.find(filter).fetch();
+  return messages;
 };
 
-const getNotified = (chat) => {
-  const key = 'notified';
-  const notified = Storage.getItem(key);
-  if (notified) return notified[chat] || {};
-  return {};
-};
+const getlastMessage = lastMessages => lastMessages.sort((a,
+  b) => a.timestamp - b.timestamp).pop();
+
+const maxTimestampReducer = (max, el) => ((el.timestamp > max) ? el.timestamp : max);
+
+const maxNumberReducer = (max, el) => ((el > max) ? el : max);
+
+const getLastMessageTimestampFromChatList = activeChats => activeChats
+  .map(chat => ((chat.id === 'public') ? 'MAIN-PUBLIC-GROUP-CHAT' : chat.id))
+  .map(chatId => getAllMessages(chatId).reduce(maxTimestampReducer, 0))
+  .reduce(maxNumberReducer, 0);
 
 export default {
   reduceAndMapGroupMessages,
@@ -322,6 +326,10 @@ export default {
   removeFromClosedChatsSession,
   exportChat,
   clearPublicChatHistory,
-  setNotified,
-  getNotified,
+  getlastMessage,
+  getUnreadMessagesFromChatId,
+  getAllMessages,
+  maxTimestampReducer,
+  maxNumberReducer,
+  getLastMessageTimestampFromChatList,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
index 8c7886e493..b2b0d1a39c 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
@@ -30,7 +30,7 @@ const propTypes = {
     name: PropTypes.string.isRequired,
     unreadCounter: PropTypes.number.isRequired,
   }).isRequired,
-  openChat: PropTypes.string,
+  activeChat: PropTypes.string,
   compact: PropTypes.bool.isRequired,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
@@ -41,7 +41,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-  openChat: '',
+  activeChat: '',
   shortcuts: '',
 };
 
@@ -51,13 +51,17 @@ const handleClickToggleChat = (id) => {
     Session.get('openPanel') === 'chat' && Session.get('idChatOpen') === id
       ? 'userlist' : 'chat',
   );
-  Session.set('idChatOpen', id);
+  if (Session.equals('openPanel', 'chat')) {
+    Session.set('idChatOpen', id);
+  } else {
+    Session.set('idChatOpen', '');
+  }
 };
 
 const ChatListItem = (props) => {
   const {
     chat,
-    openChat,
+    activeChat,
     compact,
     intl,
     tabIndex,
@@ -65,7 +69,7 @@ const ChatListItem = (props) => {
     shortcuts: TOGGLE_CHAT_PUB_AK,
   } = props;
 
-  const isCurrentChat = chat.id === openChat;
+  const isCurrentChat = chat.id === activeChat;
   const linkClasses = {};
   linkClasses[styles.active] = isCurrentChat;
 
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
index 8b6c91d395..0050af9c76 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
@@ -7,7 +7,7 @@ import CustomLogo from './custom-logo/component';
 import UserContentContainer from './user-list-content/container';
 
 const propTypes = {
-  openChats: PropTypes.arrayOf(String).isRequired,
+  activeChats: PropTypes.arrayOf(String).isRequired,
   compact: PropTypes.bool,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
@@ -42,7 +42,7 @@ class UserList extends PureComponent {
   render() {
     const {
       intl,
-      openChats,
+      activeChats,
       compact,
       currentUser,
       isBreakoutRoom,
@@ -72,37 +72,37 @@ class UserList extends PureComponent {
       <div className={styles.userList}>
         {
           showBranding
-          && !this.props.compact
-          && CustomLogoUrl
-          ? <CustomLogo CustomLogoUrl={CustomLogoUrl} /> : null
+            && !compact
+            && CustomLogoUrl
+            ? <CustomLogo CustomLogoUrl={CustomLogoUrl} /> : null
         }
         {<UserContentContainer
           {...{
-          intl,
-          openChats,
-          compact,
-          currentUser,
-          isBreakoutRoom,
-          setEmojiStatus,
-          assignPresenter,
-          removeUser,
-          toggleVoice,
-          muteAllUsers,
-          muteAllExceptPresenter,
-          changeRole,
-          getAvailableActions,
-          normalizeEmojiName,
-          isMeetingLocked,
-          isPublicChat,
-          roving,
-          getGroupChatPrivate,
-          handleEmojiChange,
-          getEmojiList,
-          getEmoji,
-          hasBreakoutRoom,
-          getUsersId,
-        }
-      }
+            intl,
+            activeChats,
+            compact,
+            currentUser,
+            isBreakoutRoom,
+            setEmojiStatus,
+            assignPresenter,
+            removeUser,
+            toggleVoice,
+            muteAllUsers,
+            muteAllExceptPresenter,
+            changeRole,
+            getAvailableActions,
+            normalizeEmojiName,
+            isMeetingLocked,
+            isPublicChat,
+            roving,
+            getGroupChatPrivate,
+            handleEmojiChange,
+            getEmojiList,
+            getEmoji,
+            hasBreakoutRoom,
+            getUsersId,
+          }
+          }
         />}
       </div>
     );
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
index 8599e4c68d..c50f2cb6b7 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
@@ -7,7 +7,7 @@ import Service from './service';
 import UserList from './component';
 
 const propTypes = {
-  openChats: PropTypes.arrayOf(String).isRequired,
+  activeChats: PropTypes.arrayOf(String).isRequired,
   currentUser: PropTypes.shape({}).isRequired,
   getUsersId: PropTypes.func.isRequired,
   isBreakoutRoom: PropTypes.bool.isRequired,
@@ -34,7 +34,7 @@ export default withTracker(({ chatID, compact }) => ({
   hasBreakoutRoom: Service.hasBreakoutRoom(),
   getUsersId: Service.getUsersId,
   currentUser: Service.getCurrentUser(),
-  openChats: Service.getOpenChats(chatID),
+  activeChats: Service.getActiveChats(chatID),
   isBreakoutRoom: meetingIsBreakout(),
   getAvailableActions: Service.getAvailableActions,
   normalizeEmojiName: Service.normalizeEmojiName,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index ad5c6a5de4..b7a10b849b 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -18,7 +18,7 @@ const PUBLIC_GROUP_CHAT_ID = CHAT_CONFIG.public_group_id;
 // session for closed chat list
 const CLOSED_CHAT_LIST_KEY = 'closedChatList';
 
-const mapOpenChats = (chat) => {
+const mapActiveChats = (chat) => {
   const currentUserId = Auth.userID;
 
   if (chat.sender !== currentUserId) {
@@ -192,7 +192,7 @@ const getUsersId = () => getUsers().map(u => u.id);
 
 const hasBreakoutRoom = () => Breakouts.find({ parentMeetingId: Auth.meetingID }).count() > 0;
 
-const getOpenChats = (chatID) => {
+const getActiveChats = (chatID) => {
   const privateChat = GroupChat
     .find({ users: { $all: [Auth.userID] } })
     .fetch()
@@ -206,30 +206,30 @@ const getOpenChats = (chatID) => {
     filter.chatId = { $in: privateChat };
   }
 
-  let openChats = GroupChatMsg
+  let activeChats = GroupChatMsg
     .find(filter)
     .fetch()
-    .map(mapOpenChats);
+    .map(mapActiveChats);
 
   if (chatID) {
-    openChats.push(chatID);
+    activeChats.push(chatID);
   }
 
-  openChats = _.uniq(_.compact(openChats));
+  activeChats = _.uniq(_.compact(activeChats));
 
-  openChats = Users
-    .find({ userId: { $in: openChats } })
+  activeChats = Users
+    .find({ userId: { $in: activeChats } })
     .map(mapUser)
     .map((op) => {
-      const openChat = op;
-      openChat.unreadCounter = UnreadMessages.count(op.id);
-      return openChat;
+      const activeChat = op;
+      activeChat.unreadCounter = UnreadMessages.count(op.id);
+      return activeChat;
     });
 
   const currentClosedChats = Storage.getItem(CLOSED_CHAT_LIST_KEY) || [];
   const filteredChatList = [];
 
-  openChats.forEach((op) => {
+  activeChats.forEach((op) => {
     // When a new private chat message is received, ensure the conversation view is restored.
     if (op.unreadCounter > 0) {
       if (_.indexOf(currentClosedChats, op.id) > -1) {
@@ -237,24 +237,24 @@ const getOpenChats = (chatID) => {
       }
     }
 
-    // Compare openChats with session and push it into filteredChatList
-    // if one of the openChat is not in session.
-    // It will pass to openChats.
+    // Compare activeChats with session and push it into filteredChatList
+    // if one of the activeChat is not in session.
+    // It will pass to activeChats.
     if (_.indexOf(currentClosedChats, op.id) < 0) {
       filteredChatList.push(op);
     }
   });
 
-  openChats = filteredChatList;
+  activeChats = filteredChatList;
 
-  openChats.push({
+  activeChats.push({
     id: 'public',
     name: 'Public Chat',
     icon: 'group_chat',
     unreadCounter: UnreadMessages.count(PUBLIC_GROUP_CHAT_ID),
   });
 
-  return openChats
+  return activeChats
     .sort(sortChats);
 };
 
@@ -268,36 +268,36 @@ const getAvailableActions = (currentUser, user, isBreakoutRoom) => {
   const allowedToChatPrivately = !user.isCurrent && !isDialInUser;
 
   const allowedToMuteAudio = hasAuthority
-                            && user.isVoiceUser
-                            && !user.isMuted
-                            && !user.isListenOnly;
+    && user.isVoiceUser
+    && !user.isMuted
+    && !user.isListenOnly;
 
   const allowedToUnmuteAudio = hasAuthority
-                              && user.isVoiceUser
-                              && !user.isListenOnly
-                              && user.isMuted
-                              && user.isCurrent;
+    && user.isVoiceUser
+    && !user.isListenOnly
+    && user.isMuted
+    && user.isCurrent;
 
   const allowedToResetStatus = hasAuthority
-      && user.emoji.status !== EMOJI_STATUSES.none
-      && !isDialInUser;
+    && user.emoji.status !== EMOJI_STATUSES.none
+    && !isDialInUser;
 
   // if currentUser is a moderator, allow removing other users
   const allowedToRemove = currentUser.isModerator && !user.isCurrent && !isBreakoutRoom;
 
   const allowedToSetPresenter = currentUser.isModerator
-      && !user.isPresenter
-      && !isDialInUser;
+    && !user.isPresenter
+    && !isDialInUser;
 
   const allowedToPromote = currentUser.isModerator
-      && !user.isCurrent
-      && !user.isModerator
-      && !isDialInUser;
+    && !user.isCurrent
+    && !user.isModerator
+    && !isDialInUser;
 
   const allowedToDemote = currentUser.isModerator
-      && !user.isCurrent
-      && user.isModerator
-      && !isDialInUser;
+    && !user.isCurrent
+    && user.isModerator
+    && !isDialInUser;
 
   const allowedToChangeStatus = user.isCurrent;
 
@@ -361,7 +361,13 @@ const removeUser = (userId) => {
   }
 };
 
-const toggleVoice = (userId) => { userId === Auth.userID ? makeCall('toggleSelfVoice') : makeCall('toggleVoice', userId); };
+const toggleVoice = (userId) => {
+  if (userId === Auth.userID) {
+    makeCall('toggleSelfVoice');
+  } else {
+    makeCall('toggleVoice', userId);
+  }
+};
 
 const muteAllUsers = (userId) => { makeCall('muteAllUsers', userId); };
 
@@ -451,7 +457,7 @@ export default {
   changeRole,
   getUsers,
   getUsersId,
-  getOpenChats,
+  getActiveChats,
   getCurrentUser,
   getAvailableActions,
   normalizeEmojiName,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
index 7132e18dff..b6fed8012d 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
@@ -8,7 +8,7 @@ import UserPolls from './user-polls/component';
 import BreakoutRoomItem from './breakout-room/component';
 
 const propTypes = {
-  openChats: PropTypes.arrayOf(String).isRequired,
+  activeChats: PropTypes.arrayOf(String).isRequired,
   compact: PropTypes.bool,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
@@ -61,7 +61,7 @@ class UserContent extends PureComponent {
       getEmojiList,
       getEmoji,
       isPublicChat,
-      openChats,
+      activeChats,
       getGroupChatPrivate,
       pollIsOpen,
       forcePollOpen,
@@ -78,7 +78,7 @@ class UserContent extends PureComponent {
         <UserMessages
           {...{
             isPublicChat,
-            openChats,
+            activeChats,
             compact,
             intl,
             roving,
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-messages/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-messages/component.jsx
index cfb12a669f..7a96ca4be7 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-messages/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-messages/component.jsx
@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { defineMessages } from 'react-intl';
 import cx from 'classnames';
 import { styles } from '/imports/ui/components/user-list/user-list-content/styles';
-import ChatListItem from './../../chat-list-item/component';
+import ChatListItem from '../../chat-list-item/component';
 
 const propTypes = {
-  openChats: PropTypes.arrayOf(String).isRequired,
-  openChat: PropTypes.string,
+  activeChats: PropTypes.arrayOf(String).isRequired,
+  activeChat: PropTypes.string,
   compact: PropTypes.bool,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
@@ -19,7 +19,7 @@ const propTypes = {
 
 const defaultProps = {
   compact: false,
-  openChat: '',
+  activeChat: '',
 };
 
 const listTransition = {
@@ -46,20 +46,21 @@ class UserMessages extends PureComponent {
       index: -1,
     };
 
-    this.openChatRefs = [];
+    this.activeChatRefs = [];
     this.selectedIndex = -1;
 
-    this.focusOpenChatItem = this.focusOpenChatItem.bind(this);
+    this.focusActiveChatItem = this.focusActiveChatItem.bind(this);
     this.changeState = this.changeState.bind(this);
   }
 
   componentDidMount() {
-    if (!this.props.compact) {
+    const { compact, roving, activeChats } = this.props;
+    if (!compact) {
       this._msgsList.addEventListener(
         'keydown',
-        event => this.props.roving(
+        event => roving(
           event,
-          this.props.openChats.length,
+          activeChats.length,
           this.changeState,
         ),
       );
@@ -67,26 +68,27 @@ class UserMessages extends PureComponent {
   }
 
   componentDidUpdate(prevProps, prevState) {
-    if (this.state.index === -1) {
+    const { index } = this.state;
+    if (index === -1) {
       return;
     }
 
-    if (this.state.index !== prevState.index) {
-      this.focusOpenChatItem(this.state.index);
+    if (index !== prevState.index) {
+      this.focusActiveChatItem(index);
     }
   }
 
-  getOpenChats() {
+  getActiveChats() {
     const {
-      openChats,
-      openChat,
+      activeChats,
+      activeChat,
       compact,
       isPublicChat,
     } = this.props;
 
     let index = -1;
 
-    return openChats.map(chat => (
+    return activeChats.map(chat => (
       <CSSTransition
         classNames={listTransition}
         appear
@@ -97,11 +99,11 @@ class UserMessages extends PureComponent {
         className={cx(styles.chatsList)}
         key={chat.id}
       >
-        <div ref={(node) => { this.openChatRefs[index += 1] = node; }}>
+        <div ref={(node) => { this.activeChatRefs[index += 1] = node; }}>
           <ChatListItem
             isPublicChat={isPublicChat}
             compact={compact}
-            openChat={openChat}
+            activeChat={activeChat}
             chat={chat}
             tabIndex={-1}
           />
@@ -114,12 +116,12 @@ class UserMessages extends PureComponent {
     this.setState({ index: newIndex });
   }
 
-  focusOpenChatItem(index) {
-    if (!this.openChatRefs[index]) {
+  focusActiveChatItem(index) {
+    if (!this.activeChatRefs[index]) {
       return;
     }
 
-    this.openChatRefs[index].firstChild.focus();
+    this.activeChatRefs[index].firstChild.focus();
   }
 
   render() {
@@ -131,10 +133,13 @@ class UserMessages extends PureComponent {
     return (
       <div className={styles.messages}>
         {
-          !compact ?
+          !compact ? (
             <h2 className={styles.smallTitle}>
               {intl.formatMessage(intlMessages.messagesTitle)}
-            </h2> : <hr className={styles.separator} />
+            </h2>
+          ) : (
+            <hr className={styles.separator} />
+          )
         }
         <div
           role="tabpanel"
@@ -143,8 +148,8 @@ class UserMessages extends PureComponent {
           ref={(ref) => { this._msgsList = ref; }}
         >
           <div className={styles.list}>
-            <TransitionGroup ref={(ref) => { this._msgItems = ref; }} >
-              { this.getOpenChats() }
+            <TransitionGroup ref={(ref) => { this._msgItems = ref; }}>
+              {this.getActiveChats()}
             </TransitionGroup>
           </div>
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index f7429df73e..6bd0e59fb9 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -248,7 +248,7 @@ class UserDropdown extends PureComponent {
 
     if (allowedToChatPrivately) {
       actions.push(this.makeDropdownItem(
-        'openChat',
+        'activeChat',
         intl.formatMessage(messages.ChatLabel),
         () => {
           getGroupChatPrivate(currentUser, user);
diff --git a/bigbluebutton-html5/imports/ui/services/user/mapUser.js b/bigbluebutton-html5/imports/ui/services/user/mapUser.js
index d831b050c5..633de920b7 100755
--- a/bigbluebutton-html5/imports/ui/services/user/mapUser.js
+++ b/bigbluebutton-html5/imports/ui/services/user/mapUser.js
@@ -30,7 +30,7 @@ const mapUser = (user) => {
     isPhoneUser: user.phone_user,
     isOnline: user.connectionStatus === 'online',
     clientType: user.clientType,
-    logTime: user.logTime,
+    loginTime: user.loginTime,
   };
 
   mappedUser.isLocked = user.locked && !(mappedUser.isPresenter || mappedUser.isModerator);

From a81705339b59361444789a7682506d739a9451c7 Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Mon, 14 Jan 2019 11:59:47 -0200
Subject: [PATCH 070/163] Avoid call tryGenerateIceCandidates twice

---
 .../components/video-provider/component.jsx   | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index cb2eb2723e..80aae0fd16 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -101,6 +101,14 @@ const MAX_CAMERA_SHARE_FAILED_WAIT_TIME = 60000;
 const PING_INTERVAL = 15000;
 
 class VideoProvider extends Component {
+  static checkIceConnectivity() {
+    // Webkit ICE restrictions demand a capture device permission to release
+    // host candidates
+    if (browser().name === 'safari') {
+      tryGenerateIceCandidates();
+    }
+  }
+
   constructor(props) {
     super(props);
 
@@ -148,6 +156,7 @@ class VideoProvider extends Component {
   }
 
   componentDidMount() {
+    VideoProvider.checkIceConnectivity();
     document.addEventListener('joinVideo', this.shareWebcam); // TODO find a better way to do this
     document.addEventListener('exitVideo', this.unshareWebcam);
     this.ws.onmessage = this.onWsMessage;
@@ -195,7 +204,7 @@ class VideoProvider extends Component {
     this.ws.close();
   }
 
-  async onWsMessage(msg) {
+  onWsMessage(msg) {
     const parsedMessage = JSON.parse(msg.data);
 
     this.logger('debug', `Received new message '${parsedMessage.id}'`, { topic: 'ws', message: parsedMessage });
@@ -206,19 +215,8 @@ class VideoProvider extends Component {
         break;
 
       case 'playStart':
-      // Webkit ICE restrictions demand a capture device permission to release
-      // host candidates
-      if (browser().name === 'safari') {
-        try {
-          await tryGenerateIceCandidates();
-        } catch(e) {
-          //TODO Warn user about connection problemns
-          console.error('Not possible to generate ICE Candidates');
-        };
-      }
-      
-      this.handlePlayStart(parsedMessage);
-      break;
+        this.handlePlayStart(parsedMessage);
+        break;
 
       case 'playStop':
         this.handlePlayStop(parsedMessage);

From a875b0b3866fb16222ddc4109c899901b7dd6e8e Mon Sep 17 00:00:00 2001
From: Gustavo Trott <gustavO@trott.com.br>
Date: Mon, 14 Jan 2019 12:41:44 -0200
Subject: [PATCH 071/163] Undo changes in askDevicesPermissions

---
 .../imports/ui/services/audio-manager/index.js    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 30f94ca9dd..691450b179 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -89,15 +89,11 @@ class AudioManager {
 
     this.isWaitingPermissions = false;
     this.devicesInitialized = false;
-
-    // Avoid ask microphone permission for "Listen Only"
-    const devicesInitializePromises = [];
-    if (this.isListenOnly == false) devicesInitializePromises.push(this.setDefaultInputDevice());
-    devicesInitializePromises.push(this.setDefaultOutputDevice());
-
-    return Promise.all(
-      devicesInitializePromises,
-    ).then(() => {
+    
+    return Promise.all([
+      this.setDefaultInputDevice(),
+      this.setDefaultOutputDevice(),
+    ]).then(() => {
       this.devicesInitialized = true;
       this.isWaitingPermissions = false;
     }).catch((err) => {
@@ -151,7 +147,6 @@ class AudioManager {
       inputStream: this.createListenOnlyStream(),
     };
 
-    
     // Webkit ICE restrictions demand a capture device permission to release
     // host candidates
     if (name === 'safari') {

From 842507e069f5e28232719b14b8c30ef703a0cf2b Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Mon, 14 Jan 2019 16:20:18 +0000
Subject: [PATCH 072/163] remove unnecessary function in user-options container

---
 .../user-participants/user-options/container.jsx         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
index 3981361e6f..f7d261bb3a 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
@@ -1,5 +1,4 @@
 import { withTracker } from 'meteor/react-meteor-data';
-import React from 'react';
 import PropTypes from 'prop-types';
 import Auth from '/imports/ui/services/auth';
 import Service from '/imports/ui/components/actions-bar/service';
@@ -16,9 +15,7 @@ const propTypes = {
   }).isRequired,
 };
 
-const UserOptionsContainer = props => <UserOptions {...props} />;
-
-export default withTracker((props) => {
+const UserOptionsContainer = withTracker((props) => {
   const {
     meeting,
     users,
@@ -40,6 +37,8 @@ export default withTracker((props) => {
     meetingName: Service.meetingName(),
     users: Service.users(),
   };
-})(UserOptionsContainer);
+})(UserOptions);
 
 UserOptionsContainer.propTypes = propTypes;
+
+export default UserOptionsContainer;

From 66d23012a1b5bcc5e1f9c8c15ec52969376a1946 Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Mon, 14 Jan 2019 14:23:11 -0200
Subject: [PATCH 073/163] Changed variable name

---
 .../imports/ui/components/chat/alert/component.jsx   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
index 1ada36c3a4..443aa822e1 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
@@ -42,7 +42,7 @@ class ChatAlert extends PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      lastAlertTimestamp: props.joinTimestamp,
+      alertEnabledTimestamp: props.joinTimestamp,
       lastAlertTimestampByChat: {},
       pendingNotificationsByChat: {},
     };
@@ -56,7 +56,7 @@ class ChatAlert extends PureComponent {
     } = this.props;
 
     const {
-      lastAlertTimestamp,
+      alertEnabledTimestamp,
       lastAlertTimestampByChat,
       pendingNotificationsByChat,
     } = this.state;
@@ -81,7 +81,7 @@ class ChatAlert extends PureComponent {
         unalertedMessagesByChatId[chatId] = thisChatUnreadMessages.filter((msg) => {
           const messageChatId = (msg.chatId === 'MAIN-PUBLIC-GROUP-CHAT') ? msg.chatId : msg.sender;
           const retorno = (msg
-            && msg.timestamp > lastAlertTimestamp
+            && msg.timestamp > alertEnabledTimestamp
             && msg.timestamp > joinTimestamp
             && msg.timestamp > (lastAlertTimestampByChat[messageChatId] || 0)
           );
@@ -121,9 +121,9 @@ class ChatAlert extends PureComponent {
   }
 
   setLastAlertTimestamp(newLastAlertTimestamp) {
-    const { lastAlertTimestamp } = this.state;
-    if (newLastAlertTimestamp > 0 && lastAlertTimestamp !== newLastAlertTimestamp) {
-      this.setState({ lastAlertTimestamp: newLastAlertTimestamp });
+    const { alertEnabledTimestamp } = this.state;
+    if (newLastAlertTimestamp > 0 && alertEnabledTimestamp !== newLastAlertTimestamp) {
+      this.setState({ alertEnabledTimestamp: newLastAlertTimestamp });
     }
   }
 

From 56322c50601f32c78c14c16eb35c87ab174e7674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Francisco=20Siebel?= <jfsiebel@gmail.com>
Date: Mon, 14 Jan 2019 14:58:01 -0200
Subject: [PATCH 074/163] fix ejecting users when private chat is locked. fix
 #6434

---
 .../imports/ui/components/user-list/component.jsx     |  2 ++
 .../imports/ui/components/user-list/container.jsx     |  1 +
 .../imports/ui/components/user-list/service.js        |  8 +++++---
 .../user-list/user-list-content/component.jsx         |  2 ++
 .../user-list-content/user-participants/component.jsx |  2 ++
 .../user-participants/user-list-item/component.jsx    |  5 ++++-
 .../user-list-item/user-dropdown/component.jsx        | 11 ++++++++++-
 7 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
index 8b6c91d395..a37f699a42 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
@@ -66,6 +66,7 @@ class UserList extends PureComponent {
       showBranding,
       hasBreakoutRoom,
       getUsersId,
+      hasPrivateChatBetweenUsers,
     } = this.props;
 
     return (
@@ -101,6 +102,7 @@ class UserList extends PureComponent {
           getEmoji,
           hasBreakoutRoom,
           getUsersId,
+          hasPrivateChatBetweenUsers,
         }
       }
         />}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
index 8599e4c68d..65109b276d 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
@@ -55,4 +55,5 @@ export default withTracker(({ chatID, compact }) => ({
   getEmojiList: Service.getEmojiList(),
   getEmoji: Service.getEmoji(),
   showBranding: getFromUserSettings('displayBrandingArea', Meteor.settings.public.app.branding.displayBrandingArea),
+  hasPrivateChatBetweenUsers: Service.hasPrivateChatBetweenUsers,
 }))(UserListContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index ad5c6a5de4..85af5d3e45 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -428,10 +428,11 @@ const roving = (event, itemCount, changeState) => {
   }
 };
 
-const getGroupChatPrivate = (sender, receiver) => {
-  const privateChat = GroupChat.findOne({ users: { $all: [receiver.id, sender.id] } });
+const hasPrivateChatBetweenUsers = (sender, receiver) => GroupChat
+  .findOne({ users: { $all: [receiver.id, sender.id] } });
 
-  if (!privateChat) {
+const getGroupChatPrivate = (sender, receiver) => {
+  if (!hasPrivateChatBetweenUsers(sender, receiver)) {
     makeCall('createGroupChat', receiver);
   }
 };
@@ -465,4 +466,5 @@ export default {
   isUserModerator,
   getEmojiList: () => EMOJI_STATUSES,
   getEmoji: () => Users.findOne({ userId: Auth.userID }).emoji,
+  hasPrivateChatBetweenUsers,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
index 7132e18dff..1f0eb997e7 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
@@ -67,6 +67,7 @@ class UserContent extends PureComponent {
       forcePollOpen,
       hasBreakoutRoom,
       getUsersId,
+      hasPrivateChatBetweenUsers,
     } = this.props;
 
     return (
@@ -119,6 +120,7 @@ class UserContent extends PureComponent {
             getEmoji,
             getGroupChatPrivate,
             getUsersId,
+            hasPrivateChatBetweenUsers,
           }}
         />
       </div>
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
index 6e79c92d51..aa2276dad5 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
@@ -125,6 +125,7 @@ class UserParticipants extends Component {
       getEmojiList,
       getEmoji,
       users,
+      hasPrivateChatBetweenUsers,
     } = this.props;
 
     let index = -1;
@@ -159,6 +160,7 @@ class UserParticipants extends Component {
               toggleVoice,
               changeRole,
               getGroupChatPrivate,
+              hasPrivateChatBetweenUsers,
             }}
             userId={u}
             getScrollContainerRef={this.getScrollContainerRef}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
index 7566c932d5..a7220ffe8d 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
@@ -46,9 +46,10 @@ class UserListItem extends PureComponent {
       removeUser,
       setEmojiStatus,
       toggleVoice,
+      hasPrivateChatBetweenUsers,
     } = this.props;
 
-    const { meetingId } = meeting;
+    const { meetingId, lockSettingsProp } = meeting;
 
     const contents = (<UserDropdown
       {...{
@@ -66,11 +67,13 @@ class UserListItem extends PureComponent {
         isBreakoutRoom,
         isMeetingLocked,
         meetingId,
+        lockSettingsProp,
         normalizeEmojiName,
         removeUser,
         setEmojiStatus,
         toggleVoice,
         user,
+        hasPrivateChatBetweenUsers,
       }}
     />);
 
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index f7429df73e..aa5946074f 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -194,6 +194,8 @@ class UserDropdown extends PureComponent {
       removeUser,
       toggleVoice,
       changeRole,
+      lockSettingsProp,
+      hasPrivateChatBetweenUsers,
     } = this.props;
 
     const { showNestedOptions } = this.state;
@@ -213,6 +215,13 @@ class UserDropdown extends PureComponent {
       allowedToChangeStatus,
     } = actionPermissions;
 
+    const { disablePrivChat } = lockSettingsProp;
+
+    const enablePrivateChat = currentUser.isModerator
+      ? allowedToChatPrivately
+      : allowedToChatPrivately
+      && (!disablePrivChat || (disablePrivChat && hasPrivateChatBetweenUsers(currentUser, user)));
+
     if (showNestedOptions) {
       if (allowedToChangeStatus) {
         actions.push(this.makeDropdownItem(
@@ -246,7 +255,7 @@ class UserDropdown extends PureComponent {
       ));
     }
 
-    if (allowedToChatPrivately) {
+    if (enablePrivateChat) {
       actions.push(this.makeDropdownItem(
         'openChat',
         intl.formatMessage(messages.ChatLabel),

From 550bbcd492d23d30e5f583a68a22b59835524bd4 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Thu, 29 Nov 2018 14:24:02 -0300
Subject: [PATCH 075/163] Share synchronized youtube video in presentation area

---
 .../imports/api/external-videos/index.js      |   7 +
 .../api/external-videos/server/index.js       |  20 ++
 .../api/external-videos/server/methods.js     |   8 +
 .../methods/startWatchingExternalVideo.js     |  19 ++
 .../methods/stopWatchingExternalVideo.js      |  17 ++
 .../actions-dropdown/component.jsx            |  20 ++
 .../ui/components/actions-bar/component.jsx   |   3 +
 .../external-video-player/component.jsx       | 219 ++++++++++++++++++
 .../external-video-player/container.jsx       |  31 +++
 .../external-video-player/modal/component.jsx | 147 ++++++++++++
 .../external-video-player/modal/container.jsx |  22 ++
 .../external-video-player/modal/styles.scss   | 163 +++++++++++++
 .../external-video-player/service.js          |  55 +++++
 .../external-video-player/styles.scss         |  52 +++++
 .../imports/ui/components/media/container.jsx |   6 +
 .../imports/ui/components/media/service.js    |   6 +
 bigbluebutton-html5/package.json              |   1 +
 bigbluebutton-html5/private/locales/en.json   |   9 +-
 .../private/locales/pt_BR.json                |  10 +-
 bigbluebutton-html5/server/main.js            |   2 +
 20 files changed, 814 insertions(+), 3 deletions(-)
 create mode 100644 bigbluebutton-html5/imports/api/external-videos/index.js
 create mode 100644 bigbluebutton-html5/imports/api/external-videos/server/index.js
 create mode 100644 bigbluebutton-html5/imports/api/external-videos/server/methods.js
 create mode 100644 bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
 create mode 100644 bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
 create mode 100644 bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
 create mode 100755 bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
 create mode 100644 bigbluebutton-html5/imports/ui/components/external-video-player/service.js
 create mode 100644 bigbluebutton-html5/imports/ui/components/external-video-player/styles.scss

diff --git a/bigbluebutton-html5/imports/api/external-videos/index.js b/bigbluebutton-html5/imports/api/external-videos/index.js
new file mode 100644
index 0000000000..8653beaffe
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/external-videos/index.js
@@ -0,0 +1,7 @@
+import { Meteor } from 'meteor/meteor';
+
+const Streamer = new Meteor.Streamer('videos');
+
+export default Streamer
+
+
diff --git a/bigbluebutton-html5/imports/api/external-videos/server/index.js b/bigbluebutton-html5/imports/api/external-videos/server/index.js
new file mode 100644
index 0000000000..8dd416f41d
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/external-videos/server/index.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+
+import ExternalVideoStreamer from '/imports/api/external-videos';
+import Users from '/imports/api/users';
+
+import Logger from '/imports/startup/server/logger';
+
+import './methods'; 
+
+ExternalVideoStreamer.allowRead('all');
+ExternalVideoStreamer.allowWrite('all');
+ExternalVideoStreamer.allowEmit(function(eventName, {userId, meetingId}) {
+  let user = Users.findOne({userId});
+
+  let ret = user && user.presenter;
+
+  Logger.debug('Auth userid:', userId, ' event: ', eventName, ' suc: ', ret);
+
+  return ret || eventName == 'viewerJoined';
+});
diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods.js b/bigbluebutton-html5/imports/api/external-videos/server/methods.js
new file mode 100644
index 0000000000..9deb71b73e
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+import startWatchingExternalVideo from './methods/startWatchingExternalVideo';
+import stopWatchingExternalVideo from './methods/stopWatchingExternalVideo';
+
+Meteor.methods({
+  startWatchingExternalVideo,
+  stopWatchingExternalVideo,
+});
diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
new file mode 100644
index 0000000000..4819e03b07
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
@@ -0,0 +1,19 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import Meetings from '/imports/api/meetings';
+
+export default function startStream(credentials, options) {
+  const { meetingId, requesterUserId, requesterToken } = credentials;
+  const { externalVideoUrl } = options;
+
+  Logger.info(' user sharing a new youtube video: ', credentials);
+
+  check(requesterUserId, String);
+  check(requesterToken, String);
+  check(externalVideoUrl, String);
+
+  Meetings.update({ meetingId }, { $set: { externalVideoUrl } });
+
+  return true;
+}
diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
new file mode 100644
index 0000000000..0738e45df7
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
@@ -0,0 +1,17 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import Meetings from '/imports/api/meetings';
+
+export default function startStream(credentials, options) {
+  const { meetingId, requesterUserId, requesterToken } = credentials;
+
+  Logger.info(' user sharing a new youtube video: ', credentials);
+
+  check(requesterUserId, String);
+  check(requesterToken, String);
+
+  Meetings.update({ meetingId }, { $set: { externalVideoUrl: null } });
+
+  return true;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 8ea2f72627..ea0f963c45 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -14,6 +14,8 @@ import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
 import BreakoutRoom from '../create-breakout-room/component';
 import { styles } from '../styles';
 
+import ExternalVideoModal from '/imports/ui/components/external-video-player/modal/container';
+
 const propTypes = {
   isUserPresenter: PropTypes.bool.isRequired,
   intl: intlShape.isRequired,
@@ -81,6 +83,10 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.actionsDropdown.takePresenterDesc',
     description: 'Description of take presenter role option',
   },
+  externalVideoLabel: {
+    id: 'app.actionsBar.actionsDropdown.shareExternalVideo',
+    description: 'Share external video button',
+  },
 });
 
 class ActionsDropdown extends Component {
@@ -110,6 +116,7 @@ class ActionsDropdown extends Component {
       intl,
       isUserPresenter,
       isUserModerator,
+      allowExternalVideo,
       meetingIsBreakout,
       hasBreakoutRoom,
       handleTakePresenter,
@@ -163,6 +170,15 @@ class ActionsDropdown extends Component {
           />
         )
         : null),
+      (isUserPresenter && allowExternalVideo ?
+        <DropdownListItem
+          icon="video"
+          label={intl.formatMessage(intlMessages.externalVideoLabel)}
+          description="External Video"
+          key="external-video"
+          onClick={this.handleExternalVideoClick}
+        />
+        : null),
       (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom
         ? (
           <DropdownListItem
@@ -177,6 +193,10 @@ class ActionsDropdown extends Component {
     ]);
   }
 
+  handleExternalVideoClick = () => {
+    this.props.mountModal(<ExternalVideoModal />);
+  }
+
   handlePresentationClick() {
     const { mountModal } = this.props;
     mountModal(<PresentationUploaderContainer />);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 861dcdcb55..26316d5b8d 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -35,6 +35,8 @@ class ActionsBar extends React.PureComponent {
     } = recordSettingsList;
 
     const actionBarClasses = {};
+    const { enableExternalVideo } = Meteor.settings.public.app;
+
     actionBarClasses[styles.centerWithActions] = isUserPresenter;
     actionBarClasses[styles.center] = true;
 
@@ -45,6 +47,7 @@ class ActionsBar extends React.PureComponent {
             isUserPresenter,
             isUserModerator,
             allowStartStopRecording,
+            allowExternalVideo: enableExternalVideo,
             isRecording,
             record,
             toggleRecording,
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
new file mode 100644
index 0000000000..43e5c31b3f
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -0,0 +1,219 @@
+import React, {Component} from "react";
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component';
+import Button from '/imports/ui/components/button/component';
+import { styles } from './styles';
+import Icon from '../icon/component';
+
+import YouTube from 'react-youtube';
+
+import Service from './service';
+
+const intlMessages = defineMessages({
+});
+
+const PlayerState = {
+  UNSTARTED: -1,
+  ENDED: 0,
+  PLAYING: 1,
+  PAUSED: 2,
+  BUFFERING: 3,
+  CUED: 5,
+}
+
+const propTypes = {
+};
+
+const defaultProps = {
+};
+
+class VideoPlayer extends Component {
+
+  player = null;
+  syncInterval = null;
+  time = null;
+  playerState = PlayerState.UNSTARTED;
+  presenterCommand = false;
+  preventStateChange = false;
+
+  opts = {
+    playerVars: {
+      width: '100%',
+      height: '100%',
+      autoplay: 1,
+      modestbranding: true,
+      rel: 0,
+      ecver: 2,
+    }
+  };
+
+  componentDidMount() {
+    window.addEventListener('resize', () => {
+      setTimeout(this.handleResize, 0);
+    });
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('resize', () => {
+      setTimeout(this.handleResize, 0);
+    });
+  }
+
+  handleResize = () => {
+    if (!this.player)
+      return;
+
+    let el = this.refPlayer;
+    let parent = el.parentElement;
+    let w = parent.clientWidth;
+    let h = parent.clientHeight;
+    let idealW = h * 16/9;
+
+    if (idealW > w) {
+      this.player.setSize(w, w * 9/16);
+    } else {
+      this.player.setSize(idealW, h);
+    }
+  }
+
+  keepSync = () => {
+    let { isPresenter } = this.props;
+
+    if (isPresenter) {
+
+      this.syncInterval = setInterval(() => {
+        let curTime = this.player.getCurrentTime();
+        let rate = this.player.getPlaybackRate();
+        Service.sendMessage('playerUpdate', {rate, time: curTime, state: this.playerState});
+      }, 2000);
+
+    } else {
+
+      Service.onMessage('play', ({time, state}) => {
+        this.presenterCommand = true;
+        if (this.player) {
+          this.player.seekTo(time, true);
+          this.playerState = PlayerState.PLAYING;
+          this.player.playVideo();
+        }
+      });
+
+      Service.onMessage('stop', ({time}) => {
+        this.presenterCommand = true;
+
+        if (this.player) {
+          this.playerState = PlayerState.PAUSED;
+          this.player.seekTo(time, true);
+          this.player.pauseVideo();
+        }
+      });
+
+      Service.onMessage('playerUpdate', (data) => {
+        if (!this.player) {
+          return;
+        }
+
+        if (data.rate != this.player.getPlaybackRate()) {
+          this.player.setPlaybackRate(data.rate);
+        }
+
+        if (Math.abs(this.player.getCurrentTime() - data.time) > 2) {
+          this.player.seekTo(data.time, true);
+        }
+
+        if (this.playerState !== data.state) {
+          this.presenterCommand = true;
+          this.playerState = data.state;
+          if (this.playerState === PlayerState.PLAYING) {
+            this.player.playVideo();
+          } else {
+            this.player.pauseVideo();
+          }
+        }
+      });
+
+      Service.onMessage('changePlaybackRate', (rate) => {
+        this.player.setPlaybackRate(rate);
+      });
+
+    }
+  }
+
+  handleOnReady = (event) => {
+    let { isPresenter } = this.props;
+
+    this.player = event.target;
+    this.player.pauseVideo();
+
+    this.keepSync();
+
+    if (!isPresenter) {
+      Service.sendMessage('viewerJoined');
+    } else {
+      this.player.playVideo();
+    }
+
+    this.handleResize();
+  };
+
+  handleStateChange = (event) => {
+    let { isPresenter } = this.props;
+    let curTime = this.player.getCurrentTime();
+
+    if (this.preventStateChange && [PlayerState.PLAYING, PlayerState.PAUSED].includes(event.data)) {
+      this.preventStateChange = false;
+      return;
+    }
+
+    if (this.playerState === event.data) {
+      return;
+    }
+
+    if (event.data === PlayerState.PLAYING) {
+
+      if (isPresenter) {
+        Service.sendMessage('play', {time: curTime});
+        this.playerState = event.data;
+      } else if (!this.presenterCommand) {
+        this.player.seekTo(curTime, true);
+        this.preventStateChange = true;
+        this.player.pauseVideo();
+      } else {
+        this.playerState = event.data;
+        this.presenterCommand = false;
+      }
+    } else if (event.data === PlayerState.PAUSED) {
+      if (isPresenter) {
+        Service.sendMessage('stop', {time: curTime});
+        this.playerState = event.data;
+      } else if (!this.presenterCommand) {
+        this.player.seekTo(curTime);
+        this.preventStateChange = true;
+        this.player.playVideo();
+      } else {
+        this.playerState = event.data;
+        this.presenterCommand = false;
+      }
+    }
+  };
+
+  render () {
+    return (
+      <div
+        id="youtube-video-player"
+        data-test="videoPlayer"
+        ref={(ref) => { this.refPlayer = ref; } }
+      >
+        <YouTube
+          videoId={this.props.videoId}
+          opts={this.opts}
+          onReady={this.handleOnReady}
+          onStateChange={this.handleStateChange}
+          />
+      </div>
+    );
+  }
+}
+
+export default injectWbResizeEvent(injectIntl(VideoPlayer));
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx
new file mode 100644
index 0000000000..37f3217594
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx
@@ -0,0 +1,31 @@
+import React, { Component } from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
+import { withTracker } from 'meteor/react-meteor-data';
+import ExternalVideo from './component';
+import ExternalVideoService from './service';
+
+const intlMessages = defineMessages({
+  title: {
+    id: 'app.externalVideo.title',
+    description: '',
+  },
+});
+
+class ExternalVideoContainer extends Component {
+  componentDidMount() {}
+  render() {
+    return (
+      <ExternalVideo {...this.props}>
+        {this.props.children}
+      </ExternalVideo>
+    );
+  }
+}
+
+export default injectIntl(withTracker(({ params, intl }) => {
+  const title = intl.formatMessage(intlMessages.title);
+
+  return {
+    title,
+  };
+})(ExternalVideoContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
new file mode 100644
index 0000000000..77098f9923
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -0,0 +1,147 @@
+import React, {Component} from "react";
+import { withModalMounter } from '/imports/ui/components/modal/service';
+
+import ModalBase from '/imports/ui/components/modal/base/component';
+import Button from '/imports/ui/components/button/component';
+
+import {styles} from './styles';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+const intlMessages = defineMessages({
+  start: {
+    id: 'app.externalVideo.start',
+    description: 'Share youtube video',
+  },
+  stop: {
+    id: 'app.externalVideo.stop',
+    description: 'Stop sharing video',
+  },
+  urlError: {
+    id: 'app.externalVideo.urlError',
+    description: 'Not a video URL error',
+  },
+  input: {
+    id: 'app.externalVideo.input',
+    description: 'Video URL',
+  },
+  title: {
+    id: 'app.externalVideo.title',
+    description: 'Modal title',
+  },
+  close: {
+    id: 'app.externalVideo.close',
+    description: 'Close',
+  },
+});
+
+const YOUTUBE_PREFIX = "https://youtube.com/watch?v=";
+
+const getUrlFromVideoId = (url) => {
+  return url ? `${YOUTUBE_PREFIX}${url}` : '';
+}
+
+class ExternalVideoModal extends Component {
+
+  state = {
+    url: getUrlFromVideoId(this.props.url),
+    sharing: this.props.hasVideo,
+  };
+
+  isUrlEmpty = () => {
+    const url = this.state.url;
+    return !url || url.length == 0;
+  }
+
+  isUrlValid = () => {
+    const url = this.state.url;
+    const regexp = RegExp('^(https?\:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/.+$');
+    return !this.isUrlEmpty() && url.match(regexp);
+  }
+
+  startWatchingHandler = () => {
+    this.props.startWatching(this.state.url);
+    this.props.closeModal();
+  }
+
+  stopWatchingHandler = () => {
+    this.props.stopWatching();
+    this.props.closeModal();
+  }
+
+  updateVideoUrlHandler = (ev) => {
+    console.log(this.props);
+    this.setState({...this.state, url: ev.target.value});
+  }
+
+  renderUrlError = () => {
+    const intl = this.props.intl;
+
+    const style = !this.isUrlEmpty() && this.state.url.length > 3 && !this.isUrlValid() ? {} : {display:' none'};
+    return (
+      <div className={styles.urlError} style={style}>
+        {intl.formatMessage(intlMessages.urlError)}
+      </div>
+    );
+  }
+
+  render() {
+    const intl = this.props.intl;
+
+    return (
+      <ModalBase
+        overlayClassName={styles.overlay}
+        className={styles.modal}
+        onRequestClose={this.props.closeModal}
+      >
+        <header data-test="videoModealHeader" className={styles.header}>
+          <h3 className={styles.title} >{intl.formatMessage(intlMessages.title)}</h3>
+          <Button
+            data-test="modalBaseCloseButton"
+            className={styles.closeBtn}
+            label={intl.formatMessage(intlMessages.close)}
+            icon="close"
+            size="md"
+            hideLabel
+            onClick={this.props.closeModal}
+          />
+        </header>
+
+        <div className={styles.content}>
+          <div className={styles.videoUrl}>
+            <label htmlFor="video-modal-input">
+              {intl.formatMessage(intlMessages.input)}
+            </label>
+            <input
+              id="video-modal-input"
+              onChange={this.updateVideoUrlHandler}
+              name="video-modal-input"
+              value={this.state.url || ""}
+            />
+          </div>
+
+          <div className={styles.content}>
+	        {this.renderUrlError()}
+	      </div>
+
+
+          <Button
+            className={styles.startBtn}
+            label={intl.formatMessage(intlMessages.start)}
+            onClick={this.startWatchingHandler}
+            disabled={!this.isUrlValid() || (getUrlFromVideoId(this.props.url) === this.state.url)}>
+          </Button>
+
+          <Button
+            className={styles.stopBtn}
+            label={intl.formatMessage(intlMessages.stop)}
+            onClick={this.stopWatchingHandler}
+            disabled={!this.state.sharing}>
+          </Button>
+        </div>
+      </ModalBase>
+    );
+  }
+}
+
+export default injectIntl(withModalMounter(ExternalVideoModal));
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
new file mode 100644
index 0000000000..ceb5a641ae
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import ExternalVideoModal from './component';
+import Service from '../service';
+
+const ExternalVideoModalContainer = (props) => {
+  return <ExternalVideoModal {...props} />;
+}
+
+
+export default withModalMounter(withTracker(({ mountModal }) =>
+  ({
+    closeModal: () => {
+      mountModal(null);
+    },
+    updateVideoUrl: Service.updateVideoUrl,
+    startWatching: Service.startWatching,
+    stopWatching: Service.stopWatching,
+    url: Service.getVideoUrl(),
+    hasVideo: Service.hasExternalVideo(),
+  }))(ExternalVideoModalContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
new file mode 100755
index 0000000000..db71873ab9
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
@@ -0,0 +1,163 @@
+@import "/imports/ui/stylesheets/variables/_all";
+@import "/imports/ui/components/modal/simple/styles";
+
+.header {
+  margin: 0;
+  padding: 0;
+  border: none;
+  line-height: 2rem;
+}
+
+.content {
+  justify-content: center;
+  padding-bottom: 0;
+  margin-right: auto;
+  margin-left: auto;
+  width: 100%;
+}
+
+.videoOptions {
+  margin-top: auto;
+  margin-bottom: auto;
+  display: flex;
+}
+
+.overlay {
+  @extend .overlay;
+}
+
+.modal {
+  @extend .modal;
+  padding: 1.5rem;
+  min-height: 20rem;
+}
+
+.closeBtn {
+  position: relative;
+  background-color: var(--color-white);
+
+  i {
+    color: var(--color-gray-light);
+  }
+
+  &:focus,
+  &:hover{
+    background-color: var(--color-gray-lighter);
+    i{
+      color: var(--color-gray);
+    }
+  }
+}
+.warning{
+  text-align: center;
+  font-weight: var(--headings-font-weight);
+  font-size: 5rem;
+  white-space: normal;
+}
+.text{
+  margin: var(--line-height-computed);
+  text-align: center;
+}
+
+.main {
+  margin: var(--line-height-computed);
+  text-align: center;
+  font-size: var(--font-size-large);
+}
+
+.startBtn {
+  &:focus {
+    outline: none !important;
+  }
+
+  i{
+    color: #3c5764;
+  }
+
+  margin: 0;
+  width: 40%;
+
+  display: block;
+
+  position: absolute;
+  bottom:   20px;
+
+  color: var(--color-white) !important;
+  background-color: var(--color-link) !important;
+}
+
+.stopBtn {
+  &:focus {
+    outline: none !important;
+  }
+
+  i{
+    color: red;
+  }
+
+  margin-left: 50%;
+  width: 40%;
+
+  display: block;
+
+  position: absolute;
+  bottom:   20px;
+
+  color: var(--color-white) !important;
+  background-color: red !important;
+}
+
+.title {
+  text-align: center;
+  font-weight: 400;
+  font-size: 1.3rem;
+  white-space: normal;
+
+  @include mq(var(--small-only)) {
+    font-size: 1rem;
+    padding: 0 1rem;
+  }
+}
+
+.videoUrl {
+  label {
+    display: block;
+    font-weight: 600;
+  }
+
+  input {
+    display: block;
+    margin: 10px 0 10px 0;
+
+    padding: 0.4em;
+
+    background-color: #F1F8FF;
+
+    line-height: 2rem;
+
+    width: 100%;
+
+    font-family: inherit;
+    font-weight: inherit;
+    border: none;
+
+    border-radius: 0.4rem;
+    transition: box-shadow var(--transitionDuration);
+  }
+
+  input:focus {
+    outline: none;
+    box-shadow: 0.2rem 0.8rem 1.6rem 600;
+  }
+
+  span {
+    font-weight: 600;
+  }
+}
+
+.urlError {
+  color: red;
+  padding: 1em;
+  transition: 1s;
+}
+
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
new file mode 100644
index 0000000000..a3606d95e1
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
@@ -0,0 +1,55 @@
+import { Meteor } from 'meteor/meteor';
+import Users from '/imports/api/users';
+import Meetings from '/imports/api/meetings';
+import Auth from '/imports/ui/services/auth';
+import Settings from '/imports/ui/services/settings';
+import ExternalVideoStreamer from '/imports/api/external-videos';
+
+import { makeCall } from '/imports/ui/services/api';
+
+const startWatching = (url) => {
+  let externalVideoUrl = videoIdFromUrl(url);
+  makeCall('startWatchingExternalVideo', {externalVideoUrl});
+}
+
+const stopWatching = () => {
+  makeCall('stopWatchingExternalVideo');
+}
+
+const videoIdFromUrl = (url) => {
+  let urlObj = new URL(url);
+  let params = new URLSearchParams(urlObj.search);
+
+  return params.get('v');
+}
+
+const sendMessage = (event, data) => {
+  ExternalVideoStreamer.emit(event,{
+      ...data,
+      meetingId: Auth._meetingID,
+      userId: Auth._userID,
+   });
+};
+
+const onMessage = (message, func) => {
+  ExternalVideoStreamer.on(message, func);
+};
+
+const hasExternalVideo = () => {
+  let meetingId = Auth._meetingID;
+  let meeting = Meetings.findOne({meetingId});
+
+  return meeting && meeting.externalVideoUrl;
+}
+
+const getVideoUrl = hasExternalVideo;
+
+export {
+  sendMessage,
+  onMessage,
+  hasExternalVideo,
+  getVideoUrl,
+  updateVideoUrl,
+  startWatching,
+  stopWatching,
+};
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/styles.scss b/bigbluebutton-html5/imports/ui/components/external-video-player/styles.scss
new file mode 100644
index 0000000000..e278d6d420
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/styles.scss
@@ -0,0 +1,52 @@
+@import "/imports/ui/stylesheets/mixins/focus";
+@import "/imports/ui/stylesheets/variables/_all";
+
+$icon-offset: -.4em;
+
+.note {
+  background-color: #fff;
+  padding-top: var(--md-padding-x);
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  justify-content: space-around;
+  overflow: hidden;
+}
+
+.header {
+  display: flex;
+  flex-direction: row;
+  align-items: left;
+  flex-shrink: 0;
+  padding-left: var(--md-padding-x);
+  padding-right: var(--md-padding-x);
+
+  a {
+    @include elementFocus(var(--color-primary));
+    padding-bottom: var(--sm-padding-y);
+    padding-left: var(--sm-padding-y);
+    text-decoration: none;
+    display: block;
+  }
+
+  [class^="icon-bbb-"],
+  [class*=" icon-bbb-"] {
+    font-size: 85%;
+  }
+}
+
+.title {
+  @extend %text-elipsis;
+  flex: 1;
+}
+
+iframe {
+  display: flex;
+  flex-flow: column;
+  flex-grow: 1;
+  flex-shrink: 1;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  border-style: none;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index eb6ca0ce21..cea1f388ee 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -12,6 +12,8 @@ import MediaService, { getSwapLayout } from './service';
 import PresentationPodsContainer from '../presentation-pod/container';
 import ScreenshareContainer from '../screenshare/container';
 import DefaultContent from '../presentation/default-content/component';
+import ExternalVideoContainer from '../external-video-player/container';
+import { getVideoUrl } from '../external-video-player/service';
 
 const LAYOUT_CONFIG = Meteor.settings.public.layout;
 const KURENTO_CONFIG = Meteor.settings.public.kurento;
@@ -132,6 +134,10 @@ export default withModalMounter(withTracker(() => {
     data.hideOverlay = hidePresentation;
   }
 
+  if (MediaService.shouldShowExternalVideo()) {
+    data.children = <ExternalVideoContainer isPresenter={MediaService.isUserPresenter()} videoId={getVideoUrl()} />;
+  }
+
   MediaContainer.propTypes = propTypes;
   return data;
 })(injectIntl(MediaContainer)));
diff --git a/bigbluebutton-html5/imports/ui/components/media/service.js b/bigbluebutton-html5/imports/ui/components/media/service.js
index 9cea76a3c1..595217bf5c 100755
--- a/bigbluebutton-html5/imports/ui/components/media/service.js
+++ b/bigbluebutton-html5/imports/ui/components/media/service.js
@@ -1,5 +1,6 @@
 import Presentations from '/imports/api/presentations';
 import { isVideoBroadcasting } from '/imports/ui/components/screenshare/service';
+import { hasExternalVideo } from '/imports/ui/components/external-video-player/service';
 import Auth from '/imports/ui/services/auth';
 import Users from '/imports/api/users';
 import Settings from '/imports/ui/services/settings';
@@ -30,6 +31,10 @@ function shouldShowScreenshare() {
   return isVideoBroadcasting() && getFromUserSettings('enableScreensharing', KURENTO_CONFIG.enableScreensharing);
 }
 
+function shouldShowExternalVideo() {
+  return hasExternalVideo() && Meteor.settings.public.app.enableExternalVideo;
+}
+
 function shouldShowOverlay() {
   return getFromUserSettings('enableVideo', KURENTO_CONFIG.enableVideo);
 }
@@ -64,6 +69,7 @@ export default {
   getPresentationInfo,
   shouldShowWhiteboard,
   shouldShowScreenshare,
+  shouldShowExternalVideo,
   shouldShowOverlay,
   isUserPresenter,
   isVideoBroadcasting,
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index f7eb4818d2..c76e5a9a61 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -62,6 +62,7 @@
     "react-toastify": "^4.4.3",
     "react-toggle": "~4.0.2",
     "react-transition-group": "~2.5.0",
+    "react-youtube": "7.8.0",
     "reconnecting-websocket": "~v4.1.10",
     "redis": "~2.8.0",
     "string-hash": "~1.1.3",
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 93c91b147b..0b8a9628d6 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -491,5 +491,12 @@
     "app.createBreakoutRoom.addParticipantLabel": "+ Add participant",
     "app.createBreakoutRoom.freeJoin": "Allow users to choose a breakout room to join",
     "app.createBreakoutRoom.leastOneWarnBreakout": "You must place at least one user in a breakout room.",
-    "app.createBreakoutRoom.modalDesc": "Complete the steps below to create rooms in your session, To add participants to a room."
+    "app.createBreakoutRoom.modalDesc": "Complete the steps below to create rooms in your session, To add participants to a room.",
+    "app.externalVideo.start": "Share a new video",
+    "app.externalVideo.stop": "Stop Sharing video",
+    "app.externalVideo.title": "Share a youtube video",
+    "app.externalVideo.input": "Youtube video URL",
+    "app.externalVideo.urlError": "This URL isn't a valid youtube video",
+    "app.externalVideo.close": "Close",
+    "app.actionsBar.actionsDropdown.shareExternalVideo": "Share Youtube Video"
 }
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
index 6450371462..f52ac7f33a 100644
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -397,7 +397,13 @@
     "app.videoDock.webcamFocusLabel": "Focar",
     "app.videoDock.webcamFocusDesc": "Focar a webcam selecionada",
     "app.videoDock.webcamUnfocusLabel": "Desfocar",
-    "app.videoDock.webcamUnfocusDesc": "Desfocar a webcam selecionada"
-
+    "app.videoDock.webcamUnfocusDesc": "Desfocar a webcam selecionada",
+    "app.externalVideo.start": "Compartilhar novo vídeo",
+    "app.externalVideo.stop": "Parar compartilhamento",
+    "app.externalVideo.title": "Compartilhar vídeo do Youtube",
+    "app.externalVideo.input": "Endereço do Youtube",
+    "app.externalVideo.urlError": "Este endereço não é um vídeo youtube válido",
+    "app.externalVideo.close": "Fechar",
+    "app.actionsBar.actionsDropdown.shareExternalVideo": "Compartilhar vídeo"
 }
 
diff --git a/bigbluebutton-html5/server/main.js b/bigbluebutton-html5/server/main.js
index a5584374cc..23e5b0885b 100755
--- a/bigbluebutton-html5/server/main.js
+++ b/bigbluebutton-html5/server/main.js
@@ -20,6 +20,8 @@ import '/imports/api/voice-users/server';
 import '/imports/api/whiteboard-multi-user/server';
 import '/imports/api/video/server';
 
+import '/imports/api/external-videos/server';
+
 // Commons
 import '/imports/api/log-client/server';
 import '/imports/api/common/server/helpers';

From 5a21ae41efc51a68bbdc09d52ca93ffa59f71744 Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Mon, 14 Jan 2019 16:11:06 -0200
Subject: [PATCH 076/163] Changed default color in the whiteboard toolbar #5691

---
 .../ui/components/whiteboard/whiteboard-toolbar/component.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
index a34fca67d2..641a74c6b5 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
@@ -85,11 +85,11 @@ class WhiteboardToolbar extends Component {
       // variables to keep current selected draw settings
       annotationSelected,
       thicknessSelected: { value: 4 },
-      colorSelected: { value: '#000000' },
+      colorSelected: { value: '#ff0000' },
       fontSizeSelected: { value: 20 },
 
       // keeping the previous color and the thickness icon's radius selected for svg animation
-      prevColorSelected: { value: '#000000' },
+      prevColorSelected: { value: '#ff0000' },
       prevThicknessSelected: { value: 4 },
 
       // lists of tools/thickness/colors are not direct children of main toolbar buttons

From 65522aa2721eb35ca9222bab9729ac7bb66823f0 Mon Sep 17 00:00:00 2001
From: Maxim Khlobystov <maxim.khlobystov@gmail.com>
Date: Mon, 14 Jan 2019 15:18:28 -0500
Subject: [PATCH 077/163] Make sure the preview video and the dropdown are in
 sync (set the default preview webcam before displaying the preview video)

---
 .../ui/components/video-preview/component.jsx | 85 +++++++++++--------
 1 file changed, 50 insertions(+), 35 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
index 995db27bc3..53aa742264 100644
--- a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -156,34 +156,48 @@ class VideoPreview extends Component {
     const constraints = {
       video: VIDEO_CONSTRAINTS,
     };
-    navigator.mediaDevices.getUserMedia(constraints).then((stream) => {
-      this.video.srcObject = stream;
-      this.deviceStream = stream;
-      navigator.mediaDevices.enumerateDevices().then((devices) => {
-        let isInitialDeviceSet = false;
-        const webcams = [];
-        if (webcamDeviceId) {
-          this.changeWebcam(webcamDeviceId);
-          this.setState({ webcamDeviceId });
-          isInitialDeviceSet = true;
-        }
-        devices.forEach((device) => {
-          if (device.kind === 'videoinput') {
-            webcams.push(device);
-            if (!isInitialDeviceSet) {
-              this.changeWebcam(device.deviceId);
-              this.setState({ webcamDeviceId: device.deviceId });
-              isInitialDeviceSet = true;
-            }
+
+    navigator.mediaDevices.enumerateDevices().then((devices) => {
+      let isInitialDeviceSet = false;
+      const webcams = [];
+
+      // set webcam
+      if (webcamDeviceId) {
+        this.changeWebcam(webcamDeviceId);
+        this.setState({ webcamDeviceId });
+        isInitialDeviceSet = true;
+      }
+      devices.forEach((device) => {
+        if (device.kind === 'videoinput') {
+          if (!isInitialDeviceSet) {
+            this.changeWebcam(device.deviceId);
+            this.setState({ webcamDeviceId: device.deviceId });
+            isInitialDeviceSet = true;
           }
-        });
-        if (webcams.length > 0) {
-          this.setState({ availableWebcams: webcams });
         }
       });
-    }).catch((error) => {
-      this.setState({ isStartSharingDisabled: true });
-      this.handlegUMError(error);
+      if (webcams.length > 0) {
+        this.setState({ availableWebcams: webcams });
+      }
+
+      constraints.video.deviceId = { exact: this.state.webcamDeviceId };
+      navigator.mediaDevices.getUserMedia(constraints).then((stream) => {
+        // display the preview
+        this.video.srcObject = stream;
+        this.deviceStream = stream;
+
+        navigator.mediaDevices.enumerateDevices().then((devices) => {
+          // get the list of webcams (labels are available at this point)
+          devices.forEach((device) => {
+            if (device.kind === 'videoinput') {
+              webcams.push(device);
+            }
+          });
+          if (webcams.length > 0) {
+            this.setState({ availableWebcams: webcams });
+          }
+        });
+      });
     });
   }
 
@@ -237,16 +251,18 @@ class VideoPreview extends Component {
                   <option key={index} value={webcam.deviceId}>
                     {webcam.label}
                   </option>
-                  ))}
+                ))}
               </select>
-              ) :
-              <select
-                className={styles.select}
-              >
-                <option disabled>
-                  {intl.formatMessage(intlMessages.webcamNotFoundLabel)}
-                </option>
-              </select>}
+            )
+              : (
+                <select
+                  className={styles.select}
+                >
+                  <option disabled>
+                    {intl.formatMessage(intlMessages.webcamNotFoundLabel)}
+                  </option>
+                </select>
+              )}
           </div>
         </div>
         <div className={styles.footer}>
@@ -271,4 +287,3 @@ class VideoPreview extends Component {
 VideoPreview.propTypes = propTypes;
 
 export default injectIntl(VideoPreview);
-

From 7153782c393d058c830ce24242eb88fe8aa74f57 Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Mon, 14 Jan 2019 12:23:46 -0800
Subject: [PATCH 078/163] Fix closing about modal

---
 .../ui/components/modal/simple/component.jsx      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
index 8f1da7a80b..030b725421 100755
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/component.jsx
@@ -24,6 +24,15 @@ const defaultProps = {
 };
 
 class ModalSimple extends Component {
+  constructor(props) {
+    super(props);
+    this.handleDismiss = this.handleDismiss.bind(this);
+  }
+
+  handleDismiss() {
+    this.props.modalHide(this.props.dismiss.callback);
+  }
+
   render() {
     const {
       title,
@@ -35,11 +44,13 @@ class ModalSimple extends Component {
       ...otherProps
     } = this.props;
 
+    const closeModel = (onRequestClose || this.handleDismiss);
+
     return (
       <ModalBase
         isOpen={modalisOpen}
         className={cx(className, styles.modal)}
-        onRequestClose={onRequestClose}
+        onRequestClose={closeModel}
         contentLabel={title}
         {...otherProps}
       >
@@ -51,7 +62,7 @@ class ModalSimple extends Component {
             icon="close"
             circle
             hideLabel
-            onClick={onRequestClose}
+            onClick={closeModel}
             aria-describedby="modalDismissDescription"
           />
         </header>

From b4bd4d1725e64f2c0c851d8818509203c248eee6 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Mon, 14 Jan 2019 21:39:03 +0000
Subject: [PATCH 079/163] recording indicator checks if iAmModerator; end
 meeting menu

---
 .../end-meeting-confirmation/component.jsx    |  86 ++++++++++++
 .../end-meeting-confirmation/container.jsx    |  20 +++
 .../end-meeting-confirmation/styles.scss      |  58 ++++++++
 .../ui/components/meeting-ended/component.jsx |  31 ++--
 .../ui/components/nav-bar/component.jsx       |   4 +-
 .../ui/components/nav-bar/container.jsx       |   8 ++
 .../nav-bar/recording-indicator/component.jsx | 132 ++++++++++++++----
 .../nav-bar/settings-dropdown/component.jsx   |  20 +--
 .../nav-bar/settings-dropdown/container.jsx   |  12 +-
 .../nav-bar/settings-dropdown/service.js      |  14 --
 .../ui/components/recording/component.jsx     |   5 +-
 .../imports/ui/components/toast/container.jsx |   4 +-
 bigbluebutton-html5/private/locales/en.json   |   2 -
 13 files changed, 322 insertions(+), 74 deletions(-)
 create mode 100644 bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
 create mode 100644 bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx
 create mode 100755 bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
new file mode 100644
index 0000000000..61f336737b
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import Button from '/imports/ui/components/button/component';
+import Modal from '/imports/ui/components/modal/simple/component';
+import { styles } from './styles';
+
+
+const intlMessages = defineMessages({
+  endMeetingTitle: {
+    id: 'app.endMeeting.title',
+    description: 'end meeting title',
+  },
+  endMeetingDescription: {
+    id: 'app.endMeeting.description',
+    description: 'end meeting description',
+  },
+  yesLabel: {
+    id: 'app.endMeeting.yesLabel',
+    description: 'label for yes button for end meeting',
+  },
+  noLabel: {
+    id: 'app.endMeeting.noLabel',
+    description: 'label for no button for end meeting',
+  },
+});
+
+const propTypes = {
+  intl: intlShape.isRequired,
+  closeModal: PropTypes.func.isRequired,
+  endMeeting: PropTypes.func.isRequired,
+};
+
+class EndMeetingComponent extends React.PureComponent {
+  constructor(props) {
+    super(props);
+    const {
+      closeModal,
+      endMeeting,
+    } = props;
+
+    this.closeModal = closeModal;
+    this.endMeeting = endMeeting;
+  }
+
+  render() {
+    const { intl } = this.props;
+
+    return (
+      <Modal
+        overlayClassName={styles.overlay}
+        className={styles.modal}
+        onRequestClose={this.closeModal}
+        hideBorder
+      >
+        <div className={styles.container}>
+          <div className={styles.header}>
+            <div className={styles.title}>
+              {intl.formatMessage(intlMessages.endMeetingTitle)}
+            </div>
+          </div>
+          <div className={styles.description}>
+            {intl.formatMessage(intlMessages.endMeetingDescription)}
+          </div>
+          <div className={styles.footer}>
+            <Button
+              color="primary"
+              className={styles.button}
+              label={intl.formatMessage(intlMessages.yesLabel)}
+              onClick={() => this.endMeeting()}
+            />
+            <Button
+              label={intl.formatMessage(intlMessages.noLabel)}
+              className={styles.button}
+              onClick={() => this.closeModal()}
+            />
+          </div>
+        </div>
+      </Modal>
+    );
+  }
+}
+
+EndMeetingComponent.propTypes = propTypes;
+
+export default injectIntl(EndMeetingComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx
new file mode 100644
index 0000000000..94718568f9
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import { makeCall } from '/imports/ui/services/api';
+import Auth from '/imports/ui/services/auth';
+import EndMeetingComponent from './component';
+
+const EndMeetingContainer = props => <EndMeetingComponent {...props} />;
+
+export default withModalMounter(withTracker(({ mountModal }) => ({
+  closeModal() {
+    mountModal(null);
+  },
+
+  endMeeting: () => {
+    makeCall('endMeeting', Auth.credentials);
+    mountModal(null);
+  },
+
+}))(EndMeetingContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/styles.scss b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/styles.scss
new file mode 100755
index 0000000000..494cec7540
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/styles.scss
@@ -0,0 +1,58 @@
+@import '/imports/ui/stylesheets/mixins/focus';
+@import '/imports/ui/stylesheets/variables/_all';
+@import "/imports/ui/components/modal/simple/styles";
+
+:root {
+  --description-margin: 3.5rem;
+}
+
+.title {
+  color: var(--color-gray-dark);
+  font-weight: var(--headings-font-weight);
+  font-size: var(--jumbo-padding-y);
+}
+
+.container {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding: 0;
+  margin-top: 0;
+  margin-right: var(--description-margin);
+  margin-left: var(--description-margin);
+  margin-bottom: var(--lg-padding-x);
+}
+
+.footer {
+  display:flex;
+}
+
+.button {
+  padding-right: var(--jumbo-padding-y);
+  padding-left: var(--jumbo-padding-y);
+  margin-right: var(--sm-padding-x);
+}
+
+.description {
+  text-align: center;
+  line-height: var(--line-height-base);
+  color: var(--color-gray);
+  margin-bottom: var(--jumbo-padding-y)
+}
+
+.modal {
+  @extend .modal;
+  padding: var(--sm-padding-y);
+}
+
+.overlay {
+  @extend .overlay;
+}
+
+.header {
+  margin: 0;
+  padding: 0;
+  border: none;
+  line-height: var(--title-position-left);
+  margin-bottom: var(--lg-padding-y);
+}
diff --git a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
index a8d07b4d80..8038e6be2b 100755
--- a/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
@@ -74,6 +74,7 @@ class MeetingEnded extends React.PureComponent {
     const comment = textarea.value;
     return comment;
   }
+
   constructor(props) {
     super(props);
     this.state = {
@@ -131,7 +132,11 @@ class MeetingEnded extends React.PureComponent {
 
   render() {
     const { intl, code } = this.props;
-    const noRating = this.state.selected <= 0;
+    const {
+      selected,
+    } = this.state;
+
+    const noRating = selected <= 0;
     return (
       <div className={styles.parent}>
         <div className={styles.modal}>
@@ -148,13 +153,15 @@ class MeetingEnded extends React.PureComponent {
                   total="5"
                   onRate={this.setSelectedStar}
                 />
-                {!noRating ? (<textarea
-                  rows="5"
-                  id="feedbackComment"
-                  className={styles.textarea}
-                  placeholder={intl.formatMessage(intlMessage.textarea)}
-                  aria-describedby="textareaDesc"
-                />) : null}
+                {!noRating ? (
+                  <textarea
+                    rows="5"
+                    id="feedbackComment"
+                    className={styles.textarea}
+                    placeholder={intl.formatMessage(intlMessage.textarea)}
+                    aria-describedby="textareaDesc"
+                  />
+                ) : null}
               </div>
             ) : null }
             <Button
@@ -162,10 +169,10 @@ class MeetingEnded extends React.PureComponent {
               onClick={this.sendFeedback}
               className={styles.button}
               label={noRating
-                 ? intl.formatMessage(intlMessage.buttonOkay)
-                 : intl.formatMessage(intlMessage.sendLabel)}
-              description={noRating ?
-                intl.formatMessage(intlMessage.confirmDesc)
+                ? intl.formatMessage(intlMessage.buttonOkay)
+                : intl.formatMessage(intlMessage.sendLabel)}
+              description={noRating
+                ? intl.formatMessage(intlMessage.confirmDesc)
                 : intl.formatMessage(intlMessage.sendDesc)}
             />
           </div>
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index 4f908c1fbc..271d3196ae 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -250,6 +250,7 @@ class NavBar extends PureComponent {
 
   render() {
     const {
+      amIModerator,
       hasUnreadMessages,
       recordProps,
       isExpanded,
@@ -302,10 +303,11 @@ class NavBar extends PureComponent {
               : intl.formatMessage(intlMessages.stopTitle))}
             mountModal={mountModal}
             time={time}
+            amIModerator={amIModerator()}
           />
         </div>
         <div className={styles.right}>
-          <SettingsDropdownContainer />
+          <SettingsDropdownContainer amIModerator={amIModerator()} />
         </div>
       </div>
     );
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
index a496dbef81..f38c89ad24 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { withTracker } from 'meteor/react-meteor-data';
 import { Session } from 'meteor/session';
 import Meetings from '/imports/api/meetings';
+import Users from '/imports/api/users';
 import Auth from '/imports/ui/services/auth';
 import { meetingIsBreakout } from '/imports/ui/components/app/service';
 import getFromUserSettings from '/imports/ui/services/users-settings';
@@ -10,6 +11,7 @@ import userListService from '../user-list/service';
 import ChatService from '../chat/service';
 import Service from './service';
 import NavBar from './component';
+import mapUser from '../../services/user/mapUser';
 
 const PUBLIC_CONFIG = Meteor.settings.public;
 const PUBLIC_GROUP_CHAT_ID = PUBLIC_CONFIG.chat.public_group_id;
@@ -68,7 +70,13 @@ export default withTracker(() => {
 
   const isExpanded = Session.get('isUserListOpen');
 
+  const amIModerator = () => {
+    const currentUser = Users.findOne({ userId: Auth.userID });
+    return mapUser(currentUser).isModerator;
+  };
+
   return {
+    amIModerator,
     isExpanded,
     breakouts,
     currentUserId,
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
index 7da7efadae..730cfdf792 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx
@@ -3,35 +3,113 @@ import Button from '/imports/ui/components/button/component';
 import RecordingContainer from '/imports/ui/components/recording/container';
 import humanizeSeconds from '/imports/utils/humanizeSeconds';
 import cx from 'classnames';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import { styles } from './styles';
 
-const RecordingIndicator = ({
-  record, title, recording, buttonTitle, mountModal, time,
-}) => {
-  if (!record) return null;
+const intlMessages = defineMessages({
+  notificationRecordingStart: {
+    id: 'app.notification.recordingStart',
+    description: 'Notification for when the recording starts',
+  },
+  notificationRecordingStop: {
+    id: 'app.notification.recordingStop',
+    description: 'Notification for when the recording stops',
+  },
+});
 
-  return (
-    <div
-      aria-label={title}
-      className={styles.recordState}
-    >
-      <div className={styles.border}>
-        <Button
-          label={buttonTitle}
-          hideLabel
-          ghost
-          className={cx(styles.btn, recording ? styles.recordIndicator : styles.notRecording)}
-          onClick={() => {
-            mountModal(<RecordingContainer />);
-            document.activeElement.blur();
-          }}
-        />
-      </div>
-      <div className={styles.presentationTitle}>
-        {recording ? humanizeSeconds(time) : <div>{buttonTitle}</div>}
-      </div>
-    </div>
-  );
+const propTypes = {
+  intl: intlShape.isRequired,
+  amIModerator: PropTypes.bool,
+  record: PropTypes.bool,
+  recording: PropTypes.bool,
+  title: PropTypes.string,
+  buttonTitle: PropTypes.string.isRequired,
+  mountModal: PropTypes.func.isRequired,
+  time: PropTypes.number,
 };
 
-export default RecordingIndicator;
+const defaultProps = {
+  amIModerator: false,
+  record: false,
+  recording: false,
+  title: '',
+  time: 0,
+};
+
+class RecordingIndicator extends React.PureComponent {
+  render() {
+    const {
+      record,
+      title,
+      recording,
+      buttonTitle,
+      mountModal,
+      time,
+      amIModerator,
+      intl,
+    } = this.props;
+
+    if (!record) return null;
+
+    return (
+      <div>
+        {amIModerator ? (
+          <div
+            aria-label={title}
+            className={styles.recordState}
+          >
+
+            <div className={styles.border}>
+              <Button
+                label={buttonTitle}
+                hideLabel
+                ghost
+                className={cx(styles.btn, recording ? styles.recordIndicator : styles.notRecording)}
+                onClick={() => {
+                  mountModal(<RecordingContainer amIModerator={amIModerator} />);
+                  document.activeElement.blur();
+                }}
+              />
+            </div>
+
+            <div className={styles.presentationTitle}>
+              {recording ? humanizeSeconds(time) : <div>{buttonTitle}</div>}
+            </div>
+
+          </div>
+        ) : null }
+
+        {amIModerator ? null : (
+          <div
+            aria-label={title}
+            className={styles.recordState}
+          >
+            <div className={styles.border}>
+              <Button
+                label={`${intl.formatMessage(recording
+                  ? intlMessages.notificationRecordingStart
+                  : intlMessages.notificationRecordingStop)}`}
+                aria-label={`${intl.formatMessage(recording
+                  ? intlMessages.notificationRecordingStart
+                  : intlMessages.notificationRecordingStop)}`}
+                hideLabel
+                ghost
+                className={cx(styles.btn, recording ? styles.recordIndicator : styles.notRecording)}
+                onClick={() => {}}
+              />
+            </div>
+            <div className={styles.presentationTitle}>
+              {recording ? humanizeSeconds(time) : null}
+            </div>
+          </div>
+        )}
+      </div>
+    );
+  }
+}
+
+RecordingIndicator.propTypes = propTypes;
+RecordingIndicator.defaultProps = defaultProps;
+
+export default injectIntl(RecordingIndicator);
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index 1d5f258316..8eaa6d2507 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -103,7 +103,7 @@ class SettingsDropdown extends PureComponent {
 
   componentWillMount() {
     const {
-      intl, mountModal, isAndroid, handleToggleFullscreen, isModerator,
+      intl, mountModal, isAndroid, handleToggleFullscreen, amIModerator,
     } = this.props;
     const { fullscreenLabel, fullscreenDesc, fullscreenIcon } = this.checkFullscreen(this.props);
     const { showHelpButton: helpButton } = Meteor.settings.public.app;
@@ -147,14 +147,16 @@ class SettingsDropdown extends PureComponent {
       onClick={() => mountModal(<ShortcutHelpComponent />)}
     />),
     (<DropdownListSeparator key={_.uniqueId('list-separator-')} />),
-    !isModerator ? null
-      : (<DropdownListItem
-        key={_.uniqueId('list-item-')}
-        icon="application"
-        label={intl.formatMessage(intlMessages.endMeetingLabel)}
-        description={intl.formatMessage(intlMessages.endMeetingDesc)}
-        onClick={() => mountModal(<EndMeetingConfirmationContainer />)}
-      />),
+    !amIModerator ? null
+      : (
+        <DropdownListItem
+          key={_.uniqueId('list-item-')}
+          icon="application"
+          label={intl.formatMessage(intlMessages.endMeetingLabel)}
+          description={intl.formatMessage(intlMessages.endMeetingDesc)}
+          onClick={() => mountModal(<EndMeetingConfirmationContainer />)}
+        />
+      ),
     (<DropdownListItem
       key={_.uniqueId('list-item-')}
       icon="logout"
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
index c0203657b9..ffae690291 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import browser from 'browser-detect';
 import SettingsDropdown from './component';
-import { toggleFullScreen, isModerator } from './service';
+import { toggleFullScreen } from './service';
 
 export default class SettingsDropdownContainer extends PureComponent {
   constructor(props) {
@@ -22,8 +22,7 @@ export default class SettingsDropdownContainer extends PureComponent {
       'MSFullscreenChange',
     ];
 
-    fullscreenChangedEvents.forEach(event =>
-      document.addEventListener(event, this.handleFullscreenChange));
+    fullscreenChangedEvents.forEach(event => document.addEventListener(event, this.handleFullscreenChange));
   }
 
   componentWillUnmount() {
@@ -34,8 +33,7 @@ export default class SettingsDropdownContainer extends PureComponent {
       'MSFullscreenChange',
     ];
 
-    fullscreenChangedEvents.forEach(event =>
-      document.removeEventListener(event, this.fullScreenToggleCallback));
+    fullscreenChangedEvents.forEach(event => document.removeEventListener(event, this.fullScreenToggleCallback));
   }
 
   handleFullscreenChange() {
@@ -50,6 +48,8 @@ export default class SettingsDropdownContainer extends PureComponent {
   }
 
   render() {
+    const { amIModerator } = this.props;
+
     const handleToggleFullscreen = toggleFullScreen;
     const { isFullScreen } = this.state;
     const result = browser();
@@ -60,7 +60,7 @@ export default class SettingsDropdownContainer extends PureComponent {
         handleToggleFullscreen={handleToggleFullscreen}
         isFullScreen={isFullScreen}
         isAndroid={isAndroid}
-        isModerator={isModerator()}
+        amIModerator={amIModerator}
       />
     );
   }
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
index 747763974e..59551489a9 100644
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/service.js
@@ -1,7 +1,3 @@
-import Users from '/imports/api/users';
-import mapUser from '/imports/ui/services/user/mapUser';
-import Auth from '/imports/ui/services/auth';
-
 const toggleFullScreen = () => {
   const element = document.documentElement;
 
@@ -30,16 +26,6 @@ const toggleFullScreen = () => {
   }
 };
 
-const isModerator = () => {
-  const currentUserId = Auth.userID;
-  const currentUser = Users.findOne({ userId: currentUserId });
-
-  console.error(currentUser)
-  return (currentUser) ? mapUser(currentUser).isModerator : null;
-};
-
-
 export {
-  isModerator,
   toggleFullScreen,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/recording/component.jsx b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
index a025153d93..931ed7eef8 100755
--- a/bigbluebutton-html5/imports/ui/components/recording/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
@@ -37,10 +37,12 @@ const propTypes = {
   closeModal: PropTypes.func.isRequired,
   toggleRecording: PropTypes.func.isRequired,
   recordingStatus: PropTypes.bool,
+  amIModerator: PropTypes.bool,
 };
 
 const defaultProps = {
   recordingStatus: false,
+  amIModerator: false,
 };
 
 class RecordingComponent extends React.PureComponent {
@@ -56,8 +58,9 @@ class RecordingComponent extends React.PureComponent {
   }
 
   render() {
-    const { intl, recordingStatus } = this.props;
+    const { intl, recordingStatus, amIModerator } = this.props;
 
+    if (!amIModerator) return null;
     return (
       <Modal
         overlayClassName={styles.overlay}
diff --git a/bigbluebutton-html5/imports/ui/components/toast/container.jsx b/bigbluebutton-html5/imports/ui/components/toast/container.jsx
index 592910f4e3..b633540b85 100755
--- a/bigbluebutton-html5/imports/ui/components/toast/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/toast/container.jsx
@@ -21,11 +21,11 @@ const intlMessages = defineMessages({
   },
   notificationRecordingStart: {
     id: 'app.notification.recordingStart',
-    description: 'Notification for when the recording start',
+    description: 'Notification for when the recording starts',
   },
   notificationRecordingStop: {
     id: 'app.notification.recordingStop',
-    description: 'Notification for when the recording stpop',
+    description: 'Notification for when the recording stops',
   },
 });
 
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 38a1ffdd2e..b54a7370f1 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -242,8 +242,6 @@
     "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Stop sharing your screen with",
-    "app.actionsBar.actionsDropdown.startRecording": "Start recording",
-    "app.actionsBar.actionsDropdown.stopRecording": "Stop recording",
     "app.actionsBar.actionsDropdown.pollBtnLabel": "Start a poll",
     "app.actionsBar.actionsDropdown.pollBtnDesc": "Toggles poll pane",
     "app.actionsBar.actionsDropdown.createBreakoutRoom": "Create breakout rooms",

From c21bb693b4da07e27881d84733518230d2fa0122 Mon Sep 17 00:00:00 2001
From: gustavotrott <gustavo@trott.com.br>
Date: Mon, 14 Jan 2019 22:45:32 -0200
Subject: [PATCH 080/163] Store in session if can generate ice candidates,
 change timeout to 5secs, display error msgs

---
 .../components/video-provider/component.jsx   |  23 +--
 .../ui/services/audio-manager/index.js        |   8 +-
 .../imports/utils/safari-webrtc.js            | 136 ++++++++++--------
 3 files changed, 100 insertions(+), 67 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index 80aae0fd16..c0cc7b83b4 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -101,14 +101,7 @@ const MAX_CAMERA_SHARE_FAILED_WAIT_TIME = 60000;
 const PING_INTERVAL = 15000;
 
 class VideoProvider extends Component {
-  static checkIceConnectivity() {
-    // Webkit ICE restrictions demand a capture device permission to release
-    // host candidates
-    if (browser().name === 'safari') {
-      tryGenerateIceCandidates();
-    }
-  }
-
+  
   constructor(props) {
     super(props);
 
@@ -146,6 +139,7 @@ class VideoProvider extends Component {
     this.customGetStats = this.customGetStats.bind(this);
   }
 
+  
 
   componentWillMount() {
     this.ws.onopen = this.onWsOpen;
@@ -156,7 +150,7 @@ class VideoProvider extends Component {
   }
 
   componentDidMount() {
-    VideoProvider.checkIceConnectivity();
+    this.checkIceConnectivity();
     document.addEventListener('joinVideo', this.shareWebcam); // TODO find a better way to do this
     document.addEventListener('exitVideo', this.unshareWebcam);
     this.ws.onmessage = this.onWsMessage;
@@ -284,6 +278,17 @@ class VideoProvider extends Component {
     }
   }
 
+  checkIceConnectivity() {
+    // Webkit ICE restrictions demand a capture device permission to release
+    // host candidates
+    if (browser().name === 'safari') {
+      const { intl } = this.props;
+      tryGenerateIceCandidates().catch((e) => {
+        this.notifyError(intl.formatMessage(intlSFUErrors[2021]));
+      });
+    }
+  }
+  
   logger(type, message, options = {}) {
     const { userId, userName } = this.props;
     const topic = options.topic || 'video';
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 691450b179..d311901fb1 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -89,7 +89,7 @@ class AudioManager {
 
     this.isWaitingPermissions = false;
     this.devicesInitialized = false;
-    
+
     return Promise.all([
       this.setDefaultInputDevice(),
       this.setDefaultOutputDevice(),
@@ -150,7 +150,11 @@ class AudioManager {
     // Webkit ICE restrictions demand a capture device permission to release
     // host candidates
     if (name === 'safari') {
-      await tryGenerateIceCandidates();
+      try {
+        await tryGenerateIceCandidates();
+      } catch (e) {
+        this.notify(this.messages.error.ICE_NEGOTIATION_FAILED);
+      }
     }
 
     // Call polyfills for webrtc client if navigator is "iOS Webview"
diff --git a/bigbluebutton-html5/imports/utils/safari-webrtc.js b/bigbluebutton-html5/imports/utils/safari-webrtc.js
index 4d569dc6df..524ceb737b 100644
--- a/bigbluebutton-html5/imports/utils/safari-webrtc.js
+++ b/bigbluebutton-html5/imports/utils/safari-webrtc.js
@@ -1,65 +1,89 @@
-const iceServersList = [
-	{urls:"stun:stun.l.google.com:19302"},
-	{urls:"stun:stun1.l.google.com:19302"},
-	{urls:"stun:stun2.l.google.com:19302"},
-	{urls:"stun:stun3.l.google.com:19302"},
-	{urls:"stun:stun4.l.google.com:19302"},
-	{urls:"stun:stun.ekiga.net"},
-	{urls:"stun:stun.ideasip.com"},
-	{urls:"stun:stun.schlund.de"},
-	{urls:"stun:stun.stunprotocol.org:3478"},
-	{urls:"stun:stun.voiparound.com"},
-	{urls:"stun:stun.voipbuster.com"},
-	{urls:"stun:stun.voipstunt.com"},
-	{urls:"stun:stun.voxgratia.org"},
-	{urls:"stun:stun.services.mozilla.com"}
-	];
+import { fetchWebRTCMappedStunTurnServers } from '/imports/utils/fetchStunTurnServers';
+import Auth from '/imports/ui/services/auth';
+import { Session } from 'meteor/session';
 
+const defaultIceServersList = [
+  { urls: 'stun:stun.l.google.com:19302' },
+  { urls: 'stun:stun1.l.google.com:19302' },
+  { urls: 'stun:stun2.l.google.com:19302' },
+  { urls: 'stun:stun3.l.google.com:19302' },
+  { urls: 'stun:stun4.l.google.com:19302' },
+  { urls: 'stun:stun.ekiga.net' },
+  { urls: 'stun:stun.ideasip.com' },
+  { urls: 'stun:stun.schlund.de' },
+  { urls: 'stun:stun.stunprotocol.org:3478' },
+  { urls: 'stun:stun.voiparound.com' },
+  { urls: 'stun:stun.voipbuster.com' },
+  { urls: 'stun:stun.voipstunt.com' },
+  { urls: 'stun:stun.voxgratia.org' },
+  { urls: 'stun:stun.services.mozilla.com' },
+];
+
+const getSessionToken = () => Auth.sessionToken;
+
+export async function getIceServersList() {
+  try {
+    const iceServers = await fetchWebRTCMappedStunTurnServers(getSessionToken());
+
+    return iceServers || defaultIceServersList;
+  } catch (error) {
+    return defaultIceServersList;
+  }
+}
 
 export function canGenerateIceCandidates() {
+  return new Promise((resolve, reject) => {
+    if (Session.get('canGenerateIceCandidates')) {
+      resolve();
+      return;
+    }
     
-    return new Promise((resolve, reject) => {
-		pc = new RTCPeerConnection({iceServers: iceServersList});
-		countIceCandidates = 0;
+    getIceServersList().catch((e) => {
+      reject();
+    }).then((iceServersReceived) => {
+      const pc = new RTCPeerConnection({ iceServers: iceServersReceived });
+      let countIceCandidates = 0;
 
-		try{ pc.addTransceiver('audio'); } catch (e) {}
+      try { pc.addTransceiver('audio'); } catch (e) { }
 
-		pc.onicecandidate = function (e) {
-			if(countIceCandidates) return;
-			if (e.candidate) {
-				countIceCandidates++;
-				resolve();
-			}
-		}
-		
-		pc.onicegatheringstatechange  = function(e) {
-			if(e.currentTarget.iceGatheringState == 'complete' && countIceCandidates == 0) reject();
-		}
-		
-		setTimeout(function(){
-			pc.close();
-			if(!countIceCandidates) reject();
-		}, 3000);
+      pc.onicecandidate = function (e) {
+        if (countIceCandidates) return;
+        if (e.candidate) {
+          countIceCandidates++;
+          Session.set('canGenerateIceCandidates', true);
+          resolve();
+        }
+      }
 
-		p = pc.createOffer({offerToReceiveVideo: true});
-		p.then( answer => {pc.setLocalDescription(answer) ; } )
-	});
-};
+      pc.onicegatheringstatechange = function (e) {
+        if (e.currentTarget.iceGatheringState == 'complete' && countIceCandidates == 0) reject();
+      }
+
+      setTimeout(function () {
+        pc.close();
+        if (!countIceCandidates) reject();
+    }, 5000);
+
+      const p = pc.createOffer({ offerToReceiveVideo: true });
+      p.then((answer) => { pc.setLocalDescription(answer); });
+    });
+  });
+}
 
 export function tryGenerateIceCandidates() {
-	return new Promise((resolve, reject) => {
-		canGenerateIceCandidates().then(ok => {
-			resolve();
-		}).catch(e => {
-			navigator.mediaDevices.getUserMedia({audio: true, video: false}).then(function (stream) {
-				canGenerateIceCandidates().then(ok => {
-					resolve();
-				}).catch(e => {
-					reject();
-				});
-			}).catch(e => {
-				reject();
-			});
-		});
-	});
-};
\ No newline at end of file
+  return new Promise((resolve, reject) => {
+    canGenerateIceCandidates().then((ok) => {
+      resolve();
+    }).catch((e) => {
+      navigator.mediaDevices.getUserMedia({ audio: true, video: false }).then(function (stream) {
+        canGenerateIceCandidates().then((ok) => {
+          resolve();
+        }).catch((e) => {
+          reject();
+        });
+      }).catch((e) => {
+        reject();
+      });
+    });
+  });
+}
\ No newline at end of file

From 2c98ecb2b85dbf202ebb3341c4ba82d138cf7268 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Tue, 15 Jan 2019 10:13:55 -0300
Subject: [PATCH 081/163] Aesthetic fixes to buttons

---
 .../presentation-options/component.jsx        | 24 ++++-------
 .../ui/components/presentation/component.jsx  | 10 ++---
 .../ui/components/presentation/styles.scss    |  2 -
 .../fullscreen-button/component.jsx           | 41 +++++++++----------
 .../ui/components/video-provider/styles.scss  | 21 ++++++++--
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
index a5e6e41de7..bbe37dbc33 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
@@ -1,10 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
-import browser from 'browser-detect';
 import Button from '/imports/ui/components/button/component';
-import logger from '/imports/startup/client/logger';
-import { notify } from '/imports/ui/services/notification';
 import cx from 'classnames';
 import { styles } from '../styles';
 
@@ -24,30 +21,23 @@ const intlMessages = defineMessages({
   },
 });
 
-const BROWSER_RESULTS = browser();
-const isMobileBrowser = (BROWSER_RESULTS ? BROWSER_RESULTS.mobile : false) ||
-  (BROWSER_RESULTS && BROWSER_RESULTS.os ?
-    BROWSER_RESULTS.os.includes('Android') : // mobile flag doesn't always work
-    false);
-
 const PresentationOptionsContainer = ({
   intl,
-  toggleSwapLayout
-}) => {
-
-  return <Button
+  toggleSwapLayout,
+}) => (
+  <Button
     className={cx(styles.button, styles.presentationButton)}
-    icon='presentation'
+    icon="presentation"
     label={intl.formatMessage(intlMessages.restorePresentationLabel)}
-     description={intl.formatMessage(intlMessages.restorePresentationDesc)}
+    description={intl.formatMessage(intlMessages.restorePresentationDesc)}
     color="primary"
     hideLabel
     circle
     size="lg"
     onClick={toggleSwapLayout}
-    id='restore-presentation'
+    id="restore-presentation"
   />
-};
+);
 
 PresentationOptionsContainer.propTypes = propTypes;
 export default injectIntl(PresentationOptionsContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 1fb55d8bb4..f19ea09e43 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -327,8 +327,8 @@ export default class PresentationArea extends Component {
     const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
 
     const style = {
-      right: `${marginRight - 82}px`,
-      top: `${marginTop - 82}px`,
+      right: `${marginRight}px`,
+      top: `${marginTop}px`,
     };
 
     return (
@@ -357,7 +357,7 @@ export default class PresentationArea extends Component {
       bottom: `${marginTop}px`,
     };
 
-    return <FullscreenButton innerStyle={style} handleFullscreen={full} />;
+    return <FullscreenButton innerStyle={style} handleFullscreen={full} dark />;
   }
 
   renderPresentationToolbar() {
@@ -405,8 +405,8 @@ export default class PresentationArea extends Component {
           />
           { this.renderPresentationClose() }
           { this.renderPresentationFullscreen() }
-          {this.state.showSlide ?
-              this.renderPresentationArea()
+          {this.state.showSlide
+            ? this.renderPresentationArea()
             : null }
           {this.props.userIsPresenter || this.props.multiUser
             ? this.renderWhiteboardToolbar()
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
index 61491fe1f2..80ec1ff6b2 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
@@ -67,11 +67,9 @@
 
 .topRight {
   position: absolute;
-  padding: 80px;
 }
 
 .topRight .close {
-  display: none;
   transition: 1s;
 }
 
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
index 64fadeaeec..b8bd74a29c 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
+import cx from 'classnames';
 import { styles } from '../styles';
 
 const intlMessages = defineMessages({
@@ -14,25 +15,23 @@ const FullscreenButtonComponent = ({
   intl,
   handleFullscreen,
   innerStyle,
-}) => {
-
-  return (
-    <div style={innerStyle} className={styles.fullscreenButton}>
-      <Button
-       role="button"
-       aria-labelledby="fullscreenButtonLabel"
-       aria-describedby="fullscreenButtonDesc"
-       color="default"
-       icon="fullscreen"
-       size="sm"
-       onClick={handleFullscreen}
-       label={intl.formatMessage(intlMessages.fullscreenButton)}
-       hideLabel
-       circle
-       className={styles.button}
-     />
-    </div>
-  );
-};
+  dark,
+}) => (
+  <div style={innerStyle} className={cx(styles.fullscreenButton, dark ? styles.dark : null)}>
+    <Button
+      role="button"
+      aria-labelledby="fullscreenButtonLabel"
+      aria-describedby="fullscreenButtonDesc"
+      color="default"
+      icon="fullscreen"
+      size="sm"
+      onClick={handleFullscreen}
+      label={intl.formatMessage(intlMessages.fullscreenButton)}
+      hideLabel
+      circle
+      className={styles.button}
+    />
+  </div>
+);
 
 export default injectIntl(FullscreenButtonComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
index 8324d1dca8..6ff4cf8022 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
@@ -17,26 +17,39 @@
 //   }
 // }
 
+:root {
+  --color-transparent: #ff000000;
+}
+
 .fullscreenButton {
   position: absolute;
   right: 0;
   bottom: 0;
-  // z-index: 2;
 
   padding: 0;
 
-  background-color: #ff000000;
+  background-color: var(--color-transparent);
+
+  cursor: pointer;
+
+  border: none;
 }
 
 .button {
 
   span, span:active, span:hover {
-    background-color: #ff000000;
+    background-color: var(--color-transparent);
 
-    border: 0;
+    border: none;
 
     i {
+      border: none;
+      background-color: var(--color-transparent);
       font-weight: bold;
     }
   }
 }
+
+.dark .button span i {
+  color: var(--color-black);
+}

From 4a396fac10f6b4230a42dec38ade87edea231897 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Tue, 15 Jan 2019 13:31:11 -0200
Subject: [PATCH 082/163] Fix error getBoundingClientRect at console

---
 .../components/chat/message-list/message-list-item/component.jsx | 1 +
 .../chat/message-list/message-list-item/message/component.jsx    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
index ba01f8f39b..b71363064c 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
@@ -24,6 +24,7 @@ const eventsToBeBound = [
 ];
 
 const isElementInViewport = (el) => {
+  if (!el) return false;
   const rect = el.getBoundingClientRect();
   const prefetchHeight = 125;
 
diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx
index 614d2f2886..2d915182a8 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/message/component.jsx
@@ -18,6 +18,7 @@ const eventsToBeBound = [
 ];
 
 const isElementInViewport = (el) => {
+  if (!el) return false;
   const rect = el.getBoundingClientRect();
 
   return (

From f1772f18f8eab470808c8f6226b63f21f77eb747 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Tue, 15 Jan 2019 18:08:42 +0000
Subject: [PATCH 083/163] reactive amIModerator on navbar dropdown

---
 .../nav-bar/settings-dropdown/component.jsx   | 193 +++++++++---------
 .../nav-bar/settings-dropdown/container.jsx   |   8 +-
 2 files changed, 99 insertions(+), 102 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index 8eaa6d2507..32cab52be9 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import _ from 'lodash';
+import PropTypes from 'prop-types';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import EndMeetingConfirmationContainer from '/imports/ui/components/end-meeting-confirmation/container';
 import AboutContainer from '/imports/ui/components/about/container';
@@ -89,6 +90,23 @@ const intlMessages = defineMessages({
   },
 });
 
+const propTypes = {
+  intl: intlShape.isRequired,
+  handleToggleFullscreen: PropTypes.func.isRequired,
+  mountModal: PropTypes.func.isRequired,
+  isFullScreen: PropTypes.bool,
+  isAndroid: PropTypes.bool,
+  amIModerator: PropTypes.bool,
+  shortcuts: PropTypes.string,
+};
+
+const defaultProps = {
+  isFullScreen: false,
+  isAndroid: false,
+  amIModerator: false,
+  shortcuts: '',
+};
+
 class SettingsDropdown extends PureComponent {
   constructor(props) {
     super(props);
@@ -101,85 +119,6 @@ class SettingsDropdown extends PureComponent {
     this.onActionsHide = this.onActionsHide.bind(this);
   }
 
-  componentWillMount() {
-    const {
-      intl, mountModal, isAndroid, handleToggleFullscreen, amIModerator,
-    } = this.props;
-    const { fullscreenLabel, fullscreenDesc, fullscreenIcon } = this.checkFullscreen(this.props);
-    const { showHelpButton: helpButton } = Meteor.settings.public.app;
-
-    this.menuItems = _.compact([(<DropdownListItem
-      key={_.uniqueId('list-item-')}
-      icon={fullscreenIcon}
-      label={fullscreenLabel}
-      description={fullscreenDesc}
-      onClick={handleToggleFullscreen}
-    />),
-    (<DropdownListItem
-      key={_.uniqueId('list-item-')}
-      icon="settings"
-      label={intl.formatMessage(intlMessages.settingsLabel)}
-      description={intl.formatMessage(intlMessages.settingsDesc)}
-      onClick={() => mountModal(<SettingsMenuContainer />)}
-    />),
-    (<DropdownListItem
-      key={_.uniqueId('list-item-')}
-      icon="about"
-      label={intl.formatMessage(intlMessages.aboutLabel)}
-      description={intl.formatMessage(intlMessages.aboutDesc)}
-      onClick={() => mountModal(<AboutContainer />)}
-    />),
-    !helpButton ? null
-      : (
-        <DropdownListItem
-          key={_.uniqueId('list-item-')}
-          icon="help"
-          label={intl.formatMessage(intlMessages.helpLabel)}
-          description={intl.formatMessage(intlMessages.helpDesc)}
-          onClick={() => window.open('https://bigbluebutton.org/videos/')}
-        />
-      ),
-    (<DropdownListItem
-      key={_.uniqueId('list-item-')}
-      icon="shortcuts"
-      label={intl.formatMessage(intlMessages.hotkeysLabel)}
-      description={intl.formatMessage(intlMessages.hotkeysDesc)}
-      onClick={() => mountModal(<ShortcutHelpComponent />)}
-    />),
-    (<DropdownListSeparator key={_.uniqueId('list-separator-')} />),
-    !amIModerator ? null
-      : (
-        <DropdownListItem
-          key={_.uniqueId('list-item-')}
-          icon="application"
-          label={intl.formatMessage(intlMessages.endMeetingLabel)}
-          description={intl.formatMessage(intlMessages.endMeetingDesc)}
-          onClick={() => mountModal(<EndMeetingConfirmationContainer />)}
-        />
-      ),
-    (<DropdownListItem
-      key={_.uniqueId('list-item-')}
-      icon="logout"
-      label={intl.formatMessage(intlMessages.leaveSessionLabel)}
-      description={intl.formatMessage(intlMessages.leaveSessionDesc)}
-      onClick={logoutRouteHandler}
-    />),
-    ]);
-
-    // Removes fullscreen button if not on Android
-    if (!isAndroid) {
-      this.menuItems.shift();
-    }
-  }
-
-  componentWillReceiveProps(nextProps) {
-    const { isAndroid } = this.props;
-    // Alters fullscreen button's label
-    if (isAndroid) {
-      this.alterMenu(nextProps);
-    }
-  }
-
   onActionsShow() {
     this.setState({
       isSettingOpen: true,
@@ -192,8 +131,13 @@ class SettingsDropdown extends PureComponent {
     });
   }
 
-  checkFullscreen(nextProps) {
-    const { intl, isFullScreen } = nextProps;
+  getFullscreenItem() {
+    const {
+      intl,
+      isFullScreen,
+      isAndroid,
+      handleToggleFullscreen,
+    } = this.props;
 
     let fullscreenLabel = intl.formatMessage(intlMessages.fullscreenLabel);
     let fullscreenDesc = intl.formatMessage(intlMessages.fullscreenDesc);
@@ -204,28 +148,78 @@ class SettingsDropdown extends PureComponent {
       fullscreenDesc = intl.formatMessage(intlMessages.exitFullscreenDesc);
       fullscreenIcon = 'exit_fullscreen';
     }
-    return {
-      fullscreenLabel,
-      fullscreenDesc,
-      fullscreenIcon,
-    };
-  }
 
-  alterMenu(props) {
-    const { fullscreenLabel, fullscreenDesc, fullscreenIcon } = this.checkFullscreen(props);
-    const { handleToggleFullscreen } = this.props;
-
-    const newFullScreenButton = (
+    if (!isAndroid) return null;
+    return (
       <DropdownListItem
-        key={_.uniqueId('list-item-')}
+        key="list-item-fullscreen"
         icon={fullscreenIcon}
         label={fullscreenLabel}
         description={fullscreenDesc}
         onClick={handleToggleFullscreen}
       />
     );
-    this.menuItems = this.menuItems.slice(1);
-    this.menuItems.unshift(newFullScreenButton);
+  }
+
+  renderMenuItems() {
+    const {
+      intl, mountModal, amIModerator,
+    } = this.props;
+
+    const { showHelpButton: helpButton } = Meteor.settings.public.app;
+
+    return _.compact([
+      this.getFullscreenItem(),
+      (<DropdownListItem
+        key="list-item-settings"
+        icon="settings"
+        label={intl.formatMessage(intlMessages.settingsLabel)}
+        description={intl.formatMessage(intlMessages.settingsDesc)}
+        onClick={() => mountModal(<SettingsMenuContainer />)}
+      />),
+      (<DropdownListItem
+        key="list-item-about"
+        icon="about"
+        label={intl.formatMessage(intlMessages.aboutLabel)}
+        description={intl.formatMessage(intlMessages.aboutDesc)}
+        onClick={() => mountModal(<AboutContainer />)}
+      />),
+      !helpButton ? null
+        : (
+          <DropdownListItem
+            key="list-item-help"
+            icon="help"
+            label={intl.formatMessage(intlMessages.helpLabel)}
+            description={intl.formatMessage(intlMessages.helpDesc)}
+            onClick={() => window.open('https://bigbluebutton.org/videos/')}
+          />
+        ),
+      (<DropdownListItem
+        key="list-item-shortcuts"
+        icon="shortcuts"
+        label={intl.formatMessage(intlMessages.hotkeysLabel)}
+        description={intl.formatMessage(intlMessages.hotkeysDesc)}
+        onClick={() => mountModal(<ShortcutHelpComponent />)}
+      />),
+      (<DropdownListSeparator key={_.uniqueId('list-separator-')} />),
+      !amIModerator ? null
+        : (
+          <DropdownListItem
+            key="list-item-end-meeting"
+            icon="application"
+            label={intl.formatMessage(intlMessages.endMeetingLabel)}
+            description={intl.formatMessage(intlMessages.endMeetingDesc)}
+            onClick={() => mountModal(<EndMeetingConfirmationContainer />)}
+          />
+        ),
+      (<DropdownListItem
+        key="list-item-logout"
+        icon="logout"
+        label={intl.formatMessage(intlMessages.leaveSessionLabel)}
+        description={intl.formatMessage(intlMessages.leaveSessionDesc)}
+        onClick={logoutRouteHandler}
+      />),
+    ]);
   }
 
   render() {
@@ -259,14 +253,13 @@ class SettingsDropdown extends PureComponent {
         </DropdownTrigger>
         <DropdownContent placement="bottom right">
           <DropdownList>
-            {
-              this.menuItems
-            }
+            {this.renderMenuItems()}
           </DropdownList>
         </DropdownContent>
       </Dropdown>
     );
   }
 }
-
+SettingsDropdown.propTypes = propTypes;
+SettingsDropdown.defaultProps = defaultProps;
 export default withShortcutHelper(withModalMounter(injectIntl(SettingsDropdown)), 'openOptions');
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
index ffae690291..37dfbe63c0 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/container.jsx
@@ -22,7 +22,9 @@ export default class SettingsDropdownContainer extends PureComponent {
       'MSFullscreenChange',
     ];
 
-    fullscreenChangedEvents.forEach(event => document.addEventListener(event, this.handleFullscreenChange));
+    fullscreenChangedEvents.forEach((event) => {
+      document.addEventListener(event, this.handleFullscreenChange);
+    });
   }
 
   componentWillUnmount() {
@@ -33,7 +35,9 @@ export default class SettingsDropdownContainer extends PureComponent {
       'MSFullscreenChange',
     ];
 
-    fullscreenChangedEvents.forEach(event => document.removeEventListener(event, this.fullScreenToggleCallback));
+    fullscreenChangedEvents.forEach((event) => {
+      document.removeEventListener(event, this.fullScreenToggleCallback);
+    });
   }
 
   handleFullscreenChange() {

From 04d31d300f610dc7d77d3c10dcc8a0d003863b63 Mon Sep 17 00:00:00 2001
From: Calvin Walton <calvin.walton@kepstin.ca>
Date: Tue, 15 Jan 2019 14:15:42 -0500
Subject: [PATCH 084/163] Wait until the media is ready before initializing the
 acorn player.

Previously, the acorn player was being initialized before the asynchronous
load of captions information completed, meaning that the acorn player didn't
know there were caption tracks, and the CC selector control wasn't available.

Fixes #6463
---
 .../playback/presentation/2.0/playback.js     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/record-and-playback/presentation/playback/presentation/2.0/playback.js b/record-and-playback/presentation/playback/presentation/2.0/playback.js
index 8783cd9016..965f67872f 100755
--- a/record-and-playback/presentation/playback/presentation/2.0/playback.js
+++ b/record-and-playback/presentation/playback/presentation/2.0/playback.js
@@ -531,16 +531,6 @@ function loadPlayback() {
     loadAudio();
   }
 
-  // load up the acorn controls
-  logger.info("==Loading acorn media player");
-  $('#video').acornMediaPlayer({
-    theme: 'bigbluebutton',
-    volumeSlider: 'vertical'
-  });
-  $('#video').on("swap", function() {
-    swapVideoPresentation();
-  });
-
   if (hasDeskshare) {
     loadDeskshare();
   } else {
@@ -802,6 +792,16 @@ document.addEventListener('playback-ready', function(event) {
   if (dataReady && mediaReady && contentReady) {
     runPopcorn();
     if (firstLoad) {
+      // load up the acorn controls
+      logger.info("==Loading acorn media player");
+      $('#video').acornMediaPlayer({
+        theme: 'bigbluebutton',
+        volumeSlider: 'vertical'
+      });
+      $('#video').on("swap", function() {
+        swapVideoPresentation();
+      });
+
       initPopcorn();
     }
   }

From 0d1a351842ae17fde0e8335589735a4dd294d953 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Tue, 15 Jan 2019 17:35:47 -0500
Subject: [PATCH 085/163] Update audio overlay to omit BigBlueButton word

Closes #6562
---
 bigbluebutton-html5/private/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 93c91b147b..d87fffad98 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -313,7 +313,7 @@
     "app.audioModal.echoTestTitle": "This is a private echo test. Speak a few words. Did you hear audio?",
     "app.audioModal.settingsTitle": "Change your audio settings",
     "app.audioModal.helpTitle": "There was an issue with your media devices",
-    "app.audioModal.helpText": "Did you give BigBlueButton permission to access your microphone? Note that a dialog should appear when you try to join audio, asking for your media device permissions, please accept that in order to join the audio conference. If that is not the case, try changing your microphone permissions in your browser's settings.",
+    "app.audioModal.helpText": "Did you give permission for access to your microphone? Note that a dialog should appear when you try to join audio, asking for your media device permissions, please accept that in order to join the audio conference. If that is not the case, try changing your microphone permissions in your browser's settings.",
     "app.audioModal.connecting": "Connecting",
     "app.audioModal.connectingEchoTest": "Connecting to echo test",
     "app.audioManager.joinedAudio": "You have joined the audio conference",
@@ -337,7 +337,7 @@
     "app.audio.audioSettings.retryLabel": "Retry",
     "app.audio.listenOnly.backLabel": "Back",
     "app.audio.listenOnly.closeLabel": "Close",
-    "app.audio.permissionsOverlay.title": "Allow BigBlueButton to use your Media Devices",
+    "app.audio.permissionsOverlay.title": "Allow access to your microphone",
     "app.audio.permissionsOverlay.hint": "We need you to allow us to use your Media Devices in order to join you to the voice conference :)",
     "app.error.removed": "You have been removed from the conference",
     "app.error.meeting.ended": "You have logged out of the conference",

From 62edac4912e1daa95dbc74e7639c1bd19d4c2814 Mon Sep 17 00:00:00 2001
From: praven <praven@qburst.com>
Date: Wed, 16 Jan 2019 12:44:57 +0530
Subject: [PATCH 086/163] Adding variables listed in the docker README

---
 labs/docker/k8s/bbb-web.yaml      | 2 ++
 labs/docker/k8s/bbb-webhooks.yaml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/labs/docker/k8s/bbb-web.yaml b/labs/docker/k8s/bbb-web.yaml
index 784ae337eb..24d6588fc3 100644
--- a/labs/docker/k8s/bbb-web.yaml
+++ b/labs/docker/k8s/bbb-web.yaml
@@ -32,6 +32,8 @@ spec:
           value: "12345"
         - name: TURN_SECRET
           value: "54321"
+        - name: TURN_DOMAIN
+          value: bigbluebutton.rocket.chat
         image: fcecagno/bigbluebutton:bbb-web
         imagePullPolicy: Always
         name: bbb-web
diff --git a/labs/docker/k8s/bbb-webhooks.yaml b/labs/docker/k8s/bbb-webhooks.yaml
index 9239ce01e4..b1aff374d2 100644
--- a/labs/docker/k8s/bbb-webhooks.yaml
+++ b/labs/docker/k8s/bbb-webhooks.yaml
@@ -30,6 +30,10 @@ spec:
           value: redis
         - name: SHARED_SECRET
           value: "12345"
+        - name: SERVER_DOMAIN
+          value: bigbluebutton.rocket.chat
+        - name: BEARER_AUTH
+          value: "1"
         image: fcecagno/bigbluebutton:bbb-webhooks
         imagePullPolicy: Always
         name: bbb-webhooks

From 49711801f199e450fc017c816ceadb39e1195b1d Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Wed, 16 Jan 2019 11:08:20 -0200
Subject: [PATCH 087/163] Fix public chat alerts #6430

---
 .../ui/components/chat/alert/component.jsx    | 14 +++++++-----
 .../ui/components/nav-bar/component.jsx       | 22 +++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
index 443aa822e1..dbf0b88c4b 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/alert/component.jsx
@@ -62,8 +62,8 @@ class ChatAlert extends PureComponent {
     } = this.state;
     // Avoid alerting messages received before enabling alerts
     if (prevProps.pushAlertDisabled && !pushAlertDisabled) {
-      const lastMessageTimestamp = Service.getLastMessageTimestampFromChatList(activeChats);
-      this.setLastAlertTimestamp(lastMessageTimestamp);
+      const newAlertEnabledTimestamp = Service.getLastMessageTimestampFromChatList(activeChats);
+      this.setAlertEnabledTimestamp(newAlertEnabledTimestamp);
       return;
     }
 
@@ -117,13 +117,15 @@ class ChatAlert extends PureComponent {
       },
     );
 
-    this.setChatMessagesState(newPendingNotificationsByChat, newLastAlertTimestampByChat);
+    if (!pushAlertDisabled) {
+      this.setChatMessagesState(newPendingNotificationsByChat, newLastAlertTimestampByChat);
+    }
   }
 
-  setLastAlertTimestamp(newLastAlertTimestamp) {
+  setAlertEnabledTimestamp(newAlertEnabledTimestamp) {
     const { alertEnabledTimestamp } = this.state;
-    if (newLastAlertTimestamp > 0 && alertEnabledTimestamp !== newLastAlertTimestamp) {
-      this.setState({ alertEnabledTimestamp: newLastAlertTimestamp });
+    if (newAlertEnabledTimestamp > 0 && alertEnabledTimestamp !== newAlertEnabledTimestamp) {
+      this.setState({ alertEnabledTimestamp: newAlertEnabledTimestamp });
     }
   }
 
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index 4f908c1fbc..1dd410700c 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -87,6 +87,16 @@ const openBreakoutJoinConfirmation = (breakout, breakoutName, mountModal) => mou
 const closeBreakoutJoinConfirmation = mountModal => mountModal(null);
 
 class NavBar extends PureComponent {
+  static handleToggleUserList() {
+    Session.set(
+      'openPanel',
+      Session.get('openPanel') !== ''
+        ? ''
+        : 'userlist',
+    );
+    Session.set('idChatOpen', '');
+  }
+
   constructor(props) {
     super(props);
 
@@ -97,7 +107,6 @@ class NavBar extends PureComponent {
     };
 
     this.incrementTime = this.incrementTime.bind(this);
-    this.handleToggleUserList = this.handleToggleUserList.bind(this);
   }
 
   componentDidMount() {
@@ -162,15 +171,6 @@ class NavBar extends PureComponent {
     clearInterval(this.interval);
   }
 
-  handleToggleUserList() {
-    Session.set(
-      'openPanel',
-      Session.get('openPanel') !== ''
-        ? ''
-        : 'userlist',
-    );
-  }
-
   inviteUserToBreakout(breakout) {
     const {
       mountModal,
@@ -278,7 +278,7 @@ class NavBar extends PureComponent {
         <div className={styles.left}>
           <Button
             data-test="userListToggleButton"
-            onClick={this.handleToggleUserList}
+            onClick={NavBar.handleToggleUserList}
             ghost
             circle
             hideLabel

From 9b2bc7c219b1a306f162faf80d8efe0629571794 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Mon, 10 Dec 2018 20:07:20 -0300
Subject: [PATCH 088/163] Correctly unmount youtube player area

---
 .../actions-bar/actions-dropdown/component.jsx | 18 ++++++++++--------
 .../external-video-player/component.jsx        | 16 +++++++---------
 .../imports/ui/components/media/container.jsx  |  4 +++-
 .../private/config/settings.yml                |  1 +
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index ea0f963c45..64dd0c2d1e 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -170,14 +170,16 @@ class ActionsDropdown extends Component {
           />
         )
         : null),
-      (isUserPresenter && allowExternalVideo ?
-        <DropdownListItem
-          icon="video"
-          label={intl.formatMessage(intlMessages.externalVideoLabel)}
-          description="External Video"
-          key="external-video"
-          onClick={this.handleExternalVideoClick}
-        />
+      (isUserPresenter && allowExternalVideo
+        ? (
+          <DropdownListItem
+            icon="video"
+            label={intl.formatMessage(intlMessages.externalVideoLabel)}
+            description="External Video"
+            key="external-video"
+            onClick={this.handleExternalVideoClick}
+          />
+        )
         : null),
       (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom
         ? (
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index 43e5c31b3f..bbc5dffa52 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -22,17 +22,10 @@ const PlayerState = {
   CUED: 5,
 }
 
-const propTypes = {
-};
-
-const defaultProps = {
-};
-
 class VideoPlayer extends Component {
 
   player = null;
   syncInterval = null;
-  time = null;
   playerState = PlayerState.UNSTARTED;
   presenterCommand = false;
   preventStateChange = false;
@@ -61,10 +54,11 @@ class VideoPlayer extends Component {
   }
 
   handleResize = () => {
-    if (!this.player)
+    let el = this.refPlayer;
+
+    if (!this.player || !el)
       return;
 
-    let el = this.refPlayer;
     let parent = el.parentElement;
     let w = parent.clientWidth;
     let h = parent.clientHeight;
@@ -198,6 +192,10 @@ class VideoPlayer extends Component {
     }
   };
 
+  componentWillUnmount() {
+    clearInterval(this.syncInterval);
+  }
+
   render () {
     return (
       <div
diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index cea1f388ee..d1223c3efc 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -135,7 +135,9 @@ export default withModalMounter(withTracker(() => {
   }
 
   if (MediaService.shouldShowExternalVideo()) {
-    data.children = <ExternalVideoContainer isPresenter={MediaService.isUserPresenter()} videoId={getVideoUrl()} />;
+    const presenter = MediaService.isUserPresenter();
+    const url = getVideoUrl();
+    data.children = <ExternalVideoContainer isPresenter={presenter} videoId={url} />;
   }
 
   MediaContainer.propTypes = propTypes;
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index f53ff108bd..962d6ec056 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -78,6 +78,7 @@ public:
     httpsConnection: false
     connectionTimeout: 60000
     showHelpButton: true
+    enableExternalVideo: false
   kurento:
     wsUrl: HOST
     chromeDefaultExtensionKey: akgoaoikmbmhcopjgakkcepdgdgkjfbc

From dfea777fb3c561412eb2ecd3f65ad134f296f43b Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Mon, 14 Jan 2019 16:10:08 -0300
Subject: [PATCH 089/163] Fixing youtube sync commits

---
 .../api/external-videos/server/index.js       |  8 ++++--
 .../external-video-player/modal/component.jsx | 27 ++++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/external-videos/server/index.js b/bigbluebutton-html5/imports/api/external-videos/server/index.js
index 8dd416f41d..255ce8571b 100644
--- a/bigbluebutton-html5/imports/api/external-videos/server/index.js
+++ b/bigbluebutton-html5/imports/api/external-videos/server/index.js
@@ -9,7 +9,8 @@ import './methods';
 
 ExternalVideoStreamer.allowRead('all');
 ExternalVideoStreamer.allowWrite('all');
-ExternalVideoStreamer.allowEmit(function(eventName, {userId, meetingId}) {
+
+const allowFromPresenter = (eventName, {userId, meetingId}) => {
   let user = Users.findOne({userId});
 
   let ret = user && user.presenter;
@@ -17,4 +18,7 @@ ExternalVideoStreamer.allowEmit(function(eventName, {userId, meetingId}) {
   Logger.debug('Auth userid:', userId, ' event: ', eventName, ' suc: ', ret);
 
   return ret || eventName == 'viewerJoined';
-});
+
+}
+
+ExternalVideoStreamer.allowEmit(allowFromPresenter);
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
index 77098f9923..89dbdf9f27 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -37,15 +37,17 @@ const intlMessages = defineMessages({
 
 const YOUTUBE_PREFIX = "https://youtube.com/watch?v=";
 
-const getUrlFromVideoId = (url) => {
-  return url ? `${YOUTUBE_PREFIX}${url}` : '';
+const getUrlFromVideoId = (id) => {
+  return id ? `${YOUTUBE_PREFIX}${id}` : '';
 }
 
 class ExternalVideoModal extends Component {
 
+  const { videoId } = this.props;
+
   state = {
-    url: getUrlFromVideoId(this.props.url),
-    sharing: this.props.hasVideo,
+    url: getUrlFromVideoId(videoId),
+    sharing: videoId,
   };
 
   isUrlEmpty = () => {
@@ -75,18 +77,23 @@ class ExternalVideoModal extends Component {
   }
 
   renderUrlError = () => {
-    const intl = this.props.intl;
+    const { intl } = this.props;
+    const { url } = this.state;
+
+    const valid = !this.isUrlEmpty() && url.length > 3 && !this.isUrlValid();
 
-    const style = !this.isUrlEmpty() && this.state.url.length > 3 && !this.isUrlValid() ? {} : {display:' none'};
     return (
-      <div className={styles.urlError} style={style}>
-        {intl.formatMessage(intlMessages.urlError)}
-      </div>
+      valid ?
+        (<div className={styles.urlError}>
+          {intl.formatMessage(intlMessages.urlError)}
+        </div>)
+      :
+        null
     );
   }
 
   render() {
-    const intl = this.props.intl;
+    const { intl } = this.props.intl;
 
     return (
       <ModalBase

From 6d4d3daba36f34099f822ebc25a5068fb6877737 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Tue, 15 Jan 2019 17:44:41 -0300
Subject: [PATCH 090/163] Youtube video. Fix syntax, variable names, move some
 code into the service, remove unused code

---
 .../methods/startWatchingExternalVideo.js     |   9 +-
 .../methods/stopWatchingExternalVideo.js      |  11 +-
 .../external-video-player/component.jsx       | 154 +++++++++---------
 .../external-video-player/container.jsx       |  18 +-
 .../external-video-player/modal/component.jsx | 115 +++++++------
 .../external-video-player/modal/container.jsx |  26 ++-
 .../external-video-player/modal/styles.scss   |   1 -
 .../external-video-player/service.js          |  62 +++----
 .../imports/ui/components/media/container.jsx |  11 +-
 .../imports/ui/components/media/service.js    |   4 +-
 10 files changed, 200 insertions(+), 211 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
index 4819e03b07..2903b02a31 100644
--- a/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
@@ -4,16 +4,13 @@ import Logger from '/imports/startup/server/logger';
 import Meetings from '/imports/api/meetings';
 
 export default function startStream(credentials, options) {
-  const { meetingId, requesterUserId, requesterToken } = credentials;
+  const { meetingId } = credentials;
   const { externalVideoUrl } = options;
 
   Logger.info(' user sharing a new youtube video: ', credentials);
 
-  check(requesterUserId, String);
-  check(requesterToken, String);
+  check(meetingId, String);
   check(externalVideoUrl, String);
 
-  Meetings.update({ meetingId }, { $set: { externalVideoUrl } });
-
-  return true;
+  return Meetings.update({ meetingId }, { $set: { externalVideoUrl } });
 }
diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
index 0738e45df7..3b63b1e01e 100644
--- a/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
@@ -3,15 +3,12 @@ import { check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
 import Meetings from '/imports/api/meetings';
 
-export default function startStream(credentials, options) {
-  const { meetingId, requesterUserId, requesterToken } = credentials;
+export default function startStream(credentials) {
+  const { meetingId } = credentials;
 
   Logger.info(' user sharing a new youtube video: ', credentials);
 
-  check(requesterUserId, String);
-  check(requesterToken, String);
+  check(meetingId, String);
 
-  Meetings.update({ meetingId }, { $set: { externalVideoUrl: null } });
-
-  return true;
+  return Meetings.update({ meetingId }, { $set: { externalVideoUrl: null } });
 }
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index bbc5dffa52..0a6f72ebd9 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -1,17 +1,7 @@
-import React, {Component} from "react";
-import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
+import React, { Component } from 'react';
 import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component';
-import Button from '/imports/ui/components/button/component';
-import { styles } from './styles';
-import Icon from '../icon/component';
-
 import YouTube from 'react-youtube';
-
-import Service from './service';
-
-const intlMessages = defineMessages({
-});
+import { sendMessage, onMessage } from './service';
 
 const PlayerState = {
   UNSTARTED: -1,
@@ -20,71 +10,84 @@ const PlayerState = {
   PAUSED: 2,
   BUFFERING: 3,
   CUED: 5,
-}
+};
 
 class VideoPlayer extends Component {
+  constructor(props) {
+    super(props);
 
-  player = null;
-  syncInterval = null;
-  playerState = PlayerState.UNSTARTED;
-  presenterCommand = false;
-  preventStateChange = false;
+    this.player = null;
+    this.syncInterval = null;
+    this.playerState = PlayerState.UNSTARTED;
+    this.presenterCommand = false;
+    this.preventStateChange = false;
+    this.opts = {
+      playerVars: {
+        width: '100%',
+        height: '100%',
+        autoplay: 1,
+        modestbranding: true,
+        rel: 0,
+        ecver: 2,
+      },
+    };
 
-  opts = {
-    playerVars: {
-      width: '100%',
-      height: '100%',
-      autoplay: 1,
-      modestbranding: true,
-      rel: 0,
-      ecver: 2,
+    this.keepSync = this.keepSync.bind(this);
+    this.handleResize = this.handleResize.bind(this);
+    this.handleOnReady = this.handleOnReady.bind(this);
+    this.handleStateChange = this.handleStateChange.bind(this);
+    this.resizeListener = () => {
+      setTimeout(this.handleResize, 0);
+    };
+  }
+
+  componentWillUpdate(nextProps) {
+    if (!nextProps.videoId) {
+      clearInterval(this.syncInterval);
     }
-  };
+  }
 
   componentDidMount() {
-    window.addEventListener('resize', () => {
-      setTimeout(this.handleResize, 0);
-    });
+    window.addEventListener('resize', this.resizeListener);
   }
 
   componentWillUnmount() {
-    window.removeEventListener('resize', () => {
-      setTimeout(this.handleResize, 0);
-    });
+    window.removeEventListener('resize', this.resizeListener);
+
+    clearInterval(this.syncInterval);
+    this.player = null;
+    this.refPlayer = null;
   }
 
-  handleResize = () => {
-    let el = this.refPlayer;
-
-    if (!this.player || !el)
+  handleResize() {
+    if (!this.player || !this.refPlayer) {
       return;
+    }
 
-    let parent = el.parentElement;
-    let w = parent.clientWidth;
-    let h = parent.clientHeight;
-    let idealW = h * 16/9;
+    const el = this.refPlayer;
+    const parent = el.parentElement;
+    const w = parent.clientWidth;
+    const h = parent.clientHeight;
+    const idealW = h * 16 / 9;
 
     if (idealW > w) {
-      this.player.setSize(w, w * 9/16);
+      this.player.setSize(w, w * 9 / 16);
     } else {
       this.player.setSize(idealW, h);
     }
   }
 
-  keepSync = () => {
-    let { isPresenter } = this.props;
+  keepSync() {
+    const { isPresenter } = this.props;
 
     if (isPresenter) {
-
       this.syncInterval = setInterval(() => {
-        let curTime = this.player.getCurrentTime();
-        let rate = this.player.getPlaybackRate();
-        Service.sendMessage('playerUpdate', {rate, time: curTime, state: this.playerState});
+        const curTime = this.player.getCurrentTime();
+        const rate = this.player.getPlaybackRate();
+        sendMessage('playerUpdate', { rate, time: curTime, state: this.playerState });
       }, 2000);
-
     } else {
-
-      Service.onMessage('play', ({time, state}) => {
+      onMessage('play', ({ time }) => {
         this.presenterCommand = true;
         if (this.player) {
           this.player.seekTo(time, true);
@@ -93,7 +96,7 @@ class VideoPlayer extends Component {
         }
       });
 
-      Service.onMessage('stop', ({time}) => {
+      onMessage('stop', ({ time }) => {
         this.presenterCommand = true;
 
         if (this.player) {
@@ -103,12 +106,12 @@ class VideoPlayer extends Component {
         }
       });
 
-      Service.onMessage('playerUpdate', (data) => {
+      onMessage('playerUpdate', (data) => {
         if (!this.player) {
           return;
         }
 
-        if (data.rate != this.player.getPlaybackRate()) {
+        if (data.rate !== this.player.getPlaybackRate()) {
           this.player.setPlaybackRate(data.rate);
         }
 
@@ -127,15 +130,14 @@ class VideoPlayer extends Component {
         }
       });
 
-      Service.onMessage('changePlaybackRate', (rate) => {
+      onMessage('changePlaybackRate', (rate) => {
         this.player.setPlaybackRate(rate);
       });
-
     }
   }
 
-  handleOnReady = (event) => {
-    let { isPresenter } = this.props;
+  handleOnReady(event) {
+    const { isPresenter } = this.props;
 
     this.player = event.target;
     this.player.pauseVideo();
@@ -143,17 +145,17 @@ class VideoPlayer extends Component {
     this.keepSync();
 
     if (!isPresenter) {
-      Service.sendMessage('viewerJoined');
+      sendMessage('viewerJoined');
     } else {
       this.player.playVideo();
     }
 
     this.handleResize();
-  };
+  }
 
-  handleStateChange = (event) => {
-    let { isPresenter } = this.props;
-    let curTime = this.player.getCurrentTime();
+  handleStateChange(event) {
+    const { isPresenter } = this.props;
+    const curTime = this.player.getCurrentTime();
 
     if (this.preventStateChange && [PlayerState.PLAYING, PlayerState.PAUSED].includes(event.data)) {
       this.preventStateChange = false;
@@ -165,9 +167,8 @@ class VideoPlayer extends Component {
     }
 
     if (event.data === PlayerState.PLAYING) {
-
       if (isPresenter) {
-        Service.sendMessage('play', {time: curTime});
+        sendMessage('play', { time: curTime });
         this.playerState = event.data;
       } else if (!this.presenterCommand) {
         this.player.seekTo(curTime, true);
@@ -179,7 +180,7 @@ class VideoPlayer extends Component {
       }
     } else if (event.data === PlayerState.PAUSED) {
       if (isPresenter) {
-        Service.sendMessage('stop', {time: curTime});
+        sendMessage('stop', { time: curTime });
         this.playerState = event.data;
       } else if (!this.presenterCommand) {
         this.player.seekTo(curTime);
@@ -190,28 +191,27 @@ class VideoPlayer extends Component {
         this.presenterCommand = false;
       }
     }
-  };
-
-  componentWillUnmount() {
-    clearInterval(this.syncInterval);
   }
 
   render () {
+    const { videoId } = this.props;
+    const { opts, handleOnReady, handleStateChange } = this;
+
     return (
       <div
         id="youtube-video-player"
         data-test="videoPlayer"
-        ref={(ref) => { this.refPlayer = ref; } }
+        ref={(ref) => { this.refPlayer = ref; }}
       >
         <YouTube
-          videoId={this.props.videoId}
-          opts={this.opts}
-          onReady={this.handleOnReady}
-          onStateChange={this.handleStateChange}
-          />
+          videoId={videoId}
+          opts={opts}
+          onReady={handleOnReady}
+          onStateChange={handleStateChange}
+        />
       </div>
     );
   }
 }
 
-export default injectWbResizeEvent(injectIntl(VideoPlayer));
+export default injectWbResizeEvent(VideoPlayer);
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx
index 37f3217594..7d3f3660cd 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/container.jsx
@@ -1,8 +1,7 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { withTracker } from 'meteor/react-meteor-data';
 import ExternalVideo from './component';
-import ExternalVideoService from './service';
 
 const intlMessages = defineMessages({
   title: {
@@ -11,16 +10,11 @@ const intlMessages = defineMessages({
   },
 });
 
-class ExternalVideoContainer extends Component {
-  componentDidMount() {}
-  render() {
-    return (
-      <ExternalVideo {...this.props}>
-        {this.props.children}
-      </ExternalVideo>
-    );
-  }
-}
+const ExternalVideoContainer = props => (
+  <ExternalVideo {...props}>
+    {props.children}
+  </ExternalVideo>
+);
 
 export default injectIntl(withTracker(({ params, intl }) => {
   const title = intl.formatMessage(intlMessages.title);
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
index 89dbdf9f27..7df0713960 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -1,12 +1,13 @@
-import React, {Component} from "react";
+import React, { Component } from 'react';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 
 import ModalBase from '/imports/ui/components/modal/base/component';
 import Button from '/imports/ui/components/button/component';
 
-import {styles} from './styles';
-
 import { defineMessages, injectIntl } from 'react-intl';
+import { isUrlValid, getUrlFromVideoId } from '../service';
+
+import { styles } from './styles';
 
 const intlMessages = defineMessages({
   start: {
@@ -35,74 +36,73 @@ const intlMessages = defineMessages({
   },
 });
 
-const YOUTUBE_PREFIX = "https://youtube.com/watch?v=";
-
-const getUrlFromVideoId = (id) => {
-  return id ? `${YOUTUBE_PREFIX}${id}` : '';
-}
-
 class ExternalVideoModal extends Component {
+  constructor(props) {
+    super(props);
 
-  const { videoId } = this.props;
+    const { videoId } = props;
 
-  state = {
-    url: getUrlFromVideoId(videoId),
-    sharing: videoId,
-  };
+    this.state = {
+      url: getUrlFromVideoId(videoId),
+      sharing: videoId,
+    };
 
-  isUrlEmpty = () => {
-    const url = this.state.url;
-    return !url || url.length == 0;
+    this.startWatchingHandler = this.startWatchingHandler.bind(this);
+    this.stopWatchingHandler = this.stopWatchingHandler.bind(this);
+    this.updateVideoUrlHandler = this.updateVideoUrlHandler.bind(this);
+    this.renderUrlError = this.renderUrlError.bind(this);
+    this.updateVideoUrlHandler = this.updateVideoUrlHandler.bind(this);
   }
 
-  isUrlValid = () => {
-    const url = this.state.url;
-    const regexp = RegExp('^(https?\:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/.+$');
-    return !this.isUrlEmpty() && url.match(regexp);
+  startWatchingHandler() {
+    const { startWatching, closeModal } = this.props;
+
+    startWatching(this.state.url);
+    closeModal();
   }
 
-  startWatchingHandler = () => {
-    this.props.startWatching(this.state.url);
-    this.props.closeModal();
+  stopWatchingHandler() {
+    const { stopWatching, closeModal } = this.props;
+
+    stopWatching();
+    closeModal();
   }
 
-  stopWatchingHandler = () => {
-    this.props.stopWatching();
-    this.props.closeModal();
+  updateVideoUrlHandler(ev) {
+    this.setState({...this.state, url: ev.target.value });
   }
 
-  updateVideoUrlHandler = (ev) => {
-    console.log(this.props);
-    this.setState({...this.state, url: ev.target.value});
-  }
-
-  renderUrlError = () => {
+  renderUrlError() {
     const { intl } = this.props;
     const { url } = this.state;
 
-    const valid = !this.isUrlEmpty() && url.length > 3 && !this.isUrlValid();
+    const valid = (!url || url.length <= 3) || isUrlValid(url);
 
     return (
-      valid ?
-        (<div className={styles.urlError}>
-          {intl.formatMessage(intlMessages.urlError)}
-        </div>)
-      :
-        null
+      !valid
+        ? (
+          <div className={styles.urlError}>
+            {intl.formatMessage(intlMessages.urlError)}
+          </div>
+        )
+        : null
     );
   }
 
   render() {
-    const { intl } = this.props.intl;
+    const { intl, videoId, closeModal } = this.props;
+    const { url, sharing } = this.state;
+
+    const startDisabled = !isUrlValid(url) || (getUrlFromVideoId(videoId) === url);
 
     return (
       <ModalBase
         overlayClassName={styles.overlay}
         className={styles.modal}
-        onRequestClose={this.props.closeModal}
+        onRequestClose={closeModal}
       >
         <header data-test="videoModealHeader" className={styles.header}>
-          <h3 className={styles.title} >{intl.formatMessage(intlMessages.title)}</h3>
+          <h3 className={styles.title}>{intl.formatMessage(intlMessages.title)}</h3>
           <Button
             data-test="modalBaseCloseButton"
             className={styles.closeBtn}
@@ -110,41 +110,40 @@ class ExternalVideoModal extends Component {
             icon="close"
             size="md"
             hideLabel
-            onClick={this.props.closeModal}
+            onClick={closeModal}
           />
         </header>
 
         <div className={styles.content}>
           <div className={styles.videoUrl}>
-            <label htmlFor="video-modal-input">
+            <label htmlFor="video-modal-input" id="video-modal-input">
               {intl.formatMessage(intlMessages.input)}
+              <input
+                id="video-modal-input"
+                onChange={this.updateVideoUrlHandler}
+                name="video-modal-input"
+                value={url}
+              />
             </label>
-            <input
-              id="video-modal-input"
-              onChange={this.updateVideoUrlHandler}
-              name="video-modal-input"
-              value={this.state.url || ""}
-            />
           </div>
 
           <div className={styles.content}>
-	        {this.renderUrlError()}
-	      </div>
-
+            {this.renderUrlError()}
+          </div>
 
           <Button
             className={styles.startBtn}
             label={intl.formatMessage(intlMessages.start)}
             onClick={this.startWatchingHandler}
-            disabled={!this.isUrlValid() || (getUrlFromVideoId(this.props.url) === this.state.url)}>
-          </Button>
+            disabled={startDisabled}
+          />
 
           <Button
             className={styles.stopBtn}
             label={intl.formatMessage(intlMessages.stop)}
             onClick={this.stopWatchingHandler}
-            disabled={!this.state.sharing}>
-          </Button>
+            disabled={!sharing}
+          />
         </div>
       </ModalBase>
     );
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
index ceb5a641ae..d97e542a50 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
@@ -2,21 +2,15 @@ import React from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import ExternalVideoModal from './component';
-import Service from '../service';
+import { startWatching, stopWatching, getVideoId } from '../service';
 
-const ExternalVideoModalContainer = (props) => {
-  return <ExternalVideoModal {...props} />;
-}
+const ExternalVideoModalContainer = props => <ExternalVideoModal {...props} />;
 
-
-export default withModalMounter(withTracker(({ mountModal }) =>
-  ({
-    closeModal: () => {
-      mountModal(null);
-    },
-    updateVideoUrl: Service.updateVideoUrl,
-    startWatching: Service.startWatching,
-    stopWatching: Service.stopWatching,
-    url: Service.getVideoUrl(),
-    hasVideo: Service.hasExternalVideo(),
-  }))(ExternalVideoModalContainer));
+export default withModalMounter(withTracker(({ mountModal }) => ({
+  closeModal: () => {
+    mountModal(null);
+  },
+  startWatching,
+  stopWatching,
+  videoId: getVideoId(),
+}))(ExternalVideoModalContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
index db71873ab9..337daa0b87 100755
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
@@ -122,7 +122,6 @@
 .videoUrl {
   label {
     display: block;
-    font-weight: 600;
   }
 
   input {
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
index a3606d95e1..1befdf1389 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
@@ -1,55 +1,61 @@
-import { Meteor } from 'meteor/meteor';
-import Users from '/imports/api/users';
 import Meetings from '/imports/api/meetings';
 import Auth from '/imports/ui/services/auth';
-import Settings from '/imports/ui/services/settings';
 import ExternalVideoStreamer from '/imports/api/external-videos';
 
 import { makeCall } from '/imports/ui/services/api';
 
+const YOUTUBE_PREFIX = 'https://youtube.com/watch?v=';
+
+const isUrlEmpty = url => !url || url.length === 0;
+
+const isUrlValid = (url) => {
+  const regexp = RegExp('^(https?://)?(www.)?(youtube.com|youtu.?be)/.+$');
+  return !isUrlEmpty(url) && url.match(regexp);
+};
+
+const getUrlFromVideoId = id => (id ? `${YOUTUBE_PREFIX}${id}` : '');
+
+const videoIdFromUrl = (url) => {
+  const urlObj = new URL(url);
+  const params = new URLSearchParams(urlObj.search);
+
+  return params.get('v');
+};
+
 const startWatching = (url) => {
-  let externalVideoUrl = videoIdFromUrl(url);
-  makeCall('startWatchingExternalVideo', {externalVideoUrl});
-}
+  const externalVideoUrl = videoIdFromUrl(url);
+  makeCall('startWatchingExternalVideo', { externalVideoUrl });
+};
 
 const stopWatching = () => {
   makeCall('stopWatchingExternalVideo');
-}
-
-const videoIdFromUrl = (url) => {
-  let urlObj = new URL(url);
-  let params = new URLSearchParams(urlObj.search);
-
-  return params.get('v');
-}
+};
 
 const sendMessage = (event, data) => {
-  ExternalVideoStreamer.emit(event,{
-      ...data,
-      meetingId: Auth._meetingID,
-      userId: Auth._userID,
-   });
+  ExternalVideoStreamer.emit(event, {
+    ...data,
+    meetingId: Auth._meetingID,
+    userId: Auth._userID,
+  });
 };
 
 const onMessage = (message, func) => {
   ExternalVideoStreamer.on(message, func);
 };
 
-const hasExternalVideo = () => {
-  let meetingId = Auth._meetingID;
-  let meeting = Meetings.findOne({meetingId});
+const getVideoId = () => {
+  const meetingId = Auth._meetingID;
+  const meeting = Meetings.findOne({ meetingId });
 
   return meeting && meeting.externalVideoUrl;
-}
-
-const getVideoUrl = hasExternalVideo;
+};
 
 export {
   sendMessage,
   onMessage,
-  hasExternalVideo,
-  getVideoUrl,
-  updateVideoUrl,
+  getVideoId,
+  getUrlFromVideoId,
+  isUrlValid,
   startWatching,
   stopWatching,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
index d1223c3efc..ccf3135ba9 100755
--- a/bigbluebutton-html5/imports/ui/components/media/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -13,7 +13,7 @@ import PresentationPodsContainer from '../presentation-pod/container';
 import ScreenshareContainer from '../screenshare/container';
 import DefaultContent from '../presentation/default-content/component';
 import ExternalVideoContainer from '../external-video-player/container';
-import { getVideoUrl } from '../external-video-player/service';
+import { getVideoId } from '../external-video-player/service';
 
 const LAYOUT_CONFIG = Meteor.settings.public.layout;
 const KURENTO_CONFIG = Meteor.settings.public.kurento;
@@ -135,9 +135,12 @@ export default withModalMounter(withTracker(() => {
   }
 
   if (MediaService.shouldShowExternalVideo()) {
-    const presenter = MediaService.isUserPresenter();
-    const url = getVideoUrl();
-    data.children = <ExternalVideoContainer isPresenter={presenter} videoId={url} />;
+    data.children = (
+      <ExternalVideoContainer
+        isPresenter={MediaService.isUserPresenter()}
+        videoId={getVideoId()}
+      />
+    );
   }
 
   MediaContainer.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/media/service.js b/bigbluebutton-html5/imports/ui/components/media/service.js
index 595217bf5c..60b559c599 100755
--- a/bigbluebutton-html5/imports/ui/components/media/service.js
+++ b/bigbluebutton-html5/imports/ui/components/media/service.js
@@ -1,6 +1,6 @@
 import Presentations from '/imports/api/presentations';
 import { isVideoBroadcasting } from '/imports/ui/components/screenshare/service';
-import { hasExternalVideo } from '/imports/ui/components/external-video-player/service';
+import { getVideoId } from '/imports/ui/components/external-video-player/service';
 import Auth from '/imports/ui/services/auth';
 import Users from '/imports/api/users';
 import Settings from '/imports/ui/services/settings';
@@ -32,7 +32,7 @@ function shouldShowScreenshare() {
 }
 
 function shouldShowExternalVideo() {
-  return hasExternalVideo() && Meteor.settings.public.app.enableExternalVideo;
+  return getVideoId() && Meteor.settings.public.app.enableExternalVideo;
 }
 
 function shouldShowOverlay() {

From 8c3079517c6c5bd391f1c41368055ce3709e36c9 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Tue, 15 Jan 2019 17:58:59 -0300
Subject: [PATCH 091/163] Youtube videos. Use PlayerState directly from
 react-youtube

---
 .../external-video-player/component.jsx         | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index 0a6f72ebd9..2fcad244e8 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -3,14 +3,7 @@ import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrap
 import YouTube from 'react-youtube';
 import { sendMessage, onMessage } from './service';
 
-const PlayerState = {
-  UNSTARTED: -1,
-  ENDED: 0,
-  PLAYING: 1,
-  PAUSED: 2,
-  BUFFERING: 3,
-  CUED: 5,
-};
+const { PlayerState } = YouTube;
 
 class VideoPlayer extends Component {
   constructor(props) {
@@ -41,16 +34,16 @@ class VideoPlayer extends Component {
     };
   }
 
+  componentDidMount() {
+    window.addEventListener('resize', this.resizeListener);
+  }
+
   componentWillUpdate(nextProps) {
     if (!nextProps.videoId) {
       clearInterval(this.syncInterval);
     }
   }
 
-  componentDidMount() {
-    window.addEventListener('resize', this.resizeListener);
-  }
-
   componentWillUnmount() {
     window.removeEventListener('resize', this.resizeListener);
 

From cff3c21212bf6eb232ec951251394f40fa0586c9 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Wed, 16 Jan 2019 10:14:32 -0300
Subject: [PATCH 092/163] Push start/stop external video events to REDIS

---
 .../server/methods/startWatchingExternalVideo.js   | 14 ++++++++++++--
 .../server/methods/stopWatchingExternalVideo.js    | 13 +++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
index 2903b02a31..087ac59ba7 100644
--- a/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
@@ -2,15 +2,25 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
 import Meetings from '/imports/api/meetings';
+import RedisPubSub from '/imports/startup/server/redis';
 
 export default function startStream(credentials, options) {
-  const { meetingId } = credentials;
+  const REDIS_CONFIG = Meteor.settings.private.redis;
+  const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
+  const EVENT_NAME = 'StartExternalVideoMsg';
+
+  const { meetingId, requesterUserId } = credentials;
   const { externalVideoUrl } = options;
 
   Logger.info(' user sharing a new youtube video: ', credentials);
 
   check(meetingId, String);
+  check(requesterUserId, String);
   check(externalVideoUrl, String);
 
-  return Meetings.update({ meetingId }, { $set: { externalVideoUrl } });
+  Meetings.update({ meetingId }, { $set: { externalVideoUrl } });
+
+  const payload = { externalVideoUrl };
+
+  return RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, requesterUserId, payload);
 }
diff --git a/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js b/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
index 3b63b1e01e..39c2bc6948 100644
--- a/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
+++ b/bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
@@ -2,13 +2,22 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
 import Meetings from '/imports/api/meetings';
+import RedisPubSub from '/imports/startup/server/redis';
 
 export default function startStream(credentials) {
-  const { meetingId } = credentials;
+  const REDIS_CONFIG = Meteor.settings.private.redis;
+  const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
+  const EVENT_NAME = 'StopExternalVideoMsg';
+
+  const { meetingId, requesterUserId } = credentials;
 
   Logger.info(' user sharing a new youtube video: ', credentials);
 
   check(meetingId, String);
+  check(requesterUserId, String);
 
-  return Meetings.update({ meetingId }, { $set: { externalVideoUrl: null } });
+  Meetings.update({ meetingId }, { $set: { externalVideoUrl: null } });
+  const payload = {};
+
+  RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, requesterUserId, payload);
 }

From 100d31dd01731fd678c575c56263d0a64550683c Mon Sep 17 00:00:00 2001
From: PravenJohn <PravenJohn@users.noreply.github.com>
Date: Wed, 16 Jan 2019 19:43:29 +0530
Subject: [PATCH 093/163] Adding port 8021 used by fsesl

---
 labs/docker/k8s/bbb-freeswitch.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/labs/docker/k8s/bbb-freeswitch.yaml b/labs/docker/k8s/bbb-freeswitch.yaml
index 6c78e391a0..90fe646d55 100644
--- a/labs/docker/k8s/bbb-freeswitch.yaml
+++ b/labs/docker/k8s/bbb-freeswitch.yaml
@@ -31,6 +31,8 @@ spec:
         ports:
         - containerPort: 7443
           protocol: TCP
+        - containerPort: 8021
+          protocol: TCP
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
       nodeSelector:
@@ -54,5 +56,8 @@ spec:
   - name: http
     targetPort: 7443
     port: 7443
+  - name: freeswitch-8021
+    targetPort: 8021
+    port: 8021
   selector:
     app: bbb-freeswitch

From f1fb776913b48e6b9e2ad23a956850cccacec1b5 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Wed, 16 Jan 2019 14:36:32 -0200
Subject: [PATCH 094/163] Remove console.log

---
 .../ui/components/actions-bar/actions-dropdown/component.jsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 16a4672285..29ac3340e1 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -230,7 +230,6 @@ class ActionsDropdown extends Component {
       getBreakouts,
       sendInvitation,
     } = this.props;
-    console.error(this.props);
 
     mountModal(
       <BreakoutRoom

From 69c89cb555a866cf613c609e51a44bce6e4ffe52 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Wed, 16 Jan 2019 13:50:24 -0300
Subject: [PATCH 095/163] Fix some linter errors and add translation

---
 .../ui/components/actions-bar/component.jsx   | 10 +++++---
 .../presentation-close-button/component.jsx   | 25 +++++++++----------
 .../ui/components/screenshare/component.jsx   | 18 ++++++++++---
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index d1426f7b09..578edc6f2e 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -85,10 +85,12 @@ class ActionsBar extends React.PureComponent {
           />
         </div>
         <div className={styles.right}>
-          { isLayoutSwapped ?
-            <PresentationOptionsContainer
-              toggleSwapLayout={toggleSwapLayout}
-            />
+          { isLayoutSwapped
+            ? (
+              <PresentationOptionsContainer
+                toggleSwapLayout={toggleSwapLayout}
+              />
+            )
             : null
           }
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
index 57df06cac9..33aa8f2b50 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { defineMessages, injectIntl, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
 import { styles } from '../styles';
 
@@ -15,21 +15,20 @@ const ClosePresentationComponent = ({
   innerStyle,
   toggleSwapLayout,
 }) => {
-
   return (
     <div style={innerStyle} className={styles.topRight}>
       <Button
-       role="button"
-       aria-labelledby="closeLabel"
-       aria-describedby="closeDesc"
-       color="default"
-       icon="close"
-       size="sm"
-       onClick={toggleSwapLayout}
-       label={intl.formatMessage(intlMessages.closePresentationLabel)}
-       hideLabel
-       className={styles.close}
-     />
+        role="button"
+        aria-labelledby="closeLabel"
+        aria-describedby="closeDesc"
+        color="default"
+        icon="close"
+        size="sm"
+        onClick={toggleSwapLayout}
+        label={intl.formatMessage(intlMessages.closePresentationLabel)}
+        hideLabel
+        className={styles.close}
+      />
     </div>
   );
 };
diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
index 6eece8818d..4e91dab733 100755
--- a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
@@ -1,10 +1,9 @@
 import React from 'react';
-
 import FullscreenButton from '../video-provider/fullscreen-button/component';
-
 import { styles } from './styles';
 
 export default class ScreenshareComponent extends React.Component {
+
   constructor() {
     super();
     this.state = {
@@ -13,18 +12,22 @@ export default class ScreenshareComponent extends React.Component {
 
     this.onVideoLoad = this.onVideoLoad.bind(this);
   }
+
   componentDidMount() {
     this.props.presenterScreenshareHasStarted();
   }
+
   componentWillReceiveProps(nextProps) {
     if (this.props.isPresenter && !nextProps.isPresenter) {
       this.props.unshareScreen();
     }
   }
+
   componentWillUnmount() {
     this.props.presenterScreenshareHasEnded();
     this.props.unshareScreen();
   }
+
   onVideoLoad() {
     this.setState({ loaded: true });
   }
@@ -50,7 +53,16 @@ export default class ScreenshareComponent extends React.Component {
     return (
       [!this.state.loaded ? (<div key="screenshareArea" className={styles.connecting} />) : null,
         this.renderFullscreenButton(),
-        (<video key="screenshareVideo" id="screenshareVideo" style={{ maxHeight: '100%', width: '100%' }} autoPlay playsInline onLoadedData={this.onVideoLoad} ref={(ref) => { this.videoTag = ref; }} />)]
+        (
+         <video key="screenshareVideo"
+           id="screenshareVideo"
+           style={{ maxHeight: '100%', width: '100%' }}
+           autoPlay
+           playsInline
+           onLoadedData={this.onVideoLoad}
+           ref={(ref) => { this.videoTag = ref; }}
+         />
+        )]
     );
   }
 }

From bf99fff4166091e54a05d248f7ab8bb66367617b Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Wed, 16 Jan 2019 14:01:22 -0300
Subject: [PATCH 096/163] Fix a few more linter errors and remove old
 translation

---
 .../presentation-close-button/component.jsx   | 34 +++++++++----------
 .../ui/components/screenshare/component.jsx   | 21 ++++++------
 bigbluebutton-html5/private/locales/en.json   |  1 +
 .../private/locales/pt_BR.json                |  1 -
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
index 33aa8f2b50..6293f86546 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
@@ -14,23 +14,21 @@ const ClosePresentationComponent = ({
   intl,
   innerStyle,
   toggleSwapLayout,
-}) => {
-  return (
-    <div style={innerStyle} className={styles.topRight}>
-      <Button
-        role="button"
-        aria-labelledby="closeLabel"
-        aria-describedby="closeDesc"
-        color="default"
-        icon="close"
-        size="sm"
-        onClick={toggleSwapLayout}
-        label={intl.formatMessage(intlMessages.closePresentationLabel)}
-        hideLabel
-        className={styles.close}
-      />
-    </div>
-  );
-};
+}) => (
+  <div style={innerStyle} className={styles.topRight}>
+    <Button
+      role="button"
+      aria-labelledby="closeLabel"
+      aria-describedby="closeDesc"
+      color="default"
+      icon="close"
+      size="sm"
+      onClick={toggleSwapLayout}
+      label={intl.formatMessage(intlMessages.closePresentationLabel)}
+      hideLabel
+      className={styles.close}
+    />
+  </div>
+);
 
 export default injectIntl(ClosePresentationComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
index 4e91dab733..6eb1a2c6d3 100755
--- a/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
@@ -3,7 +3,6 @@ import FullscreenButton from '../video-provider/fullscreen-button/component';
 import { styles } from './styles';
 
 export default class ScreenshareComponent extends React.Component {
-
   constructor() {
     super();
     this.state = {
@@ -44,24 +43,24 @@ export default class ScreenshareComponent extends React.Component {
   }
 
   render() {
-
     const style = {
       right: 0,
       bottom: 0,
     };
 
     return (
-      [!this.state.loaded ? (<div key="screenshareArea" className={styles.connecting} />) : null,
+      [!this.state.loaded ? (<div key="screenshareArea" innerStyle={style} className={styles.connecting} />) : null,
         this.renderFullscreenButton(),
         (
-         <video key="screenshareVideo"
-           id="screenshareVideo"
-           style={{ maxHeight: '100%', width: '100%' }}
-           autoPlay
-           playsInline
-           onLoadedData={this.onVideoLoad}
-           ref={(ref) => { this.videoTag = ref; }}
-         />
+          <video
+            key="screenshareVideo"
+            id="screenshareVideo"
+            style={{ maxHeight: '100%', width: '100%' }}
+            autoPlay
+            playsInline
+            onLoadedData={this.onVideoLoad}
+            ref={(ref) => { this.videoTag = ref; }}
+          />
         )]
     );
   }
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 758fe53f18..7a3ef1fe6a 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -424,6 +424,7 @@
     "app.video.stats.rtt": "RTT",
     "app.video.stats.encodeUsagePercent": "Encode usage",
     "app.video.stats.currentDelay": "Current delay",
+    "app.fullscreenButton.label": "Make element fullscreen",
     "app.deskshare.iceConnectionStateError": "Error 1108: ICE connection failed when sharing screen",
     "app.sfu.mediaServerConnectionError2000": "Error 2000: Unable to connect to media server",
     "app.sfu.mediaServerOffline2001": "Error 2001: Media server is offline. Please try again later.",
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
index 20cb82d17f..6013fb5346 100644
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -45,7 +45,6 @@
     "app.media.screenshare.safariNotSupported": "Atualmente, o compartilhamento de tela não é suportado pelo Safari. Por favor, use o Firefox ou o Google Chrome.",
     "app.meeting.ended": "Esta reunião terminou",
     "app.meeting.endedMessage": "Você será redirecionado para a tela inicial",
-    "app.presentation.close": "Fechar apresentação",
     "app.presentation.presentationToolbar.prevSlideLabel": "Slide anterior",
     "app.presentation.presentationToolbar.prevSlideDesc": "Mudar a apresentação para o slide anterior",
     "app.presentation.presentationToolbar.nextSlideLabel": "Próximo slide",

From 11c366d6031c4e32bb477c45afee7c575d85af66 Mon Sep 17 00:00:00 2001
From: Maxim Khlobystov <maxim.khlobystov@gmail.com>
Date: Wed, 16 Jan 2019 12:07:34 -0500
Subject: [PATCH 097/163] Make sure linter doesn't use removed files

---
 build_script.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_script.sh b/build_script.sh
index 85098711c0..666fcd2517 100755
--- a/build_script.sh
+++ b/build_script.sh
@@ -6,18 +6,19 @@ if [[ $files = *"bigbluebutton-html5"* ]]; then
   cd bigbluebutton-html5
   curl https://install.meteor.com/ | sh
   meteor npm install
+  cd ..
   if [ $1 = linter ]
   then
     html5_files=""
     list=$(echo $files | tr " " "\n")
     for file in $list
     do
-      if [[ $file = bigbluebutton-html5* ]] ; then
+      if [[ $file = bigbluebutton-html5* ]] && [[ -e $file ]]
+      then
         html5_files+=" $file"
       fi
     done
 
-    cd ..
     bigbluebutton-html5/node_modules/.bin/eslint --ext .jsx,.js $html5_files
   elif [ $1 = acceptance_tests ]
   then

From 9054dbf8dbf3b71db9e6bb913f18013a6a3a2ad5 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Wed, 16 Jan 2019 15:41:21 -0200
Subject: [PATCH 098/163] Clean up  code for best reading

---
 .../server/methods/requestJoinURL.js          |  4 ++--
 .../actions-dropdown/component.jsx            |  4 ++--
 .../create-breakout-room/component.jsx        | 13 +++++------
 .../ui/components/actions-bar/service.js      | 23 +------------------
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js b/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
index 93dde8d11b..971e43df2c 100755
--- a/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
+++ b/bigbluebutton-html5/imports/api/breakouts/server/methods/requestJoinURL.js
@@ -3,7 +3,7 @@ import { check } from 'meteor/check';
 import RedisPubSub from '/imports/startup/server/redis';
 import Breakouts from '/imports/api/breakouts';
 
-export default function requestJoinURL(credentials, { breakoutId, userId: id }) {
+export default function requestJoinURL(credentials, { breakoutId, userId: userIdToInvite }) {
   const REDIS_CONFIG = Meteor.settings.private.redis;
   const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
 
@@ -12,7 +12,7 @@ export default function requestJoinURL(credentials, { breakoutId, userId: id })
   check(meetingId, String);
   check(requesterUserId, String);
   check(requesterToken, String);
-  const userId = id || requesterUserId;
+  const userId = userIdToInvite || requesterUserId;
   const Breakout = Breakouts.findOne({ breakoutId });
   const BreakoutUser = Breakout.users.filter(user => user.userId === userId).shift();
 
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 29ac3340e1..86012094b4 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -151,7 +151,7 @@ class ActionsDropdown extends Component {
       formatMessage,
     } = intl;
 
-    const CanInviteUsers = isUserModerator
+    const canInviteUsers = isUserModerator
     && !meetingIsBreakout
     && hasBreakoutRoom
     && getUsersNotAssigned(users).length;
@@ -202,7 +202,7 @@ class ActionsDropdown extends Component {
           />
         )
         : null),
-      (CanInviteUsers
+      (canInviteUsers
         ? (
           <DropdownListItem
             icon="rooms"
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
index f36522cc85..2d0c2866b3 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
@@ -83,7 +83,7 @@ const intlMessages = defineMessages({
   },
   invitationConfirm: {
     id: 'app.invitation.confirm',
-    description: 'isInvitationto breakout cpnfirm button label',
+    description: 'Invitation to breakout confirm button label',
   },
 });
 const MIN_BREAKOUT_ROOMS = 2;
@@ -184,12 +184,11 @@ class BreakoutRoom extends Component {
       return;
     }
 
-    users
-      .filter(u => u.room > 0)
-      .forEach((user) => {
-        const breakout = breakouts[user.room - 1];
-        sendInvitation(breakout.breakoutId, user.userId);
-      });
+    breakouts.forEach((breakout) => {
+      const { breakoutId } = breakout;
+      const breakoutUsers = this.getUserByRoom(breakout.sequence);
+      breakoutUsers.forEach(user => sendInvitation(breakoutId, user.userId));
+    });
 
     this.setState({ preventClosing: false });
   }
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
index 20a67ec67d..9a62e5c0d8 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js
@@ -4,28 +4,6 @@ import { makeCall } from '/imports/ui/services/api';
 import Meetings from '/imports/api/meetings';
 import Breakouts from '/imports/api/breakouts';
 
-const processOutsideToggleRecording = (e) => {
-  switch (e.data) {
-    case 'c_record': {
-      makeCall('toggleRecording');
-      break;
-    }
-    case 'c_recording_status': {
-      const recordingState = Meetings.findOne({ meetingId: Auth.meetingID }).recordProp.recording;
-      const recordingMessage = recordingState ? 'recordingStarted' : 'recordingStopped';
-      this.window.parent.postMessage({ response: recordingMessage }, '*');
-      break;
-    }
-    default: {
-      // console.log(e.data);
-    }
-  }
-};
-
-const connectRecordingObserver = () => {
-  // notify on load complete
-  this.window.parent.postMessage({ response: 'readyToConnect' }, '*');
-};
 const getBreakouts = () => Breakouts.find({ parentMeetingId: Auth.meetingID })
   .fetch()
   .sort((a, b) => a.sequence - b.sequence);
@@ -37,6 +15,7 @@ const getUsersNotAssigned = (users) => {
     .map(u => u.userId);
   return users.filter(u => !breakoutUsers.includes(u.intId));
 };
+
 const takePresenterRole = () => makeCall('assignPresenter', Auth.userID);
 
 export default {

From 70f16abec656e15227f2613946ff581118f4ea12 Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Wed, 16 Jan 2019 16:10:36 -0200
Subject: [PATCH 099/163] Limit the zoom functionality (double-tap) to occur
 only when the pan tool is selected #6520

---
 .../presentation/presentation-overlay/component.jsx         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx
index 492d446c53..9b2fb2bebb 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx
@@ -359,7 +359,11 @@ export default class PresentationOverlay extends Component {
       whiteboardId,
     });
   }
+
   tapHandler(event) {
+    const AnnotationTool = WhiteboardToolbarService
+      .getCurrentDrawSettings().whiteboardAnnotationTool;
+
     if (event.touches.length === 2) return;
     if (!this.tapedTwice) {
       this.tapedTwice = true;
@@ -369,7 +373,7 @@ export default class PresentationOverlay extends Component {
     event.preventDefault();
     const sizeDefault = this.state.zoom === HUNDRED_PERCENT;
 
-    if (sizeDefault) {
+    if (sizeDefault && AnnotationTool === 'hand') {
       this.doZoomCall(200, this.currentClientX, this.currentClientY);
       return;
     }

From 48fbf8ce5db2206c3b5589597e0b7dac06387be0 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Wed, 16 Jan 2019 18:25:24 +0000
Subject: [PATCH 100/163] keep poll result pane open after publishing

---
 .../components/poll/live-result/component.jsx | 105 +++++++++---------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
index dee6d7e1c8..6229ec23de 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/component.jsx
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { defineMessages, injectIntl } from 'react-intl';
-import { Session } from 'meteor/session';
 import Button from '/imports/ui/components/button/component';
 import { styles } from './styles';
 import Service from './service';
@@ -27,19 +26,14 @@ const intlMessages = defineMessages({
 });
 
 class LiveResult extends Component {
-  constructor(props) {
-    super(props);
-
-    this.renderPollStats = this.renderPollStats.bind(this);
-    this.renderAnswers = this.renderAnswers.bind(this);
-  }
-
-  renderAnswers() {
-    const { currentPoll, getUser } = this.props;
+  static getDerivedStateFromProps(nextProps) {
+    const { currentPoll, getUser } = nextProps;
 
     if (!currentPoll) return null;
 
-    const { answers, responses, users } = currentPoll;
+    const {
+      answers, responses, users, numRespondents,
+    } = currentPoll;
 
     let userAnswers = responses
       ? [...users, ...responses.map(u => u.userId)]
@@ -67,23 +61,8 @@ class LiveResult extends Component {
         <div className={styles.itemR} key={_.uniqueId('stats-')}>{user.answer}</div>,
       ], []);
 
-    return userAnswers;
-  }
-
-  renderPollStats() {
-    const { currentPoll } = this.props;
-
     const pollStats = [];
 
-    if (!currentPoll) return;
-
-    const {
-      answers,
-      numRespondents,
-    } = currentPoll;
-
-    if (!answers) return;
-
     answers.map((obj) => {
       const pct = Math.round(obj.numVotes / numRespondents * 100);
 
@@ -102,38 +81,55 @@ class LiveResult extends Component {
       );
     });
 
-    return pollStats;
+    return {
+      userAnswers,
+      pollStats,
+    };
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      userAnswers: null,
+      pollStats: null,
+    };
   }
 
   render() {
     const {
-      intl, publishPoll, stopPoll, handleBackClick,
+      intl, publishPoll, stopPoll, handleBackClick, currentPoll,
     } = this.props;
 
+    const { userAnswers, pollStats } = this.state;
+
     return (
       <div>
         <div className={styles.stats}>
-          {this.renderPollStats()}
+          {pollStats}
         </div>
-        <Button
-          onClick={() => {
-            publishPoll();
-            stopPoll();
-            Session.set('openPanel', 'userlist');
-            Session.set('forcePollOpen', false);
-          }}
-          label={intl.formatMessage(intlMessages.publishLabel)}
-          color="primary"
-          className={styles.btn}
-        />
-        <Button
-          onClick={() => {
-            handleBackClick();
-          }}
-          label={intl.formatMessage(intlMessages.backLabel)}
-          color="default"
-          className={styles.btn}
-        />
+        {currentPoll
+          ? (
+            <Button
+              onClick={() => {
+                publishPoll();
+                stopPoll();
+              }}
+              label={intl.formatMessage(intlMessages.publishLabel)}
+              color="primary"
+              className={styles.btn}
+            />
+          ) : (
+            <Button
+              onClick={() => {
+                handleBackClick();
+              }}
+              label={intl.formatMessage(intlMessages.backLabel)}
+              color="default"
+              className={styles.btn}
+            />
+          )
+        }
         <div className={styles.container}>
           <div className={styles.usersHeading}>
             {intl.formatMessage(intlMessages.usersTitle)}
@@ -141,7 +137,7 @@ class LiveResult extends Component {
           <div className={styles.responseHeading}>
             {intl.formatMessage(intlMessages.responsesTitle)}
           </div>
-          {this.renderAnswers()}
+          {userAnswers}
         </div>
       </div>
     );
@@ -150,12 +146,19 @@ class LiveResult extends Component {
 
 export default injectIntl(LiveResult);
 
+LiveResult.defaultProps = { currentPoll: null };
+
 LiveResult.propTypes = {
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
   }).isRequired,
-  getUser: PropTypes.func.isRequired,
-  currentPoll: PropTypes.arrayOf(Object).isRequired,
+  currentPoll: PropTypes.oneOfType([
+    PropTypes.arrayOf(Object),
+    PropTypes.shape({
+      answers: PropTypes.arrayOf(PropTypes.object),
+      users: PropTypes.arrayOf(PropTypes.string),
+    }),
+  ]),
   publishPoll: PropTypes.func.isRequired,
   stopPoll: PropTypes.func.isRequired,
   handleBackClick: PropTypes.func.isRequired,

From 6a417f7fb34a786f43db401c525949ac6e788a5d Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Wed, 16 Jan 2019 16:27:48 -0200
Subject: [PATCH 101/163] Import correction

---
 .../components/presentation/presentation-overlay/component.jsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx
index 9b2fb2bebb..fd56f682da 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-overlay/component.jsx
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import SlideCalcUtil, { HUNDRED_PERCENT, MAX_PERCENT, MYSTERY_NUM, STEP } from '/imports/utils/slideCalcUtils';
+import WhiteboardToolbarService from '../../whiteboard/whiteboard-toolbar/service';
 // After lots of trial and error on why synching doesn't work properly, I found I had to
 // multiply the coordinates by 2. There's something I don't understand probably on the
 // canvas coordinate system. (ralam feb 22, 2012)

From 471730ad88f0f4df95117198554b695fe0f13e0c Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Wed, 16 Jan 2019 16:58:03 -0200
Subject: [PATCH 102/163] Exclude moderator in the Randomly Assign

---
 .../components/actions-bar/create-breakout-room/component.jsx  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
index 2d0c2866b3..620ab52812 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
@@ -196,6 +196,7 @@ class BreakoutRoom extends Component {
   onAssignRandomly() {
     const { numberOfRooms } = this.state;
     return this.getUserByRoom(0)
+      .filter(user => !user.isModerator)
       .forEach(user => this.changeUserRoom(user.userId, Math.floor(Math.random() * (numberOfRooms) + 1)));
   }
 
@@ -209,9 +210,11 @@ class BreakoutRoom extends Component {
 
   setRoomUsers() {
     const { users, getUsersNotAssigned } = this.props;
+
     const roomUsers = getUsersNotAssigned(users).map(user => ({
       userId: user.userId,
       userName: user.name,
+      isModerator: user.moderator,
       room: 0,
     }));
 

From 3dda92b0063b007f22d1686ea851d62754050609 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Wed, 16 Jan 2019 14:17:26 -0500
Subject: [PATCH 103/163] Set the default draw thickness to 2

Close #6572
---
 .../ui/components/whiteboard/whiteboard-toolbar/component.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
index 641a74c6b5..4bc5c0ad28 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
@@ -84,13 +84,13 @@ class WhiteboardToolbar extends Component {
 
       // variables to keep current selected draw settings
       annotationSelected,
-      thicknessSelected: { value: 4 },
+      thicknessSelected: { value: 2 },
       colorSelected: { value: '#ff0000' },
       fontSizeSelected: { value: 20 },
 
       // keeping the previous color and the thickness icon's radius selected for svg animation
       prevColorSelected: { value: '#ff0000' },
-      prevThicknessSelected: { value: 4 },
+      prevThicknessSelected: { value: 2 },
 
       // lists of tools/thickness/colors are not direct children of main toolbar buttons
       // and we want the list to close when onBlur fires at the main toolbar button

From e6e1a91173882ecc5d0870a4294dacb8b1ec7cdf Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Wed, 16 Jan 2019 14:22:10 -0600
Subject: [PATCH 104/163] Added more checks for FreeSWITCH

---
 bigbluebutton-config/bin/bbb-conf | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index e31d013a87..178441f655 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -72,6 +72,15 @@ if [ "$(id -u)" != "0" ]; then
   fi
 fi
 
+if [ ! -f /etc/bigbluebutton/bigbluebutton-release ]; then
+	echo "#"
+	echo "# BigBlueButton does not appear to be installed.  Could not"
+	echo "# locate:"
+	echo "#"
+	echo "# /usr/share/red5/webapps/bigbluebutton/WEB-INF/red5-web.xml"
+	exit 1
+fi
+
 source /etc/bigbluebutton/bigbluebutton-release
 
 #
@@ -361,11 +370,17 @@ start_bigbluebutton () {
         # Apply any local configuration options (if exists)
         #
         if [ -x /etc/bigbluebutton/bbb-conf/apply-config.sh ]; then
-                echo -n "Applying /etc/bigbluebutton/bbb-conf/apply-config.sh : "
+                echo -n "Applying updates in /etc/bigbluebutton/bbb-conf/apply-config.sh: "
                 /etc/bigbluebutton/bbb-conf/apply-config.sh
                 echo
         fi
 
+        if grep -q "Failure to connect to CORE_DB sofia_reg_external" /opt/freeswitch/var/log/freeswitch/freeswitch.log; then
+		# See: http://docs.bigbluebutton.org/install/install.html#freeswitch-fails-to-bind-to-ipv4
+                echo "Clearing the FreeSWITCH database."
+		rm -rf /opt/freeswitch/var/lib/freeswitch/db/*
+	fi
+
     echo "Starting BigBlueButton"
     if command -v systemctl >/dev/null; then
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
@@ -1535,6 +1550,13 @@ check_state() {
                 echo "#"
         fi
 
+        if systemctl status freeswitch | grep -q SETSCHEDULER; then
+                echo "# Error: FreeSWITCH failed to start with SETSCHEDULER error, see"
+                echo "#"
+                echo "#   http://docs.bigbluebutton.org/install/install.html#freeswitch-fails-to-start-with-a-setscheduler-error"
+                echo "#"
+        fi
+
 	exit 0
 }
 

From 063035805050350df2ff84f3f2e81eed55fa7d8b Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Wed, 16 Jan 2019 22:58:22 +0000
Subject: [PATCH 105/163] fix console errors / add breakout invitation to
 user-options

---
 .../user-options/component.jsx                | 51 +++++++++++++++++--
 .../user-options/container.jsx                |  3 ++
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
index ff7d1bffc3..e7eb434d7e 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
@@ -82,6 +82,10 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.actionsDropdown.createBreakoutRoomDesc',
     description: 'Description of create breakout room option',
   },
+  invitationItem: {
+    id: 'app.invitation.title',
+    description: 'invitation to breakout title',
+  },
 });
 
 class UserOptions extends PureComponent {
@@ -102,6 +106,8 @@ class UserOptions extends PureComponent {
     this.onActionsHide = this.onActionsHide.bind(this);
     this.alterMenu = this.alterMenu.bind(this);
     this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
+    this.onCreateBreakouts = this.onCreateBreakouts.bind(this);
+    this.onInvitationUsers = this.onInvitationUsers.bind(this);
   }
 
   componentDidUpdate(prevProps) {
@@ -123,19 +129,36 @@ class UserOptions extends PureComponent {
     });
   }
 
-  handleCreateBreakoutRoomClick() {
+  onCreateBreakouts() {
+    return this.handleCreateBreakoutRoomClick(false);
+  }
+
+  onInvitationUsers() {
+    return this.handleCreateBreakoutRoomClick(true);
+  }
+
+  handleCreateBreakoutRoomClick(isInvitation) {
     const {
       createBreakoutRoom,
       mountModal,
       meetingName,
       users,
+      getUsersNotAssigned,
+      getBreakouts,
+      sendInvitation,
     } = this.props;
 
     mountModal(
       <BreakoutRoom
-        createBreakoutRoom={createBreakoutRoom}
-        meetingName={meetingName}
-        users={users}
+        {...{
+          createBreakoutRoom,
+          meetingName,
+          users,
+          getUsersNotAssigned,
+          isInvitation,
+          getBreakouts,
+          sendInvitation,
+        }}
       />,
     );
   }
@@ -189,8 +212,16 @@ class UserOptions extends PureComponent {
       toggleMuteAllUsersExceptPresenter,
       meetingIsBreakout,
       hasBreakoutRoom,
+      getUsersNotAssigned,
+      isUserModerator,
+      users,
     } = this.props;
 
+    const canInviteUsers = isUserModerator
+    && !meetingIsBreakout
+    && hasBreakoutRoom
+    && getUsersNotAssigned(users).length;
+
     this.menuItems = _.compact([
       (<DropdownListItem
         key={this.clearStatusId}
@@ -220,7 +251,7 @@ class UserOptions extends PureComponent {
         description={intl.formatMessage(intlMessages.lockViewersDesc)}
         onClick={() => mountModal(<LockViewersContainer />)}
       />),
-      (!meetingIsBreakout && !hasBreakoutRoom
+      (!meetingIsBreakout && !hasBreakoutRoom && isUserModerator
         ? (
           <DropdownListItem
             key={this.createBreakoutId}
@@ -231,6 +262,16 @@ class UserOptions extends PureComponent {
           />
         ) : null
       ),
+      (canInviteUsers
+        ? (
+          <DropdownListItem
+            icon="rooms"
+            label={intl.formatMessage(intlMessages.invitationItem)}
+            key={this.createBreakoutRoomId}
+            onClick={this.onInvitationUsers}
+          />
+        )
+        : null),
     ]);
 
     if (isMeetingMuted) {
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
index f7d261bb3a..472655c338 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/container.jsx
@@ -36,6 +36,9 @@ const UserOptionsContainer = withTracker((props) => {
     hasBreakoutRoom: Service.hasBreakoutRoom(),
     meetingName: Service.meetingName(),
     users: Service.users(),
+    getBreakouts: Service.getBreakouts,
+    sendInvitation: Service.sendInvitation,
+    getUsersNotAssigned: Service.getUsersNotAssigned,
   };
 })(UserOptions);
 

From ab637b837099651df66e7d5014b9e6a353d4d8c9 Mon Sep 17 00:00:00 2001
From: PravenJohn <PravenJohn@users.noreply.github.com>
Date: Thu, 17 Jan 2019 12:53:46 +0530
Subject: [PATCH 106/163] updating kurento conn string to the service name

---
 labs/docker/k8s/bbb-webrtc-sfu.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/labs/docker/k8s/bbb-webrtc-sfu.yaml b/labs/docker/k8s/bbb-webrtc-sfu.yaml
index 323622f023..d6cee0ec51 100644
--- a/labs/docker/k8s/bbb-webrtc-sfu.yaml
+++ b/labs/docker/k8s/bbb-webrtc-sfu.yaml
@@ -29,7 +29,7 @@ spec:
         - name: KURENTO_NAME
           value: kurento
         - name: KURENTO_URL
-          value: ws://kurento:8888/kurento
+          value: ws://bbb-kurento:8888/kurento
         - name: REDIS_HOST
           value: redis
         - name: FREESWITCH_IP

From 797a485d3e53913b592e3facdb53a11646d26078 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Thu, 17 Jan 2019 16:33:43 +0000
Subject: [PATCH 107/163] end-meeting removed class variables

---
 .../audio/audio-modal/component.jsx           | 125 +++++++++---------
 .../end-meeting-confirmation/component.jsx    |  19 +--
 .../end-meeting-confirmation/container.jsx    |   3 +-
 .../ui/components/lock-viewers/component.jsx  |  51 +++----
 .../ui/components/recording/component.jsx     |  21 ++-
 .../ui/components/video-preview/component.jsx |  61 +++++----
 6 files changed, 126 insertions(+), 154 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
index 437b894475..d06f46b383 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -98,15 +98,7 @@ class AudioModal extends Component {
       hasError: false,
     };
 
-    const {
-      intl,
-      closeModal,
-      joinEchoTest,
-      exitAudio,
-      leaveEchoTest,
-      changeInputDevice,
-      changeOutputDevice,
-    } = props;
+    const { intl } = props;
 
     this.handleGoToAudioOptions = this.handleGoToAudioOptions.bind(this);
     this.handleGoToAudioSettings = this.handleGoToAudioSettings.bind(this);
@@ -115,12 +107,6 @@ class AudioModal extends Component {
     this.handleJoinMicrophone = this.handleJoinMicrophone.bind(this);
     this.handleJoinListenOnly = this.handleJoinListenOnly.bind(this);
     this.skipAudioOptions = this.skipAudioOptions.bind(this);
-    this.closeModal = closeModal;
-    this.joinEchoTest = joinEchoTest;
-    this.exitAudio = exitAudio;
-    this.leaveEchoTest = leaveEchoTest;
-    this.changeInputDevice = changeInputDevice;
-    this.changeOutputDevice = changeOutputDevice;
 
     this.contents = {
       echoTest: {
@@ -161,10 +147,11 @@ class AudioModal extends Component {
   componentWillUnmount() {
     const {
       isEchoTest,
+      exitAudio,
     } = this.props;
 
     if (isEchoTest) {
-      this.exitAudio();
+      exitAudio();
     }
   }
 
@@ -176,7 +163,8 @@ class AudioModal extends Component {
   }
 
   handleGoToAudioSettings() {
-    this.leaveEchoTest().then(() => {
+    const { leaveEchoTest } = this.props;
+    leaveEchoTest().then(() => {
       this.setState({
         content: 'settings',
       });
@@ -200,13 +188,14 @@ class AudioModal extends Component {
     const {
       inputDeviceId,
       outputDeviceId,
+      joinEchoTest,
     } = this.props;
 
     this.setState({
       hasError: false,
     });
 
-    return this.joinEchoTest().then(() => {
+    return joinEchoTest().then(() => {
       console.log(inputDeviceId, outputDeviceId);
       this.setState({
         content: 'echoTest',
@@ -261,10 +250,10 @@ class AudioModal extends Component {
 
 
     return (
-      isConnecting ||
-      forceListenOnlyAttendee ||
-      joinFullAudioImmediately ||
-      joinFullAudioEchoTest
+      isConnecting
+      || forceListenOnlyAttendee
+      || joinFullAudioImmediately
+      || joinFullAudioEchoTest
     ) && !content && !hasError;
   }
 
@@ -279,26 +268,30 @@ class AudioModal extends Component {
 
     return (
       <span className={styles.audioOptions}>
-        {!forceListenOnlyAttendee ?
-          <Button
-            className={styles.audioBtn}
-            label={intl.formatMessage(intlMessages.microphoneLabel)}
-            icon="unmute"
-            circle
-            size="jumbo"
-            disabled={audioLocked}
-            onClick={skipCheck ? this.handleJoinMicrophone : this.handleGoToEchoTest}
-          />
+        {!forceListenOnlyAttendee
+          ? (
+            <Button
+              className={styles.audioBtn}
+              label={intl.formatMessage(intlMessages.microphoneLabel)}
+              icon="unmute"
+              circle
+              size="jumbo"
+              disabled={audioLocked}
+              onClick={skipCheck ? this.handleJoinMicrophone : this.handleGoToEchoTest}
+            />
+          )
           : null}
-        {listenOnlyMode ?
-          <Button
-            className={styles.audioBtn}
-            label={intl.formatMessage(intlMessages.listenOnlyLabel)}
-            icon="listen"
-            circle
-            size="jumbo"
-            onClick={this.handleJoinListenOnly}
-          />
+        {listenOnlyMode
+          ? (
+            <Button
+              className={styles.audioBtn}
+              label={intl.formatMessage(intlMessages.listenOnlyLabel)}
+              icon="listen"
+              circle
+              size="jumbo"
+              onClick={this.handleJoinListenOnly}
+            />
+          )
           : null}
       </span>
     );
@@ -319,7 +312,8 @@ class AudioModal extends Component {
           <div className={styles.warning}>!</div>
           <h4 className={styles.main}>{intl.formatMessage(intlMessages.iOSError)}</h4>
           <div className={styles.text}>{intl.formatMessage(intlMessages.iOSErrorDescription)}</div>
-          <div className={styles.text}>{intl.formatMessage(intlMessages.iOSErrorRecommendation)}
+          <div className={styles.text}>
+            {intl.formatMessage(intlMessages.iOSErrorRecommendation)}
           </div>
         </div>);
     }
@@ -327,9 +321,9 @@ class AudioModal extends Component {
       return (
         <div className={styles.connecting} role="alert">
           <span>
-            {!isEchoTest ?
-              intl.formatMessage(intlMessages.connecting) :
-              intl.formatMessage(intlMessages.connectingEchoTest)
+            {!isEchoTest
+              ? intl.formatMessage(intlMessages.connecting)
+              : intl.formatMessage(intlMessages.connectingEchoTest)
             }
           </span>
           <span className={styles.connectingAnimation} />
@@ -355,15 +349,18 @@ class AudioModal extends Component {
       isEchoTest,
       inputDeviceId,
       outputDeviceId,
+      joinEchoTest,
+      changeInputDevice,
+      changeOutputDevice,
     } = this.props;
 
     return (
       <AudioSettings
         handleBack={this.handleGoToAudioOptions}
         handleRetry={this.handleRetryGoToEchoTest}
-        joinEchoTest={this.joinEchoTest}
-        changeInputDevice={this.changeInputDevice}
-        changeOutputDevice={this.changeOutputDevice}
+        joinEchoTest={joinEchoTest}
+        changeInputDevice={changeInputDevice}
+        changeOutputDevice={changeOutputDevice}
         isConnecting={isConnecting}
         isConnected={isConnected}
         isEchoTest={isEchoTest}
@@ -386,6 +383,7 @@ class AudioModal extends Component {
       intl,
       showPermissionsOvelay,
       isIOSChrome,
+      closeModal,
     } = this.props;
 
     const { content } = this.state;
@@ -396,23 +394,28 @@ class AudioModal extends Component {
         <Modal
           overlayClassName={styles.overlay}
           className={styles.modal}
-          onRequestClose={this.closeModal}
+          onRequestClose={closeModal}
           hideBorder
         >
-          {!this.skipAudioOptions() ?
+          {!this.skipAudioOptions()
 
-            <header
-              data-test="audioModalHeader"
-              className={styles.header}
-            >{
-                isIOSChrome ? null :
-                <h3 className={styles.title}>
-                  {content ?
-                  this.contents[content].title :
-                  intl.formatMessage(intlMessages.audioChoiceLabel)}
-                </h3>
+            ? (
+              <header
+                data-test="audioModalHeader"
+                className={styles.header}
+              >
+                {
+                isIOSChrome ? null
+                  : (
+                    <h3 className={styles.title}>
+                      {content
+                        ? this.contents[content].title
+                        : intl.formatMessage(intlMessages.audioChoiceLabel)}
+                    </h3>
+                  )
             }
-            </header>
+              </header>
+            )
             : null
           }
           <div className={styles.content}>
diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
index 61f336737b..db9c1be92e 100644
--- a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
@@ -32,25 +32,14 @@ const propTypes = {
 };
 
 class EndMeetingComponent extends React.PureComponent {
-  constructor(props) {
-    super(props);
-    const {
-      closeModal,
-      endMeeting,
-    } = props;
-
-    this.closeModal = closeModal;
-    this.endMeeting = endMeeting;
-  }
-
   render() {
-    const { intl } = this.props;
+    const { intl, closeModal, endMeeting } = this.props;
 
     return (
       <Modal
         overlayClassName={styles.overlay}
         className={styles.modal}
-        onRequestClose={this.closeModal}
+        onRequestClose={closeModal}
         hideBorder
       >
         <div className={styles.container}>
@@ -67,12 +56,12 @@ class EndMeetingComponent extends React.PureComponent {
               color="primary"
               className={styles.button}
               label={intl.formatMessage(intlMessages.yesLabel)}
-              onClick={() => this.endMeeting()}
+              onClick={endMeeting}
             />
             <Button
               label={intl.formatMessage(intlMessages.noLabel)}
               className={styles.button}
-              onClick={() => this.closeModal()}
+              onClick={closeModal}
             />
           </div>
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx
index 94718568f9..43075e881d 100644
--- a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/container.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { withTracker } from 'meteor/react-meteor-data';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import { makeCall } from '/imports/ui/services/api';
-import Auth from '/imports/ui/services/auth';
 import EndMeetingComponent from './component';
 
 const EndMeetingContainer = props => <EndMeetingComponent {...props} />;
@@ -13,7 +12,7 @@ export default withModalMounter(withTracker(({ mountModal }) => ({
   },
 
   endMeeting: () => {
-    makeCall('endMeeting', Auth.credentials);
+    makeCall('endMeeting');
     mountModal(null);
   },
 
diff --git a/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx b/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
index 0844a19521..261a55ebf2 100755
--- a/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import Toggle from '/imports/ui/components/switch/component';
 import cx from 'classnames';
@@ -56,28 +56,21 @@ const intlMessages = defineMessages({
   },
 });
 
-class LockViewersComponent extends Component {
-  constructor(props) {
-    super(props);
+class LockViewersComponent extends React.PureComponent {
+  render() {
     const {
+      intl,
+      meeting,
       closeModal,
       toggleLockSettings,
       toggleWebcamsOnlyForModerator,
-    } = props;
-
-    this.closeModal = closeModal;
-    this.toggleLockSettings = toggleLockSettings;
-    this.toggleWebcamsOnlyForModerator = toggleWebcamsOnlyForModerator;
-  }
-
-  render() {
-    const { intl, meeting } = this.props;
+    } = this.props;
 
     return (
       <Modal
         overlayClassName={styles.overlay}
         className={styles.modal}
-        onRequestClose={this.closeModal}
+        onRequestClose={closeModal}
         hideBorder
       >
 
@@ -108,9 +101,8 @@ class LockViewersComponent extends Component {
                     icons={false}
                     defaultChecked={meeting.lockSettingsProp.disableCam}
                     onChange={() => {
-                      meeting.lockSettingsProp.disableCam =
-                        !meeting.lockSettingsProp.disableCam;
-                      this.toggleLockSettings(meeting);
+                      meeting.lockSettingsProp.disableCam = !meeting.lockSettingsProp.disableCam;
+                      toggleLockSettings(meeting);
                     }}
                     ariaLabel={intl.formatMessage(intlMessages.webcamLabel)}
                   />
@@ -131,9 +123,8 @@ class LockViewersComponent extends Component {
                     icons={false}
                     defaultChecked={meeting.usersProp.webcamsOnlyForModerator}
                     onChange={() => {
-                      meeting.usersProp.webcamsOnlyForModerator =
-                        !meeting.usersProp.webcamsOnlyForModerator;
-                      this.toggleWebcamsOnlyForModerator(meeting);
+                      meeting.usersProp.webcamsOnlyForModerator = !meeting.usersProp.webcamsOnlyForModerator;
+                      toggleWebcamsOnlyForModerator(meeting);
                     }}
                     ariaLabel={intl.formatMessage(intlMessages.otherViewersWebcamLabel)}
                   />
@@ -154,9 +145,8 @@ class LockViewersComponent extends Component {
                     icons={false}
                     defaultChecked={meeting.lockSettingsProp.disableMic}
                     onChange={() => {
-                      meeting.lockSettingsProp.disableMic =
-                        !meeting.lockSettingsProp.disableMic;
-                      this.toggleLockSettings(meeting);
+                      meeting.lockSettingsProp.disableMic = !meeting.lockSettingsProp.disableMic;
+                      toggleLockSettings(meeting);
                     }}
                     ariaLabel={intl.formatMessage(intlMessages.microphoneLable)}
                   />
@@ -177,9 +167,8 @@ class LockViewersComponent extends Component {
                     icons={false}
                     defaultChecked={meeting.lockSettingsProp.disablePubChat}
                     onChange={() => {
-                      meeting.lockSettingsProp.disablePubChat =
-                        !meeting.lockSettingsProp.disablePubChat;
-                      this.toggleLockSettings(meeting);
+                      meeting.lockSettingsProp.disablePubChat = !meeting.lockSettingsProp.disablePubChat;
+                      toggleLockSettings(meeting);
                     }}
                     ariaLabel={intl.formatMessage(intlMessages.publicChatLabel)}
                   />
@@ -200,9 +189,8 @@ class LockViewersComponent extends Component {
                     icons={false}
                     defaultChecked={meeting.lockSettingsProp.disablePrivChat}
                     onChange={() => {
-                      meeting.lockSettingsProp.disablePrivChat =
-                        !meeting.lockSettingsProp.disablePrivChat;
-                      this.toggleLockSettings(meeting);
+                      meeting.lockSettingsProp.disablePrivChat = !meeting.lockSettingsProp.disablePrivChat;
+                      toggleLockSettings(meeting);
                     }}
                     ariaLabel={intl.formatMessage(intlMessages.privateChatLable)}
                   />
@@ -223,9 +211,8 @@ class LockViewersComponent extends Component {
                     icons={false}
                     defaultChecked={meeting.lockSettingsProp.lockedLayout}
                     onChange={() => {
-                      meeting.lockSettingsProp.lockedLayout =
-                        !meeting.lockSettingsProp.lockedLayout;
-                      this.toggleLockSettings(meeting);
+                      meeting.lockSettingsProp.lockedLayout = !meeting.lockSettingsProp.lockedLayout;
+                      toggleLockSettings(meeting);
                     }}
                     ariaLabel={intl.formatMessage(intlMessages.layoutLable)}
                   />
diff --git a/bigbluebutton-html5/imports/ui/components/recording/component.jsx b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
index 931ed7eef8..72266f5a93 100755
--- a/bigbluebutton-html5/imports/ui/components/recording/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/recording/component.jsx
@@ -46,26 +46,21 @@ const defaultProps = {
 };
 
 class RecordingComponent extends React.PureComponent {
-  constructor(props) {
-    super(props);
+  render() {
     const {
+      intl,
+      recordingStatus,
+      amIModerator,
       closeModal,
       toggleRecording,
-    } = props;
-
-    this.closeModal = closeModal;
-    this.toggleRecording = toggleRecording;
-  }
-
-  render() {
-    const { intl, recordingStatus, amIModerator } = this.props;
+    } = this.props;
 
     if (!amIModerator) return null;
     return (
       <Modal
         overlayClassName={styles.overlay}
         className={styles.modal}
-        onRequestClose={this.closeModal}
+        onRequestClose={closeModal}
         hideBorder
       >
         <div className={styles.container}>
@@ -88,12 +83,12 @@ class RecordingComponent extends React.PureComponent {
               color="primary"
               className={styles.button}
               label={intl.formatMessage(intlMessages.yesLabel)}
-              onClick={() => this.toggleRecording()}
+              onClick={toggleRecording}
             />
             <Button
               label={intl.formatMessage(intlMessages.noLabel)}
               className={styles.button}
-              onClick={() => this.closeModal()}
+              onClick={closeModal}
             />
           </div>
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
index 995db27bc3..c6a931b40e 100644
--- a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -76,24 +76,17 @@ class VideoPreview extends Component {
     super(props);
 
     const {
-      closeModal,
-      startSharing,
-      changeWebcam,
       webcamDeviceId,
     } = props;
 
     this.handleJoinVideo = this.handleJoinVideo.bind(this);
     this.handleProceed = this.handleProceed.bind(this);
     this.handleStartSharing = this.handleStartSharing.bind(this);
-    this.closeModal = closeModal;
-    this.startSharing = startSharing;
-    this.changeWebcam = changeWebcam;
-    this.webcamDeviceId = webcamDeviceId;
 
     this.deviceStream = null;
 
     this.state = {
-      webcamDeviceId: this.webcamDeviceId,
+      webcamDeviceId,
       availableWebcams: null,
       isStartSharingDisabled: false,
     };
@@ -119,12 +112,12 @@ class VideoPreview extends Component {
 
   handleSelectWebcam(event) {
     const {
-      intl,
+      changeWebcam,
     } = this.props;
 
     const webcamValue = event.target.value;
     this.setState({ webcamDeviceId: webcamValue });
-    this.changeWebcam(webcamValue);
+    changeWebcam(webcamValue);
     VIDEO_CONSTRAINTS.deviceId = webcamValue ? { exact: webcamValue } : undefined;
     const constraints = {
       video: VIDEO_CONSTRAINTS,
@@ -139,20 +132,20 @@ class VideoPreview extends Component {
   }
 
   handleStartSharing() {
-    const { resolve } = this.props;
+    const { resolve, startSharing } = this.props;
     this.stopTracks();
-    this.startSharing();
+    startSharing();
     if (resolve) resolve();
   }
 
   handleProceed() {
-    const { resolve } = this.props;
-    this.closeModal();
+    const { resolve, closeModal } = this.props;
+    closeModal();
     if (resolve) resolve();
   }
 
   componentDidMount() {
-    const { webcamDeviceId } = this.props;
+    const { webcamDeviceId, changeWebcam } = this.props;
     const constraints = {
       video: VIDEO_CONSTRAINTS,
     };
@@ -163,7 +156,7 @@ class VideoPreview extends Component {
         let isInitialDeviceSet = false;
         const webcams = [];
         if (webcamDeviceId) {
-          this.changeWebcam(webcamDeviceId);
+          changeWebcam(webcamDeviceId);
           this.setState({ webcamDeviceId });
           isInitialDeviceSet = true;
         }
@@ -171,7 +164,7 @@ class VideoPreview extends Component {
           if (device.kind === 'videoinput') {
             webcams.push(device);
             if (!isInitialDeviceSet) {
-              this.changeWebcam(device.deviceId);
+              changeWebcam(device.deviceId);
               this.setState({ webcamDeviceId: device.deviceId });
               isInitialDeviceSet = true;
             }
@@ -200,6 +193,11 @@ class VideoPreview extends Component {
       intl,
     } = this.props;
 
+    const {
+      webcamDeviceId,
+      availableWebcams,
+      isStartSharingDisabled,
+    } = this.state;
     return (
       <Modal
         overlayClassName={styles.overlay}
@@ -224,29 +222,31 @@ class VideoPreview extends Component {
             <label className={styles.label}>
               {intl.formatMessage(intlMessages.cameraLabel)}
             </label>
-            {this.state.availableWebcams && this.state.availableWebcams.length > 0 ? (
+            {availableWebcams && availableWebcams.length > 0 ? (
               <select
-                value={this.state.webcamDeviceId}
+                value={webcamDeviceId}
                 className={styles.select}
                 onChange={this.handleSelectWebcam.bind(this)}
               >
                 <option disabled>
                   {intl.formatMessage(intlMessages.webcamOptionLabel)}
                 </option>
-                {this.state.availableWebcams.map((webcam, index) => (
+                {availableWebcams.map((webcam, index) => (
                   <option key={index} value={webcam.deviceId}>
                     {webcam.label}
                   </option>
-                  ))}
+                ))}
               </select>
-              ) :
-              <select
-                className={styles.select}
-              >
-                <option disabled>
-                  {intl.formatMessage(intlMessages.webcamNotFoundLabel)}
-                </option>
-              </select>}
+            )
+              : (
+                <select
+                  className={styles.select}
+                >
+                  <option disabled>
+                    {intl.formatMessage(intlMessages.webcamNotFoundLabel)}
+                  </option>
+                </select>
+              )}
           </div>
         </div>
         <div className={styles.footer}>
@@ -259,7 +259,7 @@ class VideoPreview extends Component {
               color="primary"
               label={intl.formatMessage(intlMessages.startSharingLabel)}
               onClick={() => this.handleStartSharing()}
-              disabled={this.state.isStartSharingDisabled}
+              disabled={isStartSharingDisabled}
             />
           </div>
         </div>
@@ -271,4 +271,3 @@ class VideoPreview extends Component {
 VideoPreview.propTypes = propTypes;
 
 export default injectIntl(VideoPreview);
-

From 68e6e75525f1597ba3d17d22e27e8ad60f7b2c5a Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Thu, 17 Jan 2019 14:12:32 -0300
Subject: [PATCH 108/163] More syntax fixes better log for external video auth

---
 .../api/external-videos/server/index.js       | 20 +++++++------------
 .../external-video-player/component.jsx       |  4 ++--
 .../external-video-player/modal/component.jsx |  5 +++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/external-videos/server/index.js b/bigbluebutton-html5/imports/api/external-videos/server/index.js
index 255ce8571b..a3aaefce99 100644
--- a/bigbluebutton-html5/imports/api/external-videos/server/index.js
+++ b/bigbluebutton-html5/imports/api/external-videos/server/index.js
@@ -1,24 +1,18 @@
-import { Meteor } from 'meteor/meteor';
-
 import ExternalVideoStreamer from '/imports/api/external-videos';
 import Users from '/imports/api/users';
-
 import Logger from '/imports/startup/server/logger';
-
-import './methods'; 
+import './methods';
 
 ExternalVideoStreamer.allowRead('all');
 ExternalVideoStreamer.allowWrite('all');
 
-const allowFromPresenter = (eventName, {userId, meetingId}) => {
-  let user = Users.findOne({userId});
+const allowFromPresenter = (eventName, { userId }) => {
+  const user = Users.findOne({ userId });
+  const ret = user && user.presenter;
 
-  let ret = user && user.presenter;
+  Logger.debug('ExternalVideo Streamer auth userid:', userId, ' event: ', eventName, ' suc: ', ret);
 
-  Logger.debug('Auth userid:', userId, ' event: ', eventName, ' suc: ', ret);
-
-  return ret || eventName == 'viewerJoined';
-
-}
+  return ret || eventName === 'viewerJoined';
+};
 
 ExternalVideoStreamer.allowEmit(allowFromPresenter);
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index 2fcad244e8..e4c802de23 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -38,7 +38,7 @@ class VideoPlayer extends Component {
     window.addEventListener('resize', this.resizeListener);
   }
 
-  componentWillUpdate(nextProps) {
+  componentDidUpdate(nextProps) {
     if (!nextProps.videoId) {
       clearInterval(this.syncInterval);
     }
@@ -186,7 +186,7 @@ class VideoPlayer extends Component {
     }
   }
 
-  render () {
+  render() {
     const { videoId } = this.props;
     const { opts, handleOnReady, handleStateChange } = this;
 
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
index 7df0713960..ea6f8cc405 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -56,8 +56,9 @@ class ExternalVideoModal extends Component {
 
   startWatchingHandler() {
     const { startWatching, closeModal } = this.props;
+    const { url } = this.state;
 
-    startWatching(this.state.url);
+    startWatching(url);
     closeModal();
   }
 
@@ -69,7 +70,7 @@ class ExternalVideoModal extends Component {
   }
 
   updateVideoUrlHandler(ev) {
-    this.setState({...this.state, url: ev.target.value });
+    this.setState({ url: ev.target.value });
   }
 
   renderUrlError() {

From 1e1abbe2c85c6ba69afc3fd8eacc704d30bd043a Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Thu, 17 Jan 2019 19:11:16 +0000
Subject: [PATCH 109/163] end-meeting use "title" from Modal

---
 .../ui/components/end-meeting-confirmation/component.jsx    | 6 +-----
 .../imports/ui/components/modal/simple/styles.scss          | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
index db9c1be92e..2dde19f705 100644
--- a/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx
@@ -41,13 +41,9 @@ class EndMeetingComponent extends React.PureComponent {
         className={styles.modal}
         onRequestClose={closeModal}
         hideBorder
+        title={intl.formatMessage(intlMessages.endMeetingTitle)}
       >
         <div className={styles.container}>
-          <div className={styles.header}>
-            <div className={styles.title}>
-              {intl.formatMessage(intlMessages.endMeetingTitle)}
-            </div>
-          </div>
           <div className={styles.description}>
             {intl.formatMessage(intlMessages.endMeetingDescription)}
           </div>
diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
index 3f9893bab8..9a7768c4d9 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
@@ -30,6 +30,8 @@
   flex: 1;
   margin: 0;
   font-weight: 400;
+  font-size: var(--font-size-large);
+  text-align: center;
 }
 
 .dismiss {

From 31eab75cb44661a25d510c6a966f757f339b3d3c Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Thu, 17 Jan 2019 19:33:58 +0000
Subject: [PATCH 110/163] update isOpen to keepOpen dropdown

---
 .../imports/ui/components/modal/simple/styles.scss              | 1 +
 .../ui/components/nav-bar/settings-dropdown/component.jsx       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
index 9a7768c4d9..224064c345 100644
--- a/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/modal/simple/styles.scss
@@ -32,6 +32,7 @@
   font-weight: 400;
   font-size: var(--font-size-large);
   text-align: center;
+  align-self: flex-end;
 }
 
 .dismiss {
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index 32cab52be9..5c4af9769d 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -233,7 +233,7 @@ class SettingsDropdown extends PureComponent {
     return (
       <Dropdown
         autoFocus
-        isOpen={isSettingOpen}
+        keepOpen={isSettingOpen}
         onShow={this.onActionsShow}
         onHide={this.onActionsHide}
       >

From 3365cabc72e64b94bf57e99510d37bd4ef64dac1 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Thu, 17 Jan 2019 15:15:10 -0500
Subject: [PATCH 111/163] Update year in html5 settings.yml

---
 bigbluebutton-html5/private/config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index f53ff108bd..2a0a1f5cff 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -11,7 +11,7 @@ public:
     clientTitle: BigBlueButton
     appName: BigBlueButton HTML5 Client
     bbbServerVersion: 2.2-dev
-    copyright: "©2018 BigBlueButton Inc."
+    copyright: "©2019 BigBlueButton Inc."
     html5ClientBuild: HTML5_CLIENT_VERSION
     lockOnJoin: true
     basename: "/html5client"

From 84c383be3a56300fdad5d1b7adda305bca8b7b7f Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Thu, 17 Jan 2019 17:49:04 -0600
Subject: [PATCH 112/163] Added restart for Etherpad

---
 bigbluebutton-config/bin/bbb-conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 178441f655..9364c6a5a3 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -322,7 +322,7 @@ stop_bigbluebutton () {
           BBB_TRANSCODE_AKKA=bbb-transcode-akka
        fi
 
-       systemctl stop red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-rap-archive-worker.service bbb-rap-process-worker.service bbb-rap-publish-worker.service bbb-rap-sanity-worker.service bbb-record-core.timer $HTML5 $WEBHOOKS
+       systemctl stop red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-rap-archive-worker.service bbb-rap-process-worker.service bbb-rap-publish-worker.service bbb-rap-sanity-worker.service bbb-record-core.timer $HTML5 $WEBHOOKS etherpad
     else
 	/etc/init.d/monit stop
 
@@ -393,7 +393,7 @@ start_bigbluebutton () {
           BBB_TRANSCODE_AKKA=bbb-transcode-akka
        fi
 
-       systemctl start red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-record-core.timer $HTML5 $WEBHOOKS
+       systemctl start red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-record-core.timer $HTML5 $WEBHOOKS etherpad
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
           systemctl start mongod
 	  sleep 3

From 2dfb1d872ee5f19a3a69edf3d1aa5c1cdecb84b3 Mon Sep 17 00:00:00 2001
From: Vitor Mateus <vitormateusalmeida@gmail.com>
Date: Fri, 18 Jan 2019 11:03:09 -0200
Subject: [PATCH 113/163] Avoid duplicated messages. #6500

---
 .../ui/components/chat/message-form/component.jsx     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx
index 37a840db03..785c930e0a 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx
@@ -118,6 +118,7 @@ class MessageForm extends PureComponent {
     const { message } = this.state;
     let msg = message.trim();
 
+
     if (disabled
       || msg.length === 0
       || msg.length < minMessageLength
@@ -132,11 +133,13 @@ class MessageForm extends PureComponent {
     div.appendChild(document.createTextNode(msg));
     msg = div.innerHTML;
 
-    return handleSendMessage(msg)
-      .then(() => this.setState({
+    return (
+      handleSendMessage(msg),
+      this.setState({
         message: '',
         hasErrors: false,
-      }));
+      })
+    );
   }
 
   render() {
@@ -184,7 +187,7 @@ class MessageForm extends PureComponent {
           />
         </div>
         <div className={styles.info}>
-          { hasErrors ? <span id="message-input-error">{error}</span> : null }
+          {hasErrors ? <span id="message-input-error">{error}</span> : null}
         </div>
       </form>
     );

From 3c75690d8c5b9e59c572a385e232c3d2f3c3feba Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Fri, 18 Jan 2019 10:34:03 -0300
Subject: [PATCH 114/163] Let's try vimeo

---
 .../external-video-player/component.jsx       |  1 +
 bigbluebutton-html5/package-lock.json         | 53 +++++++++++++++++++
 bigbluebutton-html5/package.json              |  3 +-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index e4c802de23..6089016c5d 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component';
 import YouTube from 'react-youtube';
+import Vimeo from 'react-vimeo';
 import { sendMessage, onMessage } from './service';
 
 const { PlayerState } = YouTube;
diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index 098dac430e..da1c1873aa 100644
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -3221,6 +3221,14 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "jsonp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz",
+      "integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
+      "requires": {
+        "debug": "^2.1.3"
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -3253,6 +3261,11 @@
         "xmlbuilder": "^10.0.0"
       }
     },
+    "keymirror": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/keymirror/-/keymirror-0.1.1.tgz",
+      "integrity": "sha1-kYiJ6hP40KQufFVyUO7nE63JXDU="
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3835,6 +3848,11 @@
         "strip-bom": "^2.0.0"
       }
     },
+    "load-script": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
+      "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ="
+    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -5769,6 +5787,26 @@
         }
       }
     },
+    "react-vimeo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-vimeo/-/react-vimeo-2.0.0.tgz",
+      "integrity": "sha512-wRjoH/b3khsRNb5i4RAyefWQBKUnKdhLWlnqDabOI7du8vZSEluRNTiGYQ23bmFJBUu1RHhb7gTS5WI1VeUkiA==",
+      "requires": {
+        "debug": "^2.2.0",
+        "jsonp": "^0.2.0",
+        "keymirror": "^0.1.1"
+      }
+    },
+    "react-youtube": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-7.8.0.tgz",
+      "integrity": "sha512-kQFR0XTpgGRtzJ54HKDaCtAGr34mgB/BVFeCAL0WUjpIKZBcWtFrKJhYkoKfvWK7aTzJuQ57xojTjG7V6JzILA==",
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "prop-types": "^15.5.3",
+        "youtube-player": "^5.5.1"
+      }
+    },
     "reactcss": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
@@ -6297,6 +6335,11 @@
         }
       }
     },
+    "sister": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sister/-/sister-3.0.1.tgz",
+      "integrity": "sha512-aG41gNRHRRxPq52MpX4vtm9tapnr6ENmHUx8LMAJWCOplEMwXzh/dp5WIo52Wl8Zlc/VUyHLJ2snX0ck+Nma9g=="
+    },
     "slice-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
@@ -7545,6 +7588,16 @@
         }
       }
     },
+    "youtube-player": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/youtube-player/-/youtube-player-5.5.2.tgz",
+      "integrity": "sha512-ZGtsemSpXnDky2AUYWgxjaopgB+shFHgXVpiJFeNB5nWEugpW1KWYDaHKuLqh2b67r24GtP6HoSW5swvf0fFIQ==",
+      "requires": {
+        "debug": "^2.6.6",
+        "load-script": "^1.0.0",
+        "sister": "^3.0.0"
+      }
+    },
     "zip-stream": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index c76e5a9a61..b8145181e9 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -62,7 +62,8 @@
     "react-toastify": "^4.4.3",
     "react-toggle": "~4.0.2",
     "react-transition-group": "~2.5.0",
-    "react-youtube": "7.8.0",
+    "react-vimeo": "^2.0.0",
+    "react-youtube": "^7.8.0",
     "reconnecting-websocket": "~v4.1.10",
     "redis": "~2.8.0",
     "string-hash": "~1.1.3",

From a3fda63b49d0ed8c6d9ee445924f16f447fb9590 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Fri, 18 Jan 2019 10:19:26 -0600
Subject: [PATCH 115/163] Updated index page for 2.2-dev

---
 bigbluebutton-config/web/index.html | 69 ++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/bigbluebutton-config/web/index.html b/bigbluebutton-config/web/index.html
index 6e8733a1f8..00a14c63d7 100644
--- a/bigbluebutton-config/web/index.html
+++ b/bigbluebutton-config/web/index.html
@@ -42,23 +42,31 @@
     <!-- Body -->
     <div class='container'>
 
+
+
+
+
       <!-- Welcome Message & Login Into Demo -->
       <div class='row'>
-        <div class='span five'>
-          <h2>Welcome</h2>
-          <p> <a href="http://bigbluebutton.org/" target="_blank">BigBlueButton</a> is an open source web conferencing system for on-line learning. </p>
-          <p> We believe that every student with a web browser should have access to a high-quality on-line learning experience </p>
-          <p> We intend to make that possible with BigBlueButton.</p>
+        <div class='span six html5clientOnly'>
+          <div class='join-meeting '>
+            <h4>Try BigBlueButton via HTML5</h4>
+            <p>New School</p>
 
-          <h4>For Developers</h4>
-          <p> The BigBlueButton project is <a href="http://bigbluebutton.org/support">supported</a> by a community of developers that care about good design and a streamlined user experience. </p>
-          <p>See <a href="/demo/demo1.jsp" target="_blank">API examples </a> for how to integrate BigBlueButton with your project.</p>
+            <form name="form1" method="GET" onsubmit="return checkform(this);" action="/demo/demoHTML5.jsp">
+              <input type="text" id="username" required="" name="username" placeholder="Enter Your Name" size="29" class="field input-default" autofocus>
+              <input type="submit" value="Join" class="submit_btn button success large"><br>
+              <input type="hidden" name="action" value="create">
+            </form>
+
+          <a class="watch" href="https://www.youtube.com/watch?v=d5v6Uar79Yc" class="pull-right">Overview Video of New HTML5 Client</a>
+
+          </div>
         </div>
-				<div class="span one"></div>
         <div class='span six'>
-          <div class='join-meeting  pull-right'>
-            <h4>Try BigBlueButton</h4>
-            <p>Join a demo session on this server.</p>
+          <div class='join-meeting'>
+            <h4>Try BigBlueButton via Flash</h4>
+            <p>Old School</p>
 
             <form name="form1" method="GET" onsubmit="return checkform(this);" action="/demo/demo1.jsp">
               <input type="text" id="username" required="" name="username" placeholder="Enter Your Name" size="29" class="field input-default" autofocus>
@@ -66,13 +74,31 @@
               <input type="hidden" name="action" value="create">
             </form>
 
-          <a class="watch" href="#video" class="pull-right">New to BigBlueButton?  Watch these videos.</a>
-
+            <a class="watch" href="#video" class="pull-right">Tutorial Videos</a>
           </div>
-
         </div>
       </div>
 
+      <hr class="featurette-divider">
+      <!-- Welcome Message & Login Into Demo -->
+      <div class='row'>
+       <div >
+          <h2>Built for online learning</h2>
+          <p> BigBlueButton is an open source web conferencing system built for on-line learning.</p>
+          <p>BigBlueButton provides all the core capabilities you expect in a web conferencing system: real-time sharing of audio, video, presentation, and screen.  BigBlueButton gives you many ways to engage users with interactive chat (public and private), multi-user whiteboard, shared notes, emojis, polling, and breakout rooms.  You can record any session for later playback.</p>
+          <p> The big change in this release is the new <a href="https://www.youtube.com/watch?v=d5v6Uar79Yc">HTML5 client</a>. The HTML5 client runs on all devices: laptop, desktop, chromebook and mobile (Android 6.0+ and iOS 12.0+).  The HTML5 client uses the browser's built-in support for <a href="https://webrtc.org/">web real-time communications (WebRTC)</a> to share audio, video, and screen with other users.  Chrome and FireFox are the recommend as they have the best support for WebRTC.</p>
+	<p> Try out the HTML5 client above and give us <a href="https://docs.google.com/forms/d/1gFz5JdN3vD6jxhlVskFYgtEKEcexdDnUzpkwUXwQ4OY/viewform?usp=send_for">your feedback</a>.  To learn more about BigBlueButton visit <a href="https://bigbluebutton.org/">bigbluebutton.org</a></p>
+
+          <h4>For Developers</h4>
+          <p> Under the hood, the HTML5 client uses the React for a responsive experience.  The BigBlueButton project is <a href="http://bigbluebutton.org/support">supported</a> by a community of developers that care about good design and a streamlined user experience.  See <a href="http://docs.bigbluebutton.org" target="_blank">our documentation site</a> for more information on how you can integrate BigBlueButton with your project.</p>
+        </div>
+        <div class="span one"></div>
+
+      </div>
+
+
+
+
       <hr class="featurette-divider">
 
       <!-- BigBlueButton Features -->
@@ -217,19 +243,19 @@
 	        </div>
 
 	        <div class='span four video-item'>
-	        	<a href="https://www.youtube.com/watch?v=oh0bEk3YSwI" target="_blank">
+	        	<a href="https://www.youtube.com/watch?v=GeJbK1lvl2I" target="_blank">
 		        	<div class="video-btn"><i class="fa fa-play-circle-o"></i></div>
 		          <img src="images/bbb-viewer-overview.jpg" alt="BigBlueButton Viewer Overview Video"/>
 	        	</a>
-	          <h3><a href="https://www.youtube.com/watch?v=oh0bEk3YSwI;feature=youtu.be" title="Student Overview" target="_blank">Viewer Overview</a></h3>
+	          <h3><a href="https://www.youtube.com/watch?v=GeJbK1lvl2I;feature=youtu.be" title="Student Overview" target="_blank">Viewer Overview</a></h3>
 	        </div>
 
 	        <div class='span four last video-item'>
-	        	<a href="https://www.youtube.com/watch?v=J9mbw00P9W0&feature=youtu.be" target="_blank">
+	        	<a href="https://www.youtube.com/watch?v=758xaFdeoN0&feature=youtu.be" target="_blank">
 		        	<div class="video-btn"><i class="fa fa-play-circle-o"></i></div>
 		          <img  src="images/bbb-presenter-overview.jpg" alt="Moderator/Presenter Overview Video"/>
 	        	</a>
-	          <h3><a href="https://www.youtube.com/watch?v=J9mbw00P9W0&feature=youtu.be" title="Moderator/Presenter Overview" target="_blank">Moderator/Presenter Overview</a></h3>
+	          <h3><a href="https://www.youtube.com/watch?v=758xaFdeoN0&feature=youtu.be" title="Moderator/Presenter Overview" target="_blank">Moderator/Presenter Overview</a></h3>
 	        </div>
 	      </div>
       </div>
@@ -261,8 +287,8 @@
 
 	      <div class="row">
 	      	<div class="span twelve center">
-		        <p>Copyright &copy; 2018 BigBlueButton Inc.<br>
-		        <small>Version <a href="http://docs.bigbluebutton.org/">2.0-RC2</a></small>		        
+		        <p>Copyright &copy; 2019 BigBlueButton Inc.<br>
+		        <small>Version <a href="http://docs.bigbluebutton.org/">2.2-dev</a></small>
 		        </p>
 	      	</div>
 	      </div>
@@ -270,3 +296,4 @@
     </footer>
   </body>
 </html>
+

From 94ab770c940b665294ee32e497e594517f96bb0f Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Fri, 18 Jan 2019 16:42:37 +0000
Subject: [PATCH 116/163] html5 locales on 2.2; updated script and files

---
 .../private/locales/bg_BG.json                |   6 +-
 bigbluebutton-html5/private/locales/de.json   | 403 ------------------
 .../private/locales/el_GR.json                |  55 ---
 .../private/locales/es_ES.json                | 214 ----------
 .../private/locales/fa_IR.json                | 396 -----------------
 bigbluebutton-html5/private/locales/fr.json   | 403 ------------------
 bigbluebutton-html5/private/locales/id.json   | 209 ---------
 .../private/locales/it_IT.json                |   9 -
 bigbluebutton-html5/private/locales/ja.json   | 379 ----------------
 .../private/locales/ja_JP.json                | 379 ----------------
 .../private/locales/pt_BR.json                | 403 ------------------
 .../private/locales/ru_RU.json                | 403 ------------------
 .../private/locales/tr_TR.json                | 355 ---------------
 .../private/locales/uk_UA.json                | 403 ------------------
 .../private/locales/zh_CN.json                | 403 ------------------
 bigbluebutton-html5/transifex.sh              |   6 +-
 16 files changed, 6 insertions(+), 4420 deletions(-)
 delete mode 100644 bigbluebutton-html5/private/locales/de.json
 delete mode 100644 bigbluebutton-html5/private/locales/el_GR.json
 delete mode 100644 bigbluebutton-html5/private/locales/es_ES.json
 delete mode 100644 bigbluebutton-html5/private/locales/fa_IR.json
 delete mode 100644 bigbluebutton-html5/private/locales/fr.json
 delete mode 100644 bigbluebutton-html5/private/locales/id.json
 delete mode 100644 bigbluebutton-html5/private/locales/it_IT.json
 delete mode 100644 bigbluebutton-html5/private/locales/ja.json
 delete mode 100644 bigbluebutton-html5/private/locales/ja_JP.json
 delete mode 100644 bigbluebutton-html5/private/locales/pt_BR.json
 delete mode 100644 bigbluebutton-html5/private/locales/ru_RU.json
 delete mode 100644 bigbluebutton-html5/private/locales/tr_TR.json
 delete mode 100644 bigbluebutton-html5/private/locales/uk_UA.json
 delete mode 100644 bigbluebutton-html5/private/locales/zh_CN.json

diff --git a/bigbluebutton-html5/private/locales/bg_BG.json b/bigbluebutton-html5/private/locales/bg_BG.json
index 276cf423b6..38cc14a469 100644
--- a/bigbluebutton-html5/private/locales/bg_BG.json
+++ b/bigbluebutton-html5/private/locales/bg_BG.json
@@ -1,7 +1,7 @@
 {
-    "app.home.greeting": "Добре дошли, {name}! Вашата презентация ще започне всеки момент",
-    "app.chat.submitLabel": "Изпрати",
-    "app.chat.titlePublic": "Общ чат"
+    "app.chat.closeChatLabel": "Затвори {0}",
+    "app.chat.hideChatLabel": "Скрий {0}",
+    "app.chat.dropdown.save": "Запази"
 
 }
 
diff --git a/bigbluebutton-html5/private/locales/de.json b/bigbluebutton-html5/private/locales/de.json
deleted file mode 100644
index fa4f77db7b..0000000000
--- a/bigbluebutton-html5/private/locales/de.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "app.home.greeting": "Willkommen {0}! Ihre Präsentation wird in Kürze beginnen...",
-    "app.chat.submitLabel": "Nachricht senden",
-    "app.chat.errorMinMessageLength": "Die Nachricht ist {0} Buchstabe(n) zu kurz",
-    "app.chat.errorMaxMessageLength": "Die Nachricht ist {0} Buchstabe(n) zu lang",
-    "app.chat.inputLabel": "Chatnachricht eingeben für {0}",
-    "app.chat.inputPlaceholder": "Nachricht {0}",
-    "app.chat.titlePublic": "Öffentlicher Chat",
-    "app.chat.titlePrivate": "Privater Chat mit {0}",
-    "app.chat.partnerDisconnected": "{0} hat die Konferenz verlassen",
-    "app.chat.closeChatLabel": "Schließen {0}",
-    "app.chat.hideChatLabel": "Verstecken {0}",
-    "app.chat.moreMessages": "Weitere Nachrichten",
-    "app.chat.dropdown.options": "Chatoptionen",
-    "app.chat.dropdown.clear": "Löschen",
-    "app.chat.dropdown.copy": "Kopieren",
-    "app.chat.dropdown.save": "Speichern",
-    "app.chat.label": "Chat",
-    "app.chat.emptyLogLabel": "Chat-Log ist leer",
-    "app.chat.clearPublicChatMessage": "Der öffentliche Chatverlauf wurde durch einen Moderator gelöscht",
-    "app.userList.usersTitle": "Teilnehmer",
-    "app.userList.participantsTitle": "Teilnehmer",
-    "app.userList.messagesTitle": "Nachrichten",
-    "app.userList.presenter": "Präsentator",
-    "app.userList.you": "Sie",
-    "app.userList.locked": "Gesperrt",
-    "app.userList.label": "Teilnehmerlliste",
-    "app.userList.toggleCompactView.label": "Kompaktansichtmodus wechseln",
-    "app.userList.guest": "Gast",
-    "app.userList.menuTitleContext": "Verfügbare Optionen",
-    "app.userList.chatListItem.unreadSingular": "{0} Neue Nachricht",
-    "app.userList.chatListItem.unreadPlural": "{0} Neue Nachrichten",
-    "app.userList.menu.chat.label": "Chat",
-    "app.userList.menu.clearStatus.label": "Status löschen",
-    "app.userList.menu.makePresenter.label": "Präsentationsrechte geben",
-    "app.userList.menu.removeUser.label": "Teilnehmer entfernen",
-    "app.userList.menu.muteUserAudio.label": "Teilnehmer stummschalten",
-    "app.userList.menu.unmuteUserAudio.label": "Stummschaltung aufheben",
-    "app.userList.userAriaLabel": "{0} {1} {2}  Status {3}",
-    "app.userList.menu.promoteUser.label": "Zum Moderator befördern",
-    "app.userList.menu.demoteUser.label": "Zum Zuschauer zurückstufen",
-    "app.media.label": "Media",
-    "app.media.screenshare.start": "Bildschirmfreigabe wurde gestartet",
-    "app.media.screenshare.end": "Bildschirmfreigabe wurde gestoppt",
-    "app.media.screenshare.safariNotSupported": "Bildschirmfreigabe wird gegenwärtig von Safari nicht unterstützt. Bitte verwenden Sie Firefox oder Google Chrome.",
-    "app.meeting.ended": "Diese Konferenz wurde beendet",
-    "app.meeting.endedMessage": "Sie werden zum Startbildschirm weitergeleitet",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Vorherige Folie",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Präsentation zur vorherigen Folie wechseln",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Nächste Folie",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Präsentation zur nächsten Folie wechseln",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Folie auswählen",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Präsentation zu bestimmter Folie wechseln",
-    "app.presentation.presentationToolbar.fitWidthLabel": "An Breite anpassen",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Folie in voller Breite darstellen",
-    "app.presentation.presentationToolbar.fitScreenLabel": "An Bildschirm anpassen",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Gesamte Folie darstellen",
-    "app.presentation.presentationToolbar.zoomLabel": "Vergrößerungsgrad",
-    "app.presentation.presentationToolbar.zoomDesc": "Vergrößerungsstufe der Präsentation ändern",
-    "app.presentation.presentationToolbar.goToSlide": "Folie {0}",
-    "app.presentationUploder.title": "Präsentation",
-    "app.presentationUploder.message": "Als Präsentator haben Sie in BigBlueButton die Möglichkeit, jegliche Office-Dokumente oder PDF-Dateien hochzuladen. Die beste Qualität erzielen Sie mit PDF-Dateien.",
-    "app.presentationUploder.confirmLabel": "Start",
-    "app.presentationUploder.confirmDesc": "Änderungen speichern und Präsentation starten",
-    "app.presentationUploder.dismissLabel": "Abbrechen",
-    "app.presentationUploder.dismissDesc": "Fenster schließen und Änderungen verwerfen",
-    "app.presentationUploder.dropzoneLabel": "Hochzuladende Dateien hier hin ziehen",
-    "app.presentationUploder.browseFilesLabel": "oder nach Dateien suchen",
-    "app.presentationUploder.fileToUpload": "Hochzuladende Datei...",
-    "app.presentationUploder.currentBadge": "Aktuell",
-    "app.presentationUploder.genericError": "Ups, irgendwas ist schief gelaufen",
-    "app.presentationUploder.upload.progress": "Hochladen ({0}%)",
-    "app.presentationUploder.upload.413": "Die Datei ist zu groß",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "Verarbeite Seite {0} von {1}",
-    "app.presentationUploder.conversion.genericConversionStatus": "Konvertiere Datei...",
-    "app.presentationUploder.conversion.generatingThumbnail": "Erzeuge Miniaturbild...",
-    "app.presentationUploder.conversion.generatedSlides": "Folien erzeugt...",
-    "app.presentationUploder.conversion.generatingSvg": "Erzeuge SVG Bilder...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Ups, die Seitenanzahl überschreitet das Limit",
-    "app.presentationUploder.conversion.timeout": "Ups, die Konvertierung dauert zu lange",
-    "app.polling.pollingTitle": "Umfrage Optionen",
-    "app.polling.pollAnswerLabel": "Umfrageantwort {0}",
-    "app.polling.pollAnswerDesc": "Diese Option auswählen für Umfrage {0}",
-    "app.failedMessage": "Es gibt Verbindungsprobleme mit dem Server.",
-    "app.connectingMessage": "Verbinde...",
-    "app.waitingMessage": "Verbindung getrennt. Versuche sie wiederherzustellen in {0} Sekunden...",
-    "app.navBar.settingsDropdown.optionsLabel": "Optionen",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Als Vollbild darstellen",
-    "app.navBar.settingsDropdown.settingsLabel": "Einstellungen öffnen",
-    "app.navBar.settingsDropdown.aboutLabel": "Versionsinfo",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Ausloggen",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Vollbilddarstellung beenden",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Das Einstellungsmenü als Vollbild darstellen",
-    "app.navBar.settingsDropdown.settingsDesc": "Basiseinstellungen verändern",
-    "app.navBar.settingsDropdown.aboutDesc": "Informationen über den Client anzeigen",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Konferenz verlassen",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Vollbildmodus beenden",
-    "app.navBar.settingsDropdown.hotkeysLabel": "Tastaturkürzel",
-    "app.navBar.settingsDropdown.hotkeysDesc": "Liste verfügbarer Tastaturkürzel",
-    "app.navBar.settingsDropdown.helpLabel": "Hilfe",
-    "app.navBar.settingsDropdown.helpDesc": "Verlinkt zu den Videoanleitungen",
-    "app.navBar.userListToggleBtnLabel": "Teilnehmerliste umschalten",
-    "app.navBar.toggleUserList.ariaLabel": "Teilnehmer/Nachrichten-Umschalter",
-    "app.navBar.toggleUserList.newMessages": "mit Benachrichtigung für neue Nachrichten",
-    "app.navBar.recording": "Diese Konferenz wird aufgezeichnet",
-    "app.navBar.recording.on": "Aufzeichnung läuft",
-    "app.navBar.recording.off": "Keine Aufnahme",
-    "app.leaveConfirmation.title": "Konferenz verlassen",
-    "app.leaveConfirmation.message": "Wollen Sie die Konferenz verlassen?",
-    "app.leaveConfirmation.confirmLabel": "Verlassen",
-    "app.leaveConfirmation.confirmDesc": "Hiermit verlassen Sie Konferenz",
-    "app.leaveConfirmation.dismissLabel": "Abbrechen",
-    "app.leaveConfirmation.dismissDesc": "Schließt den Dialog zum Verlassen der Konferenz",
-    "app.leaveConfirmation.endMeetingLabel": "Ja und Konferenz beenden",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Konferenz verlassen und für alle beenden",
-    "app.leaveConfirmation.endMeetingDesc": "Bestätigung zum Beenden der Konferenz",
-    "app.about.title": "Versionsinfo",
-    "app.about.version": "Client Build:",
-    "app.about.copyright": "Copyright:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "Abbrechen",
-    "app.about.dismissDesc": "Informationen über Client schließen",
-    "app.actionsBar.changeStatusLabel": "Status ändern",
-    "app.actionsBar.muteLabel": "Stummschalten",
-    "app.actionsBar.unmuteLabel": "Freischalten",
-    "app.actionsBar.camOffLabel": "Kamera aus",
-    "app.actionsBar.raiseLabel": "Hand heben",
-    "app.actionsBar.label": "Aktionsleiste",
-    "app.submenu.application.applicationSectionTitle": "Anwendung",
-    "app.submenu.application.audioAlertLabel": "Audiowarnungen für Chat",
-    "app.submenu.application.pushAlertLabel": "Popupwarnungen für Chat",
-    "app.submenu.application.fontSizeControlLabel": "Schriftgröße",
-    "app.submenu.application.increaseFontBtnLabel": "Schriftgröße erhöhen",
-    "app.submenu.application.decreaseFontBtnLabel": "Schriftgröße verringern",
-    "app.submenu.application.languageLabel": "Sprache",
-    "app.submenu.application.ariaLanguageLabel": "Sprache ändern",
-    "app.submenu.application.languageOptionLabel": "Sprache auswählen",
-    "app.submenu.application.noLocaleOptionLabel": "Keine Sprachschemata verfügbar",
-    "app.submenu.audio.micSourceLabel": "Mikrofonauswahl",
-    "app.submenu.audio.speakerSourceLabel": "Lautsprecherauswahl",
-    "app.submenu.audio.streamVolumeLabel": "Ihre Audiolautstärke",
-    "app.submenu.video.title": "Video",
-    "app.submenu.video.videoSourceLabel": "Videoquelle ansehen",
-    "app.submenu.video.videoOptionLabel": "Videoeingang auswählen",
-    "app.submenu.video.videoQualityLabel": "Videoqualität",
-    "app.submenu.video.qualityOptionLabel": "Videoqualität auswählen",
-    "app.submenu.video.participantsCamLabel": "Webcamvideo anderer Teilnehmer darstellen",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Untertitel",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Untertitelkontrolle übernehmen",
-    "app.submenu.closedCaptions.languageLabel": "Sprache",
-    "app.submenu.closedCaptions.localeOptionLabel": "Sprache auswählen",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Keine aktiven Gebietsschemata",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Schriftart",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Schriftart auswählen",
-    "app.submenu.closedCaptions.fontSizeLabel": "Schriftgröße",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Schriftgröße auswählen",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Hintergrundfarbe",
-    "app.submenu.closedCaptions.fontColorLabel": "Schriftfarbe",
-    "app.submenu.participants.muteAllLabel": "Alle stummschalten außer Präsentator",
-    "app.submenu.participants.lockAllLabel": "Alle Teilnehmer sperren",
-    "app.submenu.participants.lockItemLabel": "Teilnehmer {0}",
-    "app.submenu.participants.lockMicDesc": "Deaktiviert das Mikrofon für alle gesperrten Teilnehmer",
-    "app.submenu.participants.lockCamDesc": "Deaktiviert die Webcam für alle gesperrten Teilnehmer",
-    "app.submenu.participants.lockPublicChatDesc": "Deaktiviert den öffentlichen Chat für alle gesperrten Teilnehmer",
-    "app.submenu.participants.lockPrivateChatDesc": "Deaktiviert den privaten Chat für alle gesperrten Teilnehmer",
-    "app.submenu.participants.lockLayoutDesc": "Sperrt das Layout für alle gesperrten Teilnehmer",
-    "app.submenu.participants.lockMicAriaLabel": "Mikrofonsperre",
-    "app.submenu.participants.lockCamAriaLabel": "Webcamsperre",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Sperre für öffentlichen Chat",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Sperre für privaten Chat",
-    "app.submenu.participants.lockLayoutAriaLabel": "Layoutsperre",
-    "app.submenu.participants.lockMicLabel": "Mikrofon",
-    "app.submenu.participants.lockCamLabel": "Webcam",
-    "app.submenu.participants.lockPublicChatLabel": "Öffentlicher Chat",
-    "app.submenu.participants.lockPrivateChatLabel": "Privater Chat",
-    "app.submenu.participants.lockLayoutLabel": "Layout",
-    "app.settings.applicationTab.label": "Anwendung",
-    "app.settings.audioTab.label": "Audio",
-    "app.settings.videoTab.label": "Video",
-    "app.settings.closedcaptionTab.label": "Untertitel",
-    "app.settings.usersTab.label": "Teilnehmer",
-    "app.settings.main.label": "Einstellungen",
-    "app.settings.main.cancel.label": "Abbrechen",
-    "app.settings.main.cancel.label.description": "Verwirft die Änderungen und schließt das Einstellungsmenü",
-    "app.settings.main.save.label": "Speichern",
-    "app.settings.main.save.label.description": "Speichert die Einstellungen und schließt das Einstellungsmenü",
-    "app.settings.dataSavingTab.label": "Dateneinsparung",
-    "app.settings.dataSavingTab.webcam": "Webcams aktiviert",
-    "app.settings.dataSavingTab.screenShare": "Bildschirmfreigabe aktiviert",
-    "app.settings.dataSavingTab.description": "Um Datentransfervolumen zu sparen, können Sie hier einstellen, was angezeigt wird.",
-    "app.switch.onLabel": "AN",
-    "app.switch.offLabel": "AUS",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Aktionen",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Eine Präsentation hochladen",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Eine Umfrage starten",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Bildschirm freigeben",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Bildschirmfreigabe beenden",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Präsentation hochladen",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Eine Umfrage starten",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Ihren Bildschirm mit anderen teilen",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Bildschirmfreigabe beenden mit",
-    "app.actionsBar.actionsDropdown.startRecording": "Aufnahme starten",
-    "app.actionsBar.actionsDropdown.stopRecording": "Aufnahme beenden",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Status setzen",
-    "app.actionsBar.emojiMenu.awayLabel": "Abwesend",
-    "app.actionsBar.emojiMenu.awayDesc": "Ihren Status auf abwesend setzen",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "Hand heben",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "Heben Sie Ihre Hand, um eine Frage zu stellen",
-    "app.actionsBar.emojiMenu.neutralLabel": "Unentschlossen",
-    "app.actionsBar.emojiMenu.neutralDesc": "Ihren Status auf unentschieden setzen",
-    "app.actionsBar.emojiMenu.confusedLabel": "Verwirrt",
-    "app.actionsBar.emojiMenu.confusedDesc": "Ihren Status auf verwirrt setzen",
-    "app.actionsBar.emojiMenu.sadLabel": "Traurig",
-    "app.actionsBar.emojiMenu.sadDesc": "Ihren Status auf traurig setzen",
-    "app.actionsBar.emojiMenu.happyLabel": "Glücklich",
-    "app.actionsBar.emojiMenu.happyDesc": "Ihren Status auf glücklich setzen",
-    "app.actionsBar.emojiMenu.noneLabel": "Status löschen",
-    "app.actionsBar.emojiMenu.noneDesc": "Status löschen",
-    "app.actionsBar.emojiMenu.applauseLabel": "Applaus",
-    "app.actionsBar.emojiMenu.applauseDesc": "Ihren Status auf Applaus setzen",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Daumen hoch",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Ihren Status auf Daumen hoch setzen",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Daumen runter",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Ihren Status auf Daumen runter setzen",
-    "app.actionsBar.currentStatusDesc": "Aktueller Status {0}",
-    "app.audioNotification.audioFailedError1001": "Fehler 1001: Websocket unterbrochen",
-    "app.audioNotification.audioFailedError1002": "Fehler 1002: Websocketverbindung konnte nicht hergestellt werden",
-    "app.audioNotification.audioFailedError1003": "Fehler 1003: Browserversion wird nicht unterstützt",
-    "app.audioNotification.audioFailedError1004": "Fehler 1004: Fehler beim Verbinden",
-    "app.audioNotification.audioFailedError1005": "Fehler 1005: Verbindung unerwartet beendet",
-    "app.audioNotification.audioFailedError1006": "Fehler 1006: Verbindungszeitüberschreitung",
-    "app.audioNotification.audioFailedError1007": "Fehler 1007: ICE Verbindung fehlgeschlagen",
-    "app.audioNotification.audioFailedError1008": "Fehler 1008: Transfer fehlgeschlagen",
-    "app.audioNotification.audioFailedError1009": "Fehler 1009: STUN/TURN Serverinformation konnten nicht abgerufen werden",
-    "app.audioNotification.audioFailedError1010": "Fehler 1010: Zeitüberschreitung bei ICE Verbindung",
-    "app.audioNotification.audioFailedError1011": "Fehler 1011: Zeitüberschreitung beim ICE Gathering",
-    "app.audioNotification.audioFailedMessage": "Audioverbindung konnte nicht hergestellt werden",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia fehlgeschlagen. Nur sichere Quellen sind erlaubt",
-    "app.audioNotification.closeLabel": "Schließen",
-    "app.audioNotificaion.reconnectingAsListenOnly": "Mikrofonfreigabe ist nur für Moderatoren erlaubt, Sie werden im Nur-zuhören-Modus verbunden",
-    "app.breakoutJoinConfirmation.title": "Dem Breakout-Raum beitreten",
-    "app.breakoutJoinConfirmation.message": "Möchten Sie beitreten",
-    "app.breakoutJoinConfirmation.confirmLabel": "Beitreten",
-    "app.breakoutJoinConfirmation.confirmDesc": "Dem Breakout-Raum beitreten",
-    "app.breakoutJoinConfirmation.dismissLabel": "Abbrechen",
-    "app.breakoutJoinConfirmation.dismissDesc": "Beitritt zum Breakout-Raum ablehnen",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "Wählen Sie Ihren Breakout Raum aus",
-    "app.breakoutTimeRemainingMessage": "Verbleibende Breakout Raum Zeit: {0}",
-    "app.breakoutWillCloseMessage": "Zeit abgelaufen. Der Breakout-Raum wird in Kürze geschlossen",
-    "app.calculatingBreakoutTimeRemaining": "Berechne die verbleibende Zeit...",
-    "app.audioModal.microphoneLabel": "Mit Mikrofon",
-    "app.audioModal.listenOnlyLabel": "Nur zuhören",
-    "app.audioModal.audioChoiceLabel": "Wie möchten Sie der Konferenz beitreten?",
-    "app.audioModal.iOSBrowser": "Audio/Video wird nicht unterstützt",
-    "app.audioModal.iOSErrorDescription": "Gegenwärtig wird Audio und Video von Chrome für iOS nicht unterstützt.",
-    "app.audioModal.iOSErrorRecommendation": "Wir empfehlen Safari iOS zu verwenden.",
-    "app.audioModal.audioChoiceDesc": "Wie möchten Sie der Konferenz beitreten?",
-    "app.audioModal.closeLabel": "Schließen",
-    "app.audioModal.yes": "Ja",
-    "app.audioModal.no": "Nein",
-    "app.audioModal.yes.arialabel" : "Echo ist hörbar",
-    "app.audioModal.no.arialabel" : "Echo ist nicht hörbar",
-    "app.audioModal.echoTestTitle": "Dies ist ein persönlicher Echotest. Sprechen Sie ein paar Worte. Hören Sie sich selbst?",
-    "app.audioModal.settingsTitle": "Audioeinstellungen ändern",
-    "app.audioModal.helpTitle": "Es gab ein Problem mit ihren Mediengeräten (Mikrofon/Webcam)",
-    "app.audioModal.helpText": "Haben Sie BigBlueButton die Berechtigung gegeben, auf Ihr Mikrofon zuzugreifen? Beachten Sie, dass sich ein Dialogfenster öffnen sollte, sobald Sie versuchen der Audiokonferenz beizutreten. Dabei wird die Zugriffsberechtigung für Ihr Mediengerät (Mikrofon/Webcam) abgefragt. Bitte erteilen Sie diese Zugriffsberechtigung, um der Konferenz beizutreten. Falls dies nicht funktioniert, versuchen Sie die Mikrofon-Berechtigung in Ihren Browsereinstellungen zu ändern.",
-    "app.audioModal.connecting": "Verbinde",
-    "app.audioModal.connectingEchoTest": "Verbinde zum Echotest",
-    "app.audioManager.joinedAudio": "Sie sind der Konferenz beigetreten",
-    "app.audioManager.joinedEcho": "Der Echotest wurde gestartet",
-    "app.audioManager.leftAudio": "Sie haben die Audiokonferenz verlassen",
-    "app.audioManager.genericError": "Fehler: Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut",
-    "app.audioManager.connectionError": "Fehler: Verbindungsfehler",
-    "app.audioManager.requestTimeout": "Fehler: Zeitüberschreitung beim Aufruf",
-    "app.audioManager.invalidTarget": "Fehler: Beim Aufruf wurde ein ungültiges Ziel angegeben",
-    "app.audioManager.mediaError": "Fehler: Es gab ein Problem bei der Abfrage Ihrer Mediengeräte",
-    "app.audio.joinAudio": "Audio starten",
-    "app.audio.leaveAudio": "Audio beenden",
-    "app.audio.enterSessionLabel": "An Konferenz teilnehmen",
-    "app.audio.playSoundLabel": "Testmelodie abspielen",
-    "app.audio.backLabel": "Zurück",
-    "app.audio.audioSettings.titleLabel": "Audioeinstellungen vornehmen",
-    "app.audio.audioSettings.descriptionLabel": "Ein Dialogfenster wird sich in Ihrem Browser öffnen, in dem Sie der Freigabe Ihres Mikrofons zustimmen müssen.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Mikrofoneingang",
-    "app.audio.audioSettings.speakerSourceLabel": "Lautsprecherausgang",
-    "app.audio.audioSettings.microphoneStreamLabel": "Lautstärke Ihres Audiosignals",
-    "app.audio.audioSettings.retryLabel": "Erneut versuchen",
-    "app.audio.listenOnly.backLabel": "Zurück",
-    "app.audio.listenOnly.closeLabel": "Schließen",
-    "app.audio.permissionsOverlay.title": "Erlauben Sie BigBlueButton auf ihre Mediengeräte zuzugreifen",
-    "app.audio.permissionsOverlay.hint": "Es ist erforderlich, dass Sie BigBlueButton den Zugriff auf Ihre Mediengeräte erlauben, um an der Konferenz teilzunehmen :) ",
-    "app.error.removed": "Sie wurden aus der Konferenz entfernt",
-    "app.error.meeting.ended": "Sie haben die Konferenz verlassen",
-    "app.dropdown.close": "Schließen",
-    "app.error.500": "Ups, irgendwas ist schiefgelaufen",
-    "app.error.404": "Nicht gefunden",
-    "app.error.401": "Nicht erlaubt",
-    "app.error.403": "Verboten",
-    "app.error.leaveLabel": "Erneut einloggen",
-    "app.guest.waiting": "Warte auf Erlaubnis zur Konferenzteilnahme",
-    "app.toast.breakoutRoomEnded": "Breakout Raum wurde beendet. Bitte klicken Sie aufs Mikrofon-Icon um wieder der Audiokonferenz im Hauptraum beizutreten",
-    "app.toast.chat.public": "Neue öffentliche Chatnachricht",
-    "app.toast.chat.private": "Neue private Chatnachricht",
-    "app.toast.chat.system": "System",
-    "app.notification.recordingStart": "Die Konferenz wird jetzt aufgezeichnet",
-    "app.notification.recordingStop": "Die Konferenz wird nicht mehr aufgezeichnet",
-    "app.shortcut-help.title": "Tastaturkürzel",
-    "app.shortcut-help.accessKeyNotAvailable": "Tastaturkürzel nicht verfügbar",
-    "app.shortcut-help.comboLabel": "Tastenkombination",
-    "app.shortcut-help.functionLabel": "Funktion",
-    "app.shortcut-help.closeLabel": "Schließen",
-    "app.shortcut-help.closeDesc": "Schließt den Tastaturkürzel-Dialog",
-    "app.shortcut-help.openOptions": "Einstellungen öffnen",
-    "app.shortcut-help.toggleUserList": "Teilnehmerliste öffnen/schließen",
-    "app.shortcut-help.toggleMute": "Stummschalten/Freischalten",
-    "app.shortcut-help.togglePublicChat": "Öffentlichen Chat öffnen/schließen (Teilnehmerliste muss geöffnet sein)",
-    "app.shortcut-help.hidePrivateChat": "Privaten Chat verbergen",
-    "app.shortcut-help.closePrivateChat": "Privaten Chat schließen",
-    "app.shortcut-help.openActions": "Aktionsmenü öffnen",
-    "app.shortcut-help.openStatus": "Statusmenü öffnen",
-    "app.video.joinVideo": "Webcam freigeben",
-    "app.video.leaveVideo": "Webcam stoppen",
-    "app.video.iceCandidateError": "Fehler beim Hinzufügen vom ice candidate",
-    "app.video.iceConnectionStateError": "Fehler 1107: ICE Übertragung fehlgeschlagen",
-    "app.video.permissionError": "Fehler bei Freigabe der Webcam. Bitte Berechtigungen prüfen",
-    "app.video.sharingError": "Fehler bei Freigabe der Webcam",
-    "app.video.notFoundError": "Konnte keine Webcam finden. Stellen Sie sicher, dass sie angeschlossen ist",
-    "app.video.notAllowed": "Freigabeerlaubnis für die Webcam nicht erteilt, prüfen Sie Ihre Browerberechtigungen",
-    "app.video.notSupportedError": "Webcam kann nur über sichere Verbindung freigegeben werden, stellen Sie sicher, dass das SSL-Zertifikat gültig ist",
-    "app.video.notReadableError": "Konnte nicht auf die Webcam zugreifen. Stellen Sie sicher, dass kein anderes Programm auf die Webcam zugreift",
-    "app.video.swapCam": "Wechseln",
-    "app.video.swapCamDesc": "Ausrichtung der Webcams wechseln",
-    "app.video.videoMenu": "Videomenü",
-    "app.video.videoMenuDisabled": "Webcam in den Einstellungen deaktiviert",
-    "app.video.videoMenuDesc": "Videomenü öffnen",
-    "app.video.chromeExtensionError": "Sie müssen Folgendes installieren:",
-    "app.video.chromeExtensionErrorLink": "Diese Chrome Erweiterung",
-    "app.video.stats.title": "Verbindungsstatistiken",
-    "app.video.stats.packetsReceived": "Empfangene Pakete",
-    "app.video.stats.packetsSent": "Gesendete Pakete",
-    "app.video.stats.packetsLost": "Verlorene Pakete",
-    "app.video.stats.bitrate": "Bitrate",
-    "app.video.stats.lostPercentage": "Verlustprozente insgesamt",
-    "app.video.stats.lostRecentPercentage": "Verlustprozente kürzlich",
-    "app.video.stats.dimensions": "Dimensionen",
-    "app.video.stats.codec": "Codec",
-    "app.video.stats.decodeDelay": "Dekodierungsverzögerung",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "Enkodierungsnutzung",
-    "app.video.stats.currentDelay": "Aktuelle Verzögerung",
-    "app.deskshare.iceConnectionStateError": "Fehler 1108: ICE Verbindung während der Bildschirmfreigabe fehlgeschlagen",
-    "app.sfu.mediaServerConnectionError2000": "Fehler 2000: Verbindung zum Mediaserver kann nicht hergestellt werden",
-    "app.sfu.mediaServerOffline2001": "Fehler 2001: Mediaserver ist offline. Versuchen Sie es später nochmal.",
-    "app.sfu.mediaServerNoResources2002": "Fehler 2002: Mediaserver hat keine verfügbaren Resourcen",
-    "app.sfu.mediaServerRequestTimeout2003": "Fehler 2003: Zeitüberschreitung bei Anfragen an den Mediaserver",
-    "app.sfu.serverIceGatheringFailed2021": "Fehler 2021: Mediaserver kann ICE Kandidaten nicht erfassen",
-    "app.sfu.serverIceGatheringFailed2022": "Fehler 2022: Mediaserver ICE Verbindung fehlgeschlagen",
-    "app.sfu.invalidSdp2202":"Fehler 2202: Client hat ungültigen SDP generiert",
-    "app.sfu.noAvailableCodec2203": "Fehler 2203: Server konnte keinen passenden Codec finden",
-
-    "app.meeting.endNotification.ok.label": "OK",
-    "app.whiteboard.toolbar.tools": "Werkzeuge",
-    "app.whiteboard.toolbar.tools.pointer": "Zeiger",
-    "app.whiteboard.toolbar.tools.pencil": "Stift",
-    "app.whiteboard.toolbar.tools.rectangle": "Rechteck",
-    "app.whiteboard.toolbar.tools.triangle": "Dreieck",
-    "app.whiteboard.toolbar.tools.ellipse": "Ellipse",
-    "app.whiteboard.toolbar.tools.line": "Linie",
-    "app.whiteboard.toolbar.tools.text": "Text",
-    "app.whiteboard.toolbar.thickness": "Strichdicke",
-    "app.whiteboard.toolbar.thicknessDisabled": "Strichdicke ist deaktiviert",
-    "app.whiteboard.toolbar.color": "Farben",
-    "app.whiteboard.toolbar.colorDisabled": "Farben sind deaktiviert",
-    "app.whiteboard.toolbar.color.black": "Schwarz",
-    "app.whiteboard.toolbar.color.white": "Weiß",
-    "app.whiteboard.toolbar.color.red": "Rot",
-    "app.whiteboard.toolbar.color.orange": "Orange",
-    "app.whiteboard.toolbar.color.eletricLime": "Gelbgrün",
-    "app.whiteboard.toolbar.color.lime": "Hellgrün",
-    "app.whiteboard.toolbar.color.cyan": "Cyan",
-    "app.whiteboard.toolbar.color.dodgerBlue": "Dodger blau",
-    "app.whiteboard.toolbar.color.blue": "Blau",
-    "app.whiteboard.toolbar.color.violet": "Violett",
-    "app.whiteboard.toolbar.color.magenta": "Magenta",
-    "app.whiteboard.toolbar.color.silver": "Silber",
-    "app.whiteboard.toolbar.undo": "Anmerkung zurücknehmen",
-    "app.whiteboard.toolbar.clear": "Alle Anmerkungen löschen",
-    "app.whiteboard.toolbar.multiUserOn": "Mehrbenutzermodus starten",
-    "app.whiteboard.toolbar.multiUserOff": "Mehrbenutzermodus beenden",
-    "app.whiteboard.toolbar.fontSize": "Schriftgrößenliste",
-    "app.feedback.title": "Sie haben sich aus der Konferenz ausgeloggt",
-    "app.feedback.subtitle": "Wir würden gerne erfahren, wie Sie BigBlueButton finden (optional)",
-    "app.feedback.textarea": "Wie können wir BigBlueButton verbessern?",
-    "app.feedback.sendFeedback": "Feedback senden",
-    "app.feedback.sendFeedbackDesc": "Feedback senden und Konferenz verlassen",
-    "app.videoDock.webcamFocusLabel": "Vergrößern",
-    "app.videoDock.webcamFocusDesc": "Ausgewählte Webcam vergrößern",
-    "app.videoDock.webcamUnfocusLabel": "Normalgröße",
-    "app.videoDock.webcamUnfocusDesc": "Ausgewählte Webcam auf Normalgröße verkleinern"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/el_GR.json b/bigbluebutton-html5/private/locales/el_GR.json
deleted file mode 100644
index 1c5d01f652..0000000000
--- a/bigbluebutton-html5/private/locales/el_GR.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "app.home.greeting": "Καλώς ήρθατε {0}! Η παρουσίαση θα ξεκινήσει σε λίγο...",
-    "app.chat.submitLabel": "Αποστολή Μηνύματος",
-    "app.chat.errorMinMessageLength": "Το μήνυμα είναι {0} χαρακτήρες(ας). Πολύ μικρό",
-    "app.chat.errorMaxMessageLength": "Το μήνυμα είναι {0} χαρακτήρες(ας). Πολύ μεγάλο",
-    "app.chat.inputPlaceholder": "Μήνυμα {0}",
-    "app.chat.titlePublic": "Δημόσια Συνομιλία",
-    "app.chat.titlePrivate": "Ιδιωτική Συνομιλία με {0}",
-    "app.chat.partnerDisconnected": "{0} έχει εγκαταλείψει τη συνάντηση",
-    "app.chat.closeChatLabel": "Κλείσιμο {0}",
-    "app.chat.hideChatLabel": "Απόκρυψη {0}",
-    "app.chat.dropdown.options": "Επιλογές Συνομιλίας",
-    "app.chat.dropdown.clear": "Καθαρισμός",
-    "app.chat.dropdown.copy": "Αντιγραφή",
-    "app.chat.dropdown.save": "Αποθήκευση",
-    "app.chat.label": "Συνομιλία",
-    "app.userList.usersTitle": "Χρήστες",
-    "app.userList.messagesTitle": "Μηνύματα",
-    "app.userList.presenter": "Παρουσιαστής",
-    "app.userList.you": "Εσείς",
-    "app.userList.label": "Λίστα Χρηστών",
-    "app.userList.guest": "Καλεσμένος",
-    "app.userList.menuTitleContext": "Διαθέσιμες Επιλογές",
-    "app.userList.chatListItem.unreadSingular": "{0} Νέο Μήνυμα",
-    "app.userList.chatListItem.unreadPlural": "{0} Νέα Μηνύματα",
-    "app.userList.menu.makePresenter.label": "Κάνε τον/την Παρουσιαστή",
-    "app.media.screenshare.start": "Ο διαμοιρασμός οθόνης έχει αρχίσει",
-    "app.media.screenshare.end": "Ο διαμοιρασμός οθόνης έχει τελειώσει",
-    "app.media.screenshare.safariNotSupported": "Ο διαμοιρασμός οθόνης δεν υποστηρίζεται ακόμα από τον Safari.\nΠαρακαλούμε, χρησιμοποιείστε τον Firefox ή το Google Chrome.",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Επόμενη διαφάνεια",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Παρέλειψε διαφάνεια",
-    "app.presentation.presentationToolbar.goToSlide": "Διαφάνεια {0}",
-    "app.presentationUploder.title": "Παρουσίαση",
-    "app.presentationUploder.confirmLabel": "Εκκίνηση",
-    "app.presentationUploder.dismissLabel": "Ακύρωση",
-    "app.presentationUploder.genericError": "Ωχ, κάτι πήγε στραβά",
-    "app.presentationUploder.upload.progress": "Μεταφόρτωση ({0}%)",
-    "app.presentationUploder.upload.413": "Το μέγεθος του αρχείου είναι πολύ μεγάλο",
-    "app.presentationUploder.conversion.genericConversionStatus": "Μετατροπή αρχείου...",
-    "app.presentationUploder.conversion.generatedSlides": "Δημιουργία Διαφανειών...",
-    "app.waitingMessage": "Έχετε αποσυνδεθεί. Προσπαθήστε να επανασυνδεθείτε σε {0} δευτερόλεπτα...",
-    "app.navBar.settingsDropdown.optionsLabel": "Επιλογές",
-    "app.navBar.settingsDropdown.settingsLabel": "Άνοιγμα ρυθμίσεων",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Αποσύνδεση",
-    "app.navBar.settingsDropdown.helpLabel": "Βοήθεια",
-    "app.navBar.recording.on": "Εγγραφή",
-    "app.navBar.recording.off": "Μη καταγραφεί",
-    "app.actionsBar.changeStatusLabel": "Αλλαγή Κατάστασης",
-    "app.submenu.application.fontSizeControlLabel": "Μέγεθος γραμματοσειράς",
-    "app.submenu.application.languageOptionLabel": "Επιλογή γλώσσας",
-    "app.submenu.video.videoSourceLabel": "Προβολή πηγαίου",
-    "app.submenu.closedCaptions.languageLabel": "Γλώσσα"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/es_ES.json b/bigbluebutton-html5/private/locales/es_ES.json
deleted file mode 100644
index 91c9a9370c..0000000000
--- a/bigbluebutton-html5/private/locales/es_ES.json
+++ /dev/null
@@ -1,214 +0,0 @@
-{
-    "app.home.greeting": "¡Bienvenido {0}! Tu presentación iniciará en breve...",
-    "app.chat.submitLabel": "Enviar mensaje",
-    "app.chat.inputLabel": "Entrada de mensaje para chat {0}",
-    "app.chat.inputPlaceholder": "Mensaje {0}",
-    "app.chat.titlePublic": "Chat público",
-    "app.chat.titlePrivate": "Chat privado con {0}",
-    "app.chat.partnerDisconnected": "{0} ha abandonado la reunión",
-    "app.chat.closeChatLabel": "Cerrar {0}",
-    "app.chat.hideChatLabel": "Ocultar  {0}",
-    "app.chat.moreMessages": "Más mensajes abajo",
-    "app.chat.dropdown.options": "Opciones de chat",
-    "app.chat.dropdown.clear": "Limpiar",
-    "app.chat.dropdown.copy": "Copiar",
-    "app.chat.dropdown.save": "Guardar",
-    "app.chat.label": "Chat",
-    "app.chat.emptyLogLabel": "Registro de chat vacío",
-    "app.userList.usersTitle": "Usuarios",
-    "app.userList.participantsTitle": "Participantes",
-    "app.userList.messagesTitle": "Mensajes",
-    "app.userList.presenter": "Presentador",
-    "app.userList.you": "Tu",
-    "app.userList.locked": "Bloqueado",
-    "app.userList.label": "Lista de usuarios",
-    "app.userList.toggleCompactView.label": "Cambiar a modo de vista compacta",
-    "app.userList.guest": "Huesped",
-    "app.userList.menuTitleContext": "Opciones disponibles",
-    "app.userList.chatListItem.unreadSingular": "{0} Nuevo Mensaje",
-    "app.userList.chatListItem.unreadPlural": "{0} Nuevos mensajes",
-    "app.userList.menu.chat.label": "Chat",
-    "app.userList.menu.clearStatus.label": "Limpiar estátus",
-    "app.userList.menu.makePresenter.label": "Hacer presentador",
-    "app.userList.menu.muteUserAudio.label": "Silenciar usuario",
-    "app.userList.menu.unmuteUserAudio.label": "Activar sonido de usuario",
-    "app.media.label": "Media",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Diapositiva anterior",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Cambiar presentación a diapositiva anterior",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Siguiente diapositiva",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Cambiar presentación a diapositiva siguiente",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Brincar diapositiva",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Cambiar presentación a diapositiva específica",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Ajustar a lo ancho",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Mostrar diapositiva a todo lo ancho",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Ajustar a la pantalla",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Mostrar toda la diapositiva",
-    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
-    "app.presentation.presentationToolbar.zoomDesc": "Cambiar el nivel de Zoom de la presentación",
-    "app.polling.pollingTitle": "Opciones de votación",
-    "app.failedMessage": "Disculpas, problemas conectando al servidor.",
-    "app.connectingMessage": "Conectando...",
-    "app.waitingMessage": "Desconectado. Intentando reconectar en {0} segundos...",
-    "app.navBar.settingsDropdown.optionsLabel": "Opciones",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Desplegar a pantalla completa",
-    "app.navBar.settingsDropdown.settingsLabel": "Abrir configuración",
-    "app.navBar.settingsDropdown.aboutLabel": "Acerca de",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Cerrar sesión",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Salir de pantalla completa",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Hacer el menú de configuración a pantalla completa",
-    "app.navBar.settingsDropdown.settingsDesc": "Cambiar la configuración general",
-    "app.navBar.settingsDropdown.aboutDesc": "Mostrar información acerca del cliente",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Abandonar la reunión",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Salir del modo de pantalla completa",
-    "app.navBar.userListToggleBtnLabel": "Alternar lista de usuarios",
-    "app.navBar.toggleUserList.newMessages": "con nueva notificación de mensaje ",
-    "app.leaveConfirmation.title": "Abandonar sesión",
-    "app.leaveConfirmation.message": "¿Quiere abandonar esta reunión?",
-    "app.leaveConfirmation.confirmLabel": "Salir",
-    "app.leaveConfirmation.confirmDesc": "Te desconecta de la reunión",
-    "app.leaveConfirmation.dismissLabel": "Cancelar",
-    "app.leaveConfirmation.dismissDesc": "Cierra y rechaza la confirmación de abandono",
-    "app.leaveConfirmation.endMeetingLabel": "Si y cierra la sesión",
-    "app.leaveConfirmation.endMeetingDesc": "Confirmación de cierre y fin de la reunión",
-    "app.about.title": "Acerca de",
-    "app.about.version": "Construcción del cliente:",
-    "app.about.copyright": "Derechos de autor:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "Cancelar",
-    "app.about.dismissDesc": "Cerrar información acerca del cliente",
-    "app.actionsBar.changeStatusLabel": "Cambiar estátus",
-    "app.actionsBar.muteLabel": "Silenciar",
-    "app.actionsBar.unmuteLabel": "De-silenciar",
-    "app.actionsBar.camOffLabel": "Cámara Apagada",
-    "app.actionsBar.raiseLabel": "Alzar",
-    "app.actionsBar.label": "Barra de acciones",
-    "app.submenu.application.applicationSectionTitle": "Aplicación",
-    "app.submenu.application.fontSizeControlLabel": "Tamaño de fuente",
-    "app.submenu.application.increaseFontBtnLabel": "Incrementar tamaño de fuente",
-    "app.submenu.application.decreaseFontBtnLabel": "Reducir tamaño de fuente",
-    "app.submenu.application.languageLabel": "Lenguaje de aplicación",
-    "app.submenu.application.ariaLanguageLabel": "Cambiar lenguaje de aplicación",
-    "app.submenu.application.languageOptionLabel": "Seleccionar lenguaje",
-    "app.submenu.application.noLocaleOptionLabel": "No hay locales activos",
-    "app.submenu.audio.micSourceLabel": "Fuente de micrófono",
-    "app.submenu.audio.speakerSourceLabel": "Fuente de altavoces",
-    "app.submenu.audio.streamVolumeLabel": "Volumen del flujo de audio",
-    "app.submenu.video.title": "Video",
-    "app.submenu.video.videoSourceLabel": "Fuente del video",
-    "app.submenu.video.videoOptionLabel": "Escoger ver fuente",
-    "app.submenu.video.videoQualityLabel": "Calidad del Video",
-    "app.submenu.video.qualityOptionLabel": "Escoger calidad del video",
-    "app.submenu.video.participantsCamLabel": "Viendo webcams de participantes",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Subtítulos",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Tomar el control",
-    "app.submenu.closedCaptions.languageLabel": "Lenguaje",
-    "app.submenu.closedCaptions.localeOptionLabel": "Seleccionar lenguaje",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "No hay locales activos",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Familia de fuente",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Seleccionar familia de fuente",
-    "app.submenu.closedCaptions.fontSizeLabel": "Tamaño de fuente",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Seleccionar tamaño de fuente",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Color de fondo",
-    "app.submenu.closedCaptions.fontColorLabel": "Color de fuente",
-    "app.submenu.participants.muteAllLabel": "Silenciar a todos menos al presentador",
-    "app.submenu.participants.lockAllLabel": "Bloquear a todos los participantes",
-    "app.submenu.participants.lockItemLabel": "Participantes {0}",
-    "app.submenu.participants.lockMicDesc": "Deshabilita micrófono a todos los participantes bloqueados",
-    "app.submenu.participants.lockCamDesc": "Deshabilita el webcam a todos los participantes bloqueados",
-    "app.submenu.participants.lockPublicChatDesc": "Deshabilita el chat público a todos los usuarios bloqueados",
-    "app.submenu.participants.lockPrivateChatDesc": "Deshabilita el chat privado a todos los usuarios bloqueados",
-    "app.submenu.participants.lockLayoutDesc": "Bloquea el diseño a todos los usuarios bloqueados",
-    "app.submenu.participants.lockMicAriaLabel": "Bloquea micrófono",
-    "app.submenu.participants.lockCamAriaLabel": "Bloquea webcam",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Bloquea el chat público",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Bloquea el chat privado",
-    "app.submenu.participants.lockLayoutAriaLabel": "Bloquea el diseño",
-    "app.submenu.participants.lockMicLabel": "Micrófono",
-    "app.submenu.participants.lockCamLabel": "Webcam",
-    "app.submenu.participants.lockPublicChatLabel": "Chat público",
-    "app.submenu.participants.lockPrivateChatLabel": "Chat privado",
-    "app.submenu.participants.lockLayoutLabel": "Diseño",
-    "app.settings.applicationTab.label": "Aplicación",
-    "app.settings.audioTab.label": "Audio",
-    "app.settings.videoTab.label": "Video",
-    "app.settings.closedcaptionTab.label": "Subtítulos",
-    "app.settings.usersTab.label": "Participantes",
-    "app.settings.main.label": "Configuración",
-    "app.settings.main.cancel.label": "Cancela",
-    "app.settings.main.cancel.label.description": "Deshecha los cambios y cierra el menú de configuración",
-    "app.settings.main.save.label": "Guardar",
-    "app.settings.main.save.label.description": "Gurada cambios y cierra el menú de configuración",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Acciones",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Subir una presentación",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar una encuesta",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir tu pantalla",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Subir tu presentación",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar una encuesta",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Compartir tu pantalla con otros",
-    "app.actionsBar.emojiMenu.awayLabel": "Ausente",
-    "app.actionsBar.emojiMenu.awayDesc": "Cambiar tu estatus a ausente",
-    "app.actionsBar.emojiMenu.confusedLabel": "Confundido",
-    "app.actionsBar.emojiMenu.confusedDesc": "Cambiar tu estatus a confundido",
-    "app.actionsBar.emojiMenu.sadLabel": "Triste",
-    "app.actionsBar.emojiMenu.sadDesc": "Cambiar tu estatus a triste",
-    "app.actionsBar.emojiMenu.happyLabel": "Feliz",
-    "app.actionsBar.emojiMenu.happyDesc": "Cambiar tu estatus a feliz",
-    "app.actionsBar.emojiMenu.applauseLabel": "Aplausos",
-    "app.actionsBar.emojiMenu.applauseDesc": "Cambiar tu estatus a aplausos",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Señal de aprobación",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Cambiar tu estatus a señal de aprobación",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Señal de desaprobación",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Cambia tu estatus a señal de desaprobación",
-    "app.actionsBar.currentStatusDesc": "estatus actual {0}",
-    "app.audioNotification.audioFailedError1001": "Error 1001: WebSocket desconectado",
-    "app.audioNotification.audioFailedError1002": "Error 1002: No puede establecerse conexión de WebSocket",
-    "app.audioNotification.audioFailedError1003": "Error 1003: Versión de navegador no soportado ",
-    "app.audioNotification.audioFailedError1004": "Error 1004: Falla en llamada",
-    "app.audioNotification.audioFailedError1005": "Error 1005: La llamada terminó inesperadamente",
-    "app.audioNotification.audioFailedError1006": "Error 1006: Tiempo de espera de llamada agotado",
-    "app.audioNotification.audioFailedError1007": "Error 1007: Fallo de negociación ICE",
-    "app.audioNotification.audioFailedError1008": "Error 1008: Fallo de transferencia",
-    "app.audioNotification.audioFailedError1009": "Error 1009: No se pudo obtener información de servidor STUN/TURN",
-    "app.audioNotification.audioFailedError1010": "Error 1010: Se acabó tiempo de negociación ICE  ",
-    "app.audioNotification.audioFailedError1011": "Error 1011: Se acabó tiempo recolectando ICE",
-    "app.audioNotification.audioFailedMessage": "Tu conexión de audio falló en conectarse",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia falló, Solo orígenes seguros son admitidos",
-    "app.audioNotification.closeLabel": "Cerrar",
-    "app.breakoutJoinConfirmation.title": "Unirse a una sala de grupo",
-    "app.breakoutJoinConfirmation.message": "Quieres unirte",
-    "app.breakoutJoinConfirmation.confirmLabel": "Unirte",
-    "app.breakoutJoinConfirmation.confirmDesc": "Unirte a sala de grupo",
-    "app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
-    "app.breakoutJoinConfirmation.dismissDesc": "Cierra y rechaza Unirse a Sala de Grupo",
-    "app.breakoutTimeRemainingMessage": "Tiempo restante en Sala de Grupo",
-    "app.breakoutWillCloseMessage": "Tiempo transcurrido. Sala de Grupo de cerrará en breve.",
-    "app.calculatingBreakoutTimeRemaining": "Calculando tiempo restante...",
-    "app.audioModal.microphoneLabel": "Micrófono",
-    "app.audioModal.listenOnlyLabel": "Solo escuchar",
-    "app.audioModal.audioChoiceLabel": "¿Como quieres unirte al audio?",
-    "app.audioModal.audioChoiceDesc": "Selecciona como unirse al audio en esta reunión",
-    "app.audioModal.closeLabel": "Cerrar",
-    "app.audio.joinAudio": "Unirse al audio",
-    "app.audio.leaveAudio": "Abandonar audio",
-    "app.audio.enterSessionLabel": "Entrar a la sesión",
-    "app.audio.playSoundLabel": "Reproducir sonido",
-    "app.audio.backLabel": "Atrás",
-    "app.audio.audioSettings.titleLabel": "Seleccionar tu configuración de audio",
-    "app.audio.audioSettings.descriptionLabel": "Ten en cuenta que aparecerá un cuadro de diálogo en tu navegador, que te pide a aceptar compartir tu micrófono.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Fuente del micrófono",
-    "app.audio.audioSettings.speakerSourceLabel": "Fuente de altavoz",
-    "app.audio.audioSettings.microphoneStreamLabel": "Tu volúmen del flujo de audio",
-    "app.audio.listenOnly.backLabel": "Atrás",
-    "app.audio.listenOnly.closeLabel": "Cerrar",
-    "app.error.meeting.ended": "Haz salido de la conferencia",
-    "app.dropdown.close": "Cerrar",
-    "app.error.500": "Ups, algo salio mal",
-    "app.error.404": "No se encontró",
-    "app.error.401": "No autorizado",
-    "app.error.403": "Prohibido",
-    "app.error.leaveLabel": "Ingresa de nuevo",
-    "app.guest.waiting": "Esperando aprobación para unirse"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/fa_IR.json b/bigbluebutton-html5/private/locales/fa_IR.json
deleted file mode 100644
index 4136ce2d4c..0000000000
--- a/bigbluebutton-html5/private/locales/fa_IR.json
+++ /dev/null
@@ -1,396 +0,0 @@
-{
-    "app.home.greeting": "خوش آمدید{0}. ارائه شما به زودی آغاز میشود.",
-    "app.chat.submitLabel": "ارسال پیام",
-    "app.chat.errorMinMessageLength": "پیام شما {0} کاراکتر(0) است، برای ارسال، کوتاه است.",
-    "app.chat.errorMaxMessageLength": "پیام شما {0} کارکتر(0) است  و برای ارسال خیلی طولانیست.",
-    "app.chat.inputLabel": "ورودی پیام برای چت{0}",
-    "app.chat.inputPlaceholder": "پیام{0}",
-    "app.chat.titlePublic": "گفتگوی عمومی",
-    "app.chat.titlePrivate": "گفتگوی خصوصی با{0}",
-    "app.chat.partnerDisconnected": "{0}کلاس را ترک کرد.",
-    "app.chat.closeChatLabel": "خروج{0}",
-    "app.chat.hideChatLabel": "مخفی کردن{0}",
-    "app.chat.moreMessages": "مشاهده ادامه پیام های پایین",
-    "app.chat.dropdown.options": "گزینه های گفتگو",
-    "app.chat.dropdown.clear": "پاک سازی",
-    "app.chat.dropdown.copy": "کپی کردن",
-    "app.chat.dropdown.save": "ذخیره کردن",
-    "app.chat.label": "گفتگو",
-    "app.chat.emptyLogLabel": "پاک کردن سابقه گفتگو",
-    "app.chat.clearPublicChatMessage": "سابقه گفتگوها توسط مدیر حذف گردید.",
-    "app.userList.usersTitle": "دانش آموزان",
-    "app.userList.participantsTitle": "دانش آموزان",
-    "app.userList.messagesTitle": "پیام ها",
-    "app.userList.presenter": "استاد",
-    "app.userList.you": "شما",
-    "app.userList.locked": "قفل شده",
-    "app.userList.label": "لیست دانش آموزان",
-    "app.userList.toggleCompactView.label": "مخفی کردن نوار ابزار",
-    "app.userList.guest": "مهمان",
-    "app.userList.menuTitleContext": "گزینه های قابل اعمال",
-    "app.userList.chatListItem.unreadSingular": "{0} پیام جدید",
-    "app.userList.chatListItem.unreadPlural": "{0} پیام های جدید",
-    "app.userList.menu.chat.label": "گفتگو",
-    "app.userList.menu.clearStatus.label": "پاک کردن وضعیت",
-    "app.userList.menu.makePresenter.label": "تبدیل به استاد",
-    "app.userList.menu.removeUser.label": "حذف کاربر",
-    "app.userList.menu.muteUserAudio.label": "بستن صدای کاربر",
-    "app.userList.menu.unmuteUserAudio.label": "فعال سازی میکروفن کاربر",
-    "app.userList.userAriaLabel": "{0} {1} {2} وضعیت {3}",
-    "app.userList.menu.promoteUser.label": "ارتقا نقش به مدیر",
-    "app.userList.menu.demoteUser.label": "تبدیل به دانش آموز",
-    "app.media.label": "مدیا",
-    "app.media.screenshare.start": "اشتراک صفحه نمایش شروع شد",
-    "app.media.screenshare.end": "اشتراک صفحه نمایش به پایان رسید.",
-    "app.media.screenshare.safariNotSupported": "در حال حاضر اشتراک صفحه نمایش در مرورگر سافاری پشتیبانی نمیشد، لطفا از کروم یا فایرفاکس استفاده کنید.",
-    "app.meeting.ended": "جلسه پایان یافت",
-    "app.meeting.endedMessage": "شما در حال انتقال به صفحه اصلی هستید.",
-    "app.presentation.presentationToolbar.prevSlideLabel": "اسلاید قبلی",
-    "app.presentation.presentationToolbar.prevSlideDesc": "تغییر ارائه به اسلاید قبلی",
-    "app.presentation.presentationToolbar.nextSlideLabel": "اسلاید بعدی",
-    "app.presentation.presentationToolbar.nextSlideDesc": "تغییر ارائه به اسلاید بعدی",
-    "app.presentation.presentationToolbar.skipSlideLabel": "بیرون رفتن از اسلاید",
-    "app.presentation.presentationToolbar.skipSlideDesc": "تغییر ارائه به یک اسلاید خاص",
-    "app.presentation.presentationToolbar.fitWidthLabel": "اندازه تصویر را متناسب با عرض صفحه کن.",
-    "app.presentation.presentationToolbar.fitWidthDesc": "کلیه عرض اسلاید را نمایش بده",
-    "app.presentation.presentationToolbar.fitScreenLabel": "ابعاد را به اندازه تمام  صفحه کن",
-    "app.presentation.presentationToolbar.fitScreenDesc": "کل اسلاید را نمایش بده",
-    "app.presentation.presentationToolbar.zoomLabel": "بزرگ نمایی",
-    "app.presentation.presentationToolbar.zoomDesc": "تغییر مقدار زوم ارائه",
-    "app.presentation.presentationToolbar.goToSlide": "اسلاید {0}",
-    "app.presentationUploder.title": "ارائه",
-    "app.presentationUploder.message": "شما به عنوان عضوی از کلاس میتوانید جزوه خود را با فرمت فایل های Office آپلود کنید. پیشنهاد ما فایل های PDF است.",
-    "app.presentationUploder.confirmLabel": "شروع",
-    "app.presentationUploder.confirmDesc": "تغییرات خود را ذخیره کنید و ارائه را آغاز نمایید.",
-    "app.presentationUploder.dismissLabel": "کنسل",
-    "app.presentationUploder.dismissDesc": "بستن پنجره و حذف تغییرات شما",
-    "app.presentationUploder.dropzoneLabel": "فایل های خود را برای آپلود به اینجا بکشید.",
-    "app.presentationUploder.browseFilesLabel": "یا برای انتخاب فایل کلیک کنید.",
-    "app.presentationUploder.fileToUpload": "فایلهایی که آپلود خواهند شد.",
-    "app.presentationUploder.currentBadge": "جاری",
-    "app.presentationUploder.genericError": "اشتباهی اتفاق افتاد.",
-    "app.presentationUploder.upload.progress": "در حال آپلود ({0}%)",
-    "app.presentationUploder.upload.413": "حجم فایل خیلی زیاد است.",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "در حال پردازش صفحه {0} از {1}",
-    "app.presentationUploder.conversion.genericConversionStatus": "در حال تبدیل فایل",
-    "app.presentationUploder.conversion.generatingThumbnail": "در حال ساخت تصاویر کوچک از فایل",
-    "app.presentationUploder.conversion.generatedSlides": "اسلاید ها ساخته شدند.",
-    "app.presentationUploder.conversion.generatingSvg": "در حال ساخت تصاویر SVG",
-    "app.presentationUploder.conversion.pageCountExceeded": "تعداد صفحات از حد اکثر صفحات مورد پشتیبانی بیشتر است.",
-    "app.presentationUploder.conversion.timeout": "تبدیل فایل بیش از حد طول کشید.",
-    "app.polling.pollingTitle": "گزینه های نظرسنجی.",
-    "app.polling.pollAnswerLabel": "پاسخ نظرسنجی {0}",
-    "app.polling.pollAnswerDesc": "این گزینه را برای رای دادن به {0} انتخاب کنید.",
-    "app.failedMessage": "عذر خواهی میکنیم. مشکلی در ارتباط با سرور وجود دارد.",
-    "app.connectingMessage": "در حال اتصال...",
-    "app.waitingMessage": "ارتباط قطع شد. در حال تلاش مجدد در {0} ثانیه",
-    "app.navBar.settingsDropdown.optionsLabel": "گزینه ها",
-    "app.navBar.settingsDropdown.fullscreenLabel": "تمام صفحه",
-    "app.navBar.settingsDropdown.settingsLabel": "تنظیمات",
-    "app.navBar.settingsDropdown.aboutLabel": "درباره",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "خروج",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "بستن حالت تمام صفحه",
-    "app.navBar.settingsDropdown.fullscreenDesc": "منوی تنظیمات را تمام صفحه کن",
-    "app.navBar.settingsDropdown.settingsDesc": "تغییر تنظیمات معمول",
-    "app.navBar.settingsDropdown.aboutDesc": "نمایش اطلاعات دانش آموز",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "ترک جلسه",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "خروج از حالت تمام صفحه",
-    "app.navBar.settingsDropdown.hotkeysLabel": "کلیدهای میانبر",
-    "app.navBar.settingsDropdown.hotkeysDesc": "لیست کلیدهای میانبر",
-    "app.navBar.userListToggleBtnLabel": "نمایش لیست کاربران",
-    "app.navBar.toggleUserList.ariaLabel": "نمایش گفتگوی دانش آموزان و اساتید",
-    "app.navBar.toggleUserList.newMessages": "با اعلان پیام جدید",
-    "app.navBar.recording": "جلسه در حال ضبط شدن است.",
-    "app.navBar.recording.on": "در حال ضبط",
-    "app.navBar.recording.off": "ضبط نمیشود.",
-    "app.leaveConfirmation.title": "ترک جلسه",
-    "app.leaveConfirmation.message": "آیا میخواهید جلسه را ترک کنید؟",
-    "app.leaveConfirmation.confirmLabel": "ترک",
-    "app.leaveConfirmation.confirmDesc": "پیام های شما بیرون از جلسه",
-    "app.leaveConfirmation.dismissLabel": "کنسل",
-    "app.leaveConfirmation.dismissDesc": "ترک جلسه را رد کرد و آن را بست.",
-    "app.leaveConfirmation.endMeetingLabel": "بله و بستن جلسه",
-    "app.leaveConfirmation.endMeetingAriaLabel": "ترک و پایان جلسه",
-    "app.leaveConfirmation.endMeetingDesc": "تایید خروج از جلسه را بست.",
-    "app.about.title": "درباره",
-    "app.about.version": "نسخه کاربر",
-    "app.about.copyright": "کپی رایت",
-    "app.about.confirmLabel": "تایید",
-    "app.about.confirmDesc": "تایید",
-    "app.about.dismissLabel": "کنسل",
-    "app.about.dismissDesc": "بستن قسمت درباره کاربر",
-    "app.actionsBar.changeStatusLabel": "تغییر وضعیت دانش آموز",
-    "app.actionsBar.muteLabel": "حالت بی صدا",
-    "app.actionsBar.unmuteLabel": "فعال سازی صدا",
-    "app.actionsBar.camOffLabel": "بستن دوربین",
-    "app.actionsBar.raiseLabel": "اجازه گرفتن از استاد",
-    "app.actionsBar.label": "منوی امکانات",
-    "app.submenu.application.applicationSectionTitle": "نرم افزار",
-    "app.submenu.application.fontSizeControlLabel": "اندازه متن",
-    "app.submenu.application.increaseFontBtnLabel": "افزایش اندازه متن نرم افزار",
-    "app.submenu.application.decreaseFontBtnLabel": "کاهش اندازه متن نرم افزار",
-    "app.submenu.application.languageLabel": "زبان نرم افزار",
-    "app.submenu.application.ariaLanguageLabel": "تغییر زبان نرم افزار",
-    "app.submenu.application.languageOptionLabel": "انتخاب زبان",
-    "app.submenu.application.noLocaleOptionLabel": "هیچ زبان فعالی وجود ندارد",
-    "app.submenu.audio.micSourceLabel": "ورودی صدای میکروفن",
-    "app.submenu.audio.speakerSourceLabel": "صدای خروجی",
-    "app.submenu.audio.streamVolumeLabel": "ولوم صدای میکروفن شما",
-    "app.submenu.video.title": "تصویر کلاس",
-    "app.submenu.video.videoSourceLabel": "منبع تصویر",
-    "app.submenu.video.videoOptionLabel": "انتخاب منبع تصویر",
-    "app.submenu.video.videoQualityLabel": "کیفیت تصویر",
-    "app.submenu.video.qualityOptionLabel": "انتخاب کیفیت تصویر",
-    "app.submenu.video.participantsCamLabel": "مشاهده دوربین کاربران",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "کپشن های بسته شده",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "بدست گرفتن کنترل",
-    "app.submenu.closedCaptions.languageLabel": "زبان",
-    "app.submenu.closedCaptions.localeOptionLabel": "انتخاب زبان",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "هیچ زبان فعالی وجود ندارد.",
-    "app.submenu.closedCaptions.fontFamilyLabel": "فونت",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "انتخاب فونت",
-    "app.submenu.closedCaptions.fontSizeLabel": "اندازه فونت",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "انتخاب اندازه فونت",
-    "app.submenu.closedCaptions.backgroundColorLabel": "رنگ پس زمینه",
-    "app.submenu.closedCaptions.fontColorLabel": "رنگ متن",
-    "app.submenu.participants.muteAllLabel": "غیر فعال سازی صدای کاربران به جز اساتید",
-    "app.submenu.participants.lockAllLabel": "قفل کردن کابران",
-    "app.submenu.participants.lockItemLabel": "شرکت کنندگان{0}",
-    "app.submenu.participants.lockMicDesc": "غیر فعال سازی میکروفن شرکت کنندگان قفل شده",
-    "app.submenu.participants.lockCamDesc": "غیر فعال سازی دوربین کاربران قفل شده.",
-    "app.submenu.participants.lockPublicChatDesc": "غیرفعال سازی گفتگوی عمومی کابران قفل شده",
-    "app.submenu.participants.lockPrivateChatDesc": "غیرفعال سازی گفتگوی خصوصی برای کابران قفل شده.",
-    "app.submenu.participants.lockLayoutDesc": "قفل کردن چینش صفحه کابران قفل شده",
-    "app.submenu.participants.lockMicAriaLabel": "قفل کردن میکروفن",
-    "app.submenu.participants.lockCamAriaLabel": "قفل کردن دوربین",
-    "app.submenu.participants.lockPublicChatAriaLabel": "قفل کردن گفتگوی عمومی",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "قفل کردن گفتگوی خصوصی",
-    "app.submenu.participants.lockLayoutAriaLabel": "قفل کردن چینش تصویر",
-    "app.submenu.participants.lockMicLabel": "میکروفن",
-    "app.submenu.participants.lockCamLabel": "دوربین",
-    "app.submenu.participants.lockPublicChatLabel": "گفتگوی عمومی",
-    "app.submenu.participants.lockPrivateChatLabel": "گفتگوی خصوصی",
-    "app.submenu.participants.lockLayoutLabel": "چینش تصویر",
-    "app.settings.applicationTab.label": "نرم افزار",
-    "app.settings.audioTab.label": "صدا",
-    "app.settings.videoTab.label": "تصویر کلاس",
-    "app.settings.closedcaptionTab.label": "کپشن های بسته شده",
-    "app.settings.usersTab.label": "شرکت کنندگان در کلاس",
-    "app.settings.main.label": "تنظیمات",
-    "app.settings.main.cancel.label": "کنسل",
-    "app.settings.main.cancel.label.description": "حذف تغییرات و بستن منوی تنظیمات",
-    "app.settings.main.save.label": "ذخیره",
-    "app.settings.main.save.label.description": "ذخیره تغییرات و بستن منوی تنظیمات",
-    "app.settings.dataSavingTab.label": "کاهش مصرف اینترنت",
-    "app.settings.dataSavingTab.webcam": "فعال سازی دوربین کلاس",
-    "app.settings.dataSavingTab.screenShare": "فعال سازی اشتراک گذاری تصویر کامپیوتر",
-    "app.settings.dataSavingTab.description": "برای صرفه جویی در مصرف اینترنت آیتم هایی که باید نمایش داده شوند را انتخاب کنید.",
-    "app.switch.onLabel": "روشن",
-    "app.switch.offLabel": "خاموش",
-    "app.actionsBar.actionsDropdown.actionsLabel": "فعالیت ها",
-    "app.actionsBar.actionsDropdown.presentationLabel": "آپلود فایل ارائه",
-    "app.actionsBar.actionsDropdown.initPollLabel": "ایجاد نظرسنجی",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "اشتراک صفحه نمایش شما",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "متوقف کردن اشتراک گذاری دسکتاپ شما",
-    "app.actionsBar.actionsDropdown.presentationDesc": "آپلود فایل ارائه شما",
-    "app.actionsBar.actionsDropdown.initPollDesc": "ایجاد نظرسنجی",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "اشتراک گذاری تصویر کامپیوتر شما با دیگران",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "توقف اشتراک گذاری تصویر کامپیوتر شما با دیگران",
-    "app.actionsBar.actionsDropdown.startRecording": "شروع ضبط کلاس",
-    "app.actionsBar.actionsDropdown.stopRecording": "توقف ضبط کلاس",
-    "app.actionsBar.emojiMenu.awayLabel": "عدم حضور در کلاس",
-    "app.actionsBar.emojiMenu.awayDesc": "تغییر وضعیت شما به عدم حضور در کلاس",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "اجازه گرفتن از استاد",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "دست خود را بالا ببرید تا از استاد سوال بپرسید",
-    "app.actionsBar.emojiMenu.neutralLabel": "تصمیم گیری نشده",
-    "app.actionsBar.emojiMenu.neutralDesc": "تغییر وضعیت شما به تصمیم گیری نشده",
-    "app.actionsBar.emojiMenu.confusedLabel": "کامل نفهمیدم",
-    "app.actionsBar.emojiMenu.confusedDesc": "تغییر وضعیت شما به وضعیت کامل نفهمیدم",
-    "app.actionsBar.emojiMenu.sadLabel": "ناراحت",
-    "app.actionsBar.emojiMenu.sadDesc": "تغییر حالت شما به ناراحت",
-    "app.actionsBar.emojiMenu.happyLabel": "شاد",
-    "app.actionsBar.emojiMenu.happyDesc": "تغییر وضعیت شما به خوشحال",
-    "app.actionsBar.emojiMenu.noneLabel": "پاک کردن وضعیت",
-    "app.actionsBar.emojiMenu.noneDesc": "پاک کردن وضعیت شما",
-    "app.actionsBar.emojiMenu.applauseLabel": "تحسین کردن.",
-    "app.actionsBar.emojiMenu.applauseDesc": "تغییر وضعیت شما به تحسین کردن",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "عالی",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "تغییر وضعیت شما به عالی",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "نه چندان خوب",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "تغییر وضعیت شما به نه چندان خوب",
-    "app.actionsBar.currentStatusDesc": "وضعیت فعلی شما{0}",
-    "app.audioNotification.audioFailedError1001": "خطای 1001: سوکت شما قطع شد",
-    "app.audioNotification.audioFailedError1002": "خطای 1002: امکان ارتباط با سوکت برای شما فراهم نیست، وضعیت نت خود را بررسی کنید یا آن را تغییر دهید.",
-    "app.audioNotification.audioFailedError1003": "خطای 1003: نسخه مرورگر شما برای کلاس مناسب نیست.",
-    "app.audioNotification.audioFailedError1004": "خطای 1004: خطا در تماس",
-    "app.audioNotification.audioFailedError1005": "خطای 1005: تماس به صورت نامشخصی قطع شد",
-    "app.audioNotification.audioFailedError1006": "خطای 1006: تماس بسیار طولانی شد",
-    "app.audioNotification.audioFailedError1007": "خطای 1007: خطای ارتباط ice",
-    "app.audioNotification.audioFailedError1008": "خطای 1008: انتقال میسر نشد",
-    "app.audioNotification.audioFailedError1009": "خطای 1009: امکان پیدا کردن STUN/TURN وجود ندارد.",
-    "app.audioNotification.audioFailedError1010": "خطای 1010: ICE برقرار نشد اینترنت خود را چک کنید.",
-    "app.audioNotification.audioFailedError1011": "خطای 1011: ICE برقرار نشد",
-    "app.audioNotification.audioFailedMessage": "امکان اتصال صدای شما فراهم نیست.",
-    "app.audioNotification.mediaFailedMessage": "امکان گرفتن صدای میکروفن کاربر وجود ندارد.",
-    "app.audioNotification.closeLabel": "بستن",
-    "app.audioNotificaion.reconnectingAsListenOnly": "صدای میکروفن برای مدیران فقط فعال است، شما فقط شنونده هستید.",
-    "app.breakoutJoinConfirmation.title": "رفتن به اتاق استراحت",
-    "app.breakoutJoinConfirmation.message": "آیا میخواهید وارد شوید",
-    "app.breakoutJoinConfirmation.confirmLabel": "پیوستن",
-    "app.breakoutJoinConfirmation.confirmDesc": "پیوستن به اتاق استراحت",
-    "app.breakoutJoinConfirmation.dismissLabel": "کنسل",
-    "app.breakoutJoinConfirmation.dismissDesc": "بستن و رد کردن پیوستن به اتاق استراحت",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "انتخاب اتاق استراحت برای پیوستن",
-    "app.breakoutTimeRemainingMessage": "زمان باقی مانده از اتاق استراحت: {0}",
-    "app.breakoutWillCloseMessage": "زمان پایان یافت. اتاق استراحت به زودی بسته میشود",
-    "app.calculatingBreakoutTimeRemaining": "محاسبه زمان باقی مانده...",
-    "app.audioModal.microphoneLabel": "گوینده هم باشم.",
-    "app.audioModal.listenOnlyLabel": "فقط شنونده باشم.",
-    "app.audioModal.audioChoiceLabel": "چگونه میخواهید صدا را دریافت کنید.",
-    "app.audioModal.iOSBrowser": "صدا/تصویر پشتیبانی نمیشود.",
-    "app.audioModal.iOSErrorDescription": "در حال حاضر صدا و تصویر در کروم iOS پشتیبانی نمیشود.",
-    "app.audioModal.iOSErrorRecommendation": "پیشنهاد ما استفاده از سافاری است.",
-    "app.audioModal.audioChoiceDesc": "انتخاب کنید چگونه صدا را در این جلسه میخواهید دریافت کنید",
-    "app.audioModal.closeLabel": "بستن",
-    "app.audioModal.yes": "بله",
-    "app.audioModal.no": "خیر",
-    "app.audioModal.yes.arialabel" : "اکو شنیده میشود",
-    "app.audioModal.no.arialabel" : "اکو شنیده نمیشود",
-    "app.audioModal.echoTestTitle": "این یک تست اکو خصوصی است.چند کلمه صحبت کنید.آیا صدایتان را میشنوید؟",
-    "app.audioModal.settingsTitle": "تغییر تنظیمات صدا",
-    "app.audioModal.helpTitle": "یک مشکلی در سخت افزار شما وجود دارد",
-    "app.audioModal.helpText": "آیا به مرورگر خود در قسمت تنظیمات اجازه دسترسی به میکروفن را داده اید؟ اگر اینطور نیست مطابق دستورالعمل مرورگرتان عمل کرده و اجازه دسترسی به میکروفن را فعال کنید.",
-    "app.audioModal.connecting": "در حال اتصال...",
-    "app.audioModal.connectingEchoTest": "اتصال به تست اکو",
-    "app.audioManager.joinedAudio": "شما به جلسه صوتی وارد شده اید",
-    "app.audioManager.joinedEcho": "شما به تست اکو پیوسته اید",
-    "app.audioManager.leftAudio": "شما جلسه صوتی را ترک کرده اید",
-    "app.audioManager.genericError": "خطا: مشکلی پیش آمده است لطفا مجدد سعی کنید.",
-    "app.audioManager.connectionError": "خطا: خطای ارتباط",
-    "app.audioManager.requestTimeout": "خطا: خطای طول کشیدن بیش از اندازه در درخواست.",
-    "app.audioManager.invalidTarget": "خطا: تلاش برای درخواست چیزی غیر صحیح",
-    "app.audioManager.mediaError": "خطا: مشکلی در اتصال سخت افزار شما با کلاس موجود است.",
-    "app.audio.joinAudio": "پیوستن به صدا",
-    "app.audio.leaveAudio": "ترک صدا",
-    "app.audio.enterSessionLabel": "ورود به جلسه",
-    "app.audio.playSoundLabel": "پخش صدا",
-    "app.audio.backLabel": "بازگشت",
-    "app.audio.audioSettings.titleLabel": "انتخاب تنظیمات صدای شما",
-    "app.audio.audioSettings.descriptionLabel": "لطفا توجه کنید، یک پیام در مرورگر شما ظاهر میشود و از شما میخواهد اجازه اشتراک میکروفن خود را بدهید.",
-    "app.audio.audioSettings.microphoneSourceLabel": "منبع ورودی میکروفن",
-    "app.audio.audioSettings.speakerSourceLabel": "منبع خروجی صدا",
-    "app.audio.audioSettings.microphoneStreamLabel": "ولوم صدای میکروفن شما",
-    "app.audio.audioSettings.retryLabel": "تلاش مجدد",
-    "app.audio.listenOnly.backLabel": "بازگشت",
-    "app.audio.listenOnly.closeLabel": "بستن",
-    "app.audio.permissionsOverlay.title": "اجازه دهید کلاس به میکروفن  شما دسترسی داشته باشد.",
-    "app.audio.permissionsOverlay.hint": "برای پیوستن شما به کنفرانس صوتی نیاز به اجازه شما می باشد. :)",
-    "app.error.removed": "شما از کنفرانس کنار گذاشته شده اید.",
-    "app.error.meeting.ended": "شما از کنفرانس خارج شده اید",
-    "app.dropdown.close": "بستن",
-    "app.error.500": "خطای پیش آمده است.",
-    "app.error.404": "پیدا نشد",
-    "app.error.401": "شناسایی نشد",
-    "app.error.403": "ممنوع",
-    "app.error.leaveLabel": "ورود مجدد",
-    "app.guest.waiting": "منتظر تایید جهت پیوستن",
-    "app.toast.breakoutRoomEnded": "اتاق استراحت پایان یافت. لطفا مجدد به کنفرانس صوتی بپیوندید.",
-    "app.toast.chat.public": "پیام جدید در گفتگوی عمومی",
-    "app.toast.chat.private": "پیام جدید در گفتگوی خصوصی",
-    "app.toast.chat.system": "سیستم",
-    "app.notification.recordingStart": "جلسه در حال ضبط شدن است",
-    "app.notification.recordingStop": "جلسه دیگر ضبط نمیشود.",
-    "app.shortcut-help.title": "کلید های میانبر",
-    "app.shortcut-help.accessKeyNotAvailable": "کلیدهای دسترسی موجود نیستند.",
-    "app.shortcut-help.comboLabel": "کمبو",
-    "app.shortcut-help.functionLabel": "تابع",
-    "app.shortcut-help.closeLabel": "بستن",
-    "app.shortcut-help.closeDesc": "بستن صفحه کلیدهای میانبر",
-    "app.shortcut-help.openOptions": "باز کردن گزینه ها",
-    "app.shortcut-help.toggleUserList": "مشاهده لیست دانش آموزان",
-    "app.shortcut-help.toggleMute": "حالت بی صدا/با صدا",
-    "app.shortcut-help.togglePublicChat": "نمایش گفتگوی عمومی(لیتس کاربران باید فعال باشد)",
-    "app.shortcut-help.hidePrivateChat": "پنهان کردن گفتگوی خصوصی",
-    "app.shortcut-help.closePrivateChat": "بستن گفتگوی خصوصی",
-    "app.shortcut-help.openActions": "باز کردن منوی کارها",
-    "app.shortcut-help.openStatus": "باز کردن منوی وضعیت",
-    "app.video.joinVideo": "اشتراک گذاری دوربین",
-    "app.video.leaveVideo": "بستن دوربین",
-    "app.video.iceCandidateError": "خطا در افزودن ICE",
-    "app.video.permissionError": "خطا در اشتراک گذاری دوربین. لطفا دسترسی ها را چک کنید.",
-    "app.video.sharingError": "خطا در اشتراک دوربین",
-    "app.video.notFoundError": "دوربین یافت نشد. لطفا مطمئن شوید که دوربین متصل است.",
-    "app.video.notAllowed": "اجازه دسترسی مرورگر به دوربین داده نشده است. لطفا دسترسی های مرورگر را چک کنید.",
-    "app.video.notSupportedError": "مطمئن شوید SSL فعال است.",
-    "app.video.notReadableError": "عدم امکان دسترسی به داده های دوربین، مطمئن شوید دوربین شما جای دیگری درگیر نیست.",
-    "app.video.swapCam": "جابجا کردن",
-    "app.video.swapCamDesc": "جابجا کردن موقعیت تصویر دوربین ها",
-    "app.video.videoMenu": "منوی دوربین",
-    "app.video.videoMenuDisabled": "امکان مشاهده دوربین در تنظیمات شما فعال نیست.لطفا به تنظیمات مراجعه کنید.",
-    "app.video.videoMenuDesc": "منوی تنظیمات دوربین",
-    "app.video.chromeExtensionError": "شما باید نصب کنید.",
-    "app.video.chromeExtensionErrorLink": "این افزونه کروم را",
-    "app.video.stats.title": "وضعیت اتصال",
-    "app.video.stats.packetsReceived": "بسته های دریافت شده.",
-    "app.video.stats.packetsSent": "بسته های ارسال شده",
-    "app.video.stats.packetsLost": "بسته های از دست رفته",
-    "app.video.stats.bitrate": "بیت ریت",
-    "app.video.stats.lostPercentage": "درصد از دست رفته",
-    "app.video.stats.lostRecentPercentage": "درصد از دست رفته اخیر",
-    "app.video.stats.dimensions": "ابعاد",
-    "app.video.stats.codec": "کدک",
-    "app.video.stats.decodeDelay": "تاخیر بازگشایی",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "استفاده ENCOD",
-    "app.video.stats.currentDelay": "تاخیر جاری",
-    "app.sfu.mediaServerConnectionError2000": "خطای 2000: عدم امکان ارتباط با سرور",
-    "app.sfu.mediaServerOffline2001": "خطای 2001: سرور مدیا اینترنت ندارد. لطفا بعدا چک کنید.",
-    "app.sfu.mediaServerNoResources2002": "خطای 2002: سرور مدیا منابع قابل دسترسی ندارد.",
-    "app.sfu.mediaServerRequestTimeout2003": "خطای 2003: درخواست های سرور مدیا TIMEOUT میشود",
-    "app.sfu.serverIceGatheringFailed2021": "خطای 2021: سرور مدیا ICE ندارد.",
-    "app.sfu.serverIceGatheringFailed2022": "خطای 2022: سرور مدیا اتصال ICE ندارد.",
-    "app.sfu.invalidSdp2202":"خطای 2202: کاربر SDP اشتباه ایجاد کرده است.",
-    "app.sfu.noAvailableCodec2203": "خطای 2203: سرور کدک متناسب را پیدا نمیکند",
-
-    "app.meeting.endNotification.ok.label": "باشه",
-    "app.whiteboard.toolbar.tools": "ابزارها",
-    "app.whiteboard.toolbar.tools.pointer": "نشانگر",
-    "app.whiteboard.toolbar.tools.pencil": "مداد",
-    "app.whiteboard.toolbar.tools.rectangle": "چهارگوش",
-    "app.whiteboard.toolbar.tools.triangle": "سه گوش",
-    "app.whiteboard.toolbar.tools.ellipse": "بیضی",
-    "app.whiteboard.toolbar.tools.line": "خط",
-    "app.whiteboard.toolbar.tools.text": "متن",
-    "app.whiteboard.toolbar.thickness": "ضخامت خط",
-    "app.whiteboard.toolbar.thicknessDisabled": "ضخامت خط غیر فعال است.",
-    "app.whiteboard.toolbar.color": "رنگ ها",
-    "app.whiteboard.toolbar.colorDisabled": "رنگ ها غیر فعالند",
-    "app.whiteboard.toolbar.color.black": "مشکی",
-    "app.whiteboard.toolbar.color.white": "سفید",
-    "app.whiteboard.toolbar.color.red": "قرمز",
-    "app.whiteboard.toolbar.color.orange": "نارنجی",
-    "app.whiteboard.toolbar.color.eletricLime": "زرد آبی",
-    "app.whiteboard.toolbar.color.lime": "لیمویی",
-    "app.whiteboard.toolbar.color.cyan": "آبی روشن",
-    "app.whiteboard.toolbar.color.dodgerBlue": "آبی تیره",
-    "app.whiteboard.toolbar.color.blue": "آبی",
-    "app.whiteboard.toolbar.color.violet": "بنفش",
-    "app.whiteboard.toolbar.color.magenta": "قرمز",
-    "app.whiteboard.toolbar.color.silver": "نقره ای",
-    "app.whiteboard.toolbar.undo": "دوباره سازی حاشیه نویسی",
-    "app.whiteboard.toolbar.clear": "پاک کردن همه حاشیه نویسی ها",
-    "app.whiteboard.toolbar.multiUserOn": "فعال کردن حالت چند کابره",
-    "app.whiteboard.toolbar.multiUserOff": "خاموش کردن حالت چند کاربره",
-    "app.whiteboard.toolbar.fontSize": "لیست اندازه فونت",
-    "app.feedback.title": "شما از کنفرانس بیرون رفته اید",
-    "app.feedback.subtitle": "بسیار ممنون میشویم نظر خود را در خصوص کلاس بفرمایید(نظر شما)",
-    "app.feedback.textarea": "چگونه میتوان کلاس را بهتر کرد؟",
-    "app.feedback.sendFeedback": "ارسال پیشنهاد و انتقاد",
-    "app.feedback.sendFeedbackDesc": "ارسال پیشنهاد و انتقاد و ترک جلسه",
-    "app.videoDock.webcamFocusLabel": "تمرکز",
-    "app.videoDock.webcamFocusDesc": "تمرکز در دوربین انتخاب شده",
-    "app.videoDock.webcamUnfocusLabel": "خروج از حالت تمرکز",
-    "app.videoDock.webcamUnfocusDesc": "خروج از حالت تمرکز در دوربین انتخاب شده"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/fr.json b/bigbluebutton-html5/private/locales/fr.json
deleted file mode 100644
index caf0280af2..0000000000
--- a/bigbluebutton-html5/private/locales/fr.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "app.home.greeting": "Bienvenue {0} ! Votre présentation commence bientôt...",
-    "app.chat.submitLabel": "Envoyer message",
-    "app.chat.errorMinMessageLength": "Le message est {0} caractère(s) trop court",
-    "app.chat.errorMaxMessageLength": "Le message est {0} caractère(s) trop long",
-    "app.chat.inputLabel": "Saisie des messages pour le chat {0}",
-    "app.chat.inputPlaceholder": "Message {0}",
-    "app.chat.titlePublic": "Discussion publique",
-    "app.chat.titlePrivate": "Discussion privée avec {0}",
-    "app.chat.partnerDisconnected": "{0} a quitté la conférence",
-    "app.chat.closeChatLabel": "Fermer {0}",
-    "app.chat.hideChatLabel": "Cacher {0}",
-    "app.chat.moreMessages": "Plus de messages ci-dessous",
-    "app.chat.dropdown.options": "Options de Discussion",
-    "app.chat.dropdown.clear": "Effacer",
-    "app.chat.dropdown.copy": "Copier",
-    "app.chat.dropdown.save": "Sauvegarder",
-    "app.chat.label": "Discussion",
-    "app.chat.emptyLogLabel": "Journal de discussion vide",
-    "app.chat.clearPublicChatMessage": "L'historique des discussions publiques a été effacé par un modérateur",
-    "app.userList.usersTitle": "Utilisateurs",
-    "app.userList.participantsTitle": "Participants",
-    "app.userList.messagesTitle": "Messages",
-    "app.userList.presenter": "Présentateur",
-    "app.userList.you": "Vous",
-    "app.userList.locked": "Verrouillé",
-    "app.userList.label": "Liste d'utilisateurs",
-    "app.userList.toggleCompactView.label": "Basculer le mode d'affichage compact",
-    "app.userList.guest": "Invité",
-    "app.userList.menuTitleContext": "Options disponibles",
-    "app.userList.chatListItem.unreadSingular": "{0} nouveau message",
-    "app.userList.chatListItem.unreadPlural": "{0} nouveaux messages",
-    "app.userList.menu.chat.label": "Discussion",
-    "app.userList.menu.clearStatus.label": "Effacer l'état",
-    "app.userList.menu.makePresenter.label": "Promouvoir comme Présentateur",
-    "app.userList.menu.removeUser.label": "Retirer l'utilisateur",
-    "app.userList.menu.muteUserAudio.label": "Rendre Muet",
-    "app.userList.menu.unmuteUserAudio.label": "Autoriser à parler",
-    "app.userList.userAriaLabel": "{0} {1} {2} État {3}",
-    "app.userList.menu.promoteUser.label": "Promouvoir comme modérateur",
-    "app.userList.menu.demoteUser.label": "Rendre utilisateur normal",
-    "app.media.label": "Média",
-    "app.media.screenshare.start": "Le Partage d'écran à commencé",
-    "app.media.screenshare.end": "Le Partage d'écran s'est terminé",
-    "app.media.screenshare.safariNotSupported": "Le Partage d'écran n'est pour le moment pas supporté par Safari. Veuillez utiliser Firefox ou Google Chrome.",
-    "app.meeting.ended": "Cette session s'est terminée",
-    "app.meeting.endedMessage": "Vous serez redirigé vers l'écran d'accueil",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Diapositive précédente",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Changer la présentation à la diapositive précédente",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Diapositive suivante",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Changer la présentation à la diapositive suivante",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Passer la diapositive",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Changer la présentation à une diapositive spécifique",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Adapté à la largeur",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Afficher toute la largeur de la diapositive",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Ajuster à l'écran",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Afficher toute la diapositive",
-    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
-    "app.presentation.presentationToolbar.zoomDesc": "Changer le niveau de zoom de la présentation",
-    "app.presentation.presentationToolbar.goToSlide": "Diapositive {0}",
-    "app.presentationUploder.title": "Présentation",
-    "app.presentationUploder.message": "En tant que présentateur dans BigBlueButton, vous avez la possibilité de téléverser n'importe quel document bureautique ou fichier PDF. Nous recommandons pour les meilleurs résultats de téléverser un fichier PDF.",
-    "app.presentationUploder.confirmLabel": "Débuter",
-    "app.presentationUploder.confirmDesc": "Sauvegardez vos modifications et lancez la présentation",
-    "app.presentationUploder.dismissLabel": "Annuler",
-    "app.presentationUploder.dismissDesc": "Ferme la fenêtre d'option et supprime vos modifications",
-    "app.presentationUploder.dropzoneLabel": "Faites glisser les fichiers ici pour téléverser",
-    "app.presentationUploder.browseFilesLabel": "ou parcourez pour trouver des fichiers",
-    "app.presentationUploder.fileToUpload": "À téléverser...",
-    "app.presentationUploder.currentBadge": "En cours",
-    "app.presentationUploder.genericError": "Oups, quelque chose s'est mal passé",
-    "app.presentationUploder.upload.progress": "Téléversement ({0}%)",
-    "app.presentationUploder.upload.413": "Le fichier est trop volumineux",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "Traitement de la page {0} sur {1}",
-    "app.presentationUploder.conversion.genericConversionStatus": "Conversion du fichier...",
-    "app.presentationUploder.conversion.generatingThumbnail": "Création des vignettes...",
-    "app.presentationUploder.conversion.generatedSlides": "Diapositives générées...",
-    "app.presentationUploder.conversion.generatingSvg": "Création des images SVG...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Oups, le nombre de pages a dépassé la limite",
-    "app.presentationUploder.conversion.timeout": "Oups, la conversion prend trop de temps",
-    "app.polling.pollingTitle": "Options du Sondage",
-    "app.polling.pollAnswerLabel": "Réponse de sondage {0}",
-    "app.polling.pollAnswerDesc": "Choisir cette option pour voter pour {0}",
-    "app.failedMessage": "Problème de connexion au serveur, toutes nos excuses.",
-    "app.connectingMessage": "Connexion en cours...",
-    "app.waitingMessage": "Déconnecté. Tentative de reconnexion dans {0} secondes...",
-    "app.navBar.settingsDropdown.optionsLabel": "Options",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Plein écran",
-    "app.navBar.settingsDropdown.settingsLabel": "Ouvrir les paramètres",
-    "app.navBar.settingsDropdown.aboutLabel": "À propos",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Déconnexion",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Quitter le plein écran",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Passer le menu de paramétrage en plein écran",
-    "app.navBar.settingsDropdown.settingsDesc": "Modifier les paramètres généraux",
-    "app.navBar.settingsDropdown.aboutDesc": "Afficher les informations du client",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Quitter la conférence",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Quitter le mode plein écran",
-    "app.navBar.settingsDropdown.hotkeysLabel": "Raccourcis",
-    "app.navBar.settingsDropdown.hotkeysDesc": "Liste des raccourcis disponibles",
-    "app.navBar.settingsDropdown.helpLabel": "Aide",
-    "app.navBar.settingsDropdown.helpDesc": "Liens utilisateur à des didacticiels vidéo",
-    "app.navBar.userListToggleBtnLabel": "Basculer l'affichage de la Liste des Utilisateurs",
-    "app.navBar.toggleUserList.ariaLabel": "Basculer l'affichage de la Liste des Utilisateurs aux messages",
-    "app.navBar.toggleUserList.newMessages": "avec notification des nouveaux messages",
-    "app.navBar.recording": "Cette session est enregistrée",
-    "app.navBar.recording.on": "Enregistrement",
-    "app.navBar.recording.off": "Ne pas enregistrer",
-    "app.leaveConfirmation.title": "Quitter la session",
-    "app.leaveConfirmation.message": "Voulez-vous quitter cette conférence ?",
-    "app.leaveConfirmation.confirmLabel": "Quitter",
-    "app.leaveConfirmation.confirmDesc": "Vous déconnecte de la conférence",
-    "app.leaveConfirmation.dismissLabel": "Annuler",
-    "app.leaveConfirmation.dismissDesc": "Ferme sans confirmation",
-    "app.leaveConfirmation.endMeetingLabel": "Accepter et fermer la session",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Quitter et fermer la session",
-    "app.leaveConfirmation.endMeetingDesc": "Clore et confirmer la fin de conférence",
-    "app.about.title": "À propos",
-    "app.about.version": "Version du client :",
-    "app.about.copyright": "Copyright :",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "Annuler",
-    "app.about.dismissDesc": "Fermer l'information client",
-    "app.actionsBar.changeStatusLabel": "Changer le statut",
-    "app.actionsBar.muteLabel": "Rendre silencieux",
-    "app.actionsBar.unmuteLabel": "Autoriser à parler",
-    "app.actionsBar.camOffLabel": "Caméra désactivée",
-    "app.actionsBar.raiseLabel": "Lever la main",
-    "app.actionsBar.label": "Barre d'actions",
-    "app.submenu.application.applicationSectionTitle": "Application",
-    "app.submenu.application.audioAlertLabel": "Alertes audio pour Discussion",
-    "app.submenu.application.pushAlertLabel": "Alertes Popup de Discussion",
-    "app.submenu.application.fontSizeControlLabel": "Taille des caractères",
-    "app.submenu.application.increaseFontBtnLabel": "Augmenter la Taille de la Police",
-    "app.submenu.application.decreaseFontBtnLabel": "Diminuer la Taille de la Police",
-    "app.submenu.application.languageLabel": "Langue de l'application",
-    "app.submenu.application.ariaLanguageLabel": "Changer la langue de l'application",
-    "app.submenu.application.languageOptionLabel": "Choisir la langue",
-    "app.submenu.application.noLocaleOptionLabel": "Pas de lieu actif",
-    "app.submenu.audio.micSourceLabel": "Source du Micro",
-    "app.submenu.audio.speakerSourceLabel": "Source du haut-parleur",
-    "app.submenu.audio.streamVolumeLabel": "Volume de votre flux audio",
-    "app.submenu.video.title": "Vidéo",
-    "app.submenu.video.videoSourceLabel": "Voir la source",
-    "app.submenu.video.videoOptionLabel": "Choisir la source de la vue",
-    "app.submenu.video.videoQualityLabel": "Qualité vidéo",
-    "app.submenu.video.qualityOptionLabel": "Choisissez la qualité vidéo",
-    "app.submenu.video.participantsCamLabel": "Voir les webcams des participants",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Sous-titres codés",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "S'approprier",
-    "app.submenu.closedCaptions.languageLabel": "Langue",
-    "app.submenu.closedCaptions.localeOptionLabel": "Choisir la langue",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Pas de lieux actifs",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Famille de police",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Choisir la famille de Police",
-    "app.submenu.closedCaptions.fontSizeLabel": "Taille des caractères",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Choisissez la taille des caractères",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Couleur du fond",
-    "app.submenu.closedCaptions.fontColorLabel": "Couleur des caractères",
-    "app.submenu.participants.muteAllLabel": "Couper le son, excepté pour le présentateur",
-    "app.submenu.participants.lockAllLabel": "Verrouiller tous les participants",
-    "app.submenu.participants.lockItemLabel": "Participants {0}",
-    "app.submenu.participants.lockMicDesc": "Désactiver le micro de tous les participants verrouillés",
-    "app.submenu.participants.lockCamDesc": "Désactiver la webcam de tous les participants verrouillés",
-    "app.submenu.participants.lockPublicChatDesc": "Désactiver la discussion publique pour tous les participants verrouillés",
-    "app.submenu.participants.lockPrivateChatDesc": "Désactiver la discussion privée pour tous les participants verrouillés",
-    "app.submenu.participants.lockLayoutDesc": "Verrouiller la disposition pour tous les participants verrouillés",
-    "app.submenu.participants.lockMicAriaLabel": "Verrouillage du micro",
-    "app.submenu.participants.lockCamAriaLabel": "Verrouillage de la webcam",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Discussion publique verrouillée",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Discussion privée verrouillée",
-    "app.submenu.participants.lockLayoutAriaLabel": "Disposition verrouillée",
-    "app.submenu.participants.lockMicLabel": "Microphone",
-    "app.submenu.participants.lockCamLabel": "Webcam",
-    "app.submenu.participants.lockPublicChatLabel": "Discussion Publique",
-    "app.submenu.participants.lockPrivateChatLabel": "Discussion Privée",
-    "app.submenu.participants.lockLayoutLabel": "Disposition",
-    "app.settings.applicationTab.label": "Application",
-    "app.settings.audioTab.label": "Audio",
-    "app.settings.videoTab.label": "Vidéo",
-    "app.settings.closedcaptionTab.label": "Sous-titres codés",
-    "app.settings.usersTab.label": "Participants",
-    "app.settings.main.label": "Paramètres",
-    "app.settings.main.cancel.label": "Annuler",
-    "app.settings.main.cancel.label.description": "Annule les changements et ferme le menu des paramètres",
-    "app.settings.main.save.label": "Sauvegarder",
-    "app.settings.main.save.label.description": "Sauvegarde les changements et ferme le menu des paramètres",
-    "app.settings.dataSavingTab.label": "Enregistrement des Données",
-    "app.settings.dataSavingTab.webcam": "Activer les Webcams",
-    "app.settings.dataSavingTab.screenShare": "Activer le Partage de Bureau",
-    "app.settings.dataSavingTab.description": "Pour économiser votre bande passante, ajustez ce qui est actuellement affiché.",
-    "app.switch.onLabel": "ON",
-    "app.switch.offLabel": "OFF",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Actions",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Téléverser une présentation",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Débuter un sondage",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Partager votre écran",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Cesser le partage d'écran",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Téléverser votre présentation",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Débuter un sondage",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Partager votre écran avec d'autres",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Cesser de partager votre écran avec",
-    "app.actionsBar.actionsDropdown.startRecording": "Commencer à enregistrer",
-    "app.actionsBar.actionsDropdown.stopRecording": "Arrêter d'enregistrer",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Définir le statut",
-    "app.actionsBar.emojiMenu.awayLabel": "Éloigné",
-    "app.actionsBar.emojiMenu.awayDesc": "Passer votre état à éloigné",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "Lever la main",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "Lever la main pour poser une question",
-    "app.actionsBar.emojiMenu.neutralLabel": "Indécis",
-    "app.actionsBar.emojiMenu.neutralDesc": "Passer votre état à indécis",
-    "app.actionsBar.emojiMenu.confusedLabel": "Désorienté",
-    "app.actionsBar.emojiMenu.confusedDesc": "Passer votre état à désorienté",
-    "app.actionsBar.emojiMenu.sadLabel": "Triste",
-    "app.actionsBar.emojiMenu.sadDesc": "Passer votre état à triste",
-    "app.actionsBar.emojiMenu.happyLabel": "Ravi",
-    "app.actionsBar.emojiMenu.happyDesc": "Passer votre état à ravi",
-    "app.actionsBar.emojiMenu.noneLabel": "Effacer votre état",
-    "app.actionsBar.emojiMenu.noneDesc": "Effacer votre statut",
-    "app.actionsBar.emojiMenu.applauseLabel": "Approuver",
-    "app.actionsBar.emojiMenu.applauseDesc": "Passer votre état à applaudissements",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Favorable",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Passer votre statut à favorable",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Défavorable",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Passer votre statut à défavorable",
-    "app.actionsBar.currentStatusDesc": "statut actuel {0}",
-    "app.audioNotification.audioFailedError1001": "Erreur 1001 : WebSocket déconnecté",
-    "app.audioNotification.audioFailedError1002": "Erreur 1002 : impossible d'établir une connexion WebSocket.",
-    "app.audioNotification.audioFailedError1003": "Erreur 1003 : version de navigateur non supportée",
-    "app.audioNotification.audioFailedError1004": "Erreur 1004 : défaut sur appel",
-    "app.audioNotification.audioFailedError1005": "Erreur 1005 : l'appel s'est terminé inopinément",
-    "app.audioNotification.audioFailedError1006": "Erreur 1006 : délai d'appel dépassé",
-    "app.audioNotification.audioFailedError1007": "Erreur 1007 : la négociation ICE a échoué",
-    "app.audioNotification.audioFailedError1008": "Erreur 1008 : échec du transfert",
-    "app.audioNotification.audioFailedError1009": "Erreur 1009 : impossible de récupérer les informations du serveur STUN/TURN.",
-    "app.audioNotification.audioFailedError1010": "Erreur 1010 :  délai dépassé durant la négociation ICE",
-    "app.audioNotification.audioFailedError1011": "Erreur 1011 : délai d'attente dépassé pour ICE",
-    "app.audioNotification.audioFailedMessage": "Votre connexion audio à échoué",
-    "app.audioNotification.mediaFailedMessage": "Votre connexion micro a échoué",
-    "app.audioNotification.closeLabel": "Fermer",
-    "app.audioNotificaion.reconnectingAsListenOnly": "L'audio a été verrouillé pour les modérateurs uniquement, vous êtes connecté pour écouter seulement",
-    "app.breakoutJoinConfirmation.title": "Rejoindre la salle de groupe",
-    "app.breakoutJoinConfirmation.message": "Voulez-vous rejoindre",
-    "app.breakoutJoinConfirmation.confirmLabel": "Rejoindre",
-    "app.breakoutJoinConfirmation.confirmDesc": "Rejoignez la salle de groupe",
-    "app.breakoutJoinConfirmation.dismissLabel": "Annuler",
-    "app.breakoutJoinConfirmation.dismissDesc": "Fermer et refuser de rejoindre la salle de groupe",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "Choisissez une salle de groupe à rejoindre",
-    "app.breakoutTimeRemainingMessage": "Temps restant pour la salle de groupe : {0}",
-    "app.breakoutWillCloseMessage": "Temps écoulé. La salle de groupe fermera bientôt",
-    "app.calculatingBreakoutTimeRemaining": "Calcul du temps restant...",
-    "app.audioModal.microphoneLabel": "Microphone",
-    "app.audioModal.listenOnlyLabel": "Écoute seule",
-    "app.audioModal.audioChoiceLabel": "Voulez-vous rejoindre l'audio ?",
-    "app.audioModal.iOSBrowser": "Audio/Vidéo non supporté",
-    "app.audioModal.iOSErrorDescription": "Actuellement l'audio et la vidéo ne sont pas supportés par Chrome sur iOS.",
-    "app.audioModal.iOSErrorRecommendation": "Nous recommandons d'utiliser Safari iOS.",
-    "app.audioModal.audioChoiceDesc": "Sélectionnez comment rejoindre l'audio de cette conférence",
-    "app.audioModal.closeLabel": "Fermer",
-    "app.audioModal.yes": "Oui",
-    "app.audioModal.no": "Non",
-    "app.audioModal.yes.arialabel" : "Écho activé",
-    "app.audioModal.no.arialabel" : "Écho désactivé",
-    "app.audioModal.echoTestTitle": "Écho test privé. Dites quelques mots. Entendez-vous l'audio ?",
-    "app.audioModal.settingsTitle": "Modifier vos paramètres audio",
-    "app.audioModal.helpTitle": "Il y a un problème avec vos périphériques",
-    "app.audioModal.helpText": "Avez-vous donné à BigBlueButton la permission d'accéder à votre microphone ? Notez qu'une boîte de dialogue devrait apparaître lorsque vous essayez de vous joindre à l'audio, vous demandant les permissions d'accès à vos périphériques multimédia. Veuillez accepter afin de vous joindre à la conférence audio. Si tel n'est pas le cas, essayez de changer les permissions de votre micro dans les paramètres de votre navigateur.",
-    "app.audioModal.connecting": "Connexion en cours",
-    "app.audioModal.connectingEchoTest": "Connexion au test d'écho",
-    "app.audioManager.joinedAudio": "Vous avez rejoint la conférence audio",
-    "app.audioManager.joinedEcho": "Vous avez rejoint le test d'écho",
-    "app.audioManager.leftAudio": "Vous avez quitté la conférence audio",
-    "app.audioManager.genericError": "Erreur : une erreur s'est produite, veuillez réessayez.",
-    "app.audioManager.connectionError": "Erreur : erreur de connexion",
-    "app.audioManager.requestTimeout": "Erreur : un délai est dépassé dans la requête",
-    "app.audioManager.invalidTarget": "Erreur : tentative de requête sur une destination invalide",
-    "app.audioManager.mediaError": "Erreur : il y a un problème pour obtenir vos périphériques multimédias",
-    "app.audio.joinAudio": "Rejoindre l'Audio",
-    "app.audio.leaveAudio": "Quitter l'Audio",
-    "app.audio.enterSessionLabel": "Entrer dans la Session",
-    "app.audio.playSoundLabel": "Jouer un son",
-    "app.audio.backLabel": "Retour",
-    "app.audio.audioSettings.titleLabel": "Choisissez vos paramètres audio",
-    "app.audio.audioSettings.descriptionLabel": "Veuillez noter qu'une boîte de dialogue apparaîtra dans votre navigateur, vous demandant d'accepter le partage de votre micro.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Source du Micro",
-    "app.audio.audioSettings.speakerSourceLabel": "Source du haut-parleur",
-    "app.audio.audioSettings.microphoneStreamLabel": "Le volume de votre flux audio",
-    "app.audio.audioSettings.retryLabel": "Réessayer",
-    "app.audio.listenOnly.backLabel": "Retour",
-    "app.audio.listenOnly.closeLabel": "Fermer",
-    "app.audio.permissionsOverlay.title": "Autoriser BigBlueButton à utiliser vos périphériques multimédias",
-    "app.audio.permissionsOverlay.hint": "Nous avons besoin de vous pour nous permettre d'utiliser vos périphériques Multimédias afin de vous joindre à la conférence vocale :)",
-    "app.error.removed": "Vous avez été retiré de la conférence",
-    "app.error.meeting.ended": "Vous avez été déconnecté de la conférence",
-    "app.dropdown.close": "Fermer",
-    "app.error.500": "Oups, quelque chose s'est mal passé",
-    "app.error.404": "Non trouvé",
-    "app.error.401": "Non autorisé",
-    "app.error.403": "Interdit",
-    "app.error.leaveLabel": "Connectez-vous à nouveau",
-    "app.guest.waiting": "En attente de l'approbation d'adhésion",
-    "app.toast.breakoutRoomEnded": "La salle de groupe s'est terminée. Veuillez vous joindre à l'audio.",
-    "app.toast.chat.public": "Nouveau message de discussion publique",
-    "app.toast.chat.private": "Nouveau message de discussion privée",
-    "app.toast.chat.system": "Système",
-    "app.notification.recordingStart": "Cette session est maintenant enregistrée",
-    "app.notification.recordingStop": "Cette session n'est maintenant plus enregistrée",
-    "app.shortcut-help.title": "Raccourcis",
-    "app.shortcut-help.accessKeyNotAvailable": "Raccourcis non disponible.",
-    "app.shortcut-help.comboLabel": "Combo",
-    "app.shortcut-help.functionLabel": "Fonction",
-    "app.shortcut-help.closeLabel": "Fermer",
-    "app.shortcut-help.closeDesc": "Ferme la fenêtre des raccourcis",
-    "app.shortcut-help.openOptions": "Ouvrir les options",
-    "app.shortcut-help.toggleUserList": "Basculer la liste d'utilisateurs",
-    "app.shortcut-help.toggleMute": "Assourdir / Activer",
-    "app.shortcut-help.togglePublicChat": "Basculer vers la Discussion Publique(La liste utilisateurs doit être ouvert)",
-    "app.shortcut-help.hidePrivateChat": "Cacher la discussion privée",
-    "app.shortcut-help.closePrivateChat": "Fermer la discussion privée",
-    "app.shortcut-help.openActions": "Ouvrir le menu Actions",
-    "app.shortcut-help.openStatus": "Ouvrir le menu Statut",
-    "app.video.joinVideo": "Partager la Webcam",
-    "app.video.leaveVideo": "Ne plus partager la Webcam",
-    "app.video.iceCandidateError": "Erreur lors de l'ajout d'un candidat ICE",
-    "app.video.iceConnectionStateError": "Erreur 1107 : négociation ICE échouée",
-    "app.video.permissionError": "Erreur lors du partage de la webcam. Veuillez vérifier les permissions.",
-    "app.video.sharingError": "Erreur lors du partage de la Webcam",
-    "app.video.notFoundError": "Webcam introuvable. Assurez-vous qu'elle soit bien connectée",
-    "app.video.notAllowed": "Permission manquante pour partager la Webcam. Veuillez vérifier les permissions dans votre navigateur",
-    "app.video.notSupportedError": "La vidéo de la webcam peut uniquement être partagée avec des sources sûres ; assurez-vous que votre certificat SSL est valide",
-    "app.video.notReadableError": "Impossible d'obtenir la vidéo de la webcam. Assurez-vous qu'aucun autre programme n'utilise la webcam",
-    "app.video.swapCam": "Échanger",
-    "app.video.swapCamDesc": "Permuter les Webcams",
-    "app.video.videoMenu": "Menu Vidéo",
-    "app.video.videoMenuDisabled": "Le menu Vidéo de la Webcam est désactivé dans les paramètres",
-    "app.video.videoMenuDesc": "Ouvrir le menu déroulant de la vidéo",
-    "app.video.chromeExtensionError": "Vous devez installer ",
-    "app.video.chromeExtensionErrorLink": "cette Extension Chrome",
-    "app.video.stats.title": "Statistiques de connexion",
-    "app.video.stats.packetsReceived": "Paquets reçus",
-    "app.video.stats.packetsSent": "Paquets envoyés",
-    "app.video.stats.packetsLost": "Paquets perdus",
-    "app.video.stats.bitrate": "Bitrate",
-    "app.video.stats.lostPercentage": "Pourcentage perdu total",
-    "app.video.stats.lostRecentPercentage": "Pourcentage perdu récent",
-    "app.video.stats.dimensions": "Dimensions",
-    "app.video.stats.codec": "Codec",
-    "app.video.stats.decodeDelay": "Délai de décodage",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "Usage de l'encodage",
-    "app.video.stats.currentDelay": "Délai actuel",
-    "app.deskshare.iceConnectionStateError": "Erreur 1108 : connexion ICE échouée lors du partage d'écran",
-    "app.sfu.mediaServerConnectionError2000": "Erreur 2000 : impossible de se connecter au serveur multimédia",
-    "app.sfu.mediaServerOffline2001": "Erreur 2001 : le serveur multimédia est hors ligne. Veuillez réessayer plus tard.",
-    "app.sfu.mediaServerNoResources2002": "Erreur 2002 : le serveur de médias n'a pas de ressources disponibles",
-    "app.sfu.mediaServerRequestTimeout2003": "Erreur 2003 : les demandes du serveur multimédia expirent",
-    "app.sfu.serverIceGatheringFailed2021": "Erreur 2021 : le serveur multimédia ne peut pas rassembler de candidats ICE",
-    "app.sfu.serverIceGatheringFailed2022": "Erreur 2022 : la connexion ICE au serveur de médias a échoué",
-    "app.sfu.invalidSdp2202":"Erreur 2202 : le client a généré un SDP non valide",
-    "app.sfu.noAvailableCodec2203": "Erreur 2203 : le serveur n'a pas trouvé de codec approprié",
-
-    "app.meeting.endNotification.ok.label": "OK",
-    "app.whiteboard.toolbar.tools": "Outils",
-    "app.whiteboard.toolbar.tools.pointer": "Pointeur",
-    "app.whiteboard.toolbar.tools.pencil": "Crayon",
-    "app.whiteboard.toolbar.tools.rectangle": "Rectangle",
-    "app.whiteboard.toolbar.tools.triangle": "Triangle",
-    "app.whiteboard.toolbar.tools.ellipse": "Ellipse",
-    "app.whiteboard.toolbar.tools.line": "Ligne",
-    "app.whiteboard.toolbar.tools.text": "Texte",
-    "app.whiteboard.toolbar.thickness": "Épaisseur du trait",
-    "app.whiteboard.toolbar.thicknessDisabled": "L'épaisseur du trait est désactivée",
-    "app.whiteboard.toolbar.color": "Couleurs",
-    "app.whiteboard.toolbar.colorDisabled": "Couleurs désactivées",
-    "app.whiteboard.toolbar.color.black": "Noir",
-    "app.whiteboard.toolbar.color.white": "Blanc",
-    "app.whiteboard.toolbar.color.red": "Rouge",
-    "app.whiteboard.toolbar.color.orange": "Orange",
-    "app.whiteboard.toolbar.color.eletricLime": "Vert électrique",
-    "app.whiteboard.toolbar.color.lime": "Vert",
-    "app.whiteboard.toolbar.color.cyan": "Cyan",
-    "app.whiteboard.toolbar.color.dodgerBlue": "Bleu foncé",
-    "app.whiteboard.toolbar.color.blue": "Bleu",
-    "app.whiteboard.toolbar.color.violet": "Violet",
-    "app.whiteboard.toolbar.color.magenta": "Magenta",
-    "app.whiteboard.toolbar.color.silver": "Argenté",
-    "app.whiteboard.toolbar.undo": "Annuler l'annotation",
-    "app.whiteboard.toolbar.clear": "Effacer toutes les annotations",
-    "app.whiteboard.toolbar.multiUserOn": "Activer le mode multi-utilisateur",
-    "app.whiteboard.toolbar.multiUserOff": "Désactiver le mode multi-utilisateur",
-    "app.whiteboard.toolbar.fontSize": "Liste des Tailles de Police",
-    "app.feedback.title": "Vous avez quitté la conférence",
-    "app.feedback.subtitle": "Nous aimerions connaitre votre expérience avec BigBlueButton (optionnel)",
-    "app.feedback.textarea": "Comment pouvons nous améliorer BigBlueButton ?",
-    "app.feedback.sendFeedback": "Envoyer l'avis",
-    "app.feedback.sendFeedbackDesc": "Envoyer l'avis et quitter la conférence",
-    "app.videoDock.webcamFocusLabel": "Focus",
-    "app.videoDock.webcamFocusDesc": "Focus sur la webcam sélectionnée",
-    "app.videoDock.webcamUnfocusLabel": "Arrêt du focus",
-    "app.videoDock.webcamUnfocusDesc": "Arrêt du focus sur la webcam sélectionnée"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/id.json b/bigbluebutton-html5/private/locales/id.json
deleted file mode 100644
index d2a85c265e..0000000000
--- a/bigbluebutton-html5/private/locales/id.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-    "app.home.greeting": "Selamat datang {0}! Presentasi anda akan mulai sesaat lagi...",
-    "app.chat.submitLabel": "Kirimkan pesan",
-    "app.chat.inputLabel": "Input pesan untuk chat {0}",
-    "app.chat.inputPlaceholder": "Pesan {0}",
-    "app.chat.titlePublic": "Chat Publik",
-    "app.chat.titlePrivate": "Chat pribadi dengan {0}",
-    "app.chat.partnerDisconnected": "{0} sudah keluar dari meeting",
-    "app.chat.closeChatLabel": "Tutup {0}",
-    "app.chat.hideChatLabel": "Sembunyikan {0}",
-    "app.chat.moreMessages": "Lihat pesan lebih banyak dibawah ini",
-    "app.chat.dropdown.options": "Opsi Chat",
-    "app.chat.dropdown.clear": "Bersihkan",
-    "app.chat.dropdown.copy": "Salin",
-    "app.chat.dropdown.save": "Simpan",
-    "app.chat.label": "Chat",
-    "app.chat.emptyLogLabel": "Log Chatting kosong",
-    "app.userList.usersTitle": "Pengguna",
-    "app.userList.participantsTitle": "Peserta",
-    "app.userList.messagesTitle": "Pesan",
-    "app.userList.presenter": "Pemateri",
-    "app.userList.you": "Anda",
-    "app.userList.locked": "Terkunci",
-    "app.userList.label": "Daftar Pengguna",
-    "app.userList.guest": "Tamu",
-    "app.userList.menuTitleContext": "Opsi yang tersedia",
-    "app.userList.chatListItem.unreadSingular": "{0} Pesan Baru",
-    "app.userList.chatListItem.unreadPlural": "{0} Pesan Baru",
-    "app.userList.menu.chat.label": "Chat",
-    "app.userList.menu.clearStatus.label": "Bersihkan Status",
-    "app.userList.menu.makePresenter.label": "Ubah menjadi Pemateri",
-    "app.userList.menu.removeUser.label": "Hapus pengguna",
-    "app.userList.menu.muteUserAudio.label": "Diamkan pengguna",
-    "app.userList.menu.unmuteUserAudio.label": "Aktifkan pengguna",
-    "app.media.screenshare.start": "Berbagi layar sudah mulai",
-    "app.media.screenshare.end": "Berbagi layar sudah berakhir",
-    "app.meeting.ended": "Sesi sudah berakhir",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Slide Sebelumnya",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Pindahkan presentasi ke slide sebelumnya",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Slide selanjutnya",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Pindahkan presentasi ke slide selanjutnya",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Lewati Slide",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Pindahkan presentasi ke slide tertentu",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Sesuaikan dengan lebar layar",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Tampilkan seluruh lebar slide",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Sesuaikan dengan ukuran layar",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Tampilkan seluruh slide",
-    "app.presentation.presentationToolbar.zoomLabel": "Perbesar",
-    "app.presentation.presentationToolbar.zoomDesc": "Ubah level zoom dari presentasi",
-    "app.presentationUploder.title": "Presentasi",
-    "app.presentationUploder.message": "Silakan unggah file presentasi dalam bentuk microsoft office format, file .jpg ataupun file .pdf. Gunakan mode presentasi/landscape untuk mendapatkan hasil terbaik. ",
-    "app.presentationUploder.confirmLabel": "Mulai",
-    "app.presentationUploder.confirmDesc": "Simpan ubahan Anda dan mulai presentasi",
-    "app.presentationUploder.dismissLabel": "Batalkan",
-    "app.presentationUploder.dismissDesc": "Tutup jendela dan batalkan perubahan.",
-    "app.presentationUploder.dropzoneLabel": "Drag file untuk unggah",
-    "app.presentationUploder.browseFilesLabel": "atau telusuri file",
-    "app.presentationUploder.fileToUpload": "untuk diunggah",
-    "app.presentationUploder.genericError": "Ops, terjadi kesalahan",
-    "app.presentationUploder.upload.413": "File terlalu besar",
-    "app.presentationUploder.conversion.genericConversionStatus": "Mengkonversikan file",
-    "app.presentationUploder.conversion.generatingThumbnail": "Membuat thumbnail...",
-    "app.presentationUploder.conversion.generatedSlides": "Slides telah siap",
-    "app.presentationUploder.conversion.generatingSvg": "Membuat gambar SVG ...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Ops, jumlah halaman melebihi batas",
-    "app.polling.pollingTitle": "Pilihan Polling",
-    "app.failedMessage": "Mohon maaf, ada kesulitan terhubung ke server",
-    "app.connectingMessage": "Menghubungkan",
-    "app.waitingMessage": "Terputus. Sedang menghubungkan kembali dalam {0} detik...",
-    "app.navBar.settingsDropdown.optionsLabel": "Pilihan",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Aktifkan layar penuh",
-    "app.navBar.settingsDropdown.settingsLabel": "Buka Pengaturan",
-    "app.navBar.settingsDropdown.aboutLabel": "Tentang",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Keluar",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Buat menu pengaturan menjadi layar penuh",
-    "app.navBar.settingsDropdown.settingsDesc": "Ubah pengaturan umum",
-    "app.navBar.settingsDropdown.aboutDesc": "Tampilkan informasi tentang klien",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Keluar meeting",
-    "app.navBar.userListToggleBtnLabel": "Alihkan Daftar Pengguna",
-    "app.leaveConfirmation.title": "Keluar sesi",
-    "app.leaveConfirmation.message": "Anda ingin keluar dari meeting ini ?",
-    "app.leaveConfirmation.confirmLabel": "Keluar",
-    "app.leaveConfirmation.confirmDesc": "Anda keluar dari meeting",
-    "app.leaveConfirmation.dismissLabel": "Batalkan",
-    "app.leaveConfirmation.dismissDesc": "Tentang",
-    "app.about.title": "Tentang",
-    "app.about.version": "Versi klien:",
-    "app.about.copyright": "Hak Cipta:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "Batalkan",
-    "app.about.dismissDesc": "Tutup informasi klien",
-    "app.actionsBar.changeStatusLabel": "Ubah Status",
-    "app.actionsBar.muteLabel": "Diamkan",
-    "app.actionsBar.unmuteLabel": "Aktifkan",
-    "app.actionsBar.camOffLabel": "Kamera Off",
-    "app.actionsBar.raiseLabel": "Naikan",
-    "app.submenu.application.applicationSectionTitle": "Aplikasi",
-    "app.submenu.application.fontSizeControlLabel": "Ukuran Huruf",
-    "app.submenu.application.increaseFontBtnLabel": "Besarkan Ukuran Huruf Aplikasi",
-    "app.submenu.application.decreaseFontBtnLabel": "Kecilkan Ukuran Huruf Aplikasi",
-    "app.submenu.application.languageLabel": "Bahasa Aplikasi",
-    "app.submenu.application.ariaLanguageLabel": "Ubah Bahasa Aplikasi",
-    "app.submenu.application.languageOptionLabel": "Pilih Bahasa",
-    "app.submenu.application.noLocaleOptionLabel": "Tidak ada lokalisasi yang aktif",
-    "app.submenu.audio.micSourceLabel": "Sumber Mikropon",
-    "app.submenu.audio.speakerSourceLabel": "Sumber Speaker",
-    "app.submenu.audio.streamVolumeLabel": "Volume stream audio Anda",
-    "app.submenu.video.title": "Video",
-    "app.submenu.video.videoSourceLabel": "Lihat Sumber",
-    "app.submenu.video.videoOptionLabel": "Pilih Lihat Sumber",
-    "app.submenu.video.videoQualityLabel": "Kualitas Video",
-    "app.submenu.video.qualityOptionLabel": "Pilih kualitas video",
-    "app.submenu.video.participantsCamLabel": "Melihat Web Kamera Peserta",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Subtitel",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Ambil kepemilikan",
-    "app.submenu.closedCaptions.languageLabel": "Bahasa",
-    "app.submenu.closedCaptions.localeOptionLabel": "Pilih Bahasa",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Tidaki ada lokalisasi yang aktif",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Jenis Huruf",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Pilih jenis Huruf",
-    "app.submenu.closedCaptions.fontSizeLabel": "Ukuran Huruf",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Pilih ukuran Huruf",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Warna latar",
-    "app.submenu.closedCaptions.fontColorLabel": "Warna Huruf",
-    "app.submenu.participants.muteAllLabel": "Diamkan semua kecuali pemateri",
-    "app.submenu.participants.lockAllLabel": "Kunci semua peserta",
-    "app.submenu.participants.lockItemLabel": "Peserta {0}",
-    "app.submenu.participants.lockMicDesc": "Nonaktifkan mikropon untuk semua peserta yang terkunci",
-    "app.submenu.participants.lockCamDesc": "Nonaktifkan web kamera untuk semua peserta yang terkunci",
-    "app.submenu.participants.lockPublicChatDesc": "Nonaktifkan Chat publik untuk semua peserta yang terkunci",
-    "app.submenu.participants.lockPrivateChatDesc": "Nonaktifkan Chat privat untuk semua peserta yang terkunci",
-    "app.submenu.participants.lockLayoutDesc": "Kunci Layout untuk semua peserta yang terkunci",
-    "app.submenu.participants.lockMicAriaLabel": "Kunci Mikropon",
-    "app.submenu.participants.lockCamAriaLabel": "Kunci Web Kamera.",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Chat publik terkunci",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Chat privat terkunci",
-    "app.submenu.participants.lockLayoutAriaLabel": "Layout terkunci",
-    "app.submenu.participants.lockMicLabel": "Mikropon",
-    "app.submenu.participants.lockCamLabel": "Web Kamera",
-    "app.submenu.participants.lockPublicChatLabel": "Chat Publik",
-    "app.submenu.participants.lockPrivateChatLabel": "Chat Privat",
-    "app.submenu.participants.lockLayoutLabel": "Layout",
-    "app.settings.applicationTab.label": "Aplikasi",
-    "app.settings.audioTab.label": "Audio",
-    "app.settings.videoTab.label": "Video",
-    "app.settings.closedcaptionTab.label": "Subtitel",
-    "app.settings.usersTab.label": "Partisipan",
-    "app.settings.main.label": "Pengaturan",
-    "app.settings.main.cancel.label": "Batalkan",
-    "app.settings.main.cancel.label.description": "Batalkan perubahan dan tutup menu pengaturan.",
-    "app.settings.main.save.label": "Simpan",
-    "app.settings.main.save.label.description": "Simpan perubahan dan tutup menu pengaturan",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Aksi",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Unggah presentasi",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Mulai polling",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Bagikan Layar",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Unggah presentasi",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Mulai polling",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Bagikan layar anda dengan orang lain",
-    "app.actionsBar.emojiMenu.awayLabel": "Tidak Fokus",
-    "app.actionsBar.emojiMenu.awayDesc": "Ubah status menjadi Tidak Fokus",
-    "app.actionsBar.emojiMenu.confusedLabel": "Bingung",
-    "app.actionsBar.emojiMenu.confusedDesc": "Ubah status anda menjadi Bingung",
-    "app.actionsBar.emojiMenu.sadLabel": "Sedih",
-    "app.actionsBar.emojiMenu.sadDesc": "Ubah status anda menjadi Sedih",
-    "app.actionsBar.emojiMenu.happyLabel": "Bahagia",
-    "app.actionsBar.emojiMenu.happyDesc": "Ubah status anda menjadi Bahagia",
-    "app.actionsBar.emojiMenu.applauseLabel": "Tepuk tangan",
-    "app.actionsBar.emojiMenu.applauseDesc": "Ubah status anda menjadi Tepuk Tangan",
-    "app.actionsBar.currentStatusDesc": "status saat ini {0}",
-    "app.audioNotification.audioFailedMessage": "Koneksi audio anda gagal terhubung",
-    "app.audioNotification.mediaFailedMessage": "Aktivasi Mikropon  gagal, hanya sumber yang aman yang diizinkan ",
-    "app.audioNotification.closeLabel": "Tutup",
-    "app.breakoutJoinConfirmation.title": "Terhubung Ruang Diskusi Kelompok",
-    "app.breakoutJoinConfirmation.message": "Anda ingin bergabung ?",
-    "app.breakoutJoinConfirmation.confirmLabel": "Bergabung",
-    "app.breakoutJoinConfirmation.confirmDesc": "Sedang menghubungkan ke Ruang Diskusi Kelompok",
-    "app.breakoutJoinConfirmation.dismissLabel": "Batalkan",
-    "app.breakoutJoinConfirmation.dismissDesc": "Tutup dan tolak bergabung dengan Ruang diskusi kelompok",
-    "app.breakoutTimeRemainingMessage": "Waktu tersisa untuk Ruang Diskusi Kelompok: {0}",
-    "app.breakoutWillCloseMessage": "Waktu sudah habis. Ruang Diskusi Kelompok akan segera ditutup.",
-    "app.calculatingBreakoutTimeRemaining": "Menghitung sisa waktu...",
-    "app.audioModal.microphoneLabel": "MIkropon",
-    "app.audioModal.listenOnlyLabel": "Hanya Mendengar",
-    "app.audioModal.audioChoiceLabel": "Bagaimana anda akan terhubung dengan audio?",
-    "app.audioModal.closeLabel": "Tutup",
-    "app.audio.joinAudio": "Terhubung audio",
-    "app.audio.leaveAudio": "Tinggalkan audio",
-    "app.audio.enterSessionLabel": "Masuk sesi",
-    "app.audio.playSoundLabel": "Mainkan audio",
-    "app.audio.backLabel": "Kembali",
-    "app.audio.audioSettings.titleLabel": "Pilih pengaturan audio anda",
-    "app.audio.audioSettings.descriptionLabel": "Mohon diperhatikan, dialog akan muncul pada browser anda, Silakan untuk menekan tombol  menerima berbagi mikropon jika diminta.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Sumber Mikropon",
-    "app.audio.audioSettings.speakerSourceLabel": "Sumber Speaker",
-    "app.audio.audioSettings.microphoneStreamLabel": "Volume stream audio anda",
-    "app.audio.listenOnly.backLabel": "Kembali",
-    "app.audio.listenOnly.closeLabel": "Tutup",
-    "app.error.meeting.ended": "Anda telah keluar dari konferensi",
-    "app.dropdown.close": "Tutup",
-    "app.error.500": "Ops, sepertinya ada kesalahan",
-    "app.error.404": "Tidak ditemukan",
-    "app.error.401": "Tidak memiliki izin",
-    "app.error.403": "Dilarang",
-    "app.error.leaveLabel": "Log in Kembali"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/it_IT.json b/bigbluebutton-html5/private/locales/it_IT.json
deleted file mode 100644
index 6863ff0051..0000000000
--- a/bigbluebutton-html5/private/locales/it_IT.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "app.home.greeting": "Benvenuto {0}! La tua presentazione comincerà a breve...",
-    "app.chat.submitLabel": "Invia Messaggio",
-    "app.chat.errorMinMessageLength": "Il messaggio di {0} carattere(i) è troppo breve",
-    "app.chat.errorMaxMessageLength": "Il messaggio di {0} carattere(i) è troppo lungo",
-    "app.chat.inputLabel": "Messaggio di input per la chat  {0}"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
deleted file mode 100644
index 43a6025d42..0000000000
--- a/bigbluebutton-html5/private/locales/ja.json
+++ /dev/null
@@ -1,379 +0,0 @@
-{
-    "app.home.greeting": "ようこそ {0} さん！ プレゼンテーションは間もなく始まります…",
-    "app.chat.submitLabel": "メッセージを送信",
-    "app.chat.errorMinMessageLength": "このメッセージは文字数が{0}文字足りません",
-    "app.chat.errorMaxMessageLength": "このメッセージは文字数制限を{0}文字超えています",
-    "app.chat.inputLabel": "チャット {0} へメッセージ入力",
-    "app.chat.inputPlaceholder": "メッセージ {0}",
-    "app.chat.titlePublic": "公開チャット",
-    "app.chat.titlePrivate": "{0} との非公開チャット",
-    "app.chat.partnerDisconnected": "{0} は会議から退出しました",
-    "app.chat.closeChatLabel": "{0} を閉じる",
-    "app.chat.hideChatLabel": "{0} を隠す",
-    "app.chat.moreMessages": "下にまだメッセージがあります",
-    "app.chat.dropdown.options": "チャット設定",
-    "app.chat.dropdown.clear": "クリア",
-    "app.chat.dropdown.copy": "コピー",
-    "app.chat.dropdown.save": "セーブ",
-    "app.chat.label": "チャット",
-    "app.chat.emptyLogLabel": "チャットログは空です",
-    "app.chat.clearPublicChatMessage": "チャット履歴はモデレーターにクリアされました",
-    "app.userList.usersTitle": "ユーザー",
-    "app.userList.participantsTitle": "参加者",
-    "app.userList.messagesTitle": "メッセージ",
-    "app.userList.presenter": "プレゼンター",
-    "app.userList.you": "自分",
-    "app.userList.locked": "ロック",
-    "app.userList.label": "ユーザーリスト",
-    "app.userList.toggleCompactView.label": "コンパクトモード",
-    "app.userList.guest": "ゲスト",
-    "app.userList.menuTitleContext": "変更できる設定",
-    "app.userList.chatListItem.unreadSingular": "未読メッセージ：{0}",
-    "app.userList.chatListItem.unreadPlural": "未読メッセージ{0}",
-    "app.userList.menu.chat.label": "チャット",
-    "app.userList.menu.clearStatus.label": "ステータスをクリア",
-    "app.userList.menu.makePresenter.label": "プレゼンターにする",
-    "app.userList.menu.removeUser.label": "ユーザーを取り除く",
-    "app.userList.menu.muteUserAudio.label": "ユーザーをミュートする",
-    "app.userList.menu.unmuteUserAudio.label": "ユーザーのミュートを外す",
-    "app.userList.userAriaLabel": "{0} {1} {2} ステータス {3}",
-    "app.media.label": "メディア",
-    "app.media.screenshare.start": "スクリーンシェアが開始しました",
-    "app.media.screenshare.end": "スクリーンシェアが終了しました",
-    "app.media.screenshare.safariNotSupported": "Safariは画面共有をサポートしていません。FirefoxまたはGoogle Chromeをお使いください。",
-    "app.meeting.ended": "このセッションは終了しました",
-    "app.meeting.endedMessage": "ホームスクリーンに戻ります",
-    "app.presentation.presentationToolbar.prevSlideLabel": "前のスライド",
-    "app.presentation.presentationToolbar.prevSlideDesc": "前のスライド",
-    "app.presentation.presentationToolbar.nextSlideLabel": "次のスライド",
-    "app.presentation.presentationToolbar.nextSlideDesc": "次のスライド",
-    "app.presentation.presentationToolbar.skipSlideLabel": "スライドをスキップ",
-    "app.presentation.presentationToolbar.skipSlideDesc": "表示したいスライドに移動",
-    "app.presentation.presentationToolbar.fitWidthLabel": "幅に合わせる",
-    "app.presentation.presentationToolbar.fitWidthDesc": "幅に合わせる",
-    "app.presentation.presentationToolbar.fitScreenLabel": "画面に合わせる",
-    "app.presentation.presentationToolbar.fitScreenDesc": "画面に合わせる",
-    "app.presentation.presentationToolbar.zoomLabel": "ズーム",
-    "app.presentation.presentationToolbar.zoomDesc": "プレゼンテーションのズームを変更する",
-    "app.presentation.presentationToolbar.goToSlide": "スライド {0}",
-    "app.presentationUploder.title": "プレゼンテーション",
-    "app.presentationUploder.message": "プレゼンターはドキュメントをアップロードすることができます。お勧めのファイル形式はPDFです。",
-    "app.presentationUploder.confirmLabel": "スタート",
-    "app.presentationUploder.confirmDesc": "編集を保存してプレゼンテーションを開始する",
-    "app.presentationUploder.dismissLabel": "キャンセル",
-    "app.presentationUploder.dismissDesc": "編集を保存せずウィンドウを閉じる",
-    "app.presentationUploder.dropzoneLabel": "ファイルをここにドラッグしてアップロードする",
-    "app.presentationUploder.browseFilesLabel": "またはファイルを探す",
-    "app.presentationUploder.fileToUpload": "アップロード待ち...",
-    "app.presentationUploder.currentBadge": "現在",
-    "app.presentationUploder.genericError": "エラーが発生しました",
-    "app.presentationUploder.upload.413": "ファイルが大きすぎます",
-    "app.presentationUploder.conversion.genericConversionStatus": "ファイル変換中...",
-    "app.presentationUploder.conversion.generatingThumbnail": "サムネール作成中...",
-    "app.presentationUploder.conversion.generatedSlides": "スライド作成...",
-    "app.presentationUploder.conversion.generatingSvg": "SVG画像作成中...",
-    "app.presentationUploder.conversion.pageCountExceeded": "エラー：ページ数が多すぎました",
-    "app.presentationUploder.conversion.timeout": "エラー：処理に時間がかかりすぎました",
-    "app.polling.pollingTitle": "投票オプション",
-    "app.polling.pollAnswerLabel": "投票結果{0}",
-    "app.polling.pollAnswerDesc": "この選択肢で「{0}」に投票する",
-    "app.failedMessage": "サーバー接続障害",
-    "app.connectingMessage": "接続中…",
-    "app.waitingMessage": "切断されました。 {0} 秒後に再接続します…",
-    "app.navBar.settingsDropdown.optionsLabel": "オプション",
-    "app.navBar.settingsDropdown.fullscreenLabel": "全画面表示に切替",
-    "app.navBar.settingsDropdown.settingsLabel": "設定を開く",
-    "app.navBar.settingsDropdown.aboutLabel": "アバウト",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "ログアウト",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "全画面表示解除",
-    "app.navBar.settingsDropdown.fullscreenDesc": "設定メニューを全画面表示",
-    "app.navBar.settingsDropdown.settingsDesc": "一般の設定を変更",
-    "app.navBar.settingsDropdown.aboutDesc": "クライアントに関する情報を表示",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "会議から退室",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "全画面表示解除",
-    "app.navBar.settingsDropdown.hotkeysLabel": "ショートカット",
-    "app.navBar.settingsDropdown.hotkeysDesc": "ショートカットを押してください",
-    "app.navBar.userListToggleBtnLabel": "ユーザーリストのトグル",
-    "app.navBar.toggleUserList.ariaLabel": "ユーザーリストのトグル",
-    "app.navBar.toggleUserList.newMessages": "メッセージを通知する",
-    "app.navBar.recording": "このセッションは録画されています",
-    "app.navBar.recording.on": "録画中",
-    "app.navBar.recording.off": "録画されていません",
-    "app.leaveConfirmation.title": "セッションから離れる",
-    "app.leaveConfirmation.message": "この会議から退室しますか？",
-    "app.leaveConfirmation.confirmLabel": "退室",
-    "app.leaveConfirmation.confirmDesc": "自分を会議からログアウトさせる",
-    "app.leaveConfirmation.dismissLabel": "キャンセル",
-    "app.leaveConfirmation.dismissDesc": "退出確認を破棄し閉じる",
-    "app.leaveConfirmation.endMeetingLabel": "同意してセッションを終了する",
-    "app.leaveConfirmation.endMeetingAriaLabel": "退室してセッションを終了する",
-    "app.leaveConfirmation.endMeetingDesc": "会議を閉じて終了させる",
-    "app.about.title": "アバウト",
-    "app.about.version": "Client Build:",
-    "app.about.copyright": "Copyright:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "キャンセル",
-    "app.about.dismissDesc": "クライアント情報を閉じる",
-    "app.actionsBar.changeStatusLabel": "ステータス変更",
-    "app.actionsBar.muteLabel": "ミュート",
-    "app.actionsBar.unmuteLabel": "ミュート解除",
-    "app.actionsBar.camOffLabel": "カメラオフ",
-    "app.actionsBar.raiseLabel": "手をあげる",
-    "app.actionsBar.label": "アクションメニュー",
-    "app.submenu.application.applicationSectionTitle": "アプリケーション",
-    "app.submenu.application.fontSizeControlLabel": "フォントサイズ",
-    "app.submenu.application.increaseFontBtnLabel": "アプリケーションのフォントサイズを大きくする",
-    "app.submenu.application.decreaseFontBtnLabel": "アプリケーションのフォントサイズを小さくする",
-    "app.submenu.application.languageLabel": "アプリケーション言語",
-    "app.submenu.application.ariaLanguageLabel": "アプリケーション言語を変更",
-    "app.submenu.application.languageOptionLabel": "言語を選択",
-    "app.submenu.application.noLocaleOptionLabel": "アクティブなロケールがありません",
-    "app.submenu.audio.micSourceLabel": "マイクのソース",
-    "app.submenu.audio.speakerSourceLabel": "スピーカーのソース",
-    "app.submenu.audio.streamVolumeLabel": "音声ストリームの音量",
-    "app.submenu.video.title": "ビデオ",
-    "app.submenu.video.videoSourceLabel": "ソースを表示",
-    "app.submenu.video.videoOptionLabel": "ソース表示を選択",
-    "app.submenu.video.videoQualityLabel": "ビデオ品質",
-    "app.submenu.video.qualityOptionLabel": "ビデオ品質を選択",
-    "app.submenu.video.participantsCamLabel": "参加者のウェブカメラを見ています",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "クローズドキャプション",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "所有権をとる",
-    "app.submenu.closedCaptions.languageLabel": "言語",
-    "app.submenu.closedCaptions.localeOptionLabel": "言語を選択",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "アクティブなロケールがありません",
-    "app.submenu.closedCaptions.fontFamilyLabel": "フォントファミリー",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "フォントファミリーを選択",
-    "app.submenu.closedCaptions.fontSizeLabel": "フォントサイズ",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "フォントサイズを選択",
-    "app.submenu.closedCaptions.backgroundColorLabel": "背景色",
-    "app.submenu.closedCaptions.fontColorLabel": "フォント色",
-    "app.submenu.participants.muteAllLabel": "プレゼンター以外の全員をミュート",
-    "app.submenu.participants.lockAllLabel": "すべての参加者をロック",
-    "app.submenu.participants.lockItemLabel": "参加者 {0}",
-    "app.submenu.participants.lockMicDesc": "ロック中のすべての参加者のマイクを無効化",
-    "app.submenu.participants.lockCamDesc": "ロック中のすべての参加者のウェブカメラを無効化",
-    "app.submenu.participants.lockPublicChatDesc": "ロック中のすべての参加者の公開チャットを無効化",
-    "app.submenu.participants.lockPrivateChatDesc": "ロック中のすべての参加者の非公開チャットを無効化",
-    "app.submenu.participants.lockLayoutDesc": "ロック中のすべての参加者のレイアウトを固定",
-    "app.submenu.participants.lockMicAriaLabel": "マイクのロック",
-    "app.submenu.participants.lockCamAriaLabel": "ウェブカメラのロック",
-    "app.submenu.participants.lockPublicChatAriaLabel": "公開チャットのロック",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "非公開チャットのロック",
-    "app.submenu.participants.lockLayoutAriaLabel": "レイアウトのロック",
-    "app.submenu.participants.lockMicLabel": "マイク",
-    "app.submenu.participants.lockCamLabel": "ウェブカメラ",
-    "app.submenu.participants.lockPublicChatLabel": "公開チャット",
-    "app.submenu.participants.lockPrivateChatLabel": "非公開チャット",
-    "app.submenu.participants.lockLayoutLabel": "レイアウト",
-    "app.settings.applicationTab.label": "アプリケーション",
-    "app.settings.audioTab.label": "音声",
-    "app.settings.videoTab.label": "ビデオ",
-    "app.settings.closedcaptionTab.label": "クローズドキャプション",
-    "app.settings.usersTab.label": "参加者",
-    "app.settings.main.label": "設定",
-    "app.settings.main.cancel.label": "キャンセル",
-    "app.settings.main.cancel.label.description": "変更を破棄し設定メニューを閉じる",
-    "app.settings.main.save.label": "保存",
-    "app.settings.main.save.label.description": "変更を保存し設定メニューを閉じる",
-    "app.settings.dataSavingTab.label": "データ量調整",
-    "app.settings.dataSavingTab.webcam": "カメラを許可する",
-    "app.settings.dataSavingTab.screenShare": "画面共有を許可する",
-    "app.settings.dataSavingTab.description": "データ量を下げるには設定を変更してください",
-    "app.switch.onLabel": "オン",
-    "app.switch.offLabel": "オフ",
-    "app.actionsBar.actionsDropdown.actionsLabel": "アクション",
-    "app.actionsBar.actionsDropdown.presentationLabel": "プレゼンテーションをアップロード",
-    "app.actionsBar.actionsDropdown.initPollLabel": "投票を初期化",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "画面を共有する",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有を止める",
-    "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
-    "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "との画面共有を止める",
-    "app.actionsBar.actionsDropdown.startRecording": "録画開始",
-    "app.actionsBar.actionsDropdown.stopRecording": "録画停止",
-    "app.actionsBar.emojiMenu.awayLabel": "不在",
-    "app.actionsBar.emojiMenu.awayDesc": "スタータスを「不在」にする",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "挙手",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "質問がありましたら挙手してください",
-    "app.actionsBar.emojiMenu.neutralLabel": "普通",
-    "app.actionsBar.emojiMenu.neutralDesc": "ステータスを「普通」にする",
-    "app.actionsBar.emojiMenu.confusedLabel": "わけがわからない",
-    "app.actionsBar.emojiMenu.confusedDesc": "ステータスを「わけがわからない」にする",
-    "app.actionsBar.emojiMenu.sadLabel": "悲しい",
-    "app.actionsBar.emojiMenu.sadDesc": "ステータスを「悲しい」にする",
-    "app.actionsBar.emojiMenu.happyLabel": "ハッピー",
-    "app.actionsBar.emojiMenu.happyDesc": "ステータスを「ハッピー」にする",
-    "app.actionsBar.emojiMenu.noneLabel": "ステータスをクリアする",
-    "app.actionsBar.emojiMenu.noneDesc": "ステータスをクリアする",
-    "app.actionsBar.emojiMenu.applauseLabel": "拍手",
-    "app.actionsBar.emojiMenu.applauseDesc": "ステータスを「拍手」にする",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "いいね",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "ステータスを「いいね」にする",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "ダメ",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "ステータスを「ダメ」にする",
-    "app.actionsBar.currentStatusDesc": "現在のステータス {0}",
-    "app.audioNotification.audioFailedError1001": "エラー1001：WebSocketの接続が切れました",
-    "app.audioNotification.audioFailedError1002": "エラー1002：WebSocketに接続できませんでした",
-    "app.audioNotification.audioFailedError1003": "エラー1003：ブラウザのバージョンはサポートされていません",
-    "app.audioNotification.audioFailedError1004": "エラー1004：通話失敗",
-    "app.audioNotification.audioFailedError1005": "エラー1005：問題が発生し通話が終了しました",
-    "app.audioNotification.audioFailedError1006": "エラー1006：通話がタイムアウトしました",
-    "app.audioNotification.audioFailedError1007": "エラー1007：ICE接続失敗",
-    "app.audioNotification.audioFailedError1008": "エラー1008：トランスファー失敗",
-    "app.audioNotification.audioFailedError1009": "エラー1009：STUN/TURNサーバー情報にアクセスできませんでした",
-    "app.audioNotification.audioFailedError1010": "エラー1010：ICE接続がタイムアウトしました",
-    "app.audioNotification.audioFailedError1011": "エラー1011：ICEギャザリングがタイムアウトしました",
-    "app.audioNotification.audioFailedMessage": "音声接続に失敗しました",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia に失敗。安全な接続だけが許可されます",
-    "app.audioNotification.closeLabel": "閉じる",
-    "app.breakoutJoinConfirmation.title": "小会議室に参加",
-    "app.breakoutJoinConfirmation.message": "参加しますか",
-    "app.breakoutJoinConfirmation.confirmLabel": "参加",
-    "app.breakoutJoinConfirmation.confirmDesc": "自分を小会議室に参加させる",
-    "app.breakoutJoinConfirmation.dismissLabel": "キャンセル",
-    "app.breakoutJoinConfirmation.dismissDesc": "小会議室の参加を拒否し閉じる",
-    "app.breakoutTimeRemainingMessage": "小会議室残り時間： {0}",
-    "app.breakoutWillCloseMessage": "終了時間。間もなく小会議室を閉じます",
-    "app.calculatingBreakoutTimeRemaining": "残り時間計算中…",
-    "app.audioModal.microphoneLabel": "マイク",
-    "app.audioModal.listenOnlyLabel": "聴講のみ",
-    "app.audioModal.audioChoiceLabel": "音声はどうしますか？",
-    "app.audioModal.iOSBrowser": "音声、ビデオがサポートされていません",
-    "app.audioModal.iOSErrorDescription": "iOSのChromeでは、音声、  ビデオは現在サポートされていません",
-    "app.audioModal.iOSErrorRecommendation": "Safari iOSをお使いください",
-    "app.audioModal.audioChoiceDesc": "音声はどうしますか？",
-    "app.audioModal.closeLabel": "閉じる",
-    "app.audioModal.yes": "はい",
-    "app.audioModal.no": "いいえ",
-    "app.audioModal.yes.arialabel" : "エコーが聞こえます",
-    "app.audioModal.no.arialabel" : "エコーが聞こえません",
-    "app.audioModal.echoTestTitle": "これはエコーテストです。マイクに話すとエコーが聞こえますか？",
-    "app.audioModal.settingsTitle": "オーディオ設定を変更する",
-    "app.audioModal.helpTitle": "デバイスとの接続ができませんでした",
-    "app.audioModal.helpText": "このサイトにマイクのアクセスを許可しましたか？ページを開く際にポップアップが出てくるはずです。アクセスを許可してください。それでも問題が続きましたら、ブラウザの設定を確認してみてください。",
-    "app.audioModal.connecting": "接続中",
-    "app.audioModal.connectingEchoTest": "エコーテストに接続中",
-    "app.audioManager.joinedAudio": "セッションに参加しました",
-    "app.audioManager.joinedEcho": "エコーテストに入りました",
-    "app.audioManager.leftAudio": "セッションから退席しました",
-    "app.audioManager.genericError": "エラー：もう一度やり直してください",
-    "app.audioManager.connectionError": "エラー：接続エラー",
-    "app.audioManager.requestTimeout": "エラー：リクエストに時間がかかりすぎました",
-    "app.audioManager.invalidTarget": "エラー：リクエスト先がいませんでした",
-    "app.audioManager.mediaError": "エラー：デバイスが見つかりませんでした",
-    "app.audio.joinAudio": "音声で参加",
-    "app.audio.leaveAudio": "音声をやめる",
-    "app.audio.enterSessionLabel": "セッションに入る",
-    "app.audio.playSoundLabel": "音を出す",
-    "app.audio.backLabel": "戻る",
-    "app.audio.audioSettings.titleLabel": "音声設定を選択",
-    "app.audio.audioSettings.descriptionLabel": "マイク共有の許可を求めるダイアログがブラウザ内に現われますのでご了承ください。",
-    "app.audio.audioSettings.microphoneSourceLabel": "マイクのソース",
-    "app.audio.audioSettings.speakerSourceLabel": "スピーカーのソース",
-    "app.audio.audioSettings.microphoneStreamLabel": "音声ストリームの音量",
-    "app.audio.audioSettings.retryLabel": "再試行",
-    "app.audio.listenOnly.backLabel": "戻る",
-    "app.audio.listenOnly.closeLabel": "閉じる",
-    "app.audio.permissionsOverlay.title": "デバイスのアクセスを許可する",
-    "app.audio.permissionsOverlay.hint": "セッションに参加するには、デバイスのアクセスが必要になります",
-    "app.error.removed": "セッションから退室しました",
-    "app.error.meeting.ended": "会議からログアウトしました",
-    "app.dropdown.close": "閉じる",
-    "app.error.500": "問題が起こりました",
-    "app.error.404": "見つかりません",
-    "app.error.401": "権限がありません",
-    "app.error.403": "禁止されています",
-    "app.error.leaveLabel": "再ログイン",
-    "app.guest.waiting": "主催者の承認待ち",
-    "app.toast.breakoutRoomEnded": "The breakout room ended. オーディオで参加してください",
-    "app.notification.recordingStart": "録画が開始しました",
-    "app.notification.recordingStop": "録画が終了しました",
-    "app.shortcut-help.title": "ショートカット",
-    "app.shortcut-help.accessKeyNotAvailable": "アクセスキーがありません",
-    "app.shortcut-help.comboLabel": "コンボ",
-    "app.shortcut-help.functionLabel": "機能",
-    "app.shortcut-help.closeLabel": "閉じる",
-    "app.shortcut-help.closeDesc": "ショートカットボックスを閉じる",
-    "app.shortcut-help.openOptions": "設定を開く",
-    "app.shortcut-help.toggleUserList": "ユーザーリストトグル",
-    "app.shortcut-help.toggleMute": "ミュート/ミュート解除",
-    "app.shortcut-help.togglePublicChat": "公開チャットトグル(ユーザーリストが開いている場合のみ)",
-    "app.shortcut-help.hidePrivateChat": "個人チャットを隠す",
-    "app.shortcut-help.closePrivateChat": "個人チャットを閉じる",
-    "app.shortcut-help.openActions": "アクションメニューを開く",
-    "app.shortcut-help.openStatus": "ステータスメニューを開く",
-    "app.video.joinVideo": "カメラ共有",
-    "app.video.leaveVideo": "カメラ共有解除",
-    "app.video.iceCandidateError": "アイス候補者追加エラー",
-    "app.video.permissionError": "カメラ共有エラー。設定を確認してください",
-    "app.video.sharingError": "カメラ共有エラー",
-    "app.video.notFoundError": "カメラが見つかりませんでした。接続を確認してください",
-    "app.video.notAllowed": "カメラを共有する権限がありませんでした。ブラウザの設定を確認してください",
-    "app.video.notSupportedError": "カメラは安全なページでしか共有できません。SSL証明書が有効か確かめてください",
-    "app.video.notReadableError": "カメラの映像を受け取れませんでした。他のプログラムが使ってないことを確認してください",
-    "app.video.swapCam": "スワップ",
-    "app.video.swapCamDesc": "カメラの向きを反転する",
-    "app.video.videoMenu": "ビデオメニュー",
-    "app.video.videoMenuDisabled": "設定でビデオメニューがブロックされています",
-    "app.video.videoMenuDesc": "設定でビデオメニューがブロックされています",
-    "app.video.chromeExtensionError": "インストールしてください",
-    "app.video.chromeExtensionErrorLink": "このChrome拡張機能",
-    "app.video.stats.title": "接続情報",
-    "app.video.stats.packetsReceived": "パケット受信",
-    "app.video.stats.packetsSent": "パケット送信",
-    "app.video.stats.packetsLost": "エラーパケット",
-    "app.video.stats.bitrate": "ビットレート",
-    "app.video.stats.lostPercentage": "トータルパーセンテージ（エラー）",
-    "app.video.stats.lostRecentPercentage": "最新のパーセンテージ（エラー）",
-    "app.video.stats.dimensions": "解像度",
-    "app.video.stats.codec": "コーデック",
-    "app.video.stats.decodeDelay": "遅延（ディコード）",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "エンコードの使用状況",
-    "app.video.stats.currentDelay": "遅延（最新）",
-
-    "app.meeting.endNotification.ok.label": "OK",
-    "app.whiteboard.toolbar.tools": "ツール",
-    "app.whiteboard.toolbar.tools.pointer": "ポインタ",
-    "app.whiteboard.toolbar.tools.pencil": "ペン",
-    "app.whiteboard.toolbar.tools.rectangle": "長方形",
-    "app.whiteboard.toolbar.tools.triangle": "三角形",
-    "app.whiteboard.toolbar.tools.ellipse": "楕円",
-    "app.whiteboard.toolbar.tools.line": "線",
-    "app.whiteboard.toolbar.tools.text": "テキスト",
-    "app.whiteboard.toolbar.thickness": "線の太さ",
-    "app.whiteboard.toolbar.thicknessDisabled": "線の太さは変えられません",
-    "app.whiteboard.toolbar.color": "色",
-    "app.whiteboard.toolbar.colorDisabled": "色は変えられません",
-    "app.whiteboard.toolbar.color.black": "黒",
-    "app.whiteboard.toolbar.color.white": "白",
-    "app.whiteboard.toolbar.color.red": "赤",
-    "app.whiteboard.toolbar.color.orange": "オレンジ",
-    "app.whiteboard.toolbar.color.eletricLime": "黄緑",
-    "app.whiteboard.toolbar.color.lime": "ライム",
-    "app.whiteboard.toolbar.color.cyan": "シアン",
-    "app.whiteboard.toolbar.color.dodgerBlue": "ドジャーブルー",
-    "app.whiteboard.toolbar.color.blue": "青",
-    "app.whiteboard.toolbar.color.violet": "紫",
-    "app.whiteboard.toolbar.color.magenta": "マゼンタ",
-    "app.whiteboard.toolbar.color.silver": "シルバー",
-    "app.whiteboard.toolbar.undo": "取り消す",
-    "app.whiteboard.toolbar.clear": "全て取り消す",
-    "app.whiteboard.toolbar.multiUserOn": "マルチユーザーモードにする",
-    "app.whiteboard.toolbar.multiUserOff": "マルチユーザーモードを外す",
-    "app.whiteboard.toolbar.fontSize": "フォントサイズ",
-    "app.feedback.title": "セッションからログアウトしました",
-    "app.feedback.subtitle": "BigBlueButtonの感想は？ (任意)",
-    "app.feedback.textarea": "BigBlueButtonに何が欲しいですか?",
-    "app.feedback.sendFeedback": "フィードバックを送る",
-    "app.feedback.sendFeedbackDesc": "フィードバックを送ってセッションから退席する",
-    "app.videoDock.webcamFocusLabel": "フォーカス",
-    "app.videoDock.webcamFocusDesc": "選択したカメラにフォーカスする",
-    "app.videoDock.webcamUnfocusLabel": "フォーカスを外す",
-    "app.videoDock.webcamUnfocusDesc": "選択したカメラのフォーカスを外す"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/ja_JP.json b/bigbluebutton-html5/private/locales/ja_JP.json
deleted file mode 100644
index 43a6025d42..0000000000
--- a/bigbluebutton-html5/private/locales/ja_JP.json
+++ /dev/null
@@ -1,379 +0,0 @@
-{
-    "app.home.greeting": "ようこそ {0} さん！ プレゼンテーションは間もなく始まります…",
-    "app.chat.submitLabel": "メッセージを送信",
-    "app.chat.errorMinMessageLength": "このメッセージは文字数が{0}文字足りません",
-    "app.chat.errorMaxMessageLength": "このメッセージは文字数制限を{0}文字超えています",
-    "app.chat.inputLabel": "チャット {0} へメッセージ入力",
-    "app.chat.inputPlaceholder": "メッセージ {0}",
-    "app.chat.titlePublic": "公開チャット",
-    "app.chat.titlePrivate": "{0} との非公開チャット",
-    "app.chat.partnerDisconnected": "{0} は会議から退出しました",
-    "app.chat.closeChatLabel": "{0} を閉じる",
-    "app.chat.hideChatLabel": "{0} を隠す",
-    "app.chat.moreMessages": "下にまだメッセージがあります",
-    "app.chat.dropdown.options": "チャット設定",
-    "app.chat.dropdown.clear": "クリア",
-    "app.chat.dropdown.copy": "コピー",
-    "app.chat.dropdown.save": "セーブ",
-    "app.chat.label": "チャット",
-    "app.chat.emptyLogLabel": "チャットログは空です",
-    "app.chat.clearPublicChatMessage": "チャット履歴はモデレーターにクリアされました",
-    "app.userList.usersTitle": "ユーザー",
-    "app.userList.participantsTitle": "参加者",
-    "app.userList.messagesTitle": "メッセージ",
-    "app.userList.presenter": "プレゼンター",
-    "app.userList.you": "自分",
-    "app.userList.locked": "ロック",
-    "app.userList.label": "ユーザーリスト",
-    "app.userList.toggleCompactView.label": "コンパクトモード",
-    "app.userList.guest": "ゲスト",
-    "app.userList.menuTitleContext": "変更できる設定",
-    "app.userList.chatListItem.unreadSingular": "未読メッセージ：{0}",
-    "app.userList.chatListItem.unreadPlural": "未読メッセージ{0}",
-    "app.userList.menu.chat.label": "チャット",
-    "app.userList.menu.clearStatus.label": "ステータスをクリア",
-    "app.userList.menu.makePresenter.label": "プレゼンターにする",
-    "app.userList.menu.removeUser.label": "ユーザーを取り除く",
-    "app.userList.menu.muteUserAudio.label": "ユーザーをミュートする",
-    "app.userList.menu.unmuteUserAudio.label": "ユーザーのミュートを外す",
-    "app.userList.userAriaLabel": "{0} {1} {2} ステータス {3}",
-    "app.media.label": "メディア",
-    "app.media.screenshare.start": "スクリーンシェアが開始しました",
-    "app.media.screenshare.end": "スクリーンシェアが終了しました",
-    "app.media.screenshare.safariNotSupported": "Safariは画面共有をサポートしていません。FirefoxまたはGoogle Chromeをお使いください。",
-    "app.meeting.ended": "このセッションは終了しました",
-    "app.meeting.endedMessage": "ホームスクリーンに戻ります",
-    "app.presentation.presentationToolbar.prevSlideLabel": "前のスライド",
-    "app.presentation.presentationToolbar.prevSlideDesc": "前のスライド",
-    "app.presentation.presentationToolbar.nextSlideLabel": "次のスライド",
-    "app.presentation.presentationToolbar.nextSlideDesc": "次のスライド",
-    "app.presentation.presentationToolbar.skipSlideLabel": "スライドをスキップ",
-    "app.presentation.presentationToolbar.skipSlideDesc": "表示したいスライドに移動",
-    "app.presentation.presentationToolbar.fitWidthLabel": "幅に合わせる",
-    "app.presentation.presentationToolbar.fitWidthDesc": "幅に合わせる",
-    "app.presentation.presentationToolbar.fitScreenLabel": "画面に合わせる",
-    "app.presentation.presentationToolbar.fitScreenDesc": "画面に合わせる",
-    "app.presentation.presentationToolbar.zoomLabel": "ズーム",
-    "app.presentation.presentationToolbar.zoomDesc": "プレゼンテーションのズームを変更する",
-    "app.presentation.presentationToolbar.goToSlide": "スライド {0}",
-    "app.presentationUploder.title": "プレゼンテーション",
-    "app.presentationUploder.message": "プレゼンターはドキュメントをアップロードすることができます。お勧めのファイル形式はPDFです。",
-    "app.presentationUploder.confirmLabel": "スタート",
-    "app.presentationUploder.confirmDesc": "編集を保存してプレゼンテーションを開始する",
-    "app.presentationUploder.dismissLabel": "キャンセル",
-    "app.presentationUploder.dismissDesc": "編集を保存せずウィンドウを閉じる",
-    "app.presentationUploder.dropzoneLabel": "ファイルをここにドラッグしてアップロードする",
-    "app.presentationUploder.browseFilesLabel": "またはファイルを探す",
-    "app.presentationUploder.fileToUpload": "アップロード待ち...",
-    "app.presentationUploder.currentBadge": "現在",
-    "app.presentationUploder.genericError": "エラーが発生しました",
-    "app.presentationUploder.upload.413": "ファイルが大きすぎます",
-    "app.presentationUploder.conversion.genericConversionStatus": "ファイル変換中...",
-    "app.presentationUploder.conversion.generatingThumbnail": "サムネール作成中...",
-    "app.presentationUploder.conversion.generatedSlides": "スライド作成...",
-    "app.presentationUploder.conversion.generatingSvg": "SVG画像作成中...",
-    "app.presentationUploder.conversion.pageCountExceeded": "エラー：ページ数が多すぎました",
-    "app.presentationUploder.conversion.timeout": "エラー：処理に時間がかかりすぎました",
-    "app.polling.pollingTitle": "投票オプション",
-    "app.polling.pollAnswerLabel": "投票結果{0}",
-    "app.polling.pollAnswerDesc": "この選択肢で「{0}」に投票する",
-    "app.failedMessage": "サーバー接続障害",
-    "app.connectingMessage": "接続中…",
-    "app.waitingMessage": "切断されました。 {0} 秒後に再接続します…",
-    "app.navBar.settingsDropdown.optionsLabel": "オプション",
-    "app.navBar.settingsDropdown.fullscreenLabel": "全画面表示に切替",
-    "app.navBar.settingsDropdown.settingsLabel": "設定を開く",
-    "app.navBar.settingsDropdown.aboutLabel": "アバウト",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "ログアウト",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "全画面表示解除",
-    "app.navBar.settingsDropdown.fullscreenDesc": "設定メニューを全画面表示",
-    "app.navBar.settingsDropdown.settingsDesc": "一般の設定を変更",
-    "app.navBar.settingsDropdown.aboutDesc": "クライアントに関する情報を表示",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "会議から退室",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "全画面表示解除",
-    "app.navBar.settingsDropdown.hotkeysLabel": "ショートカット",
-    "app.navBar.settingsDropdown.hotkeysDesc": "ショートカットを押してください",
-    "app.navBar.userListToggleBtnLabel": "ユーザーリストのトグル",
-    "app.navBar.toggleUserList.ariaLabel": "ユーザーリストのトグル",
-    "app.navBar.toggleUserList.newMessages": "メッセージを通知する",
-    "app.navBar.recording": "このセッションは録画されています",
-    "app.navBar.recording.on": "録画中",
-    "app.navBar.recording.off": "録画されていません",
-    "app.leaveConfirmation.title": "セッションから離れる",
-    "app.leaveConfirmation.message": "この会議から退室しますか？",
-    "app.leaveConfirmation.confirmLabel": "退室",
-    "app.leaveConfirmation.confirmDesc": "自分を会議からログアウトさせる",
-    "app.leaveConfirmation.dismissLabel": "キャンセル",
-    "app.leaveConfirmation.dismissDesc": "退出確認を破棄し閉じる",
-    "app.leaveConfirmation.endMeetingLabel": "同意してセッションを終了する",
-    "app.leaveConfirmation.endMeetingAriaLabel": "退室してセッションを終了する",
-    "app.leaveConfirmation.endMeetingDesc": "会議を閉じて終了させる",
-    "app.about.title": "アバウト",
-    "app.about.version": "Client Build:",
-    "app.about.copyright": "Copyright:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "キャンセル",
-    "app.about.dismissDesc": "クライアント情報を閉じる",
-    "app.actionsBar.changeStatusLabel": "ステータス変更",
-    "app.actionsBar.muteLabel": "ミュート",
-    "app.actionsBar.unmuteLabel": "ミュート解除",
-    "app.actionsBar.camOffLabel": "カメラオフ",
-    "app.actionsBar.raiseLabel": "手をあげる",
-    "app.actionsBar.label": "アクションメニュー",
-    "app.submenu.application.applicationSectionTitle": "アプリケーション",
-    "app.submenu.application.fontSizeControlLabel": "フォントサイズ",
-    "app.submenu.application.increaseFontBtnLabel": "アプリケーションのフォントサイズを大きくする",
-    "app.submenu.application.decreaseFontBtnLabel": "アプリケーションのフォントサイズを小さくする",
-    "app.submenu.application.languageLabel": "アプリケーション言語",
-    "app.submenu.application.ariaLanguageLabel": "アプリケーション言語を変更",
-    "app.submenu.application.languageOptionLabel": "言語を選択",
-    "app.submenu.application.noLocaleOptionLabel": "アクティブなロケールがありません",
-    "app.submenu.audio.micSourceLabel": "マイクのソース",
-    "app.submenu.audio.speakerSourceLabel": "スピーカーのソース",
-    "app.submenu.audio.streamVolumeLabel": "音声ストリームの音量",
-    "app.submenu.video.title": "ビデオ",
-    "app.submenu.video.videoSourceLabel": "ソースを表示",
-    "app.submenu.video.videoOptionLabel": "ソース表示を選択",
-    "app.submenu.video.videoQualityLabel": "ビデオ品質",
-    "app.submenu.video.qualityOptionLabel": "ビデオ品質を選択",
-    "app.submenu.video.participantsCamLabel": "参加者のウェブカメラを見ています",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "クローズドキャプション",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "所有権をとる",
-    "app.submenu.closedCaptions.languageLabel": "言語",
-    "app.submenu.closedCaptions.localeOptionLabel": "言語を選択",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "アクティブなロケールがありません",
-    "app.submenu.closedCaptions.fontFamilyLabel": "フォントファミリー",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "フォントファミリーを選択",
-    "app.submenu.closedCaptions.fontSizeLabel": "フォントサイズ",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "フォントサイズを選択",
-    "app.submenu.closedCaptions.backgroundColorLabel": "背景色",
-    "app.submenu.closedCaptions.fontColorLabel": "フォント色",
-    "app.submenu.participants.muteAllLabel": "プレゼンター以外の全員をミュート",
-    "app.submenu.participants.lockAllLabel": "すべての参加者をロック",
-    "app.submenu.participants.lockItemLabel": "参加者 {0}",
-    "app.submenu.participants.lockMicDesc": "ロック中のすべての参加者のマイクを無効化",
-    "app.submenu.participants.lockCamDesc": "ロック中のすべての参加者のウェブカメラを無効化",
-    "app.submenu.participants.lockPublicChatDesc": "ロック中のすべての参加者の公開チャットを無効化",
-    "app.submenu.participants.lockPrivateChatDesc": "ロック中のすべての参加者の非公開チャットを無効化",
-    "app.submenu.participants.lockLayoutDesc": "ロック中のすべての参加者のレイアウトを固定",
-    "app.submenu.participants.lockMicAriaLabel": "マイクのロック",
-    "app.submenu.participants.lockCamAriaLabel": "ウェブカメラのロック",
-    "app.submenu.participants.lockPublicChatAriaLabel": "公開チャットのロック",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "非公開チャットのロック",
-    "app.submenu.participants.lockLayoutAriaLabel": "レイアウトのロック",
-    "app.submenu.participants.lockMicLabel": "マイク",
-    "app.submenu.participants.lockCamLabel": "ウェブカメラ",
-    "app.submenu.participants.lockPublicChatLabel": "公開チャット",
-    "app.submenu.participants.lockPrivateChatLabel": "非公開チャット",
-    "app.submenu.participants.lockLayoutLabel": "レイアウト",
-    "app.settings.applicationTab.label": "アプリケーション",
-    "app.settings.audioTab.label": "音声",
-    "app.settings.videoTab.label": "ビデオ",
-    "app.settings.closedcaptionTab.label": "クローズドキャプション",
-    "app.settings.usersTab.label": "参加者",
-    "app.settings.main.label": "設定",
-    "app.settings.main.cancel.label": "キャンセル",
-    "app.settings.main.cancel.label.description": "変更を破棄し設定メニューを閉じる",
-    "app.settings.main.save.label": "保存",
-    "app.settings.main.save.label.description": "変更を保存し設定メニューを閉じる",
-    "app.settings.dataSavingTab.label": "データ量調整",
-    "app.settings.dataSavingTab.webcam": "カメラを許可する",
-    "app.settings.dataSavingTab.screenShare": "画面共有を許可する",
-    "app.settings.dataSavingTab.description": "データ量を下げるには設定を変更してください",
-    "app.switch.onLabel": "オン",
-    "app.switch.offLabel": "オフ",
-    "app.actionsBar.actionsDropdown.actionsLabel": "アクション",
-    "app.actionsBar.actionsDropdown.presentationLabel": "プレゼンテーションをアップロード",
-    "app.actionsBar.actionsDropdown.initPollLabel": "投票を初期化",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "画面を共有する",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有を止める",
-    "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
-    "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "との画面共有を止める",
-    "app.actionsBar.actionsDropdown.startRecording": "録画開始",
-    "app.actionsBar.actionsDropdown.stopRecording": "録画停止",
-    "app.actionsBar.emojiMenu.awayLabel": "不在",
-    "app.actionsBar.emojiMenu.awayDesc": "スタータスを「不在」にする",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "挙手",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "質問がありましたら挙手してください",
-    "app.actionsBar.emojiMenu.neutralLabel": "普通",
-    "app.actionsBar.emojiMenu.neutralDesc": "ステータスを「普通」にする",
-    "app.actionsBar.emojiMenu.confusedLabel": "わけがわからない",
-    "app.actionsBar.emojiMenu.confusedDesc": "ステータスを「わけがわからない」にする",
-    "app.actionsBar.emojiMenu.sadLabel": "悲しい",
-    "app.actionsBar.emojiMenu.sadDesc": "ステータスを「悲しい」にする",
-    "app.actionsBar.emojiMenu.happyLabel": "ハッピー",
-    "app.actionsBar.emojiMenu.happyDesc": "ステータスを「ハッピー」にする",
-    "app.actionsBar.emojiMenu.noneLabel": "ステータスをクリアする",
-    "app.actionsBar.emojiMenu.noneDesc": "ステータスをクリアする",
-    "app.actionsBar.emojiMenu.applauseLabel": "拍手",
-    "app.actionsBar.emojiMenu.applauseDesc": "ステータスを「拍手」にする",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "いいね",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "ステータスを「いいね」にする",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "ダメ",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "ステータスを「ダメ」にする",
-    "app.actionsBar.currentStatusDesc": "現在のステータス {0}",
-    "app.audioNotification.audioFailedError1001": "エラー1001：WebSocketの接続が切れました",
-    "app.audioNotification.audioFailedError1002": "エラー1002：WebSocketに接続できませんでした",
-    "app.audioNotification.audioFailedError1003": "エラー1003：ブラウザのバージョンはサポートされていません",
-    "app.audioNotification.audioFailedError1004": "エラー1004：通話失敗",
-    "app.audioNotification.audioFailedError1005": "エラー1005：問題が発生し通話が終了しました",
-    "app.audioNotification.audioFailedError1006": "エラー1006：通話がタイムアウトしました",
-    "app.audioNotification.audioFailedError1007": "エラー1007：ICE接続失敗",
-    "app.audioNotification.audioFailedError1008": "エラー1008：トランスファー失敗",
-    "app.audioNotification.audioFailedError1009": "エラー1009：STUN/TURNサーバー情報にアクセスできませんでした",
-    "app.audioNotification.audioFailedError1010": "エラー1010：ICE接続がタイムアウトしました",
-    "app.audioNotification.audioFailedError1011": "エラー1011：ICEギャザリングがタイムアウトしました",
-    "app.audioNotification.audioFailedMessage": "音声接続に失敗しました",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia に失敗。安全な接続だけが許可されます",
-    "app.audioNotification.closeLabel": "閉じる",
-    "app.breakoutJoinConfirmation.title": "小会議室に参加",
-    "app.breakoutJoinConfirmation.message": "参加しますか",
-    "app.breakoutJoinConfirmation.confirmLabel": "参加",
-    "app.breakoutJoinConfirmation.confirmDesc": "自分を小会議室に参加させる",
-    "app.breakoutJoinConfirmation.dismissLabel": "キャンセル",
-    "app.breakoutJoinConfirmation.dismissDesc": "小会議室の参加を拒否し閉じる",
-    "app.breakoutTimeRemainingMessage": "小会議室残り時間： {0}",
-    "app.breakoutWillCloseMessage": "終了時間。間もなく小会議室を閉じます",
-    "app.calculatingBreakoutTimeRemaining": "残り時間計算中…",
-    "app.audioModal.microphoneLabel": "マイク",
-    "app.audioModal.listenOnlyLabel": "聴講のみ",
-    "app.audioModal.audioChoiceLabel": "音声はどうしますか？",
-    "app.audioModal.iOSBrowser": "音声、ビデオがサポートされていません",
-    "app.audioModal.iOSErrorDescription": "iOSのChromeでは、音声、  ビデオは現在サポートされていません",
-    "app.audioModal.iOSErrorRecommendation": "Safari iOSをお使いください",
-    "app.audioModal.audioChoiceDesc": "音声はどうしますか？",
-    "app.audioModal.closeLabel": "閉じる",
-    "app.audioModal.yes": "はい",
-    "app.audioModal.no": "いいえ",
-    "app.audioModal.yes.arialabel" : "エコーが聞こえます",
-    "app.audioModal.no.arialabel" : "エコーが聞こえません",
-    "app.audioModal.echoTestTitle": "これはエコーテストです。マイクに話すとエコーが聞こえますか？",
-    "app.audioModal.settingsTitle": "オーディオ設定を変更する",
-    "app.audioModal.helpTitle": "デバイスとの接続ができませんでした",
-    "app.audioModal.helpText": "このサイトにマイクのアクセスを許可しましたか？ページを開く際にポップアップが出てくるはずです。アクセスを許可してください。それでも問題が続きましたら、ブラウザの設定を確認してみてください。",
-    "app.audioModal.connecting": "接続中",
-    "app.audioModal.connectingEchoTest": "エコーテストに接続中",
-    "app.audioManager.joinedAudio": "セッションに参加しました",
-    "app.audioManager.joinedEcho": "エコーテストに入りました",
-    "app.audioManager.leftAudio": "セッションから退席しました",
-    "app.audioManager.genericError": "エラー：もう一度やり直してください",
-    "app.audioManager.connectionError": "エラー：接続エラー",
-    "app.audioManager.requestTimeout": "エラー：リクエストに時間がかかりすぎました",
-    "app.audioManager.invalidTarget": "エラー：リクエスト先がいませんでした",
-    "app.audioManager.mediaError": "エラー：デバイスが見つかりませんでした",
-    "app.audio.joinAudio": "音声で参加",
-    "app.audio.leaveAudio": "音声をやめる",
-    "app.audio.enterSessionLabel": "セッションに入る",
-    "app.audio.playSoundLabel": "音を出す",
-    "app.audio.backLabel": "戻る",
-    "app.audio.audioSettings.titleLabel": "音声設定を選択",
-    "app.audio.audioSettings.descriptionLabel": "マイク共有の許可を求めるダイアログがブラウザ内に現われますのでご了承ください。",
-    "app.audio.audioSettings.microphoneSourceLabel": "マイクのソース",
-    "app.audio.audioSettings.speakerSourceLabel": "スピーカーのソース",
-    "app.audio.audioSettings.microphoneStreamLabel": "音声ストリームの音量",
-    "app.audio.audioSettings.retryLabel": "再試行",
-    "app.audio.listenOnly.backLabel": "戻る",
-    "app.audio.listenOnly.closeLabel": "閉じる",
-    "app.audio.permissionsOverlay.title": "デバイスのアクセスを許可する",
-    "app.audio.permissionsOverlay.hint": "セッションに参加するには、デバイスのアクセスが必要になります",
-    "app.error.removed": "セッションから退室しました",
-    "app.error.meeting.ended": "会議からログアウトしました",
-    "app.dropdown.close": "閉じる",
-    "app.error.500": "問題が起こりました",
-    "app.error.404": "見つかりません",
-    "app.error.401": "権限がありません",
-    "app.error.403": "禁止されています",
-    "app.error.leaveLabel": "再ログイン",
-    "app.guest.waiting": "主催者の承認待ち",
-    "app.toast.breakoutRoomEnded": "The breakout room ended. オーディオで参加してください",
-    "app.notification.recordingStart": "録画が開始しました",
-    "app.notification.recordingStop": "録画が終了しました",
-    "app.shortcut-help.title": "ショートカット",
-    "app.shortcut-help.accessKeyNotAvailable": "アクセスキーがありません",
-    "app.shortcut-help.comboLabel": "コンボ",
-    "app.shortcut-help.functionLabel": "機能",
-    "app.shortcut-help.closeLabel": "閉じる",
-    "app.shortcut-help.closeDesc": "ショートカットボックスを閉じる",
-    "app.shortcut-help.openOptions": "設定を開く",
-    "app.shortcut-help.toggleUserList": "ユーザーリストトグル",
-    "app.shortcut-help.toggleMute": "ミュート/ミュート解除",
-    "app.shortcut-help.togglePublicChat": "公開チャットトグル(ユーザーリストが開いている場合のみ)",
-    "app.shortcut-help.hidePrivateChat": "個人チャットを隠す",
-    "app.shortcut-help.closePrivateChat": "個人チャットを閉じる",
-    "app.shortcut-help.openActions": "アクションメニューを開く",
-    "app.shortcut-help.openStatus": "ステータスメニューを開く",
-    "app.video.joinVideo": "カメラ共有",
-    "app.video.leaveVideo": "カメラ共有解除",
-    "app.video.iceCandidateError": "アイス候補者追加エラー",
-    "app.video.permissionError": "カメラ共有エラー。設定を確認してください",
-    "app.video.sharingError": "カメラ共有エラー",
-    "app.video.notFoundError": "カメラが見つかりませんでした。接続を確認してください",
-    "app.video.notAllowed": "カメラを共有する権限がありませんでした。ブラウザの設定を確認してください",
-    "app.video.notSupportedError": "カメラは安全なページでしか共有できません。SSL証明書が有効か確かめてください",
-    "app.video.notReadableError": "カメラの映像を受け取れませんでした。他のプログラムが使ってないことを確認してください",
-    "app.video.swapCam": "スワップ",
-    "app.video.swapCamDesc": "カメラの向きを反転する",
-    "app.video.videoMenu": "ビデオメニュー",
-    "app.video.videoMenuDisabled": "設定でビデオメニューがブロックされています",
-    "app.video.videoMenuDesc": "設定でビデオメニューがブロックされています",
-    "app.video.chromeExtensionError": "インストールしてください",
-    "app.video.chromeExtensionErrorLink": "このChrome拡張機能",
-    "app.video.stats.title": "接続情報",
-    "app.video.stats.packetsReceived": "パケット受信",
-    "app.video.stats.packetsSent": "パケット送信",
-    "app.video.stats.packetsLost": "エラーパケット",
-    "app.video.stats.bitrate": "ビットレート",
-    "app.video.stats.lostPercentage": "トータルパーセンテージ（エラー）",
-    "app.video.stats.lostRecentPercentage": "最新のパーセンテージ（エラー）",
-    "app.video.stats.dimensions": "解像度",
-    "app.video.stats.codec": "コーデック",
-    "app.video.stats.decodeDelay": "遅延（ディコード）",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "エンコードの使用状況",
-    "app.video.stats.currentDelay": "遅延（最新）",
-
-    "app.meeting.endNotification.ok.label": "OK",
-    "app.whiteboard.toolbar.tools": "ツール",
-    "app.whiteboard.toolbar.tools.pointer": "ポインタ",
-    "app.whiteboard.toolbar.tools.pencil": "ペン",
-    "app.whiteboard.toolbar.tools.rectangle": "長方形",
-    "app.whiteboard.toolbar.tools.triangle": "三角形",
-    "app.whiteboard.toolbar.tools.ellipse": "楕円",
-    "app.whiteboard.toolbar.tools.line": "線",
-    "app.whiteboard.toolbar.tools.text": "テキスト",
-    "app.whiteboard.toolbar.thickness": "線の太さ",
-    "app.whiteboard.toolbar.thicknessDisabled": "線の太さは変えられません",
-    "app.whiteboard.toolbar.color": "色",
-    "app.whiteboard.toolbar.colorDisabled": "色は変えられません",
-    "app.whiteboard.toolbar.color.black": "黒",
-    "app.whiteboard.toolbar.color.white": "白",
-    "app.whiteboard.toolbar.color.red": "赤",
-    "app.whiteboard.toolbar.color.orange": "オレンジ",
-    "app.whiteboard.toolbar.color.eletricLime": "黄緑",
-    "app.whiteboard.toolbar.color.lime": "ライム",
-    "app.whiteboard.toolbar.color.cyan": "シアン",
-    "app.whiteboard.toolbar.color.dodgerBlue": "ドジャーブルー",
-    "app.whiteboard.toolbar.color.blue": "青",
-    "app.whiteboard.toolbar.color.violet": "紫",
-    "app.whiteboard.toolbar.color.magenta": "マゼンタ",
-    "app.whiteboard.toolbar.color.silver": "シルバー",
-    "app.whiteboard.toolbar.undo": "取り消す",
-    "app.whiteboard.toolbar.clear": "全て取り消す",
-    "app.whiteboard.toolbar.multiUserOn": "マルチユーザーモードにする",
-    "app.whiteboard.toolbar.multiUserOff": "マルチユーザーモードを外す",
-    "app.whiteboard.toolbar.fontSize": "フォントサイズ",
-    "app.feedback.title": "セッションからログアウトしました",
-    "app.feedback.subtitle": "BigBlueButtonの感想は？ (任意)",
-    "app.feedback.textarea": "BigBlueButtonに何が欲しいですか?",
-    "app.feedback.sendFeedback": "フィードバックを送る",
-    "app.feedback.sendFeedbackDesc": "フィードバックを送ってセッションから退席する",
-    "app.videoDock.webcamFocusLabel": "フォーカス",
-    "app.videoDock.webcamFocusDesc": "選択したカメラにフォーカスする",
-    "app.videoDock.webcamUnfocusLabel": "フォーカスを外す",
-    "app.videoDock.webcamUnfocusDesc": "選択したカメラのフォーカスを外す"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
deleted file mode 100644
index 6450371462..0000000000
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "app.home.greeting": "Bem-vindo {0}! Sua apresentação começará em breve...",
-    "app.chat.submitLabel": "Enviar Mensagem",
-    "app.chat.errorMinMessageLength": "Mensagem menor do que {0} caractere(s)",
-    "app.chat.errorMaxMessageLength": "Mensagem maior do que {0} caractere(s)",
-    "app.chat.inputLabel": "Entrada de mensagem para o bate-papo {0}",
-    "app.chat.inputPlaceholder": "Mensagem {0}",
-    "app.chat.titlePublic": "Bate-papo Público",
-    "app.chat.titlePrivate": "Bate-papo Privado com {0}",
-    "app.chat.partnerDisconnected": "{0} saiu da reunião",
-    "app.chat.closeChatLabel": "Fechar {0}",
-    "app.chat.hideChatLabel": "Ocultar {0}",
-    "app.chat.moreMessages": "Mais mensagens abaixo",
-    "app.chat.dropdown.options": "Opções do Bate-papo",
-    "app.chat.dropdown.clear": "Limpar",
-    "app.chat.dropdown.copy": "Copiar",
-    "app.chat.dropdown.save": "Salvar",
-    "app.chat.label": "Bate-papo",
-    "app.chat.emptyLogLabel": "Registro do bate-papo vazio",
-    "app.chat.clearPublicChatMessage": "O histórico de bate-papo público foi apagado por um moderador",
-    "app.userList.usersTitle": "Usuários",
-    "app.userList.participantsTitle": "Participantes",
-    "app.userList.messagesTitle": "Mensagens",
-    "app.userList.presenter": "Apresentador",
-    "app.userList.you": "Você",
-    "app.userList.locked": "Bloqueado",
-    "app.userList.label": "Lista de usuários",
-    "app.userList.toggleCompactView.label": "Alternar para o modo de exibição compacta",
-    "app.userList.guest": "Convidado",
-    "app.userList.menuTitleContext": "Opções disponíveis",
-    "app.userList.chatListItem.unreadSingular": "{0} Nova mensagem",
-    "app.userList.chatListItem.unreadPlural": "{0} Novas mensagens",
-    "app.userList.menu.chat.label": "Bate-papo",
-    "app.userList.menu.clearStatus.label": "Limpar status",
-    "app.userList.menu.makePresenter.label": "Torná-lo apresentador",
-    "app.userList.menu.removeUser.label": "Remover usuário",
-    "app.userList.menu.muteUserAudio.label": "Silenciar usuário",
-    "app.userList.menu.unmuteUserAudio.label": "Desbloquear microfone do usuário",
-    "app.userList.userAriaLabel": "{0} {1} {2}  Status {3}",
-    "app.userList.menu.promoteUser.label": "Promover para moderador",
-    "app.userList.menu.demoteUser.label": "Rebaixar para espectador",
-    "app.media.label": "Mídia",
-    "app.media.screenshare.start": "O compartilhamento de tela foi iniciado",
-    "app.media.screenshare.end": "O compartilhamento de tela foi encerrado",
-    "app.media.screenshare.safariNotSupported": "Atualmente, o compartilhamento de tela não é suportado pelo Safari. Por favor, use o Firefox ou o Google Chrome.",
-    "app.meeting.ended": "Esta reunião terminou",
-    "app.meeting.endedMessage": "Você será redirecionado para a tela inicial",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Slide anterior",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Mudar a apresentação para o slide anterior",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Próximo slide",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Mudar a apresentação para o próximo slide",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Pular slide",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Mudar a apresentação para um slide específico",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Ajustar a largura",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Exibir toda a largura do slide",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Ajustar a tela",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Exibir todo o slide",
-    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
-    "app.presentation.presentationToolbar.zoomDesc": "Alterar o nível de zoom da apresentação",
-    "app.presentation.presentationToolbar.goToSlide": "Slide {0}",
-    "app.presentationUploder.title": "Apresentação",
-    "app.presentationUploder.message": "Como apresentador, você tem a capacidade de carregar qualquer documento do Office ou arquivo PDF. Para melhores resultados, recomendamos que se carregue arquivos em PDF.",
-    "app.presentationUploder.confirmLabel": "Iniciar",
-    "app.presentationUploder.confirmDesc": "Salve as alterações e inicie a apresentação",
-    "app.presentationUploder.dismissLabel": "Cancelar",
-    "app.presentationUploder.dismissDesc": "Feche a janela e descarte as alterações",
-    "app.presentationUploder.dropzoneLabel": "Arraste arquivos aqui para carregar",
-    "app.presentationUploder.browseFilesLabel": "ou procure arquivos",
-    "app.presentationUploder.fileToUpload": "Carregar arquivo...",
-    "app.presentationUploder.currentBadge": "Atual",
-    "app.presentationUploder.genericError": "Ops, algo deu errado",
-    "app.presentationUploder.upload.progress": "Carregando ({0}%)",
-    "app.presentationUploder.upload.413": "O arquivo é muito grande",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "Página de processamento {0} de {1}",
-    "app.presentationUploder.conversion.genericConversionStatus": "Convertendo arquivo...",
-    "app.presentationUploder.conversion.generatingThumbnail": "Gerando miniaturas...",
-    "app.presentationUploder.conversion.generatedSlides": "Slides gerados...",
-    "app.presentationUploder.conversion.generatingSvg": "Gerando imagens SVG...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Ops, a contagem de páginas excedeu o limite",
-    "app.presentationUploder.conversion.timeout": "Ops, a conversão está demorando muito",
-    "app.polling.pollingTitle": "Opções da enquete",
-    "app.polling.pollAnswerLabel": "Resposta da enquete {0}",
-    "app.polling.pollAnswerDesc": "Selecione esta opção para votar em {0}",
-    "app.failedMessage": "Desculpe-nos, estamos com problemas na conexão com o servidor",
-    "app.connectingMessage": "Conectando...",
-    "app.waitingMessage": "Desconectado. Tentando reconectar em {0} segundos...",
-    "app.navBar.settingsDropdown.optionsLabel": "Opções",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Alternar para tela cheia",
-    "app.navBar.settingsDropdown.settingsLabel": "Abrir configurações",
-    "app.navBar.settingsDropdown.aboutLabel": "Sobre",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Sair",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Sair da tela cheia",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Alternar o menu de configurações para tela cheia",
-    "app.navBar.settingsDropdown.settingsDesc": "Alterar as configurações gerais",
-    "app.navBar.settingsDropdown.aboutDesc": "Mostrar informações sobre o cliente",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Deixar a reunião",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Sair do modo de tela cheia",
-    "app.navBar.settingsDropdown.hotkeysLabel": "Atalhos de teclado",
-    "app.navBar.settingsDropdown.hotkeysDesc": "Lista de atalhos disponíveis",
-    "app.navBar.settingsDropdown.helpLabel": "Ajuda",
-    "app.navBar.settingsDropdown.helpDesc": "Vídeo tutoriais",
-    "app.navBar.userListToggleBtnLabel": "Alternar lista de usuários",
-    "app.navBar.toggleUserList.ariaLabel": "Alternar Usuários e Mensagens",
-    "app.navBar.toggleUserList.newMessages": "com notificação para novas mensagens",
-    "app.navBar.recording": "Esta conferência está sendo gravada",
-    "app.navBar.recording.on": "A gravação está em andamento",
-    "app.navBar.recording.off": "Sem gravação",
-    "app.leaveConfirmation.title": "Deixar a reunião",
-    "app.leaveConfirmation.message": "Você quer sair desta reunião?",
-    "app.leaveConfirmation.confirmLabel": "Sair",
-    "app.leaveConfirmation.confirmDesc": "Desconecta da reunião",
-    "app.leaveConfirmation.dismissLabel": "Cancelar",
-    "app.leaveConfirmation.dismissDesc": "Fecha e rejeita a confirmação de saída",
-    "app.leaveConfirmation.endMeetingLabel": "Sim e finalizar a reunião",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Sair e finalizar a conferência para todos",
-    "app.leaveConfirmation.endMeetingDesc": "Confirmação para fechar e encerrar a reunião",
-    "app.about.title": "Sobre",
-    "app.about.version": "Client Build:",
-    "app.about.copyright": "Copyright:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "Cancelar",
-    "app.about.dismissDesc": "Fechar informações sobre o cliente",
-    "app.actionsBar.changeStatusLabel": "Alterar status",
-    "app.actionsBar.muteLabel": "Silenciar",
-    "app.actionsBar.unmuteLabel": "Falar",
-    "app.actionsBar.camOffLabel": "Câmera desligada",
-    "app.actionsBar.raiseLabel": "Levantar a mão",
-    "app.actionsBar.label": "Barra de ações",
-    "app.submenu.application.applicationSectionTitle": "Aplicação",
-    "app.submenu.application.audioAlertLabel": "Alertas de áudio para Bate-papo",
-    "app.submenu.application.pushAlertLabel": "Alertas de pop-up para Bate-papo",
-    "app.submenu.application.fontSizeControlLabel": "Tamanho da fonte",
-    "app.submenu.application.increaseFontBtnLabel": "Aumentar o tamanho da fonte da aplicação",
-    "app.submenu.application.decreaseFontBtnLabel": "Diminuir o tamanho da fonte da aplicação",
-    "app.submenu.application.languageLabel": "Idioma da aplicação",
-    "app.submenu.application.ariaLanguageLabel": "Alterar idioma da aplicação",
-    "app.submenu.application.languageOptionLabel": "Escolha o idioma",
-    "app.submenu.application.noLocaleOptionLabel": "Não existem esquemas de idiomas disponíveis",
-    "app.submenu.audio.micSourceLabel": "Seleção do microfone",
-    "app.submenu.audio.speakerSourceLabel": "Seleção do alto-falante",
-    "app.submenu.audio.streamVolumeLabel": "Seu volume de áudio",
-    "app.submenu.video.title": "Vídeo",
-    "app.submenu.video.videoSourceLabel": "Seleção do vídeo",
-    "app.submenu.video.videoOptionLabel": "Selecione a entrada de vídeo",
-    "app.submenu.video.videoQualityLabel": "Qualidade do vídeo",
-    "app.submenu.video.qualityOptionLabel": "Escolha a qualidade do vídeo",
-    "app.submenu.video.participantsCamLabel": "Visualizando webcams dos participantes",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Legendas",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Assumir o controle",
-    "app.submenu.closedCaptions.languageLabel": "Idioma",
-    "app.submenu.closedCaptions.localeOptionLabel": "Escolha o idioma",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Nenhum esquema de idioma ativo",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Família da fonte",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Selecionar família da fonte",
-    "app.submenu.closedCaptions.fontSizeLabel": "Tamanho da fonte",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Escolha o tamanho da fonte",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Cor de fundo",
-    "app.submenu.closedCaptions.fontColorLabel": "Cor da fonte",
-    "app.submenu.participants.muteAllLabel": "Silenciar todos exceto o apresentador",
-    "app.submenu.participants.lockAllLabel": "Restringir todos os participantes",
-    "app.submenu.participants.lockItemLabel": "Participantes {0}",
-    "app.submenu.participants.lockMicDesc": "Desativa o microfone para todos os participantes bloqueados",
-    "app.submenu.participants.lockCamDesc": "Desativa a webcam para todos os participantes bloqueados",
-    "app.submenu.participants.lockPublicChatDesc": "Desativa o bate-papo público para todos os participantes bloqueados",
-    "app.submenu.participants.lockPrivateChatDesc": "Desativa o bate-papo privado para todos os participantes bloqueados",
-    "app.submenu.participants.lockLayoutDesc": "Bloqueia o layout para todos os participantes bloqueados",
-    "app.submenu.participants.lockMicAriaLabel": "Bloqueia o microfone",
-    "app.submenu.participants.lockCamAriaLabel": "Bloqueia a webcam",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Bloqueia o bate-papo público",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Bloqueia o bate-papo privado",
-    "app.submenu.participants.lockLayoutAriaLabel": "Bloqueia o layout",
-    "app.submenu.participants.lockMicLabel": "Microfone",
-    "app.submenu.participants.lockCamLabel": "Webcam",
-    "app.submenu.participants.lockPublicChatLabel": "Bate-papo Público",
-    "app.submenu.participants.lockPrivateChatLabel": "Bate-papo Privado",
-    "app.submenu.participants.lockLayoutLabel": "Layout",
-    "app.settings.applicationTab.label": "Aplicação",
-    "app.settings.audioTab.label": "Áudio",
-    "app.settings.videoTab.label": "Vídeo",
-    "app.settings.closedcaptionTab.label": "Legendas",
-    "app.settings.usersTab.label": "Participantes",
-    "app.settings.main.label": "Configurações",
-    "app.settings.main.cancel.label": "Cancelar",
-    "app.settings.main.cancel.label.description": "Descartar as alterações e fechar o menu de configurações",
-    "app.settings.main.save.label": "Salvar",
-    "app.settings.main.save.label.description": "Salvar as alterações e fechar o menu de configurações",
-    "app.settings.dataSavingTab.label": "Economia de dados",
-    "app.settings.dataSavingTab.webcam": "Ativar Webcams",
-    "app.settings.dataSavingTab.screenShare": "Ativar o compartilhamento de tela",
-    "app.settings.dataSavingTab.description": "Para economizar o volume de transferência de dados, ajuste o que está sendo exibido no momento.",
-    "app.switch.onLabel": "Ligar",
-    "app.switch.offLabel": "Desligar",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Ações",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Carregar uma apresentação",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar uma enquete",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartilhar sua tela",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Parar compartilhamento de tela",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Carregar sua apresentação",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar uma enquete",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Compartilhar sua tela com os outros",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Pare o compartilhamento de tela com",
-    "app.actionsBar.actionsDropdown.startRecording": "Iniciar a gravação",
-    "app.actionsBar.actionsDropdown.stopRecording": "Parar a gravação",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Definir Status",
-    "app.actionsBar.emojiMenu.awayLabel": "Ausente",
-    "app.actionsBar.emojiMenu.awayDesc": "Mudar seu status para ausente",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "Levantar a mão",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "Levante a mão para fazer uma pergunta",
-    "app.actionsBar.emojiMenu.neutralLabel": "Indeciso",
-    "app.actionsBar.emojiMenu.neutralDesc": "Mudar seu status para indeciso",
-    "app.actionsBar.emojiMenu.confusedLabel": "Confuso",
-    "app.actionsBar.emojiMenu.confusedDesc": "Mudar seu status para confuso",
-    "app.actionsBar.emojiMenu.sadLabel": "Triste",
-    "app.actionsBar.emojiMenu.sadDesc": "Mudar seu status para triste",
-    "app.actionsBar.emojiMenu.happyLabel": "Feliz",
-    "app.actionsBar.emojiMenu.happyDesc": "Mudar seu status para feliz",
-    "app.actionsBar.emojiMenu.noneLabel": "Limpar Status",
-    "app.actionsBar.emojiMenu.noneDesc": "Limpar seu status",
-    "app.actionsBar.emojiMenu.applauseLabel": "Aplauso",
-    "app.actionsBar.emojiMenu.applauseDesc": "Mudar seu status para aplauso",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Positivo",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Mudar seu status para positivo",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Negativo",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Mudar seu status para negativo",
-    "app.actionsBar.currentStatusDesc": "status atual {0}",
-    "app.audioNotification.audioFailedError1001": "Erro 1001: WebSocket desconectou",
-    "app.audioNotification.audioFailedError1002": "Erro 1002: Não foi possível estabelecer a conexão WebSocket",
-    "app.audioNotification.audioFailedError1003": "Erro 1003: Versão do navegador não suportada",
-    "app.audioNotification.audioFailedError1004": "Erro 1004: Falha na chamada",
-    "app.audioNotification.audioFailedError1005": "Erro 1005: Chamada encerrada inesperadamente",
-    "app.audioNotification.audioFailedError1006": "Erro 1006: Tempo de espera da chamada expirou",
-    "app.audioNotification.audioFailedError1007": "Erro 1007: Negociação ICE falhou",
-    "app.audioNotification.audioFailedError1008": "Erro 1008: Falha na transferência",
-    "app.audioNotification.audioFailedError1009": "Erro 1009: Não foi possível recuperar as informações do servidor STUN/TURN",
-    "app.audioNotification.audioFailedError1010": "Erro 1010: Negociação ICE expirou",
-    "app.audioNotification.audioFailedError1011": "Erro 1011: Coleta de candidatos ICE expirou",
-    "app.audioNotification.audioFailedMessage": "Conexão de áudio não pôde ser estabelecida",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia falhou. Somente fontes seguras são permitidas",
-    "app.audioNotification.closeLabel": "Fechar",
-    "app.audioNotificaion.reconnectingAsListenOnly": "O áudio foi bloqueado apenas para moderadores, você está sendo conectado apenas como ouvinte",
-    "app.breakoutJoinConfirmation.title": "Entrar na sala de apoio",
-    "app.breakoutJoinConfirmation.message": "Gostaria de participar",
-    "app.breakoutJoinConfirmation.confirmLabel": "Entrar",
-    "app.breakoutJoinConfirmation.confirmDesc": "Entrar na sala de apoio",
-    "app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
-    "app.breakoutJoinConfirmation.dismissDesc": "Fechar e rejeitar o convite a sala de apoio",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "Escolha uma sala de apoio para entrar",
-    "app.breakoutTimeRemainingMessage": "Tempo restante na sala de apoio: {0}",
-    "app.breakoutWillCloseMessage": "Tempo expirado. A sala de discussão será fechada em breve",
-    "app.calculatingBreakoutTimeRemaining": "Calculando o tempo restante...",
-    "app.audioModal.microphoneLabel": "Microfone",
-    "app.audioModal.listenOnlyLabel": "Somente ouvir",
-    "app.audioModal.audioChoiceLabel": "Como você gostaria de se juntar ao áudio?",
-    "app.audioModal.iOSBrowser": "Áudio/Vídeo não é suportado",
-    "app.audioModal.iOSErrorDescription": "No momento, o Chrome não suporta áudio e vídeo para iOS.",
-    "app.audioModal.iOSErrorRecommendation": "Recomendamos o Safari para usar o iOS.",
-    "app.audioModal.audioChoiceDesc": "Selecione como se juntar ao áudio nesta reunião",
-    "app.audioModal.closeLabel": "Fechar",
-    "app.audioModal.yes": "Sim",
-    "app.audioModal.no": "Não",
-    "app.audioModal.yes.arialabel" : "Som é audível",
-    "app.audioModal.no.arialabel" : "Som não é audível",
-    "app.audioModal.echoTestTitle": "Este é um teste privado de áudio. Fale algumas palavras. Você consegue ouvir sua voz?",
-    "app.audioModal.settingsTitle": "Alterar as configurações de áudio",
-    "app.audioModal.helpTitle": "Houve um problema com seus dispositivos de mídia",
-    "app.audioModal.helpText": "Você autorizou o acesso ao seu microfone? Observe que uma caixa de diálogo deve abrir assim que você tentar participar da conferência de áudio, pedindo as permissões de acesso aos dispositivos de mídia, por favor conceda essa permissão de acesso para participar da conferência. Se isso não funcionar, tente alterar a permissão do microfone nas configurações do seu navegador.",
-    "app.audioModal.connecting": "Conectando",
-    "app.audioModal.connectingEchoTest": "Conectando ao teste de áudio",
-    "app.audioManager.joinedAudio": "Você se juntou à conferência de áudio",
-    "app.audioManager.joinedEcho": "O teste de áudio foi iniciado",
-    "app.audioManager.leftAudio": "Você deixou a conferência de áudio",
-    "app.audioManager.genericError": "Erro: Ocorreu um erro, tente novamente",
-    "app.audioManager.connectionError": "Erro: Erro de conexão",
-    "app.audioManager.requestTimeout": "Erro: Tempo limite de chamada",
-    "app.audioManager.invalidTarget": "Erro: Um alvo inválido foi especificado na chamada",
-    "app.audioManager.mediaError": "Erro: Houve um problema ao consultar seus dispositivos de mídia",
-    "app.audio.joinAudio": "Ativar áudio",
-    "app.audio.leaveAudio": "Desativar áudio",
-    "app.audio.enterSessionLabel": "Entrar na reunião",
-    "app.audio.playSoundLabel": "Tocar som de teste",
-    "app.audio.backLabel": "Voltar",
-    "app.audio.audioSettings.titleLabel": "Configurações de áudio",
-    "app.audio.audioSettings.descriptionLabel": "Uma caixa de diálogo aparecerá em seu navegador, onde você deve concordar em compartilhar o seu microfone.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Seleção do microfone",
-    "app.audio.audioSettings.speakerSourceLabel": "Seleção do alto-falante",
-    "app.audio.audioSettings.microphoneStreamLabel": "Seu volume da transmissão de áudio",
-    "app.audio.audioSettings.retryLabel": "Tente novamente",
-    "app.audio.listenOnly.backLabel": "Voltar",
-    "app.audio.listenOnly.closeLabel": "Fechar",
-    "app.audio.permissionsOverlay.title": "Permitir que o BigBlueButton acesse seus dispositivos de mídia",
-    "app.audio.permissionsOverlay.hint": "Precisamos que você nos permita acessar seus dispositivos de mídia para participar da conferência por voz :)",
-    "app.error.removed": "Você foi removido da conferência",
-    "app.error.meeting.ended": "Você saiu da conferência",
-    "app.dropdown.close": "Fechar",
-    "app.error.500": "Ops, algo deu errado",
-    "app.error.404": "Não encontrado",
-    "app.error.401": "Não autorizado",
-    "app.error.403": "Proibido",
-    "app.error.leaveLabel": "Faça o login novamente",
-    "app.guest.waiting": "Esperando aprovação para participar",
-    "app.toast.breakoutRoomEnded": "A sala de apoio terminou. Clique no ícone do microfone para reingressar a conferência de áudio na sala principal",
-    "app.toast.chat.public": "Nova mensagem de Bate-papo público",
-    "app.toast.chat.private": "Nova mensagem de Bate-papo privado",
-    "app.toast.chat.system": "Sistema",
-    "app.notification.recordingStart": "Esta reunião está sendo gravada",
-    "app.notification.recordingStop": "Esta reunião não está mais sendo gravada",
-    "app.shortcut-help.title": "Atalhos de teclado",
-    "app.shortcut-help.accessKeyNotAvailable": "Atalho de teclado não disponível",
-    "app.shortcut-help.comboLabel": "Combo",
-    "app.shortcut-help.functionLabel": "Função",
-    "app.shortcut-help.closeLabel": "Fechar",
-    "app.shortcut-help.closeDesc": "Fecha a caixa de diálogo de atalhos do teclado",
-    "app.shortcut-help.openOptions": "Abrir Configurações",
-    "app.shortcut-help.toggleUserList": "Abrir / fechar a lista de usuários",
-    "app.shortcut-help.toggleMute": "Mudo / Falar",
-    "app.shortcut-help.togglePublicChat": "Abrir / fechar Bate-papo Público (lista de usuários deve estar aberta)",
-    "app.shortcut-help.hidePrivateChat": "Ocultar Bate-papo Privado",
-    "app.shortcut-help.closePrivateChat": "Fechar Bate-papo Privado",
-    "app.shortcut-help.openActions": "Abrir o Menu de Ações",
-    "app.shortcut-help.openStatus": "Abrir o Menu de Status",
-    "app.video.joinVideo": "Ativar Webcam",
-    "app.video.leaveVideo": "Pare a Webcam",
-    "app.video.iceCandidateError": "Erro ao adicionar o candidato ICE",
-    "app.video.iceConnectionStateError": "Erro 1107: Negociação ICE falhou",
-    "app.video.permissionError": "Erro ao compartilhar a webcam. Verifique as permissões",
-    "app.video.sharingError": "Erro ao compartilhar a webcam",
-    "app.video.notFoundError": "Não foi possível encontrar uma webcam. Por favor, verifique se ela está conectada",
-    "app.video.notAllowed": "Autorização não concedida para o compartilhamento da webcam, verifique as permissões do seu navegador",
-    "app.video.notSupportedError": "A webcam só pode ser compartilhada via conexão segura, verifique se o certificado SSL é válido",
-    "app.video.notReadableError": "Não foi possível acessar a webcam. Por favor, certifique-se de que nenhum outro programa esteja acessando a webcam",
-    "app.video.swapCam": "Alterar",
-    "app.video.swapCamDesc": "Alterar a orientação das webcams",
-    "app.video.videoMenu": "Menu de vídeo",
-    "app.video.videoMenuDisabled": "Webcam desativada nas configurações",
-    "app.video.videoMenuDesc": "Abra o menu de vídeo",
-    "app.video.chromeExtensionError": "Você deve instalar o seguinte:",
-    "app.video.chromeExtensionErrorLink": "esta extensão do Chrome",
-    "app.video.stats.title": "Estatísticas de conexão",
-    "app.video.stats.packetsReceived": "Pacotes recebidos",
-    "app.video.stats.packetsSent": "Pacotes enviados",
-    "app.video.stats.packetsLost": "Pacotes perdidos",
-    "app.video.stats.bitrate": "Taxa de bits",
-    "app.video.stats.lostPercentage": "Percentuais de perda total",
-    "app.video.stats.lostRecentPercentage": "Percentuais de perda recentemente",
-    "app.video.stats.dimensions": "Dimensões",
-    "app.video.stats.codec": "Codec",
-    "app.video.stats.decodeDelay": "Atraso de decodificação",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "Uso de codificação",
-    "app.video.stats.currentDelay": "Atraso atual",
-    "app.deskshare.iceConnectionStateError": "Erro 1108: Falha na conexão ICE ao compartilhar a tela",
-    "app.sfu.mediaServerConnectionError2000": "Erro 2000: Não foi possível conectar ao servidor de mídia",
-    "app.sfu.mediaServerOffline2001": "Erro 2001: Servidor de mídia está offline. Por favor, tente novamente mais tarde.",
-    "app.sfu.mediaServerNoResources2002": "Erro 2002: Servidor de mídia não possui recursos disponíveis",
-    "app.sfu.mediaServerRequestTimeout2003": "Erro 2003: Tempo limite para solicitações ao servidor de mídia",
-    "app.sfu.serverIceGatheringFailed2021": "Erro 2021: O servidor de mídia não pode capturar candidatos ICE",
-    "app.sfu.serverIceGatheringFailed2022": "Erro 2022: Falha na conexão ICE do servidor de mídia",
-    "app.sfu.invalidSdp2202":"Erro 2202: Cliente gerou um SDP inválido",
-    "app.sfu.noAvailableCodec2203": "Erro 2203: O servidor não encontrou um codec apropriado",
-
-    "app.meeting.endNotification.ok.label": "OK",
-    "app.whiteboard.toolbar.tools": "Ferramentas",
-    "app.whiteboard.toolbar.tools.pointer": "Cursor",
-    "app.whiteboard.toolbar.tools.pencil": "Lápis",
-    "app.whiteboard.toolbar.tools.rectangle": "Retângulo",
-    "app.whiteboard.toolbar.tools.triangle": "Triângulo",
-    "app.whiteboard.toolbar.tools.ellipse": "Elipse",
-    "app.whiteboard.toolbar.tools.line": "Linha",
-    "app.whiteboard.toolbar.tools.text": "Texto",
-    "app.whiteboard.toolbar.thickness": "Espessura da Linha",
-    "app.whiteboard.toolbar.thicknessDisabled": "A espessura da Linha está Desativada",
-    "app.whiteboard.toolbar.color": "Cores",
-    "app.whiteboard.toolbar.colorDisabled": "As Cores estão Desativadas",
-    "app.whiteboard.toolbar.color.black": "Preto",
-    "app.whiteboard.toolbar.color.white": "Branco",
-    "app.whiteboard.toolbar.color.red": "Vermelho",
-    "app.whiteboard.toolbar.color.orange": "Laranja",
-    "app.whiteboard.toolbar.color.eletricLime": "Verde limão",
-    "app.whiteboard.toolbar.color.lime": "Verde",
-    "app.whiteboard.toolbar.color.cyan": "Ciano",
-    "app.whiteboard.toolbar.color.dodgerBlue": "Azul Dodger",
-    "app.whiteboard.toolbar.color.blue": "Azul",
-    "app.whiteboard.toolbar.color.violet": "Violeta",
-    "app.whiteboard.toolbar.color.magenta": "Magenta",
-    "app.whiteboard.toolbar.color.silver": "Prata",
-    "app.whiteboard.toolbar.undo": "Desfazer Anotação",
-    "app.whiteboard.toolbar.clear": "Limpar todas as anotações",
-    "app.whiteboard.toolbar.multiUserOn": "Iniciar o modo multiusuário",
-    "app.whiteboard.toolbar.multiUserOff": "Sair do modo multiusuário",
-    "app.whiteboard.toolbar.fontSize": "Lista de tamanhos de fonte",
-    "app.feedback.title": "Você saiu da conferência",
-    "app.feedback.subtitle": "Adoraríamos ouvir sobre sua experiência com o BigBlueButton (opcional)",
-    "app.feedback.textarea": "Como podemos melhorar o BigBlueButton?",
-    "app.feedback.sendFeedback": "Enviar feedback",
-    "app.feedback.sendFeedbackDesc": "Enviar um Feedback e deixar a reunião",
-    "app.videoDock.webcamFocusLabel": "Focar",
-    "app.videoDock.webcamFocusDesc": "Focar a webcam selecionada",
-    "app.videoDock.webcamUnfocusLabel": "Desfocar",
-    "app.videoDock.webcamUnfocusDesc": "Desfocar a webcam selecionada"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/ru_RU.json b/bigbluebutton-html5/private/locales/ru_RU.json
deleted file mode 100644
index 77f47fdf0c..0000000000
--- a/bigbluebutton-html5/private/locales/ru_RU.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "app.home.greeting": "Добро пожаловать {0}! Ваша презентация начнётся в ближайшее время... ",
-    "app.chat.submitLabel": "Отправить сообщение",
-    "app.chat.errorMinMessageLength": "Сообщение из {0} символа(-ов) слишком короткое",
-    "app.chat.errorMaxMessageLength": "Сообщение из {0} символа(-ов) слишком длинное",
-    "app.chat.inputLabel": "Ввод сообщений для чата {0}",
-    "app.chat.inputPlaceholder": "Сообщение {0}",
-    "app.chat.titlePublic": "Общий чат",
-    "app.chat.titlePrivate": "Приватный чат с {0}",
-    "app.chat.partnerDisconnected": "{0} покинул конференцию",
-    "app.chat.closeChatLabel": "Закрыть {0}",
-    "app.chat.hideChatLabel": "Спрятать {0}",
-    "app.chat.moreMessages": "Больше сообщений ниже",
-    "app.chat.dropdown.options": "Настройки чата",
-    "app.chat.dropdown.clear": "Очистить",
-    "app.chat.dropdown.copy": "Копировать",
-    "app.chat.dropdown.save": "Сохранить",
-    "app.chat.label": "Чат",
-    "app.chat.emptyLogLabel": "Журнал чата пуст",
-    "app.chat.clearPublicChatMessage": "Журнал общего чата был очищен модератором",
-    "app.userList.usersTitle": "Пользователи",
-    "app.userList.participantsTitle": "Участники",
-    "app.userList.messagesTitle": "Сообщения",
-    "app.userList.presenter": "Ведущий",
-    "app.userList.you": "Вы",
-    "app.userList.locked": "Заблокировано",
-    "app.userList.label": "Список пользователей",
-    "app.userList.toggleCompactView.label": "Включить/выключить компактный вид",
-    "app.userList.guest": "Гость",
-    "app.userList.menuTitleContext": "Доступные опции",
-    "app.userList.chatListItem.unreadSingular": "{0} новое сообщение",
-    "app.userList.chatListItem.unreadPlural": "{0} новых сообщений",
-    "app.userList.menu.chat.label": "Чат",
-    "app.userList.menu.clearStatus.label": "Очистить статус",
-    "app.userList.menu.makePresenter.label": "Сделать ведущим",
-    "app.userList.menu.removeUser.label": "Исключить пользователя",
-    "app.userList.menu.muteUserAudio.label": "Выключить микрофон пользователя",
-    "app.userList.menu.unmuteUserAudio.label": "Включить микрофон пользователя",
-    "app.userList.userAriaLabel": "{0} {1} {2}  Статус {3}",
-    "app.userList.menu.promoteUser.label": "Повысить до модератора",
-    "app.userList.menu.demoteUser.label": "Понизить до зрителя",
-    "app.media.label": "Медиа",
-    "app.media.screenshare.start": "Демонстрация экрана началась",
-    "app.media.screenshare.end": "Демонстрация экрана закончилась",
-    "app.media.screenshare.safariNotSupported": "Демонстрация экрана на данный момент не поддерживается Safari. Пожалуйста, используйте Firefox или Google Chrome.",
-    "app.meeting.ended": "Сеанс окончен",
-    "app.meeting.endedMessage": "Вы будете перенаправлены назад на главный экран",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Предыдущий слайд",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Переключить презентацию на предыдущий слайд",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Следующий слайд",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Переключить презентацию на следующий слайд",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Пропустить слайд",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Переключить презентацию на указанный слайд",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Подогнать по ширине",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Уместить по ширине слайда",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Подогнать к экрану",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Уместить слайд целиком",
-    "app.presentation.presentationToolbar.zoomLabel": "Масштаб",
-    "app.presentation.presentationToolbar.zoomDesc": "Изменить масштаб презетации",
-    "app.presentation.presentationToolbar.goToSlide": "Слайд {0}",
-    "app.presentationUploder.title": "Презентация",
-    "app.presentationUploder.message": "Как ведущий, вы можете загрузить любой офисный документ или файл PDF. Для лучшего результата, мы рекомендуем загружать PDF.",
-    "app.presentationUploder.confirmLabel": "Начать",
-    "app.presentationUploder.confirmDesc": "Сохранить изменения и начать презентацию",
-    "app.presentationUploder.dismissLabel": "Отменить",
-    "app.presentationUploder.dismissDesc": "Закрыть окно изображения и отменить изменения",
-    "app.presentationUploder.dropzoneLabel": "Перетащите сюда файлы, чтобы загрузить их",
-    "app.presentationUploder.browseFilesLabel": "или выберите файл",
-    "app.presentationUploder.fileToUpload": "Чтобы загрузить...",
-    "app.presentationUploder.currentBadge": "Текущий",
-    "app.presentationUploder.genericError": "Ой, что-то пошло не так",
-    "app.presentationUploder.upload.progress": "Загрузка ({0}%)",
-    "app.presentationUploder.upload.413": "Файл слишком большой",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "Обработка страницы {0} из {1}",
-    "app.presentationUploder.conversion.genericConversionStatus": "Файл конвертируется...",
-    "app.presentationUploder.conversion.generatingThumbnail": "Генерируются миниатюры...",
-    "app.presentationUploder.conversion.generatedSlides": "Слайды генерируются...",
-    "app.presentationUploder.conversion.generatingSvg": "Генерация изображений SVG...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Ой, достигнут предел количества страниц",
-    "app.presentationUploder.conversion.timeout": "Ой, конвертация занимает слишком много времени",
-    "app.polling.pollingTitle": "Варианты голосования",
-    "app.polling.pollAnswerLabel": "Результат опроса {0}",
-    "app.polling.pollAnswerDesc": "Выберите этот вариант, чтобы проголосовать за {0}",
-    "app.failedMessage": "Извините, проблемы с подключением к серверу.",
-    "app.connectingMessage": "Подключение...",
-    "app.waitingMessage": "Соединение потеряно. Попытка переподключения через {0} секунд...",
-    "app.navBar.settingsDropdown.optionsLabel": "Опции",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Перейти в полноэкранный режим",
-    "app.navBar.settingsDropdown.settingsLabel": "Открыть настройки",
-    "app.navBar.settingsDropdown.aboutLabel": "О программе",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Выход",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Выйти из полноэкранного режима",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Сделать меню настроек на весь экран",
-    "app.navBar.settingsDropdown.settingsDesc": "Изменить главные настройки",
-    "app.navBar.settingsDropdown.aboutDesc": "Показать информацию о клиенте",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Покинуть конференцию",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Выйти из полноэкранного режима",
-    "app.navBar.settingsDropdown.hotkeysLabel": "Быстрые клавиши",
-    "app.navBar.settingsDropdown.hotkeysDesc": "Список доступных быстрых клавиш",
-    "app.navBar.settingsDropdown.helpLabel": "Помощь",
-    "app.navBar.settingsDropdown.helpDesc": "Ссылает пользователей на видеоуроки",
-    "app.navBar.userListToggleBtnLabel": "Включить/выключить список пользователей",
-    "app.navBar.toggleUserList.ariaLabel": "Включить/выключить Пользователей и Сообщения",
-    "app.navBar.toggleUserList.newMessages": "с уведомлением о новых сообщениях",
-    "app.navBar.recording": "Этот сеанс записывается",
-    "app.navBar.recording.on": "Записывается",
-    "app.navBar.recording.off": "Не записывается",
-    "app.leaveConfirmation.title": "Покинуть сеанс",
-    "app.leaveConfirmation.message": "Вы действительно хотите покинуть эту конференцию?",
-    "app.leaveConfirmation.confirmLabel": "Выйти",
-    "app.leaveConfirmation.confirmDesc": "Выйти из конференции",
-    "app.leaveConfirmation.dismissLabel": "Отмена",
-    "app.leaveConfirmation.dismissDesc": "Закрывает и отклоняет подтверждение о выходе",
-    "app.leaveConfirmation.endMeetingLabel": "Да, завершить сеанс",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Покинуть и завершить сеанс",
-    "app.leaveConfirmation.endMeetingDesc": "Подтвердить завершение конференции",
-    "app.about.title": "О программе",
-    "app.about.version": "Сборка клиента:",
-    "app.about.copyright": "Авторские права:",
-    "app.about.confirmLabel": "ОК",
-    "app.about.confirmDesc": "ОК",
-    "app.about.dismissLabel": "Отмена",
-    "app.about.dismissDesc": "Закрыть информацию о клиента",
-    "app.actionsBar.changeStatusLabel": "Изменить статус",
-    "app.actionsBar.muteLabel": "Выключить микрофон",
-    "app.actionsBar.unmuteLabel": "Включить микрофон",
-    "app.actionsBar.camOffLabel": "Выключить камеру",
-    "app.actionsBar.raiseLabel": "Поднять",
-    "app.actionsBar.label": "Панель действий",
-    "app.submenu.application.applicationSectionTitle": "Приложение",
-    "app.submenu.application.audioAlertLabel": "Звуковые оповещения для чата",
-    "app.submenu.application.pushAlertLabel": "Всплывающие оповещения для чата",
-    "app.submenu.application.fontSizeControlLabel": "Размер шрифта",
-    "app.submenu.application.increaseFontBtnLabel": "Увеличить шрифт приложения",
-    "app.submenu.application.decreaseFontBtnLabel": "Уменьшить шрифт приложения",
-    "app.submenu.application.languageLabel": "Язык приложения",
-    "app.submenu.application.ariaLanguageLabel": "Изменить язык приложения",
-    "app.submenu.application.languageOptionLabel": "Выберите язык",
-    "app.submenu.application.noLocaleOptionLabel": "Нет доступных переводов",
-    "app.submenu.audio.micSourceLabel": "Источник микрофона",
-    "app.submenu.audio.speakerSourceLabel": "Источник динамиков",
-    "app.submenu.audio.streamVolumeLabel": "Громкость аудио-потока",
-    "app.submenu.video.title": "Видео",
-    "app.submenu.video.videoSourceLabel": "Видео-источник",
-    "app.submenu.video.videoOptionLabel": "Выбрать видео-источник",
-    "app.submenu.video.videoQualityLabel": "Качество видео",
-    "app.submenu.video.qualityOptionLabel": "Выберите качество видео",
-    "app.submenu.video.participantsCamLabel": "Просмотр веб-камер участников",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Субтитры",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Перехватить",
-    "app.submenu.closedCaptions.languageLabel": "Язык",
-    "app.submenu.closedCaptions.localeOptionLabel": "Выберите язык",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Нет доступных переводов",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Шрифт",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Выберите шрифт",
-    "app.submenu.closedCaptions.fontSizeLabel": "Размер шрифта",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Выберите размер шрифта",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Цвет фона",
-    "app.submenu.closedCaptions.fontColorLabel": "Цвет шрифта",
-    "app.submenu.participants.muteAllLabel": "Выключить микрофоны у всех кроме ведущего",
-    "app.submenu.participants.lockAllLabel": "Блокировать всех участников",
-    "app.submenu.participants.lockItemLabel": "Participants {0}",
-    "app.submenu.participants.lockMicDesc": "Отключает микрофон у всех блокированных участников",
-    "app.submenu.participants.lockCamDesc": "Отключает веб-камеру у всех блокированных участников",
-    "app.submenu.participants.lockPublicChatDesc": "Отключает общий чат для всех блокированных участников",
-    "app.submenu.participants.lockPrivateChatDesc": "Отключает приватный чат для всех блокированных участников",
-    "app.submenu.participants.lockLayoutDesc": "Заблокировать расположение окон для всех заблокированных участников",
-    "app.submenu.participants.lockMicAriaLabel": "Заблокировать микрофон",
-    "app.submenu.participants.lockCamAriaLabel": "Заблокировать веб-камеру",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Заблокировать общий чат",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Заблокировать приватный чат",
-    "app.submenu.participants.lockLayoutAriaLabel": "Заблокировать расположение окон",
-    "app.submenu.participants.lockMicLabel": "Микрофон",
-    "app.submenu.participants.lockCamLabel": "Веб-камера",
-    "app.submenu.participants.lockPublicChatLabel": "Общий чат",
-    "app.submenu.participants.lockPrivateChatLabel": "Приватный чат",
-    "app.submenu.participants.lockLayoutLabel": "Расположение окон",
-    "app.settings.applicationTab.label": "Приложение",
-    "app.settings.audioTab.label": "Аудио",
-    "app.settings.videoTab.label": "Видео",
-    "app.settings.closedcaptionTab.label": "Субтитры",
-    "app.settings.usersTab.label": "Участники",
-    "app.settings.main.label": "Настройки",
-    "app.settings.main.cancel.label": "Отмена",
-    "app.settings.main.cancel.label.description": "Сбрасывает изменения и закрывает меню настроек",
-    "app.settings.main.save.label": "Сохранить",
-    "app.settings.main.save.label.description": "Сохраняет изменения и закрывает меню настроек",
-    "app.settings.dataSavingTab.label": "Сохранение данных",
-    "app.settings.dataSavingTab.webcam": "Включить веб камеры",
-    "app.settings.dataSavingTab.screenShare": "Включить демонстрацию рабочего стола",
-    "app.settings.dataSavingTab.description": "Чтобы сохранить устойчивую скорость соединения, выберите, что будет отображаться",
-    "app.switch.onLabel": "ВКЛ",
-    "app.switch.offLabel": "ВЫКЛ",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Действия",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Загрузить презентацию",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Начать опрос",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Демонстировать ваш экран",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Остановить демонстрацию экрана",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Загрузите вашу презентацию",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Начать опрос",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Демонстрировать ваш экран другим участникам",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Остановить демонстрацию экрана ",
-    "app.actionsBar.actionsDropdown.startRecording": "Начать запись",
-    "app.actionsBar.actionsDropdown.stopRecording": "Остановить запись",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Установить статус",
-    "app.actionsBar.emojiMenu.awayLabel": "Отошел",
-    "app.actionsBar.emojiMenu.awayDesc": "Изменяет ваш статус на \"Отошел\"",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "Поднять руку",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "Поднять руку, чтобы задать вопрос",
-    "app.actionsBar.emojiMenu.neutralLabel": "Нерешительный",
-    "app.actionsBar.emojiMenu.neutralDesc": "Изменяет ваш статус на \"Нерешительный\"",
-    "app.actionsBar.emojiMenu.confusedLabel": "Смущен",
-    "app.actionsBar.emojiMenu.confusedDesc": "Изменяет ваш статус на \"Смущен\"",
-    "app.actionsBar.emojiMenu.sadLabel": "Грустный",
-    "app.actionsBar.emojiMenu.sadDesc": "Изменяет ваш статус на \"Грустный\"",
-    "app.actionsBar.emojiMenu.happyLabel": "Счастливый",
-    "app.actionsBar.emojiMenu.happyDesc": "Изменяет ваш статус на \"Счастливый\"",
-    "app.actionsBar.emojiMenu.noneLabel": "Очистить статус",
-    "app.actionsBar.emojiMenu.noneDesc": "Очищает ваш статус",
-    "app.actionsBar.emojiMenu.applauseLabel": "Апплодисменты",
-    "app.actionsBar.emojiMenu.applauseDesc": "Изменяет ваш статус на \"Аплодисменты\"",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Нравится",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Изменяет ваш статус на \"Нравится\"",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Не нравится",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Изменяет ваш статус на \"Не нравится\"",
-    "app.actionsBar.currentStatusDesc": "текущий статус {0}",
-    "app.audioNotification.audioFailedError1001": "Ошибка 1001: WebSocket отключен",
-    "app.audioNotification.audioFailedError1002": "Ошибка 1002: Не удалось установить соединение WebSocket",
-    "app.audioNotification.audioFailedError1003": "Ошибка 1003: Версия браузера не поддерживается",
-    "app.audioNotification.audioFailedError1004": "Ошибка 1004: Сбой вызова",
-    "app.audioNotification.audioFailedError1005": "Ошибка 1005: Вызов внезапно прервался",
-    "app.audioNotification.audioFailedError1006": "Ошибка 1006: Время вызова истекло",
-    "app.audioNotification.audioFailedError1007": "Ошибка 1007: Согласование ICE не состоялось",
-    "app.audioNotification.audioFailedError1008": "Ошибка 1008: Сбой передачи",
-    "app.audioNotification.audioFailedError1009": "Ошибка 1009: не удалось получить информацию STUN/TURN сервера",
-    "app.audioNotification.audioFailedError1010": "Ошибка 1010: Время согласования ICE истекло ",
-    "app.audioNotification.audioFailedError1011": "Ошибка 1011: Превышено время сбора ICE",
-    "app.audioNotification.audioFailedMessage": "Не удалось установить аудио-соединение",
-    "app.audioNotification.mediaFailedMessage": "Ошибка getUserMicMedia, разрешены только безопасные источники",
-    "app.audioNotification.closeLabel": "Закрыть",
-    "app.audioNotificaion.reconnectingAsListenOnly": "Аудио было заблокировано модератором, вы присоединились в режиме прослушивания",
-    "app.breakoutJoinConfirmation.title": "Присоединиться к комнате групповой работы",
-    "app.breakoutJoinConfirmation.message": "Вы хотите присоединиться к ",
-    "app.breakoutJoinConfirmation.confirmLabel": "Присоединиться",
-    "app.breakoutJoinConfirmation.confirmDesc": "Присоединяет вас к конференции",
-    "app.breakoutJoinConfirmation.dismissLabel": "Отмена",
-    "app.breakoutJoinConfirmation.dismissDesc": "Закрывает и отклоняет присоединение к конференции",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "Выберите конференцию, к которой хотите подключиться",
-    "app.breakoutTimeRemainingMessage": "Оставшееся время конференции: {0}",
-    "app.breakoutWillCloseMessage": "Время вышло. Комната групповой работы скоро закроется.",
-    "app.calculatingBreakoutTimeRemaining": "Подсчёт оставшегося времени...",
-    "app.audioModal.microphoneLabel": "Микрофон",
-    "app.audioModal.listenOnlyLabel": "Только слушать",
-    "app.audioModal.audioChoiceLabel": "Как вы хотите войти в аудио-конференцию?",
-    "app.audioModal.iOSBrowser": "Аудио/Видео не поддерживается",
-    "app.audioModal.iOSErrorDescription": "В настоящее время аудио и видео не поддерживаются в Chrome для iOS.",
-    "app.audioModal.iOSErrorRecommendation": "Мы рекомендуем использовать Safari для iOS.",
-    "app.audioModal.audioChoiceDesc": "Выберите, как участвовать в аудио-конференции",
-    "app.audioModal.closeLabel": "Закрыть",
-    "app.audioModal.yes": "Да",
-    "app.audioModal.no": "Нет",
-    "app.audioModal.yes.arialabel" : "Звучит эхо",
-    "app.audioModal.no.arialabel" : "Эхо не звучит",
-    "app.audioModal.echoTestTitle": "Это тестирование звука, его слышите только вы. Скажите несколько слов в микрофон. Слышите ли вы себя в динамиках?",
-    "app.audioModal.settingsTitle": "Изменить настройки звука",
-    "app.audioModal.helpTitle": "Возникли проблемы с вашими аудио-устройствами",
-    "app.audioModal.helpText": "Дали ли вы BigBlueButton разрешение на использование вашего микрофона? Когда вы подключаете аудио, вы должны увидеть диалог запроса доступа к аудио-устройствам - вы должны предоставить доступ, чтобы учавствовать в аудио-конференции. Если этого не произошло, попробуйте изменить настройки доступа к микрофону в настройках вашего браузера.",
-    "app.audioModal.connecting": "Покдлючение",
-    "app.audioModal.connectingEchoTest": "Подключение к тесту звука",
-    "app.audioManager.joinedAudio": "Вы подключились к аудио-конференции",
-    "app.audioManager.joinedEcho": "Вы подключились к тесту звука",
-    "app.audioManager.leftAudio": "Вы отключились от аудио-конференции",
-    "app.audioManager.genericError": "Ошибка: что-то пошло не так, пожалуйста, попробуйте еще раз",
-    "app.audioManager.connectionError": "Ошибка: подключение не удалось",
-    "app.audioManager.requestTimeout": "Ошибка: время ожидания подключения истекло",
-    "app.audioManager.invalidTarget": "Ошибка: Попытка запросить что-то от неверной цели",
-    "app.audioManager.mediaError": "Ошибка: возникла проблема с вашими аудио-устройствами",
-    "app.audio.joinAudio": "Присоединиться к аудио-конференции",
-    "app.audio.leaveAudio": "Покинуть аудио-конференцию",
-    "app.audio.enterSessionLabel": "Подключиться к сеансу",
-    "app.audio.playSoundLabel": "Проиграть звук",
-    "app.audio.backLabel": "Назад",
-    "app.audio.audioSettings.titleLabel": "Выберите аудио-настройки",
-    "app.audio.audioSettings.descriptionLabel": "Вам будет показан запрос на разрешение использование вашего микрофона",
-    "app.audio.audioSettings.microphoneSourceLabel": "Микрофон",
-    "app.audio.audioSettings.speakerSourceLabel": "Динамики",
-    "app.audio.audioSettings.microphoneStreamLabel": "Громкость вашего аудио-потока",
-    "app.audio.audioSettings.retryLabel": "Повторить",
-    "app.audio.listenOnly.backLabel": "Назад",
-    "app.audio.listenOnly.closeLabel": "Закрыть",
-    "app.audio.permissionsOverlay.title": "Разрешите BigBlueButton использовать ваши медиа-устройства",
-    "app.audio.permissionsOverlay.hint": "Вы должны разрешить нам использовать ваши медиа-устройства, чтобы учавствовать в аудио-конференции :)",
-    "app.error.removed": "Вас удалили из конференции",
-    "app.error.meeting.ended": "Вы вышли из конференции",
-    "app.dropdown.close": "Закрыть",
-    "app.error.500": "Упс, что-то пошло не так",
-    "app.error.404": "Не найдено",
-    "app.error.401": "Не авторизирован",
-    "app.error.403": "Доступ запрещен",
-    "app.error.leaveLabel": "Зайдите снова",
-    "app.guest.waiting": "Ожидание одобрения входа",
-    "app.toast.breakoutRoomEnded": "Конференция закончилась. Пожалуйста, присоединитесь снова к аудио конференции.",
-    "app.toast.chat.public": "Новое сообщение в публичном чате",
-    "app.toast.chat.private": "Новое сообщение в приватном чате",
-    "app.toast.chat.system": "Система",
-    "app.notification.recordingStart": "Этот сеанс записывается",
-    "app.notification.recordingStop": "Этот сеанс больше не будет записан",
-    "app.shortcut-help.title": "Клавиши быстрого доступа",
-    "app.shortcut-help.accessKeyNotAvailable": "Доступ к ключам недоступен.",
-    "app.shortcut-help.comboLabel": "Комбо",
-    "app.shortcut-help.functionLabel": "Функция",
-    "app.shortcut-help.closeLabel": "Закрыть",
-    "app.shortcut-help.closeDesc": "Закрывает модальные клавиши быстрого доступа",
-    "app.shortcut-help.openOptions": "Открывает параметры",
-    "app.shortcut-help.toggleUserList": "Включает список пользователей",
-    "app.shortcut-help.toggleMute": "Включает / Выключает микрофон",
-    "app.shortcut-help.togglePublicChat": "Включает публичный чат (Список пользователей должен быть открыт)",
-    "app.shortcut-help.hidePrivateChat": "Прячет приватный чат",
-    "app.shortcut-help.closePrivateChat": "Закрывает приватный чат",
-    "app.shortcut-help.openActions": "Открывает меню действий",
-    "app.shortcut-help.openStatus": "Открывает меню статуса",
-    "app.video.joinVideo": "Транслировать веб-камеру",
-    "app.video.leaveVideo": "Не транслировать веб-камеру",
-    "app.video.iceCandidateError": "Щшибка добавления ice кандидата",
-    "app.video.iceConnectionStateError": "Ошибка 1107: согласование ICE провалилось",
-    "app.video.permissionError": "Ошибка. Проверьте разрешение на доступ к веб-камере.",
-    "app.video.sharingError": "Ошибка трансляции веб-камеры",
-    "app.video.notFoundError": "Невозможно найти веб-камеру. Пожалуйста, проверте присоединена ли она",
-    "app.video.notAllowed": "Отсутствует разрешение на трансляцию веб-камеры, пожалуйста, убедитесь, что ваш браузер имеет необходиміе разрешения",
-    "app.video.notSupportedError": "Можна транслировать видео с веб-камеры только с безопасных источников, убедитесь, что ваш сертификат SSL действителен",
-    "app.video.notReadableError": "Не удалось получить видео с веб-камеры. Убедитесь, что другая программа не использует веб-камеру",
-    "app.video.swapCam": "Заменить",
-    "app.video.swapCamDesc": "поменять направление веб-камер",
-    "app.video.videoMenu": "Меню видео",
-    "app.video.videoMenuDisabled": "Меню видео веб-камеры отключено в настройках",
-    "app.video.videoMenuDesc": "Открыть выпадающее меню видео",
-    "app.video.chromeExtensionError": "Вы должны установить",
-    "app.video.chromeExtensionErrorLink": "это расширение Chrome",
-    "app.video.stats.title": "Статистика подключений",
-    "app.video.stats.packetsReceived": "Полученные пакеты",
-    "app.video.stats.packetsSent": "Пакеты отправлены",
-    "app.video.stats.packetsLost": "Пакеты потеряны",
-    "app.video.stats.bitrate": "Битрейт",
-    "app.video.stats.lostPercentage": "Общий процент потерянных",
-    "app.video.stats.lostRecentPercentage": "Нынешний процент потерянных",
-    "app.video.stats.dimensions": "Размеры",
-    "app.video.stats.codec": "Кодек",
-    "app.video.stats.decodeDelay": "Задержка декодирования",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "Использование кодировкой",
-    "app.video.stats.currentDelay": "Текущая задержка",
-    "app.deskshare.iceConnectionStateError": "Ошибка 1108: соединение с ICE не удалось при совместном использовании экрана",
-    "app.sfu.mediaServerConnectionError2000": "Ошибка 2000: невозможно подключиться к медиа-серверу",
-    "app.sfu.mediaServerOffline2001": "Ошибка 2001: Медиа-сервер отключен. Пожалуйста, повторите попытку позже.",
-    "app.sfu.mediaServerNoResources2002": "Ошибка 2002: у медиасервера нет доступных ресурсов",
-    "app.sfu.mediaServerRequestTimeout2003": "Ошибка 2003: время запроса на медиа сервер вышло",
-    "app.sfu.serverIceGatheringFailed2021": "Ошибка 2021: Медиа-сервер не может собирать кандидатов ICE",
-    "app.sfu.serverIceGatheringFailed2022": "Ошибка 2022: Медиа серверу не удалось подключиться к ICE",
-    "app.sfu.invalidSdp2202":"Ошибка 2202: клиент создал недопустимый SDP",
-    "app.sfu.noAvailableCodec2203": "Ошибка 2203: сервер не смог найти соответствующий кодек",
-
-    "app.meeting.endNotification.ok.label": "ОК",
-    "app.whiteboard.toolbar.tools": "Инструменты",
-    "app.whiteboard.toolbar.tools.pointer": "Указатель",
-    "app.whiteboard.toolbar.tools.pencil": "Карандаш",
-    "app.whiteboard.toolbar.tools.rectangle": "Четырехугольник",
-    "app.whiteboard.toolbar.tools.triangle": "Треугольник",
-    "app.whiteboard.toolbar.tools.ellipse": "Окружность",
-    "app.whiteboard.toolbar.tools.line": "Линия",
-    "app.whiteboard.toolbar.tools.text": "Текст",
-    "app.whiteboard.toolbar.thickness": "Толщина рисования",
-    "app.whiteboard.toolbar.thicknessDisabled": "Толщина рисования отключена",
-    "app.whiteboard.toolbar.color": "Цвета",
-    "app.whiteboard.toolbar.colorDisabled": "Цвета отключены",
-    "app.whiteboard.toolbar.color.black": "Черный",
-    "app.whiteboard.toolbar.color.white": "Белый",
-    "app.whiteboard.toolbar.color.red": "Красный",
-    "app.whiteboard.toolbar.color.orange": "Оранжевый",
-    "app.whiteboard.toolbar.color.eletricLime": "Салатовый",
-    "app.whiteboard.toolbar.color.lime": "Зеленый",
-    "app.whiteboard.toolbar.color.cyan": "Бирюзовый",
-    "app.whiteboard.toolbar.color.dodgerBlue": "Голубой",
-    "app.whiteboard.toolbar.color.blue": "Синий",
-    "app.whiteboard.toolbar.color.violet": "Фиолетовый",
-    "app.whiteboard.toolbar.color.magenta": "Пурпурный",
-    "app.whiteboard.toolbar.color.silver": "Серый",
-    "app.whiteboard.toolbar.undo": "Отменить пометку",
-    "app.whiteboard.toolbar.clear": "Очистить все пометки",
-    "app.whiteboard.toolbar.multiUserOn": "Включить многопользовательский режим",
-    "app.whiteboard.toolbar.multiUserOff": "Выключить многопользовательский режим",
-    "app.whiteboard.toolbar.fontSize": "Выбор размера шрифта",
-    "app.feedback.title": "Вы вышли из конференции",
-    "app.feedback.subtitle": "Мы бы хотели услышать о вашем опыте работы с BigBlueButton (необязательно)",
-    "app.feedback.textarea": "Как мы можем сделать BigBlueButton лучше?",
-    "app.feedback.sendFeedback": "Отправить отзыв",
-    "app.feedback.sendFeedbackDesc": "Отправить отзыв и покинуть встречу",
-    "app.videoDock.webcamFocusLabel": "Фокус",
-    "app.videoDock.webcamFocusDesc": "Сфокусировать выбранную веб-камеру",
-    "app.videoDock.webcamUnfocusLabel": "Расфокусировать",
-    "app.videoDock.webcamUnfocusDesc": "Расфокусировать выбранную веб-камеру"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/tr_TR.json b/bigbluebutton-html5/private/locales/tr_TR.json
deleted file mode 100644
index 42bd9a8ba9..0000000000
--- a/bigbluebutton-html5/private/locales/tr_TR.json
+++ /dev/null
@@ -1,355 +0,0 @@
-{
-    "app.home.greeting": "Hoş geldin {0}! Sunumunuz birazdan başlayacak...",
-    "app.chat.submitLabel": "Mesaj Gönder",
-    "app.chat.errorMinMessageLength": "Mesaj {0} karakter daha kısa",
-    "app.chat.errorMaxMessageLength": "Mesaj {0} karakter daha uzun",
-    "app.chat.inputLabel": "{0} sohbeti için mesaj verisi",
-    "app.chat.inputPlaceholder": "Mesaj {0}",
-    "app.chat.titlePublic": "Genel Sohbet",
-    "app.chat.titlePrivate": "{0} ile Özel Sohbet",
-    "app.chat.partnerDisconnected": "{0} görüşmeden ayrıldı",
-    "app.chat.closeChatLabel": "Kapat {0}",
-    "app.chat.hideChatLabel": "Gizle {0}",
-    "app.chat.moreMessages": "Mesajların devamı aşağıda",
-    "app.chat.dropdown.options": "Sohbet Seçenekleri",
-    "app.chat.dropdown.clear": "Temizle",
-    "app.chat.dropdown.copy": "Kopyala",
-    "app.chat.dropdown.save": "Kaydet",
-    "app.chat.label": "Sohbet",
-    "app.chat.emptyLogLabel": "Sohbet sistem kayıtları boş",
-    "app.chat.clearPublicChatMessage": "Genel sohbet geçmişi moderatör tarafından temizlendi",
-    "app.userList.usersTitle": "Kullanıcılar",
-    "app.userList.participantsTitle": "Katılımcılar",
-    "app.userList.messagesTitle": "Mesajlar",
-    "app.userList.presenter": "Sunucu",
-    "app.userList.you": "Siz",
-    "app.userList.locked": "Kilitli",
-    "app.userList.label": "Kullanıcı Listesi",
-    "app.userList.toggleCompactView.label": "Sıkıştırılmış görünüm moduna geç",
-    "app.userList.guest": "Misafir",
-    "app.userList.menuTitleContext": "Kullanılabilir Seçenekler",
-    "app.userList.chatListItem.unreadSingular": "{0} Yeni Mesaj",
-    "app.userList.chatListItem.unreadPlural": "{0} Yeni Mesaj",
-    "app.userList.menu.chat.label": "Sohbet",
-    "app.userList.menu.clearStatus.label": "Durum Temizle",
-    "app.userList.menu.makePresenter.label": "Sunucu Yap",
-    "app.userList.menu.removeUser.label": "Kullanıcı uzaklaştır",
-    "app.userList.menu.muteUserAudio.label": "Kullanıcıyı sustur",
-    "app.userList.menu.unmuteUserAudio.label": "Kullanıcıyı konuştur",
-    "app.userList.userAriaLabel": "{0} {1} {2}  Durum {3}",
-    "app.media.label": "Medya",
-    "app.media.screenshare.start": "Ekran paylaşımı başladı",
-    "app.media.screenshare.end": "Ekran paylaşımı sonlandı",
-    "app.meeting.ended": "Oturum sonlandı",
-    "app.meeting.endedMessage": "Ana ekrana geri yönlendirileceksiniz",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Önceki slayt",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Sunumu önceki slayda değiştir",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Sonraki slayt",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Sunumu sonraki slayda değiştir",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Slayt atla",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Sunumu belirli slayda değiştir",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Genişliğe sığdır",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Slayt genişliğinde göster",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Ekrana sığdır",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Tüm slaydı göster",
-    "app.presentation.presentationToolbar.zoomLabel": "Odak",
-    "app.presentation.presentationToolbar.zoomDesc": "Sunumun odak seviyesini değiştir",
-    "app.presentation.presentationToolbar.goToSlide": "Slayt {0}",
-    "app.presentationUploder.title": "Sunum",
-    "app.presentationUploder.message": "BigBlueButton'da sunucu olarak herhangi bir ofis belgesini ya da PDF dosyasını yükleyebilirsiniz. En iyi sonuç için PDF dosyası yüklemenizi tavsiye ederiz.",
-    "app.presentationUploder.confirmLabel": "Başlat",
-    "app.presentationUploder.confirmDesc": "Değişiklikleri kaydet ve sunumu başlat",
-    "app.presentationUploder.dismissLabel": "Vazgeç",
-    "app.presentationUploder.dismissDesc": "Model penceresini kapatın ve değişiklikleri geri alın",
-    "app.presentationUploder.dropzoneLabel": "Yüklenecek dosyaları buraya sürükleyin",
-    "app.presentationUploder.browseFilesLabel": "ya da dosyalara göz at",
-    "app.presentationUploder.fileToUpload": "Yüklenecek...",
-    "app.presentationUploder.currentBadge": "Şimdiki",
-    "app.presentationUploder.genericError": "Hops, birşeyler ters gitti",
-    "app.presentationUploder.upload.413": "Dosya çok büyük",
-    "app.presentationUploder.conversion.genericConversionStatus": "Dosyayı dönüştürüyor...",
-    "app.presentationUploder.conversion.generatingThumbnail": "Küçük resimler oluşturuluyor...",
-    "app.presentationUploder.conversion.generatedSlides": "Slaytlar oluşturuldu...",
-    "app.presentationUploder.conversion.generatingSvg": "SVG resimler oluşturuluyor...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Hops, sayfa sayısı limiti aştı",
-    "app.presentationUploder.conversion.timeout": "Hops, dönüştürme uzun zaman alıyor",
-    "app.polling.pollingTitle": "Oylama Seçenekleri",
-    "app.polling.pollAnswerLabel": "{0} Oylamasını cevapla",
-    "app.polling.pollAnswerDesc": "{0} Oylaması için bu seçeneği seç",
-    "app.failedMessage": "Özür dileriz, sunucuya bağlanma sorunu var.",
-    "app.connectingMessage": "Bağlanıyor...",
-    "app.waitingMessage": "Bağlantı koptu. {0} saniye sonra tekrar bağlanmayı deneyecek...",
-    "app.navBar.settingsDropdown.optionsLabel": "Seçenekler",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Tam ekran yap",
-    "app.navBar.settingsDropdown.settingsLabel": "Ayarları aç",
-    "app.navBar.settingsDropdown.aboutLabel": "Hakkında",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Çıkış",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Tam ekrandan çık",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Ayarlar menüsünü tam ekran yap",
-    "app.navBar.settingsDropdown.settingsDesc": "Genel ayarları değiştir",
-    "app.navBar.settingsDropdown.aboutDesc": "Kullanıcı bilgilerini göster",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Görüşmeden ayrıl",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Tam ekran modundan çık",
-    "app.navBar.settingsDropdown.hotkeysLabel": "Kısayol Tuşları",
-    "app.navBar.settingsDropdown.hotkeysDesc": "Hazır kısayol tuşları listesi",
-    "app.navBar.userListToggleBtnLabel": "Kullanıcı Listesine Geç",
-    "app.navBar.toggleUserList.ariaLabel": "Kullanıcılar ve Mesajlara Geç",
-    "app.navBar.toggleUserList.newMessages": "yeni mesaj bildirimiyle",
-    "app.navBar.recording": "Bu oturum kaydediliyor",
-    "app.navBar.recording.on": "Kaydediyor",
-    "app.navBar.recording.off": "Kaydetmiyor",
-    "app.leaveConfirmation.title": "Oturumdan Ayrıl",
-    "app.leaveConfirmation.message": "Görüşmeden ayrılmak istiyor musunuz?",
-    "app.leaveConfirmation.confirmLabel": "Ayrıl",
-    "app.leaveConfirmation.confirmDesc": "Sizi görüşmeden çıkarır",
-    "app.leaveConfirmation.dismissLabel": "Vazgeç",
-    "app.leaveConfirmation.dismissDesc": "Ayrılma onayını reddeder ve kapatır",
-    "app.leaveConfirmation.endMeetingLabel": "Evet ve oturumu kapat",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Ayrıl ve oturumu sonlandır",
-    "app.leaveConfirmation.endMeetingDesc": "Onayı kapatır ve görüşmeyi sonlandırır",
-    "app.about.title": "Hakkında",
-    "app.about.version": "İstemci Sürümü:",
-    "app.about.copyright": "Telif Hakkı:",
-    "app.about.confirmLabel": "TAMAM",
-    "app.about.confirmDesc": "TAMAM",
-    "app.about.dismissLabel": "Vazgeç",
-    "app.about.dismissDesc": "Kullanıcı bilgilerini kapat",
-    "app.actionsBar.changeStatusLabel": "Durum Değiştir",
-    "app.actionsBar.muteLabel": "Sustur",
-    "app.actionsBar.unmuteLabel": "Konuştur",
-    "app.actionsBar.camOffLabel": "Kamera Devre Dışı",
-    "app.actionsBar.raiseLabel": "El Kaldır",
-    "app.actionsBar.label": "Eylem Çubuğu",
-    "app.submenu.application.applicationSectionTitle": "Uygulama",
-    "app.submenu.application.fontSizeControlLabel": "Yazı büyüklüğü",
-    "app.submenu.application.increaseFontBtnLabel": "Uygulama Yazı Büyüklüğünü Artır",
-    "app.submenu.application.decreaseFontBtnLabel": "Uygulama Yazı Büyüklüğünü Azalt",
-    "app.submenu.application.languageLabel": "Uygulama Dili",
-    "app.submenu.application.ariaLanguageLabel": "Uygulama Dilini Değiştir",
-    "app.submenu.application.languageOptionLabel": "Dil seçin",
-    "app.submenu.application.noLocaleOptionLabel": "Aktif yerel ayar bulunamadı",
-    "app.submenu.audio.micSourceLabel": "Mikrofon kaynağı",
-    "app.submenu.audio.speakerSourceLabel": "Hoparlör kaynağı",
-    "app.submenu.audio.streamVolumeLabel": "Sesinizin seviyesi",
-    "app.submenu.video.title": "Video",
-    "app.submenu.video.videoSourceLabel": "Görüntü kaynağı",
-    "app.submenu.video.videoOptionLabel": "Görüntü kaynağını seç",
-    "app.submenu.video.videoQualityLabel": "Video Kalitesi",
-    "app.submenu.video.qualityOptionLabel": "Video kalitesini seç",
-    "app.submenu.video.participantsCamLabel": "Katılımcıların web kameraları görüntüleniyor",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Altyazı",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Sahiplik al",
-    "app.submenu.closedCaptions.languageLabel": "Dil",
-    "app.submenu.closedCaptions.localeOptionLabel": "Dil seçin",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Aktif yerel ayar bulunamadı",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Yazı tipi",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Yazı tipini Seç",
-    "app.submenu.closedCaptions.fontSizeLabel": "Yazı büyüklüğü",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Yazı büyüklüğünü Seç",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Arkalan rengi",
-    "app.submenu.closedCaptions.fontColorLabel": "Yazı rengi",
-    "app.submenu.participants.muteAllLabel": "Sunucu hariç tümünü sustur",
-    "app.submenu.participants.lockAllLabel": "Tüm katılımcıları kilitle",
-    "app.submenu.participants.lockItemLabel": "Katılımcılar {0}",
-    "app.submenu.participants.lockMicDesc": "Tüm kilitli katılımcıların mikrofonunu devre dışı bırakır",
-    "app.submenu.participants.lockCamDesc": "Tüm kilitli katılımcıların web kamerasını devre dışı bırakır",
-    "app.submenu.participants.lockPublicChatDesc": "Tüm kilitli katılımcılar için genel sohbeti devre dışı bırakır",
-    "app.submenu.participants.lockPrivateChatDesc": "Tüm kilitli katılımcılar için özel sohbeti devre dışı bırakır",
-    "app.submenu.participants.lockLayoutDesc": "Tüm kilitli katılımcıların ekran görünümünü kilitler",
-    "app.submenu.participants.lockMicAriaLabel": "Mikrofon kilidi",
-    "app.submenu.participants.lockCamAriaLabel": "Web kamera kilidi",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Genel sohbet kilidi",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Özel sohbet kilidi",
-    "app.submenu.participants.lockLayoutAriaLabel": "Görünüm kilidi",
-    "app.submenu.participants.lockMicLabel": "Mikrofon",
-    "app.submenu.participants.lockCamLabel": "Web Kamerası",
-    "app.submenu.participants.lockPublicChatLabel": "Genel Sohbet",
-    "app.submenu.participants.lockPrivateChatLabel": "Özel Sohbet",
-    "app.submenu.participants.lockLayoutLabel": "Görünüm",
-    "app.settings.applicationTab.label": "Uygulama ",
-    "app.settings.audioTab.label": "Ses",
-    "app.settings.videoTab.label": "Video",
-    "app.settings.closedcaptionTab.label": "Altyazı",
-    "app.settings.usersTab.label": "Katılımcılar",
-    "app.settings.main.label": "Ayarlar",
-    "app.settings.main.cancel.label": "Vazgeç",
-    "app.settings.main.cancel.label.description": "Değişiklikleri geri alır ve ayarlar menüsünü kapatır",
-    "app.settings.main.save.label": "Kaydet",
-    "app.settings.main.save.label.description": "Değişiklikleri kaydeder ve ayarlar menüsünü kapatır",
-    "app.settings.dataSavingTab.label": "Veri Kazancı",
-    "app.settings.dataSavingTab.webcam": "Kameraları Etkinleştir",
-    "app.settings.dataSavingTab.screenShare": "Masaüstü Paylaşımını Etkinleştir",
-    "app.settings.dataSavingTab.description": "Bant genişliğinden tasarruf etmek için mevcut gösterimi ayarlayın.",
-    "app.switch.onLabel": "AÇIK",
-    "app.switch.offLabel": "KAPALI",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Eylemler",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Bir sunum yükle",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Oylama başlat",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Ekranını paylaş",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ekran paylaşımını sonlandır",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Sunumunuzu yükleyin",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Oylama başlat",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Ekranını diğerleriyle paylaş",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Ekran genişliği paylaşımını sonlandır",
-    "app.actionsBar.actionsDropdown.startRecording": "Kaydı başlat",
-    "app.actionsBar.actionsDropdown.stopRecording": "Kaydı durdur",
-    "app.actionsBar.emojiMenu.awayLabel": "Dışarıda",
-    "app.actionsBar.emojiMenu.awayDesc": "Durumunu dışarıda yap",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "El Kaldır",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "Soru sormak için el kaldırın",
-    "app.actionsBar.emojiMenu.neutralLabel": "Kararsız",
-    "app.actionsBar.emojiMenu.neutralDesc": "Durumunu kararsız yap",
-    "app.actionsBar.emojiMenu.confusedLabel": "Şaşırmış",
-    "app.actionsBar.emojiMenu.confusedDesc": "Durumunu şaşırmış yap",
-    "app.actionsBar.emojiMenu.sadLabel": "Üzgün",
-    "app.actionsBar.emojiMenu.sadDesc": "Durumunu üzgün yap",
-    "app.actionsBar.emojiMenu.happyLabel": "Mutlu",
-    "app.actionsBar.emojiMenu.happyDesc": "Durumunu mutlu yap",
-    "app.actionsBar.emojiMenu.noneLabel": "Durum Temizle",
-    "app.actionsBar.emojiMenu.noneDesc": "Durumunu temizle",
-    "app.actionsBar.emojiMenu.applauseLabel": "Alkış",
-    "app.actionsBar.emojiMenu.applauseDesc": "Durumunu alkış yap",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Beğendim",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Durumunu beğendi yap",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Beğenmedim",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Durumunu beğenmedi yap",
-    "app.actionsBar.currentStatusDesc": "şimdiki durum {0}",
-    "app.audioNotification.audioFailedError1001": "Hata 1001: WebSocket bağlantısı koptu",
-    "app.audioNotification.audioFailedError1002": "Hata 1002: WebSocket bağlantısı oluşturulamadı",
-    "app.audioNotification.audioFailedError1003": "Hata 1003: Web tarayıcının sürümü desteklenmiyor",
-    "app.audioNotification.audioFailedError1004": "Hata 1004: Arama hatası",
-    "app.audioNotification.audioFailedError1005": "Hata 1005: Arama beklenmedik şekilde sonlandı",
-    "app.audioNotification.audioFailedError1006": "Hata 1006: Arama zaman aşımına uğradı",
-    "app.audioNotification.audioFailedError1007": "Hata 1007: ICE Bilgi ve İçerik iletişimi başarısız oldu",
-    "app.audioNotification.audioFailedError1008": "Hata 1008: Aktarım başarısız oldu",
-    "app.audioNotification.audioFailedError1009": "Hata 1009: STUN/TURN sunucu bilgisi algılamadı",
-    "app.audioNotification.audioFailedError1010": "Hata 1010: ICE Bilgi ve İçerik iletişimi zaman aşımına uğradı",
-    "app.audioNotification.audioFailedError1011": "Hata 1011: ICE Bilgi ve İçerik toplanması zaman aşımına uğradı",
-    "app.audioNotification.audioFailedMessage": "Ses bağlantınız sağlanamadı",
-    "app.audioNotification.mediaFailedMessage": "Kullanıcının mikrofonuna erişim başarısız oldu. Yalnızca güvenli kaynaklara izin veriliyor.",
-    "app.audioNotification.closeLabel": "Kapat",
-    "app.breakoutJoinConfirmation.title": "Özel Odaya Katıl",
-    "app.breakoutJoinConfirmation.message": "Katılmak istiyor musunuz?",
-    "app.breakoutJoinConfirmation.confirmLabel": "Katıl",
-    "app.breakoutJoinConfirmation.confirmDesc": "Özel Odaya katılın",
-    "app.breakoutJoinConfirmation.dismissLabel": "Vazgeç",
-    "app.breakoutJoinConfirmation.dismissDesc": "Özel Odaya Katılımı reddeder ve kapatır",
-    "app.breakoutTimeRemainingMessage": "Özel Oda kalan süre: {0}",
-    "app.breakoutWillCloseMessage": "Süre bitti. Özel Oda birazdan kapanacak",
-    "app.calculatingBreakoutTimeRemaining": "Kalan süre hesaplanıyor...",
-    "app.audioModal.microphoneLabel": "Mikrofon",
-    "app.audioModal.listenOnlyLabel": "Yalnızca Dinle",
-    "app.audioModal.audioChoiceLabel": "Sesli katılımınızı nasıl yapmak istersiniz?",
-    "app.audioModal.audioChoiceDesc": "Bu görüşmede sesli katılımınızı nasıl yapmak istediğinizi seçin",
-    "app.audioModal.closeLabel": "Kapat",
-    "app.audioModal.yes": "Evet",
-    "app.audioModal.no": "Hayır",
-    "app.audioModal.yes.arialabel" : "Yankı duyulur",
-    "app.audioModal.no.arialabel" : "Yankı duyulmaz",
-    "app.audioModal.echoTestTitle": "Bu bir özel ses testidir. Birkaç kelime konuşun. Sesinizi duydunuz mu?",
-    "app.audioModal.settingsTitle": "Ses ayarlarınızı değiştirin",
-    "app.audioModal.helpTitle": "Medya cihazlarınızla ilgili bir problemi oluştu",
-    "app.audioModal.helpText": "BigBlueButton'ın mikrofonunuza erişim talebini onayladınız mı? Sesli görüşmeye katılmak istediğinizde, medya cihazlarınıza erişim izniyle ilgili bir iletişim kutusu görünecektir, sesli görüşmeye katılabilmek için onay vermeniz gerekir. Eğer onay iletişim kutusu görünmediyse, web tarayıcınızın ayarlarındaki mikrofon izinlerini değiştirmeyi deneyin.",
-    "app.audioModal.connecting": "Bağlanıyor",
-    "app.audioModal.connectingEchoTest": "Ses testine bağlanılıyor",
-    "app.audioManager.joinedAudio": "Sesli görüşmeye katıldınız",
-    "app.audioManager.joinedEcho": "Ses yankı testine katıldınız",
-    "app.audioManager.leftAudio": "Sesli görüşmeden ayrıldınız",
-    "app.audioManager.genericError": "Hata: Bir hata oluştu, lütfen tekrar deneyin",
-    "app.audioManager.connectionError": "Hata: Bağlantı hatası",
-    "app.audioManager.requestTimeout": "Hata: İstek zaman aşımına uğradı",
-    "app.audioManager.invalidTarget": "Hata: Geçersiz hedeften talep denemesi hatası",
-    "app.audioManager.mediaError": "Hata: Medya cihazlarınıza erişim problemi oluştu",
-    "app.audio.joinAudio": "Sesli Katıl",
-    "app.audio.leaveAudio": "Sesli Katılımı Kapat",
-    "app.audio.enterSessionLabel": "Oturuma Katıl",
-    "app.audio.playSoundLabel": "Sesi Oynat",
-    "app.audio.backLabel": "Geri",
-    "app.audio.audioSettings.titleLabel": "Ses ayarlarınızı seçin",
-    "app.audio.audioSettings.descriptionLabel": "Web tarayıcınızda mikrofon paylaşımıyla ilgili iletişim kutusu görünecektir, onaylamayı unutmayınız.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Mikrofon kaynağı",
-    "app.audio.audioSettings.speakerSourceLabel": "Hoparlör kaynağı",
-    "app.audio.audioSettings.microphoneStreamLabel": "Sesinizin seviyesi",
-    "app.audio.audioSettings.retryLabel": "Yeniden Dene",
-    "app.audio.listenOnly.backLabel": "Geri",
-    "app.audio.listenOnly.closeLabel": "Kapat",
-    "app.audio.permissionsOverlay.title": "BigBlueButton'un Medya Cihazlarınızı kullanmasına izin verin",
-    "app.audio.permissionsOverlay.hint": "Sizi sesli görüşmeye katabilmemiz için Medya Cihazlarınıza erişimimize izin vermeniz gerekir :)",
-    "app.error.removed": "Konferanstan uzaklaştırıldınız",
-    "app.error.meeting.ended": "Konferanstan ayrıldınız",
-    "app.dropdown.close": "Kapat",
-    "app.error.500": "Hops, birşeyler ters gitti",
-    "app.error.404": "Bulunamadı",
-    "app.error.401": "Yetkisiz",
-    "app.error.403": "Yasaklı",
-    "app.error.leaveLabel": "Tekrar giriş yap",
-    "app.guest.waiting": "Katılım onayı bekleniyor",
-    "app.toast.breakoutRoomEnded": "Özel sonlandı. Lütfen sesli görüşmeye yeniden katılın.",
-    "app.notification.recordingStart": "Bu oturum şu anda kaydediliyor",
-    "app.notification.recordingStop": "Bu oturum artık kaydedilmiyor",
-    "app.shortcut-help.title": "Kısayol Tuşları",
-    "app.shortcut-help.accessKeyNotAvailable": "Erişim tuşları hazır değil",
-    "app.shortcut-help.comboLabel": "Açılan Kutu",
-    "app.shortcut-help.functionLabel": "Fonksiyon",
-    "app.shortcut-help.closeLabel": "Kapat",
-    "app.shortcut-help.closeDesc": "Kısayol kipini kapatır",
-    "app.shortcut-help.openOptions": "Seçenekleri Aç",
-    "app.shortcut-help.toggleUserList": "Kullanıcı Listesine Geç",
-    "app.shortcut-help.toggleMute": "Sustur / Konuştur",
-    "app.shortcut-help.togglePublicChat": "Genel Sohbete Geç (Kullanıcı Listesi açık olmalıdır)",
-    "app.shortcut-help.hidePrivateChat": "Özel Sohbeti Gizle",
-    "app.shortcut-help.closePrivateChat": "Özel Sohbeti Kapat",
-    "app.shortcut-help.openActions": "Eylem Menüsünü Aç",
-    "app.shortcut-help.openStatus": "Durum Menüsünü Aç",
-    "app.video.joinVideo": "Kamera Paylaş",
-    "app.video.leaveVideo": "Kamera Paylaşma",
-    "app.video.iceCandidateError": "ICE adayı ekleme hatası",
-    "app.video.permissionError": "Kamera paylaşımı hatası. Lütfen izinleri kontrol edin.",
-    "app.video.sharingError": "Kamera paylaşımı hatası",
-    "app.video.swapCam": "Değiştir",
-    "app.video.swapCamDesc": "Kameraların yönünü değiştir",
-    "app.video.videoMenu": "Video menüsü",
-    "app.video.videoMenuDisabled": "Ayarlarda Video menüsü Kamera devre dışı",
-    "app.video.videoMenuDesc": "Video menüsünü liste olarak aç",
-    "app.video.chromeExtensionError": "Yüklemeniz gerekiyor",
-    "app.video.chromeExtensionErrorLink": "Chrome Uzantısı",
-
-    "app.meeting.endNotification.ok.label": "TAMAM",
-    "app.whiteboard.toolbar.tools": "Araçlar",
-    "app.whiteboard.toolbar.tools.pointer": "İşaretçi",
-    "app.whiteboard.toolbar.tools.pencil": "Kalem",
-    "app.whiteboard.toolbar.tools.rectangle": "Dikdörtgen",
-    "app.whiteboard.toolbar.tools.triangle": "Üçgen",
-    "app.whiteboard.toolbar.tools.ellipse": "Elips",
-    "app.whiteboard.toolbar.tools.line": "Çizgi",
-    "app.whiteboard.toolbar.tools.text": "Metin",
-    "app.whiteboard.toolbar.thickness": "Çizim Kalınlığı",
-    "app.whiteboard.toolbar.thicknessDisabled": "Çizim Kalınlığı Devredışı",
-    "app.whiteboard.toolbar.color": "Renkler",
-    "app.whiteboard.toolbar.colorDisabled": "Renkler Devredışı",
-    "app.whiteboard.toolbar.color.black": "Siyah",
-    "app.whiteboard.toolbar.color.white": "Beyaz",
-    "app.whiteboard.toolbar.color.red": "Kırmızı",
-    "app.whiteboard.toolbar.color.orange": "Turuncu",
-    "app.whiteboard.toolbar.color.lime": "Açık Yeşil",
-    "app.whiteboard.toolbar.color.cyan": "Cam Göbeği",
-    "app.whiteboard.toolbar.color.dodgerBlue": "Hile Mavisi",
-    "app.whiteboard.toolbar.color.blue": "Mavi",
-    "app.whiteboard.toolbar.color.violet": "Menekşe",
-    "app.whiteboard.toolbar.color.magenta": "Fuşya",
-    "app.whiteboard.toolbar.color.silver": "Gümüş",
-    "app.whiteboard.toolbar.undo": "Ek Açıklamayı Geri Al",
-    "app.whiteboard.toolbar.clear": "Tüm Ek Açıklamaları Temizle",
-    "app.whiteboard.toolbar.multiUserOn": "Çoklu kullanıcı modunu aç",
-    "app.whiteboard.toolbar.multiUserOff": "Çoklu kullanıcı modunu kapat",
-    "app.whiteboard.toolbar.fontSize": "Yazı Tipi Büyüklüğü Listesi",
-    "app.feedback.title": "Konferanstan ayrıldınız",
-    "app.feedback.sendFeedback": "Geri bildirim yap",
-    "app.feedback.sendFeedbackDesc": "Geri bildirim yap ve görüşmeden ayrıl",
-    "app.videoDock.webcamFocusLabel": "Odakla",
-    "app.videoDock.webcamFocusDesc": "Seçili kamerayı odakla",
-    "app.videoDock.webcamUnfocusLabel": "Uzaklaş",
-    "app.videoDock.webcamUnfocusDesc": "Seçili kameradan uzaklaş"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/uk_UA.json b/bigbluebutton-html5/private/locales/uk_UA.json
deleted file mode 100644
index 4f2c8c65b7..0000000000
--- a/bigbluebutton-html5/private/locales/uk_UA.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "app.home.greeting": "Ласкаво просимо {0}! Ваша презентація почнеться найближчим часом... ",
-    "app.chat.submitLabel": "Надіслати повідомлення",
-    "app.chat.errorMinMessageLength": "Повідомлення із {0} символа(-ів) занадто коротке",
-    "app.chat.errorMaxMessageLength": "Повідомлення із {0} символа(-ів) занадто довге",
-    "app.chat.inputLabel": "Введення повідомлення для чату {0}",
-    "app.chat.inputPlaceholder": "Повідомлення {0}",
-    "app.chat.titlePublic": "Загальний чат",
-    "app.chat.titlePrivate": "Приватний чат з {0}",
-    "app.chat.partnerDisconnected": "{0} покинув конференцію",
-    "app.chat.closeChatLabel": "Закрити {0}",
-    "app.chat.hideChatLabel": "Приховати {0}",
-    "app.chat.moreMessages": "Більше повідомлень нижче",
-    "app.chat.dropdown.options": "Параметри чату",
-    "app.chat.dropdown.clear": "Очистити",
-    "app.chat.dropdown.copy": "Скопіювати",
-    "app.chat.dropdown.save": "Зберегти",
-    "app.chat.label": "Чат",
-    "app.chat.emptyLogLabel": "Журнал чату порожній",
-    "app.chat.clearPublicChatMessage": "Історія публічного чату була очищена модератором",
-    "app.userList.usersTitle": "Користувачі",
-    "app.userList.participantsTitle": "Учасники",
-    "app.userList.messagesTitle": "Повідомлення",
-    "app.userList.presenter": "Ведучий",
-    "app.userList.you": "Ви",
-    "app.userList.locked": "Заблокований",
-    "app.userList.label": "Список користувачів",
-    "app.userList.toggleCompactView.label": "Увімкнути/вимкнути компактний вид",
-    "app.userList.guest": "Гість",
-    "app.userList.menuTitleContext": "Доступні опції",
-    "app.userList.chatListItem.unreadSingular": "{0} нове повідомлення",
-    "app.userList.chatListItem.unreadPlural": "{0} нових повідомлень",
-    "app.userList.menu.chat.label": "Чат",
-    "app.userList.menu.clearStatus.label": "Очистити статус",
-    "app.userList.menu.makePresenter.label": "Зробити ведучим",
-    "app.userList.menu.removeUser.label": "Виключити користувача",
-    "app.userList.menu.muteUserAudio.label": "Вимкнути мікрофон користувача",
-    "app.userList.menu.unmuteUserAudio.label": "Увімкнути мікрофон користувача",
-    "app.userList.userAriaLabel": "{0} {1} {2}  Статус {3}",
-    "app.userList.menu.promoteUser.label": "Підвищити до модератора",
-    "app.userList.menu.demoteUser.label": "Понизити до глядача",
-    "app.media.label": "Медія",
-    "app.media.screenshare.start": "Демонстрація екрану розпочалася",
-    "app.media.screenshare.end": "Демонстрацію екрану закінчено",
-    "app.media.screenshare.safariNotSupported": "Демонстрація екрану наразі не підтримується Safari. Будь ласка, використовуйте Firefox або Google Chrome.",
-    "app.meeting.ended": "Ця сесія завершилася",
-    "app.meeting.endedMessage": "Ви будете перенаправлені на головний екран",
-    "app.presentation.presentationToolbar.prevSlideLabel": "Попередній слайд",
-    "app.presentation.presentationToolbar.prevSlideDesc": "Перемкнути презентацію на попередній слайд",
-    "app.presentation.presentationToolbar.nextSlideLabel": "Наступний слайд",
-    "app.presentation.presentationToolbar.nextSlideDesc": "Перемкнути презентацію на наступний слайд",
-    "app.presentation.presentationToolbar.skipSlideLabel": "Пропустити слайд",
-    "app.presentation.presentationToolbar.skipSlideDesc": "Перемкнути презентацію на вказаний слайд",
-    "app.presentation.presentationToolbar.fitWidthLabel": "Підігнати по ширині",
-    "app.presentation.presentationToolbar.fitWidthDesc": "Показати всю ширину слайда",
-    "app.presentation.presentationToolbar.fitScreenLabel": "Підігнати до екрана",
-    "app.presentation.presentationToolbar.fitScreenDesc": "Показати весь слайд",
-    "app.presentation.presentationToolbar.zoomLabel": "Масштаб",
-    "app.presentation.presentationToolbar.zoomDesc": "Змінити масштаб презентації",
-    "app.presentation.presentationToolbar.goToSlide": "Слайд {0}",
-    "app.presentationUploder.title": "Презентація",
-    "app.presentationUploder.message": "Як ведучий у BigBlueButton, ви маєте можливість завантажувати будь-який офісний документ або файл PDF. Ми рекомендуємо завантажувати файл PDF для отримання найкращих результатів.",
-    "app.presentationUploder.confirmLabel": "Почати",
-    "app.presentationUploder.confirmDesc": "Зберегти зміни та розпочати презентацію",
-    "app.presentationUploder.dismissLabel": "Відмінити",
-    "app.presentationUploder.dismissDesc": "Закрити вікно зображення та скасувати зміни",
-    "app.presentationUploder.dropzoneLabel": "Перетягніть файли сюди, щоб завантажити",
-    "app.presentationUploder.browseFilesLabel": "або виберіть файл",
-    "app.presentationUploder.fileToUpload": "Щоб завантажити",
-    "app.presentationUploder.currentBadge": "Поточний",
-    "app.presentationUploder.genericError": "Ой, щось пішло не так",
-    "app.presentationUploder.upload.progress": "Завантаження ({0}%)",
-    "app.presentationUploder.upload.413": "Файл занадто великий",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "Обробка сторінки {0} з {1}",
-    "app.presentationUploder.conversion.genericConversionStatus": "Файл конвертується...",
-    "app.presentationUploder.conversion.generatingThumbnail": "Генерування мініатюр...",
-    "app.presentationUploder.conversion.generatedSlides": "Слайди генеруються...",
-    "app.presentationUploder.conversion.generatingSvg": "Генерація слайдів SVG...",
-    "app.presentationUploder.conversion.pageCountExceeded": "Ой, кількість сторінок перевищила ліміт",
-    "app.presentationUploder.conversion.timeout": "Ой, перетворення займає надто багато часу",
-    "app.polling.pollingTitle": "Варіанти опитування",
-    "app.polling.pollAnswerLabel": "Результат опитування {0}",
-    "app.polling.pollAnswerDesc": "Виберіть цей варіант щоб проголосувати за {0}",
-    "app.failedMessage": "Вибачте, проблеми з підключенням до сервера.",
-    "app.connectingMessage": "З'єднання...",
-    "app.waitingMessage": "Втрачено з'еднання. Спроба повторного підключення через {0} секунд...",
-    "app.navBar.settingsDropdown.optionsLabel": "Опції",
-    "app.navBar.settingsDropdown.fullscreenLabel": "Розгорнути на весь екран",
-    "app.navBar.settingsDropdown.settingsLabel": "Відкрити параметри",
-    "app.navBar.settingsDropdown.aboutLabel": "Про програму",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "Вихід",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "Вийти з повноекранного режиму",
-    "app.navBar.settingsDropdown.fullscreenDesc": "Розгорнути меню параметрів на весь екран",
-    "app.navBar.settingsDropdown.settingsDesc": "Змінити загальні параметри",
-    "app.navBar.settingsDropdown.aboutDesc": "Показати інформацію про клієнта",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "Залишити конференцію",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "Вийти з повноекранного режиму",
-    "app.navBar.settingsDropdown.hotkeysLabel": "Швидкі клавіши",
-    "app.navBar.settingsDropdown.hotkeysDesc": "Перелік наявних швидких клавіш",
-    "app.navBar.settingsDropdown.helpLabel": "Допомога",
-    "app.navBar.settingsDropdown.helpDesc": "Посилає користувача на відеоролики",
-    "app.navBar.userListToggleBtnLabel": "Увімкнути/вимкнути список користувачів",
-    "app.navBar.toggleUserList.ariaLabel": "Увімкнути/вимкнути Користувачів та Повідомлення",
-    "app.navBar.toggleUserList.newMessages": "зі сповіщенням про нове повідомлення",
-    "app.navBar.recording": "Ця сесія записується",
-    "app.navBar.recording.on": "Записується",
-    "app.navBar.recording.off": "Не записується",
-    "app.leaveConfirmation.title": "Залишити сесію",
-    "app.leaveConfirmation.message": "Ви впевнені, що хочете залишити цю конференцію?",
-    "app.leaveConfirmation.confirmLabel": "Вийти",
-    "app.leaveConfirmation.confirmDesc": "Вийти з конференції",
-    "app.leaveConfirmation.dismissLabel": "Відміна",
-    "app.leaveConfirmation.dismissDesc": "Закриває та відхиляє підтвердження про вихід",
-    "app.leaveConfirmation.endMeetingLabel": "Так, залишити сесію",
-    "app.leaveConfirmation.endMeetingAriaLabel": "Покинути та завершити сесію",
-    "app.leaveConfirmation.endMeetingDesc": "Підтвердити завершення конференції",
-    "app.about.title": "Про програму",
-    "app.about.version": "Збірка клієнта:",
-    "app.about.copyright": "Авторське право:",
-    "app.about.confirmLabel": "OK",
-    "app.about.confirmDesc": "OK",
-    "app.about.dismissLabel": "Відміна",
-    "app.about.dismissDesc": "Закрити інформацію про клієнта",
-    "app.actionsBar.changeStatusLabel": "Змінити статус",
-    "app.actionsBar.muteLabel": "Вимкнути мікрофон",
-    "app.actionsBar.unmuteLabel": "Увімкнути мікрофон",
-    "app.actionsBar.camOffLabel": "Вимкнути камеру",
-    "app.actionsBar.raiseLabel": "Підняти",
-    "app.actionsBar.label": "Панель дій",
-    "app.submenu.application.applicationSectionTitle": "Застосунок",
-    "app.submenu.application.audioAlertLabel": "Аудіо сповіщення для чату",
-    "app.submenu.application.pushAlertLabel": "Спливаючі сповіщення для чату",
-    "app.submenu.application.fontSizeControlLabel": "Розмір шрифту",
-    "app.submenu.application.increaseFontBtnLabel": "Збільшити шрифт застосунку",
-    "app.submenu.application.decreaseFontBtnLabel": "Зменшити шрифт застосунку",
-    "app.submenu.application.languageLabel": "Мова застосунку",
-    "app.submenu.application.ariaLanguageLabel": "Змінити мову застосунку",
-    "app.submenu.application.languageOptionLabel": "Вибрати мову",
-    "app.submenu.application.noLocaleOptionLabel": "Відсутні доступні переклади",
-    "app.submenu.audio.micSourceLabel": "Джерело мікрофона",
-    "app.submenu.audio.speakerSourceLabel": "Джерело динаміків",
-    "app.submenu.audio.streamVolumeLabel": "Гучність аудіо потоку",
-    "app.submenu.video.title": "Відео",
-    "app.submenu.video.videoSourceLabel": "Джерело відео",
-    "app.submenu.video.videoOptionLabel": "Виберіть джерело відео",
-    "app.submenu.video.videoQualityLabel": "Якість відео",
-    "app.submenu.video.qualityOptionLabel": "Виберіть якість відео",
-    "app.submenu.video.participantsCamLabel": "Перегляд веб-камер учасників",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "Субтитри",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "Перехопити",
-    "app.submenu.closedCaptions.languageLabel": "Мова",
-    "app.submenu.closedCaptions.localeOptionLabel": "Виберіть мову",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "Відсутні доступні переклади",
-    "app.submenu.closedCaptions.fontFamilyLabel": "Шрифт",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Виберіть шрифт",
-    "app.submenu.closedCaptions.fontSizeLabel": "Розмір шрифту",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "Виберіть розмір шрифту",
-    "app.submenu.closedCaptions.backgroundColorLabel": "Колір фону",
-    "app.submenu.closedCaptions.fontColorLabel": "Колір шрифта",
-    "app.submenu.participants.muteAllLabel": "Вимкнути мікрофони у всіх окрім ведучого",
-    "app.submenu.participants.lockAllLabel": "Заблокувати всіх учасників",
-    "app.submenu.participants.lockItemLabel": "Учасники {0}",
-    "app.submenu.participants.lockMicDesc": "Вимикає мікрофони усіх заблокованих учасників",
-    "app.submenu.participants.lockCamDesc": "Вимикає веб-камери усіх заблокованих учасників",
-    "app.submenu.participants.lockPublicChatDesc": "Вимикає загальний чат для усіх заблокованих учасників",
-    "app.submenu.participants.lockPrivateChatDesc": "Вимикає приватний чат для усіх заблокованих учасників",
-    "app.submenu.participants.lockLayoutDesc": "Блокує розміщення вікон для усіх заблокованих учасників",
-    "app.submenu.participants.lockMicAriaLabel": "Блокувати мікрофон",
-    "app.submenu.participants.lockCamAriaLabel": "Блокувати веб-камеру",
-    "app.submenu.participants.lockPublicChatAriaLabel": "Блокувати публічний чат",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "Блокувати приватний чат",
-    "app.submenu.participants.lockLayoutAriaLabel": "Блокувати розміщення вікон",
-    "app.submenu.participants.lockMicLabel": "Мікрофон",
-    "app.submenu.participants.lockCamLabel": "Веб-камера",
-    "app.submenu.participants.lockPublicChatLabel": "Публічний чат",
-    "app.submenu.participants.lockPrivateChatLabel": "Приватний чат",
-    "app.submenu.participants.lockLayoutLabel": "Розміщення вікон",
-    "app.settings.applicationTab.label": "Застосунок",
-    "app.settings.audioTab.label": "Аудіо",
-    "app.settings.videoTab.label": "Відео",
-    "app.settings.closedcaptionTab.label": "Субтитри",
-    "app.settings.usersTab.label": "Учасники",
-    "app.settings.main.label": "Налаштування",
-    "app.settings.main.cancel.label": "Відмінити",
-    "app.settings.main.cancel.label.description": "Відміняє зміни та закриває меню налаштувань",
-    "app.settings.main.save.label": "Зберегти",
-    "app.settings.main.save.label.description": "Зберігає зміни та закриває меню налаштувань",
-    "app.settings.dataSavingTab.label": "Збереження даних",
-    "app.settings.dataSavingTab.webcam": "Увімкнути веб-камери",
-    "app.settings.dataSavingTab.screenShare": "Увімкнути демонстрацію робочого столу",
-    "app.settings.dataSavingTab.description": "Щоб зберегти пропускну здатність, виберіть що зараз буде відображатись.",
-    "app.switch.onLabel": "УВІМК.",
-    "app.switch.offLabel": "ВИМК.",
-    "app.actionsBar.actionsDropdown.actionsLabel": "Дії",
-    "app.actionsBar.actionsDropdown.presentationLabel": "Завантажити презентацію",
-    "app.actionsBar.actionsDropdown.initPollLabel": "Розпочати опитування",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "Демонструвати ваш екран",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Зупинити демонстрацію екрану",
-    "app.actionsBar.actionsDropdown.presentationDesc": "Завантажити вашу презентацію",
-    "app.actionsBar.actionsDropdown.initPollDesc": "Розпочати опитування",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "Демонструвати ваш екран іншим учасникам",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Зупинити демонстрацію екрану",
-    "app.actionsBar.actionsDropdown.startRecording": "Почати запис",
-    "app.actionsBar.actionsDropdown.stopRecording": "Зупинити запис",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Встановити статус",
-    "app.actionsBar.emojiMenu.awayLabel": "Відійшов",
-    "app.actionsBar.emojiMenu.awayDesc": "Змінює ваш статус на \"Відійшов\"",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "Підняти руку",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "Підняти руку щоб поставити питання",
-    "app.actionsBar.emojiMenu.neutralLabel": "Не визначився",
-    "app.actionsBar.emojiMenu.neutralDesc": "Змінює ваш статус на \"Не визначився\"",
-    "app.actionsBar.emojiMenu.confusedLabel": "Збентежений",
-    "app.actionsBar.emojiMenu.confusedDesc": "Змінює ваш статус на \"Збентежений\"",
-    "app.actionsBar.emojiMenu.sadLabel": "Сумний",
-    "app.actionsBar.emojiMenu.sadDesc": "Змінює ваш статус на \"Сумний\"",
-    "app.actionsBar.emojiMenu.happyLabel": "Щасливий",
-    "app.actionsBar.emojiMenu.happyDesc": "Змінює ваш статус на \"Щасливий\"",
-    "app.actionsBar.emojiMenu.noneLabel": "Очистити статус",
-    "app.actionsBar.emojiMenu.noneDesc": "Очищує ваш статус",
-    "app.actionsBar.emojiMenu.applauseLabel": "Оплески",
-    "app.actionsBar.emojiMenu.applauseDesc": "Змінює ваш статус на \"Оплески\"",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "Подобається",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Змінює ваш статус на \"Подобається\"",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "Не подобається",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Змінює ваш статус на \"Не подобається\"",
-    "app.actionsBar.currentStatusDesc": "нинішній статус {0}",
-    "app.audioNotification.audioFailedError1001": "Помилка 1001: WebSocket відключено",
-    "app.audioNotification.audioFailedError1002": "Помилка 1002: Не вдалось встановити з'єднання WebSocket",
-    "app.audioNotification.audioFailedError1003": "Помилка 1003: Версія браузера не підтримується",
-    "app.audioNotification.audioFailedError1004": "Помилка 1004: Збій виклика",
-    "app.audioNotification.audioFailedError1005": "Помилка 1005: Виклик раптово перервався",
-    "app.audioNotification.audioFailedError1006": "Помилка 1006: Час дзвінка минув",
-    "app.audioNotification.audioFailedError1007": "Помилка 1007: Узгодження ICE не відбулось",
-    "app.audioNotification.audioFailedError1008": "Помилка 1008: Передача не вдалась",
-    "app.audioNotification.audioFailedError1009": "Помилка 1009: Не вдалось отримати STUN/TURN інформацію з серверу",
-    "app.audioNotification.audioFailedError1010": "Помилка 1010: Час узгодження ICE вичерпано",
-    "app.audioNotification.audioFailedError1011": "Помилка 1011: Перевищено час збору ICE",
-    "app.audioNotification.audioFailedMessage": "Не вдалося встановити аудіо з'єднання",
-    "app.audioNotification.mediaFailedMessage": "Помилка getUserMicMedia, дозволені тільки безпечні джерела",
-    "app.audioNotification.closeLabel": "Закрити",
-    "app.audioNotificaion.reconnectingAsListenOnly": "Аудіо було заблоковано модератором, ви підключилися лише як слухач",
-    "app.breakoutJoinConfirmation.title": "Приєднатись до зустрічі",
-    "app.breakoutJoinConfirmation.message": "Чи хочете ви приєднатися до",
-    "app.breakoutJoinConfirmation.confirmLabel": "Приєднатися",
-    "app.breakoutJoinConfirmation.confirmDesc": "Приєднує вас до зустрічі",
-    "app.breakoutJoinConfirmation.dismissLabel": "Скасувати",
-    "app.breakoutJoinConfirmation.dismissDesc": "Закриває та відмовляє в приєднанні до зустрічі",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "Виберіть конференцію до якої бажаєте під’єднатися",
-    "app.breakoutTimeRemainingMessage": "Час до закінчення конференції: {0}",
-    "app.breakoutWillCloseMessage": "Час вичерпано. Конференцію невдовзі буде закрито",
-    "app.calculatingBreakoutTimeRemaining": "Підрахунок часу що залишився...",
-    "app.audioModal.microphoneLabel": "Мікрофон",
-    "app.audioModal.listenOnlyLabel": "Тільки слухати",
-    "app.audioModal.audioChoiceLabel": "Як ви хочете увійти в аудіо-конференцію?",
-    "app.audioModal.iOSBrowser": "Аудіо/Відео не підтримується",
-    "app.audioModal.iOSErrorDescription": "Наразі аудіо та відео в Chrome для iOS не підтримуються.",
-    "app.audioModal.iOSErrorRecommendation": "Ми рекомендуємо використовувати Safari для iOS.",
-    "app.audioModal.audioChoiceDesc": "Виберіть як брати участь в аудіоконференції",
-    "app.audioModal.closeLabel": "Закрити",
-    "app.audioModal.yes": "Так",
-    "app.audioModal.no": "Ні",
-    "app.audioModal.yes.arialabel" : "Звучить ехо",
-    "app.audioModal.no.arialabel" : "Ехо не звучить",
-    "app.audioModal.echoTestTitle": "Це приватний ехо-тест. Промовте кілька слів. Чи чуєте ви себе в динаміках?",
-    "app.audioModal.settingsTitle": "Змінити налаштування аудіо",
-    "app.audioModal.helpTitle": "З'явилися проблеми з вашими аудіоприладами",
-    "app.audioModal.helpText": "Чи надали ви BigBlueButton дозвіл на доступ до мікрофона? Зверніть увагу що коли ви намагаєтеся приєднатися до аудіоконференції має з'явитися діалогове вікно запитуючи дозволи на підключення медіа-пристрою, будь ласка, прийміть це, щоб приєднатися до аудіоконференції. Якщо цього не відбулося спробуйте змінити дозволи мікрофона у налаштуваннях вашого веб-переглядача.",
-    "app.audioModal.connecting": "Підключення",
-    "app.audioModal.connectingEchoTest": "Підключення до ехо тесту",
-    "app.audioManager.joinedAudio": "Ви приєдналися до аудіоконференції",
-    "app.audioManager.joinedEcho": "Ви приєдналися до ехо тесту",
-    "app.audioManager.leftAudio": "Ви покинули аудіо конференцію",
-    "app.audioManager.genericError": "Помилка: Щось пішло не так, будь ласка, спробуйте ще раз",
-    "app.audioManager.connectionError": "Помилка: Підключення не вдалося",
-    "app.audioManager.requestTimeout": "Помилка: Час очікування підключення вичерпано",
-    "app.audioManager.invalidTarget": "Помилка: Спроба запросити що-небудь від невірної цілі",
-    "app.audioManager.mediaError": "Помилка: Виникли проблеми з вашими аудіопристроями",
-    "app.audio.joinAudio": "Приєднатися до аудіоконференції",
-    "app.audio.leaveAudio": "Залишити аудіоконференцію",
-    "app.audio.enterSessionLabel": "Підключитися до сеансу",
-    "app.audio.playSoundLabel": "Програти звук",
-    "app.audio.backLabel": "Назад",
-    "app.audio.audioSettings.titleLabel": "Виберіть налаштування звуку",
-    "app.audio.audioSettings.descriptionLabel": "Зверніть увагу, що в вашому браузері з'явиться діалогове вікно, що вимагає дозволу вашого мікрофона.",
-    "app.audio.audioSettings.microphoneSourceLabel": "Джерело мікрофона",
-    "app.audio.audioSettings.speakerSourceLabel": "Джерело динаміків",
-    "app.audio.audioSettings.microphoneStreamLabel": "Гучність вашого аудіопотоку",
-    "app.audio.audioSettings.retryLabel": "Повторити",
-    "app.audio.listenOnly.backLabel": "Незад",
-    "app.audio.listenOnly.closeLabel": "Закрити",
-    "app.audio.permissionsOverlay.title": "Дозволити BigBlueButton використовувати ваші медіа-пристрої",
-    "app.audio.permissionsOverlay.hint": "Нам потрібно, щоб ви дозволили нам використовувати свої медіа-пристрої, щоб приєднатись до голосової конференції :)",
-    "app.error.removed": "Ви були вилучені з конференції",
-    "app.error.meeting.ended": "Ви вийшли з конференції",
-    "app.dropdown.close": "Закрити",
-    "app.error.500": "Ой, щось пішло не так",
-    "app.error.404": "Не знайдено",
-    "app.error.401": "Неавторизований",
-    "app.error.403": "Заборонено",
-    "app.error.leaveLabel": "Увійдіть знову",
-    "app.guest.waiting": "Очікування схвалення для приєднання",
-    "app.toast.breakoutRoomEnded": "Конференція закінчилася. Будь ласка, приєднайтесь знову до аудіо конференції.",
-    "app.toast.chat.public": "Нове повідомлення в публічному чаті",
-    "app.toast.chat.private": "Нове повідомлення в приватному чаті",
-    "app.toast.chat.system": "Система",
-    "app.notification.recordingStart": "Цей сеанс наразі записується",
-    "app.notification.recordingStop": "Цей сеанс більше не записується",
-    "app.shortcut-help.title": "Клавіші швидкого доступу",
-    "app.shortcut-help.accessKeyNotAvailable": "Ключі доступу недоступні.",
-    "app.shortcut-help.comboLabel": "Комбо",
-    "app.shortcut-help.functionLabel": "Функція",
-    "app.shortcut-help.closeLabel": "Закрити",
-    "app.shortcut-help.closeDesc": "Закриває модальні клавіші швидкого доступу",
-    "app.shortcut-help.openOptions": "Відкриває параметри",
-    "app.shortcut-help.toggleUserList": "Вмикає список користувачів",
-    "app.shortcut-help.toggleMute": "Вмикає / Вимикає мікрофон",
-    "app.shortcut-help.togglePublicChat": "Вмикає публічеий чат (Список користувачів має бути відкитим)",
-    "app.shortcut-help.hidePrivateChat": "Приховує приватний чат",
-    "app.shortcut-help.closePrivateChat": "Закриває приватний чат",
-    "app.shortcut-help.openActions": "Відкриває меню дій",
-    "app.shortcut-help.openStatus": "Відкриває меню статусу",
-    "app.video.joinVideo": "Транслювати веб-камеру",
-    "app.video.leaveVideo": "Припинити транслювати веб-камеру",
-    "app.video.iceCandidateError": "Помилка при додаванні ice кандидата",
-    "app.video.iceConnectionStateError": "Помилка 1107: узгодження ICE не вдалося",
-    "app.video.permissionError": "Помилка при трансляції веб-камерию Будь ласка перевірте дозволи",
-    "app.video.sharingError": "Помилка при трансляції веб-камери",
-    "app.video.notFoundError": "Не вдалося знайти веб-камеру. Переконайтеся, що вона під'єднана",
-    "app.video.notAllowed": "Відсутній дозвіл на трансляцію веб-камери, будь ласка, переконайтеся, що ваш браузер має необхідні дозволи",
-    "app.video.notSupportedError": "Можна транслювати веб-камеру лише з безпечних джерел, переконайтеся, що сертифікат SSL дійсний",
-    "app.video.notReadableError": "Не вдалося отримати відео з веб-камери. Будь ласка, переконайтеся, що інша програма не використовує веб-камеру",
-    "app.video.swapCam": "Змінити",
-    "app.video.swapCamDesc": "поміняти напрямок веб-камер",
-    "app.video.videoMenu": "Меню відео",
-    "app.video.videoMenuDisabled": "Меню відео веб-камера відключено в налаштуваннях",
-    "app.video.videoMenuDesc": "Відкрити контекстне меню відео",
-    "app.video.chromeExtensionError": "Ви маєте встановити",
-    "app.video.chromeExtensionErrorLink": "Це розширення Chrome",
-    "app.video.stats.title": "Статистика з'єднань",
-    "app.video.stats.packetsReceived": "Пакети отримані",
-    "app.video.stats.packetsSent": "Пакети відправлені",
-    "app.video.stats.packetsLost": "Пакети втрачені",
-    "app.video.stats.bitrate": "Бітрейт",
-    "app.video.stats.lostPercentage": "Загальний відсоток втрачених",
-    "app.video.stats.lostRecentPercentage": "Нинішній відсоток втрачених",
-    "app.video.stats.dimensions": "Розміри",
-    "app.video.stats.codec": "Кодек",
-    "app.video.stats.decodeDelay": "Затримка декодування",
-    "app.video.stats.rtt": "RTT",
-    "app.video.stats.encodeUsagePercent": "Використання кодуванням",
-    "app.video.stats.currentDelay": "Поточна затримка",
-    "app.deskshare.iceConnectionStateError": "Помилка 1108: при з'єднанні екрана не вдалося підключити ICE",
-    "app.sfu.mediaServerConnectionError2000": "Помилка 2000: неможливо підключитися до медіасервера",
-    "app.sfu.mediaServerOffline2001": "Помилка 2001: медіасервер недоступний. Будь-ласка спробуйте пізніше.",
-    "app.sfu.mediaServerNoResources2002": "Помилка 2002: сервер медіа не має доступних ресурсів",
-    "app.sfu.mediaServerRequestTimeout2003": "Помилка 2003: вийшов час запиту на медіа сервер",
-    "app.sfu.serverIceGatheringFailed2021": "Помилка 2021: медіа сервер не може збирати ICE-кандидатів",
-    "app.sfu.serverIceGatheringFailed2022": "Помилка 2022: Медіа-серверу не вдалося ICE з’єднання ",
-    "app.sfu.invalidSdp2202":"Помилка 2202: Клієнт створив невірний SDP",
-    "app.sfu.noAvailableCodec2203": "Помилка 2203: сервер не зміг знайти відповідного кодека",
-
-    "app.meeting.endNotification.ok.label": "OK",
-    "app.whiteboard.toolbar.tools": "Інструменти",
-    "app.whiteboard.toolbar.tools.pointer": "Вказівник",
-    "app.whiteboard.toolbar.tools.pencil": "Олівець",
-    "app.whiteboard.toolbar.tools.rectangle": "Чотирикутник",
-    "app.whiteboard.toolbar.tools.triangle": "Трикутник",
-    "app.whiteboard.toolbar.tools.ellipse": "Окружність",
-    "app.whiteboard.toolbar.tools.line": "Лінія",
-    "app.whiteboard.toolbar.tools.text": "Текст",
-    "app.whiteboard.toolbar.thickness": "Товщина малювання",
-    "app.whiteboard.toolbar.thicknessDisabled": "Товщину малювання вимкнуто",
-    "app.whiteboard.toolbar.color": "Кольори",
-    "app.whiteboard.toolbar.colorDisabled": "Кольори відключено",
-    "app.whiteboard.toolbar.color.black": "Чорний",
-    "app.whiteboard.toolbar.color.white": "Білий",
-    "app.whiteboard.toolbar.color.red": "Червоний",
-    "app.whiteboard.toolbar.color.orange": "Помаранчевий",
-    "app.whiteboard.toolbar.color.eletricLime": "Салатовий",
-    "app.whiteboard.toolbar.color.lime": "Зелений",
-    "app.whiteboard.toolbar.color.cyan": "Бірюзовий",
-    "app.whiteboard.toolbar.color.dodgerBlue": "Блакитний",
-    "app.whiteboard.toolbar.color.blue": "Синій",
-    "app.whiteboard.toolbar.color.violet": "Фіолетовий",
-    "app.whiteboard.toolbar.color.magenta": "Пурпурний",
-    "app.whiteboard.toolbar.color.silver": "Сірий",
-    "app.whiteboard.toolbar.undo": "Скасувати останній надпис",
-    "app.whiteboard.toolbar.clear": "Очистити всі надписи",
-    "app.whiteboard.toolbar.multiUserOn": "Увімкніть багатокористувацький режим",
-    "app.whiteboard.toolbar.multiUserOff": "Вимкніть режим багаторазового використання",
-    "app.whiteboard.toolbar.fontSize": "Вибір розміру шрифту",
-    "app.feedback.title": "Ви вийшли з конференції",
-    "app.feedback.subtitle": "Ми хотіли б почути про ваш досвід роботи з BigBlueButton (необов'язково)",
-    "app.feedback.textarea": "Як ми можемо зробити BigBlueButton краще?",
-    "app.feedback.sendFeedback": "Надіслати відгук",
-    "app.feedback.sendFeedbackDesc": "Надіслати відгук і залишити зустріч",
-    "app.videoDock.webcamFocusLabel": "Фокус",
-    "app.videoDock.webcamFocusDesc": "Сфокусувати вибрану веб-камеру",
-    "app.videoDock.webcamUnfocusLabel": "Розфокусувати",
-    "app.videoDock.webcamUnfocusDesc": "Розфокусувати вибрану веб-камеру"
-
-}
-
diff --git a/bigbluebutton-html5/private/locales/zh_CN.json b/bigbluebutton-html5/private/locales/zh_CN.json
deleted file mode 100644
index 0e948a8b37..0000000000
--- a/bigbluebutton-html5/private/locales/zh_CN.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-    "app.home.greeting": "欢迎您，{0}！您的演示即将开始...",
-    "app.chat.submitLabel": "发送消息",
-    "app.chat.errorMinMessageLength": "消息只有{0}个字符，太短了",
-    "app.chat.errorMaxMessageLength": "消息有{0}个字符，太长了",
-    "app.chat.inputLabel": "在{0}聊天中输入的消息",
-    "app.chat.inputPlaceholder": "消息{0}",
-    "app.chat.titlePublic": "公共聊天",
-    "app.chat.titlePrivate": "和{0}的私聊",
-    "app.chat.partnerDisconnected": "{0}离开了会议",
-    "app.chat.closeChatLabel": "关闭{0}",
-    "app.chat.hideChatLabel": "隐藏{0}",
-    "app.chat.moreMessages": "更多消息见下面",
-    "app.chat.dropdown.options": "聊天选项",
-    "app.chat.dropdown.clear": "清除",
-    "app.chat.dropdown.copy": "复制",
-    "app.chat.dropdown.save": "保存",
-    "app.chat.label": "聊天",
-    "app.chat.emptyLogLabel": "聊天日志是空的",
-    "app.chat.clearPublicChatMessage": "公共聊天历史记录已被主持人清空",
-    "app.userList.usersTitle": "用户",
-    "app.userList.participantsTitle": "参会者",
-    "app.userList.messagesTitle": "消息",
-    "app.userList.presenter": "演示者",
-    "app.userList.you": "您",
-    "app.userList.locked": "已锁定",
-    "app.userList.label": "用户列表",
-    "app.userList.toggleCompactView.label": "打开/关闭紧凑视图模式",
-    "app.userList.guest": "游客",
-    "app.userList.menuTitleContext": "可用选项",
-    "app.userList.chatListItem.unreadSingular": "{0}条新消息",
-    "app.userList.chatListItem.unreadPlural": "{0}条新消息",
-    "app.userList.menu.chat.label": "聊天",
-    "app.userList.menu.clearStatus.label": "清除状态",
-    "app.userList.menu.makePresenter.label": "设为演示者",
-    "app.userList.menu.removeUser.label": "删除用户",
-    "app.userList.menu.muteUserAudio.label": "静音",
-    "app.userList.menu.unmuteUserAudio.label": "取消静音",
-    "app.userList.userAriaLabel": "{0}{1}{2}状态{3}",
-    "app.userList.menu.promoteUser.label": "提升为主持人 ",
-    "app.userList.menu.demoteUser.label": "降为普通参会者 ",
-    "app.media.label": "媒体",
-    "app.media.screenshare.start": "屏幕分享已开始",
-    "app.media.screenshare.end": "屏幕分享已结束",
-    "app.media.screenshare.safariNotSupported": "Safari浏览器现在还不支持屏幕分享，请换用Firefox或Chrome浏览器。",
-    "app.meeting.ended": "此会话已结束",
-    "app.meeting.endedMessage": "您将被跳转回首页",
-    "app.presentation.presentationToolbar.prevSlideLabel": "上一页",
-    "app.presentation.presentationToolbar.prevSlideDesc": "将幻灯片切换到上一页",
-    "app.presentation.presentationToolbar.nextSlideLabel": "下一页",
-    "app.presentation.presentationToolbar.nextSlideDesc": "将幻灯片切换到下一页",
-    "app.presentation.presentationToolbar.skipSlideLabel": "跳转",
-    "app.presentation.presentationToolbar.skipSlideDesc": "将幻灯片切换到指定页",
-    "app.presentation.presentationToolbar.fitWidthLabel": "适配宽度",
-    "app.presentation.presentationToolbar.fitWidthDesc": "幻灯片的宽度方向完整显示",
-    "app.presentation.presentationToolbar.fitScreenLabel": "适配屏幕",
-    "app.presentation.presentationToolbar.fitScreenDesc": "整个幻灯片在屏幕里完整显示",
-    "app.presentation.presentationToolbar.zoomLabel": "缩放",
-    "app.presentation.presentationToolbar.zoomDesc": "更改演示区的缩放级别",
-    "app.presentation.presentationToolbar.goToSlide": "幻灯片{0}",
-    "app.presentationUploder.title": "演示",
-    "app.presentationUploder.message": "您可以上传PDF文件和任意Office文档，对于后者，系统将其转换为PDF文件。推荐您上传PDF文件。",
-    "app.presentationUploder.confirmLabel": "开始",
-    "app.presentationUploder.confirmDesc": "保存更改并开始演示",
-    "app.presentationUploder.dismissLabel": "取消",
-    "app.presentationUploder.dismissDesc": "关闭窗口并丢弃更改",
-    "app.presentationUploder.dropzoneLabel": "拖放文件到此以上传",
-    "app.presentationUploder.browseFilesLabel": "或浏览文件",
-    "app.presentationUploder.fileToUpload": "将被上传...",
-    "app.presentationUploder.currentBadge": "当前",
-    "app.presentationUploder.genericError": "哎哟，出错了",
-    "app.presentationUploder.upload.progress": "上传中({0}%)",
-    "app.presentationUploder.upload.413": "文件太大，超过了服务器限制",
-    "app.presentationUploder.conversion.conversionProcessingSlides": "处理中，第{0}页/共{1}页",
-    "app.presentationUploder.conversion.genericConversionStatus": "转换文件中...",
-    "app.presentationUploder.conversion.generatingThumbnail": "正在生成缩略图...",
-    "app.presentationUploder.conversion.generatedSlides": "幻灯片已生成...",
-    "app.presentationUploder.conversion.generatingSvg": "正在生成SVG图片...",
-    "app.presentationUploder.conversion.pageCountExceeded": "哎哟，页数超过了服务器限制",
-    "app.presentationUploder.conversion.timeout": "哎哟，转换耗费了太长时间",
-    "app.polling.pollingTitle": "调查选项",
-    "app.polling.pollAnswerLabel": "调查答案{0}",
-    "app.polling.pollAnswerDesc": "选择此选项以投给{0}",
-    "app.failedMessage": "抱歉，连接服务器时出现了问题。",
-    "app.connectingMessage": "连接中...",
-    "app.waitingMessage": "连接已断开。{0}秒后尝试重新连接...",
-    "app.navBar.settingsDropdown.optionsLabel": "选项",
-    "app.navBar.settingsDropdown.fullscreenLabel": "全屏显示",
-    "app.navBar.settingsDropdown.settingsLabel": "打开设置",
-    "app.navBar.settingsDropdown.aboutLabel": "关于",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "注销",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "退出全屏",
-    "app.navBar.settingsDropdown.fullscreenDesc": "将设置菜单全屏显示",
-    "app.navBar.settingsDropdown.settingsDesc": "更改通用设置",
-    "app.navBar.settingsDropdown.aboutDesc": "显示客户端的信息",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "离开当前会议",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "退出全屏模式",
-    "app.navBar.settingsDropdown.hotkeysLabel": "热键",
-    "app.navBar.settingsDropdown.hotkeysDesc": "可用热键列表",
-    "app.navBar.settingsDropdown.helpLabel": "帮助",
-    "app.navBar.settingsDropdown.helpDesc": "链接用户到视频教程",
-    "app.navBar.userListToggleBtnLabel": "切换用户列表",
-    "app.navBar.toggleUserList.ariaLabel": "在用户和消息之间切换显示",
-    "app.navBar.toggleUserList.newMessages": "有新消息提醒",
-    "app.navBar.recording": "正在录制当前会议",
-    "app.navBar.recording.on": "录制中",
-    "app.navBar.recording.off": "未录制",
-    "app.leaveConfirmation.title": "离开会议",
-    "app.leaveConfirmation.message": "您要退出此会议吗？",
-    "app.leaveConfirmation.confirmLabel": "退出",
-    "app.leaveConfirmation.confirmDesc": "您将从会议退出",
-    "app.leaveConfirmation.dismissLabel": "取消",
-    "app.leaveConfirmation.dismissDesc": "留在会议中，关闭此对话框",
-    "app.leaveConfirmation.endMeetingLabel": "是的并结束会议",
-    "app.leaveConfirmation.endMeetingAriaLabel": "退出并结束会议",
-    "app.leaveConfirmation.endMeetingDesc": "确认关闭并结束会议",
-    "app.about.title": "关于",
-    "app.about.version": "客户端版本：",
-    "app.about.copyright": "版权：",
-    "app.about.confirmLabel": "确定",
-    "app.about.confirmDesc": "确定",
-    "app.about.dismissLabel": "取消",
-    "app.about.dismissDesc": "关闭客户端信息对话框",
-    "app.actionsBar.changeStatusLabel": "更改状态",
-    "app.actionsBar.muteLabel": "静音",
-    "app.actionsBar.unmuteLabel": "取消静音",
-    "app.actionsBar.camOffLabel": "关闭摄像头",
-    "app.actionsBar.raiseLabel": "举手",
-    "app.actionsBar.label": "操作栏",
-    "app.submenu.application.applicationSectionTitle": "应用",
-    "app.submenu.application.audioAlertLabel": "聊天音频提醒 ",
-    "app.submenu.application.pushAlertLabel": "聊天弹窗提醒",
-    "app.submenu.application.fontSizeControlLabel": "字号",
-    "app.submenu.application.increaseFontBtnLabel": "增大界面字号",
-    "app.submenu.application.decreaseFontBtnLabel": "减小界面字号",
-    "app.submenu.application.languageLabel": "界面语言",
-    "app.submenu.application.ariaLanguageLabel": "更改界面语言",
-    "app.submenu.application.languageOptionLabel": "选择语言",
-    "app.submenu.application.noLocaleOptionLabel": "没有可用的语言",
-    "app.submenu.audio.micSourceLabel": "麦克风源",
-    "app.submenu.audio.speakerSourceLabel": "扬声器源",
-    "app.submenu.audio.streamVolumeLabel": "您音频流的音量",
-    "app.submenu.video.title": "视频",
-    "app.submenu.video.videoSourceLabel": "视频源",
-    "app.submenu.video.videoOptionLabel": "选择视频源",
-    "app.submenu.video.videoQualityLabel": "视频质量",
-    "app.submenu.video.qualityOptionLabel": "选择视频质量",
-    "app.submenu.video.participantsCamLabel": "查看参会者的摄像头",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "隐藏式字幕",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "获取所有者权限",
-    "app.submenu.closedCaptions.languageLabel": "语言",
-    "app.submenu.closedCaptions.localeOptionLabel": "选择语言",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "无可用的语言",
-    "app.submenu.closedCaptions.fontFamilyLabel": "字体",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "选择字体",
-    "app.submenu.closedCaptions.fontSizeLabel": "字号",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "选择字号",
-    "app.submenu.closedCaptions.backgroundColorLabel": "背景色",
-    "app.submenu.closedCaptions.fontColorLabel": "字体颜色",
-    "app.submenu.participants.muteAllLabel": "将演示者以外的人都静音",
-    "app.submenu.participants.lockAllLabel": "锁定所有参会者",
-    "app.submenu.participants.lockItemLabel": "参会者{0}",
-    "app.submenu.participants.lockMicDesc": "禁用所有被锁定的参会者的麦克风",
-    "app.submenu.participants.lockCamDesc": "禁用所有被锁定的参会者的摄像头",
-    "app.submenu.participants.lockPublicChatDesc": "禁止所有被锁定的参会者参与公共聊天",
-    "app.submenu.participants.lockPrivateChatDesc": "禁止所有被锁定的参会者参与私聊",
-    "app.submenu.participants.lockLayoutDesc": "锁定所有被锁定的参会者的页面布局",
-    "app.submenu.participants.lockMicAriaLabel": "锁定麦克风",
-    "app.submenu.participants.lockCamAriaLabel": "锁定摄像头",
-    "app.submenu.participants.lockPublicChatAriaLabel": "锁定公共聊天",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "锁定私聊",
-    "app.submenu.participants.lockLayoutAriaLabel": "锁定页面布局",
-    "app.submenu.participants.lockMicLabel": "麦克风",
-    "app.submenu.participants.lockCamLabel": "摄像头",
-    "app.submenu.participants.lockPublicChatLabel": "公共聊天",
-    "app.submenu.participants.lockPrivateChatLabel": "私聊",
-    "app.submenu.participants.lockLayoutLabel": "页面布局",
-    "app.settings.applicationTab.label": "应用",
-    "app.settings.audioTab.label": "音频",
-    "app.settings.videoTab.label": "视频",
-    "app.settings.closedcaptionTab.label": "隐藏式字幕",
-    "app.settings.usersTab.label": "参会者",
-    "app.settings.main.label": "设置",
-    "app.settings.main.cancel.label": "取消",
-    "app.settings.main.cancel.label.description": "丢弃更改并关闭设置菜单",
-    "app.settings.main.save.label": "保存",
-    "app.settings.main.save.label.description": "保存更改并关闭设置菜单",
-    "app.settings.dataSavingTab.label": "节省流量",
-    "app.settings.dataSavingTab.webcam": "启用摄像头",
-    "app.settings.dataSavingTab.screenShare": "启用桌面分享",
-    "app.settings.dataSavingTab.description": "调整当前显示以节省带宽",
-    "app.switch.onLabel": "开启",
-    "app.switch.offLabel": "关闭",
-    "app.actionsBar.actionsDropdown.actionsLabel": "操作",
-    "app.actionsBar.actionsDropdown.presentationLabel": "上传幻灯片",
-    "app.actionsBar.actionsDropdown.initPollLabel": "发起调查",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "分享您的桌面",
-    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "停止分享您的桌面",
-    "app.actionsBar.actionsDropdown.presentationDesc": "上传您的幻灯片",
-    "app.actionsBar.actionsDropdown.initPollDesc": "发起调查",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "和参会者分享您的桌面操作演示",
-    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "停止分享您的桌面演示给",
-    "app.actionsBar.actionsDropdown.startRecording": "开始录制",
-    "app.actionsBar.actionsDropdown.stopRecording": "停止录制",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "设置状态",
-    "app.actionsBar.emojiMenu.awayLabel": "离开",
-    "app.actionsBar.emojiMenu.awayDesc": "更改您的状态为离开",
-    "app.actionsBar.emojiMenu.raiseHandLabel": "举手",
-    "app.actionsBar.emojiMenu.raiseHandDesc": "举手提问",
-    "app.actionsBar.emojiMenu.neutralLabel": "未决定",
-    "app.actionsBar.emojiMenu.neutralDesc": "更改您的状态为未决定",
-    "app.actionsBar.emojiMenu.confusedLabel": "困惑",
-    "app.actionsBar.emojiMenu.confusedDesc": "更改您的状态为困惑",
-    "app.actionsBar.emojiMenu.sadLabel": "悲伤",
-    "app.actionsBar.emojiMenu.sadDesc": "更改您的状态为悲伤",
-    "app.actionsBar.emojiMenu.happyLabel": "高兴",
-    "app.actionsBar.emojiMenu.happyDesc": "更改您的状态为高兴",
-    "app.actionsBar.emojiMenu.noneLabel": "清除状态",
-    "app.actionsBar.emojiMenu.noneDesc": "清除您的状态",
-    "app.actionsBar.emojiMenu.applauseLabel": "鼓掌",
-    "app.actionsBar.emojiMenu.applauseDesc": "更改您的状态为鼓掌",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "点赞",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "更改你的状态为点赞",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "拍砖",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "更改您的状态为拍砖",
-    "app.actionsBar.currentStatusDesc": "当前状态{0}",
-    "app.audioNotification.audioFailedError1001": "Error 1001: WebSocket disconnected",
-    "app.audioNotification.audioFailedError1002": "Error 1002: Could not make a WebSocket connection",
-    "app.audioNotification.audioFailedError1003": "Error 1003: Browser version not supported",
-    "app.audioNotification.audioFailedError1004": "Error 1004: Failure on call",
-    "app.audioNotification.audioFailedError1005": "Error 1005: Call ended unexpectedly",
-    "app.audioNotification.audioFailedError1006": "Error 1006: Call timed out",
-    "app.audioNotification.audioFailedError1007": "Error 1007: ICE negotiation failed",
-    "app.audioNotification.audioFailedError1008": "Error 1008: Transfer failed",
-    "app.audioNotification.audioFailedError1009": "Error 1009: Could not fetch STUN/TURN server information",
-    "app.audioNotification.audioFailedError1010": "Error 1010: ICE negotiation timeout",
-    "app.audioNotification.audioFailedError1011": "Error 1011: ICE gathering timeout",
-    "app.audioNotification.audioFailedMessage": "您的音频连接失败了",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia failed, Only secure origins are allowed",
-    "app.audioNotification.closeLabel": "关闭",
-    "app.audioNotificaion.reconnectingAsListenOnly": "麦克风已被锁定给主持人使用，你只能当听众。",
-    "app.breakoutJoinConfirmation.title": "加入休息室",
-    "app.breakoutJoinConfirmation.message": "您想加入吗？",
-    "app.breakoutJoinConfirmation.confirmLabel": "加入",
-    "app.breakoutJoinConfirmation.confirmDesc": "将您加入休息室",
-    "app.breakoutJoinConfirmation.dismissLabel": "取消",
-    "app.breakoutJoinConfirmation.dismissDesc": "关闭并拒绝加入休息室",
-    "app.breakoutJoinConfirmation.freeJoinMessage": "选择分组房间加入",
-    "app.breakoutTimeRemainingMessage": "休息时间还剩： {0}",
-    "app.breakoutWillCloseMessage": "休息时间结束。休息室即将关闭",
-    "app.calculatingBreakoutTimeRemaining": "计算剩余时间...",
-    "app.audioModal.microphoneLabel": "麦克风",
-    "app.audioModal.listenOnlyLabel": "只听",
-    "app.audioModal.audioChoiceLabel": "您想怎么加入音频交流？",
-    "app.audioModal.iOSBrowser": "不支持音频/视频",
-    "app.audioModal.iOSErrorDescription": "受制于苹果操作系统的局限，目前iOS里的Chrome浏览器仍无法支持音频和视频。",
-    "app.audioModal.iOSErrorRecommendation": "推荐使用Safari浏览器。",
-    "app.audioModal.audioChoiceDesc": "选择加入会议的音频交流模式",
-    "app.audioModal.closeLabel": "关闭",
-    "app.audioModal.yes": "是",
-    "app.audioModal.no": "否",
-    "app.audioModal.yes.arialabel" : "能听见回音",
-    "app.audioModal.no.arialabel" : "听不见回音",
-    "app.audioModal.echoTestTitle": "这是回音测试，别人无法听到。请说几句话。您能听得到从本会议系统里发出来的您的话语的回音吗？",
-    "app.audioModal.settingsTitle": "更改您的音频设置",
-    "app.audioModal.helpTitle": "您的视音频相关设备出了个问题。",
-    "app.audioModal.helpText": "您之前允许浏览器在本会议系统内访问您的麦克风了吗？请注意：当年尝试加入音频交流时，浏览器左上方会弹出一个对话框，询问您是否允许本会议系统访问您的音频设备，请允许。如果您当时不小心点了不允许，则需要在您的浏览器中调整设置（Chrome浏览器可点击地址栏最左侧的绿色小锁按钮来更改）。",
-    "app.audioModal.connecting": "正在连接",
-    "app.audioModal.connectingEchoTest": "连接回音测试",
-    "app.audioManager.joinedAudio": "您已加入会议的音频交流",
-    "app.audioManager.joinedEcho": "您已开始回音测试",
-    "app.audioManager.leftAudio": "您已退出会议音频交流",
-    "app.audioManager.genericError": "出错了，请重试",
-    "app.audioManager.connectionError": "连接错误",
-    "app.audioManager.requestTimeout": "请求超时",
-    "app.audioManager.invalidTarget": "获取您的媒体设备时出错",
-    "app.audioManager.mediaError": "获取您的媒体设备时出错",
-    "app.audio.joinAudio": "加入音频",
-    "app.audio.leaveAudio": "退出音频",
-    "app.audio.enterSessionLabel": "进入会话",
-    "app.audio.playSoundLabel": "播放声音",
-    "app.audio.backLabel": "后退",
-    "app.audio.audioSettings.titleLabel": "选择您的音频设置",
-    "app.audio.audioSettings.descriptionLabel": "请注意：您的浏览器会弹出一个对话框，请您选择允许浏览器访问您的麦克风。",
-    "app.audio.audioSettings.microphoneSourceLabel": "麦克风源",
-    "app.audio.audioSettings.speakerSourceLabel": "扬声器源",
-    "app.audio.audioSettings.microphoneStreamLabel": "您的音频流音量",
-    "app.audio.audioSettings.retryLabel": "重试",
-    "app.audio.listenOnly.backLabel": "后退",
-    "app.audio.listenOnly.closeLabel": "关闭",
-    "app.audio.permissionsOverlay.title": "允许本会议系统使用您的媒体设备",
-    "app.audio.permissionsOverlay.hint": "若您要加入音频交流，您必须要允许本会议系统访问您的媒体设备。",
-    "app.error.removed": "您已被移除出会议",
-    "app.error.meeting.ended": "您已从会议中注销",
-    "app.dropdown.close": "关闭",
-    "app.error.500": "哎哟，出错了",
-    "app.error.404": "未找到",
-    "app.error.401": "未授权",
-    "app.error.403": "禁止",
-    "app.error.leaveLabel": "再次登入",
-    "app.guest.waiting": "等待审核通过",
-    "app.toast.breakoutRoomEnded": "休息时间结束，请重新加入音频交流。",
-    "app.toast.chat.public": "新公共聊天消息",
-    "app.toast.chat.private": "新私聊消息",
-    "app.toast.chat.system": "系统",
-    "app.notification.recordingStart": "此会话正在被录制",
-    "app.notification.recordingStop": "此会话不再被录制",
-    "app.shortcut-help.title": "热键",
-    "app.shortcut-help.accessKeyNotAvailable": "键盘快捷键不可用。",
-    "app.shortcut-help.comboLabel": "组合键",
-    "app.shortcut-help.functionLabel": "功能",
-    "app.shortcut-help.closeLabel": "关闭",
-    "app.shortcut-help.closeDesc": "关闭热键对话框",
-    "app.shortcut-help.openOptions": "打开选项",
-    "app.shortcut-help.toggleUserList": "切换用户列表",
-    "app.shortcut-help.toggleMute": "静音/取消静音",
-    "app.shortcut-help.togglePublicChat": "切换公共聊天（用户列表必须先打开）",
-    "app.shortcut-help.hidePrivateChat": "隐藏私聊",
-    "app.shortcut-help.closePrivateChat": "关闭私聊",
-    "app.shortcut-help.openActions": "打开操作菜单",
-    "app.shortcut-help.openStatus": "打开状态菜单",
-    "app.video.joinVideo": "分享摄像头",
-    "app.video.leaveVideo": "取消分享摄像头",
-    "app.video.iceCandidateError": "添加ice候选者时出错Error on adding ice candidate",
-    "app.video.iceConnectionStateError": "Error 1107: ICE 协商失败",
-    "app.video.permissionError": "分享摄像头时出错，请检查是否已授权",
-    "app.video.sharingError": "分享摄像头出错",
-    "app.video.notFoundError": "无法找到摄像头。请确认您已安装摄像头",
-    "app.video.notAllowed": "无权访问摄像头。请确认您已允许浏览器在本会议系统内访问您的摄像头。",
-    "app.video.notSupportedError": "为了保证安全和隐私，只能通过HTTPS连接访问摄像头，请确认本会议系统的SSL证书是有效的。",
-    "app.video.notReadableError": "无法访问摄像头视频源，请确认您的摄像头未被其他应用占用。",
-    "app.video.swapCam": "切换",
-    "app.video.swapCamDesc": "切换前置/后置摄像头",
-    "app.video.videoMenu": "视频菜单",
-    "app.video.videoMenuDisabled": "视频菜单摄像头在设置中被禁用",
-    "app.video.videoMenuDesc": "打开视频下拉菜单",
-    "app.video.chromeExtensionError": "您必须安装",
-    "app.video.chromeExtensionErrorLink": "此Chrome浏览器扩展",
-    "app.video.stats.title": "连接状态",
-    "app.video.stats.packetsReceived": "收到的数据包",
-    "app.video.stats.packetsSent": "发送的数据包",
-    "app.video.stats.packetsLost": "丢失的数据包",
-    "app.video.stats.bitrate": "比特率",
-    "app.video.stats.lostPercentage": "总丢包率",
-    "app.video.stats.lostRecentPercentage": "最近丢包率",
-    "app.video.stats.dimensions": "规格",
-    "app.video.stats.codec": "编码解码器",
-    "app.video.stats.decodeDelay": "解码延迟",
-    "app.video.stats.rtt": "往返时间",
-    "app.video.stats.encodeUsagePercent": "编码usage",
-    "app.video.stats.currentDelay": "当前延迟",
-    "app.deskshare.iceConnectionStateError": "Error 1108: 分享屏幕时ICE连接失败",
-    "app.sfu.mediaServerConnectionError2000": "Error 2000: 无法连接到媒体服务器",
-    "app.sfu.mediaServerOffline2001": "Error 2001: 媒体服务器下线了，请稍后再试",
-    "app.sfu.mediaServerNoResources2002": "Error 2002: 媒体服务器没有可用资源了",
-    "app.sfu.mediaServerRequestTimeout2003": "Error 2003: 媒体服务器请求超时",
-    "app.sfu.serverIceGatheringFailed2021": "Error 2021:  媒体服务器无法收集ICE 替补",
-    "app.sfu.serverIceGatheringFailed2022": "Error 2022: 媒体服务器ICE 连接失败",
-    "app.sfu.invalidSdp2202":"Error 2202: 客户端生成了无效的SDP",
-    "app.sfu.noAvailableCodec2203": "Error 2203: 服务器找不到合适的编解码器",
-
-    "app.meeting.endNotification.ok.label": "确认",
-    "app.whiteboard.toolbar.tools": "工具",
-    "app.whiteboard.toolbar.tools.pointer": "激光笔",
-    "app.whiteboard.toolbar.tools.pencil": "铅笔",
-    "app.whiteboard.toolbar.tools.rectangle": "长方形",
-    "app.whiteboard.toolbar.tools.triangle": "三角形",
-    "app.whiteboard.toolbar.tools.ellipse": "椭圆形",
-    "app.whiteboard.toolbar.tools.line": "线",
-    "app.whiteboard.toolbar.tools.text": "文字",
-    "app.whiteboard.toolbar.thickness": "笔触粗度",
-    "app.whiteboard.toolbar.thicknessDisabled": "笔触粗度设置已禁用",
-    "app.whiteboard.toolbar.color": "颜色",
-    "app.whiteboard.toolbar.colorDisabled": "颜色设置已禁用",
-    "app.whiteboard.toolbar.color.black": "黑",
-    "app.whiteboard.toolbar.color.white": "白",
-    "app.whiteboard.toolbar.color.red": "红",
-    "app.whiteboard.toolbar.color.orange": "橙",
-    "app.whiteboard.toolbar.color.eletricLime": "电青",
-    "app.whiteboard.toolbar.color.lime": "绿",
-    "app.whiteboard.toolbar.color.cyan": "青",
-    "app.whiteboard.toolbar.color.dodgerBlue": "道奇蓝",
-    "app.whiteboard.toolbar.color.blue": "蓝",
-    "app.whiteboard.toolbar.color.violet": "紫",
-    "app.whiteboard.toolbar.color.magenta": "品红",
-    "app.whiteboard.toolbar.color.silver": "银",
-    "app.whiteboard.toolbar.undo": "撤销批注",
-    "app.whiteboard.toolbar.clear": "清除所有批注",
-    "app.whiteboard.toolbar.multiUserOn": "开启多用户批注模式",
-    "app.whiteboard.toolbar.multiUserOff": "关闭多用户批注模式",
-    "app.whiteboard.toolbar.fontSize": "字号列表",
-    "app.feedback.title": "您已从会议中注销",
-    "app.feedback.subtitle": "我们希望能听到您对本会议系统的反馈",
-    "app.feedback.textarea": "我们怎么能把本会议系统做得更好？",
-    "app.feedback.sendFeedback": "发送反馈",
-    "app.feedback.sendFeedbackDesc": "发送反馈并退出会议",
-    "app.videoDock.webcamFocusLabel": "对焦",
-    "app.videoDock.webcamFocusDesc": "对焦选中的摄像头",
-    "app.videoDock.webcamUnfocusLabel": "取消对焦",
-    "app.videoDock.webcamUnfocusDesc": "取消对焦选中的摄像头"
-
-}
-
diff --git a/bigbluebutton-html5/transifex.sh b/bigbluebutton-html5/transifex.sh
index 28fcf58e12..c465c702a3 100755
--- a/bigbluebutton-html5/transifex.sh
+++ b/bigbluebutton-html5/transifex.sh
@@ -13,7 +13,7 @@ else
   read -p "Enter Transifex Username: " USER
   read -p "password: " -s PW
   echo -e "\n----------------------------------\nchecking project info\n----------------------------------"
-  PROJECT_INFO=$( curl -L --user "$USER":"$PW" -X GET https://www.transifex.com/api/2/project/bigbluebutton-html5/languages/ )
+  PROJECT_INFO=$( curl -L --user "$USER":"$PW" -X GET https://www.transifex.com/api/2/project/bigbluebutton-v22-html5-client/languages/ )
 
   if [ "$PROJECT_INFO" == "Authorization Required" ]
   then
@@ -36,7 +36,7 @@ else
               if [ "$LOCALE" == "$SOURCE_LANGUAGE" ]; then
                 continue # do not pull the source file
               fi
-              TRANSLATION=$(curl -L --user "$USER":"$PW" -X GET "https://www.transifex.com/api/2/project/bigbluebutton-html5/resource/enjson/translation/$LOCALE/?mode=onlytranslated&file")
+              TRANSLATION=$(curl -L --user "$USER":"$PW" -X GET "https://www.transifex.com/api/2/project/bigbluebutton-v22-html5-client/resource/enjson/translation/$LOCALE/?mode=onlytranslated&file")
               NO_EMPTY_STRINGS=$(echo "$TRANSLATION" | sed '/: *\"\"/D' | sed '/}$/D')
               if [ $(echo "$NO_EMPTY_STRINGS" | wc -l) == 1 ]
               then
@@ -50,7 +50,7 @@ else
               fi
             done
         else
-          TRANSLATION=$(curl -L --user "$USER":"$PW" -X GET "https://www.transifex.com/api/2/project/bigbluebutton-html5/resource/enjson/translation/$ARG/?mode=onlytranslated&file")
+          TRANSLATION=$(curl -L --user "$USER":"$PW" -X GET "https://www.transifex.com/api/2/project/bigbluebutton-v22-html5-client/resource/enjson/translation/$ARG/?mode=onlytranslated&file")
           if [ "$TRANSLATION" == "Not Found" ]
           then
             echo -e "${RED}Err${NC}: Translations not found for locale ->${RED}$ARG${NC}<-"

From 095935e7ef44cfd21846054368c4346e37b9fce8 Mon Sep 17 00:00:00 2001
From: Lucas Zawacki <lfzawacki@gmail.com>
Date: Mon, 21 Jan 2019 02:49:01 -0300
Subject: [PATCH 117/163] Small fixes

---
 .../imports/ui/components/external-video-player/service.js  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
index 1befdf1389..5a48ae8af6 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/service.js
@@ -34,8 +34,8 @@ const stopWatching = () => {
 const sendMessage = (event, data) => {
   ExternalVideoStreamer.emit(event, {
     ...data,
-    meetingId: Auth._meetingID,
-    userId: Auth._userID,
+    meetingId: Auth.meetingID,
+    userId: Auth.userID,
   });
 };
 
@@ -44,7 +44,7 @@ const onMessage = (message, func) => {
 };
 
 const getVideoId = () => {
-  const meetingId = Auth._meetingID;
+  const meetingId = Auth.meetingID;
   const meeting = Meetings.findOne({ meetingId });
 
   return meeting && meeting.externalVideoUrl;

From 03dbc4de147d5ad5523e2e87a4d89700309a7bcb Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Mon, 21 Jan 2019 16:53:13 +0000
Subject: [PATCH 118/163] ensure unique key for dropdown element

---
 .../actions-dropdown/component.jsx            | 12 +++++----
 .../user-options/component.jsx                | 25 +++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 86012094b4..058cd16195 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -138,8 +138,6 @@ class ActionsDropdown extends Component {
       pollBtnDesc,
       presentationLabel,
       presentationDesc,
-      startRecording,
-      stopRecording,
       createBreakoutRoom,
       createBreakoutRoomDesc,
       invitationItem,
@@ -151,6 +149,10 @@ class ActionsDropdown extends Component {
       formatMessage,
     } = intl;
 
+    const canCreateBreakout = isUserModerator
+    && !meetingIsBreakout
+    && !hasBreakoutRoom;
+
     const canInviteUsers = isUserModerator
     && !meetingIsBreakout
     && hasBreakoutRoom
@@ -191,12 +193,12 @@ class ActionsDropdown extends Component {
           />
         )
         : null),
-      (isUserModerator && !meetingIsBreakout && !hasBreakoutRoom
+      (canCreateBreakout
         ? (
           <DropdownListItem
             icon="rooms"
-            label={intl.formatMessage(intlMessages.createBreakoutRoom)}
-            description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
+            label={formatMessage(createBreakoutRoom)}
+            description={formatMessage(createBreakoutRoomDesc)}
             key={this.createBreakoutRoomId}
             onClick={this.onCreateBreakouts}
           />
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
index e7eb434d7e..26229f2cf0 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-options/component.jsx
@@ -108,6 +108,7 @@ class UserOptions extends PureComponent {
     this.handleCreateBreakoutRoomClick = this.handleCreateBreakoutRoomClick.bind(this);
     this.onCreateBreakouts = this.onCreateBreakouts.bind(this);
     this.onInvitationUsers = this.onInvitationUsers.bind(this);
+    this.renderMenuItems = this.renderMenuItems.bind(this);
   }
 
   componentDidUpdate(prevProps) {
@@ -148,7 +149,7 @@ class UserOptions extends PureComponent {
       sendInvitation,
     } = this.props;
 
-    mountModal(
+    return mountModal(
       <BreakoutRoom
         {...{
           createBreakoutRoom,
@@ -201,8 +202,7 @@ class UserOptions extends PureComponent {
     }
   }
 
-  render() {
-    const { isUserOptionsOpen } = this.state;
+  renderMenuItems() {
     const {
       intl,
       isMeetingMuted,
@@ -217,6 +217,10 @@ class UserOptions extends PureComponent {
       users,
     } = this.props;
 
+    const canCreateBreakout = isUserModerator
+    && !meetingIsBreakout
+    && !hasBreakoutRoom;
+
     const canInviteUsers = isUserModerator
     && !meetingIsBreakout
     && hasBreakoutRoom
@@ -251,14 +255,14 @@ class UserOptions extends PureComponent {
         description={intl.formatMessage(intlMessages.lockViewersDesc)}
         onClick={() => mountModal(<LockViewersContainer />)}
       />),
-      (!meetingIsBreakout && !hasBreakoutRoom && isUserModerator
+      (canCreateBreakout
         ? (
           <DropdownListItem
             key={this.createBreakoutId}
             icon="rooms"
             label={intl.formatMessage(intlMessages.createBreakoutRoom)}
             description={intl.formatMessage(intlMessages.createBreakoutRoomDesc)}
-            onClick={() => this.handleCreateBreakoutRoomClick()}
+            onClick={this.onCreateBreakouts}
           />
         ) : null
       ),
@@ -267,7 +271,7 @@ class UserOptions extends PureComponent {
           <DropdownListItem
             icon="rooms"
             label={intl.formatMessage(intlMessages.invitationItem)}
-            key={this.createBreakoutRoomId}
+            key={this.createBreakoutId}
             onClick={this.onInvitationUsers}
           />
         )
@@ -278,6 +282,13 @@ class UserOptions extends PureComponent {
       this.alterMenu();
     }
 
+    return this.menuItems;
+  }
+
+  render() {
+    const { isUserOptionsOpen } = this.state;
+    const { intl } = this.props;
+
     return (
       <Dropdown
         ref={(ref) => { this.dropdown = ref; }}
@@ -305,7 +316,7 @@ class UserOptions extends PureComponent {
         >
           <DropdownList>
             {
-              this.menuItems
+              this.renderMenuItems()
             }
           </DropdownList>
         </DropdownContent>

From 51f7645607b75888dff9a45b13eb0fc68b64d19a Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Mon, 21 Jan 2019 17:00:24 +0000
Subject: [PATCH 119/163] remove REDIS pubsub html5 logs; turned off debug

---
 bigbluebutton-html5/imports/startup/server/redis.js | 8 +-------
 bigbluebutton-html5/private/config/settings.yml     | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bigbluebutton-html5/imports/startup/server/redis.js b/bigbluebutton-html5/imports/startup/server/redis.js
index 432f34ad61..07fec77746 100644
--- a/bigbluebutton-html5/imports/startup/server/redis.js
+++ b/bigbluebutton-html5/imports/startup/server/redis.js
@@ -28,7 +28,7 @@ const makeEnvelope = (channel, eventName, header, body) => {
 
 const makeDebugger = enabled => (message) => {
   if (!enabled) return;
-  Logger.info(`REDIS: ${message}`);
+  Logger.debug(`REDIS: ${message}`);
 };
 
 class MettingMessageQueue {
@@ -166,9 +166,6 @@ class RedisPubSub {
       return;
     }
 
-    // Please keep this log until the message handling is solid
-    console.warn(` ~~~~ REDIS RECEIVED: ${eventName}  ${message}`);
-
     const queueId = meetingId || NO_MEETING_ID;
 
     if (!(queueId in this.mettingsQueues)) {
@@ -232,9 +229,6 @@ class RedisPubSub {
 
     const envelope = makeEnvelope(channel, eventName, header, payload);
 
-    // Please keep this log until the message handling is solid
-    console.warn(` ~~~~ REDIS PUBLISHING:  ${envelope}`);
-
     return this.pub.publish(channel, envelope, RedisPubSub.handlePublishError);
   }
 }
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 559bd360f5..6ecfaea42c 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -264,7 +264,7 @@ private:
     host: 127.0.0.1
     post: '6379'
     timeout: 5000
-    debug: true
+    debug: false
     channels:
       toAkkaApps: to-akka-apps-redis-channel
     subscribeTo:

From c1ad2f30a68c1a21eab99ddbb8970ba8774e984e Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Mon, 21 Jan 2019 12:06:59 -0500
Subject: [PATCH 120/163] Remove km.json missed in #6589

---
 bigbluebutton-html5/private/locales/km.json | 232 --------------------
 1 file changed, 232 deletions(-)
 delete mode 100644 bigbluebutton-html5/private/locales/km.json

diff --git a/bigbluebutton-html5/private/locales/km.json b/bigbluebutton-html5/private/locales/km.json
deleted file mode 100644
index 3239abcaa1..0000000000
--- a/bigbluebutton-html5/private/locales/km.json
+++ /dev/null
@@ -1,232 +0,0 @@
-{
-    "app.home.greeting": "សូមស្វាគមន៍ {0}! បទ​បង្ហាញ​របស់​អ្នក​នឹង​ចាប់ផ្តើម​បន្តិច​ទៀត​នេះ",
-    "app.chat.submitLabel": "ផ្ញើ​សារ",
-    "app.chat.errorMinMessageLength": "សារ​នេះ​នៅ​ខ្វះ {0} តួ​អក្សរ​ទៀត",
-    "app.chat.errorMaxMessageLength": "សារ​នេះ​លើស {0} តួ​អក្សរ",
-    "app.chat.inputLabel": "ការ​បញ្ចូល​សារ​សម្រាប់​ការ​ជជែក {0}",
-    "app.chat.inputPlaceholder": "សារ {0}",
-    "app.chat.titlePublic": "ជជែក​សាធារណៈ",
-    "app.chat.titlePrivate": "ជជែក​ឯកជន​ជាមួយ {0}",
-    "app.chat.partnerDisconnected": "{0} បាន​ចាកចេញ​ពី​ការ​ប្រជុំ",
-    "app.chat.closeChatLabel": "បិទ {0}",
-    "app.chat.hideChatLabel": "លាក់ {0}",
-    "app.chat.moreMessages": "សារ​ច្រើន​ទៀត​នៅ​ខាង​ក្រោម",
-    "app.chat.dropdown.options": "ជម្រើសក្នុងការជជែក",
-    "app.chat.dropdown.clear": "លុប",
-    "app.chat.dropdown.copy": "ចម្លង",
-    "app.chat.dropdown.save": "រក្សាទុក",
-    "app.chat.label": "ការជជែក",
-    "app.chat.emptyLogLabel": "កំណត់ត្រា​ការ​ជជែក​ទទេ",
-    "app.userList.usersTitle": "អ្នកប្រើប្រាស់",
-    "app.userList.participantsTitle": "អ្នកចូលរួម",
-    "app.userList.messagesTitle": "សារ",
-    "app.userList.presenter": "អ្នក​ធ្វើ​បទ​បង្ហាញ",
-    "app.userList.you": "អ្នក",
-    "app.userList.locked": "បាន​បិទ",
-    "app.userList.label": "បញ្ជី​អ្នកប្រើប្រាស់",
-    "app.userList.toggleCompactView.label": "បិទបើករបៀបមើលបង្រួម",
-    "app.userList.guest": "ភ្ញៀវ",
-    "app.userList.menuTitleContext": "ជម្រើសដែលមាន",
-    "app.userList.chatListItem.unreadSingular": "សារ​ថ្មី {0}",
-    "app.userList.chatListItem.unreadPlural": "សារ​ថ្មី {0}",
-    "app.userList.menu.chat.label": "ជជែក",
-    "app.userList.menu.clearStatus.label": "លុប​ស្ថានភាព",
-    "app.userList.menu.makePresenter.label": "ធ្វើ​ជា​អ្នក​ធ្វើ​បទ​បង្ហាញ",
-    "app.userList.menu.muteUserAudio.label": "បិទសម្លេងអ្នកប្រើប្រាស់",
-    "app.userList.menu.unmuteUserAudio.label": "ឈប់បិទសម្លេងអ្នកប្រើប្រាស់",
-    "app.media.label": "មេឌៀ",
-    "app.presentation.presentationToolbar.prevSlideLabel": "ស្លាយ​មុន",
-    "app.presentation.presentationToolbar.prevSlideDesc": "ប្តូរ​បទ​បង្ហាញ​ទៅ​ស្លាយ​មុន",
-    "app.presentation.presentationToolbar.nextSlideLabel": "ស្លាយ​បន្ទាប់",
-    "app.presentation.presentationToolbar.nextSlideDesc": "ប្តូរ​បទ​បង្ហាញ​ទៅ​ស្លាយ​បន្ទាប់",
-    "app.presentation.presentationToolbar.skipSlideLabel": "រំលង​ស្លាយ",
-    "app.presentation.presentationToolbar.skipSlideDesc": "ប្តូរ​បទ​បង្ហាញ​ទៅ​កាន់​ស្លាយ​ណា​មួយ",
-    "app.presentation.presentationToolbar.fitWidthLabel": "ទំហំ​សម​នឹង​ប្រវែង​ទទឹង",
-    "app.presentation.presentationToolbar.fitWidthDesc": "បង្ហាញ​ទំហំ​ទទឹង​ទាំង​មូល​របស់​ស្លាយ",
-    "app.presentation.presentationToolbar.fitScreenLabel": "ទំហំ​សម​នឹង​អេក្រង់​ទាំង​មូល",
-    "app.presentation.presentationToolbar.fitScreenDesc": "បង្ហាញ​ស្លាយ​ទាំង​មូល",
-    "app.presentation.presentationToolbar.zoomLabel": "ពង្រីក/បង្រួម",
-    "app.presentation.presentationToolbar.zoomDesc": "ប្តូរ​កម្រិត​ពង្រីក​របស់​បទ​បង្ហាញ",
-    "app.polling.pollingTitle": "ជម្រើសសម្រាប់ការ​ស្ទង់​មតិ",
-    "app.failedMessage": "សូមទោស! មាន​បញ្ហា​ក្នុង​ការ​ភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ",
-    "app.connectingMessage": "កំពុង​ភ្ជាប់...",
-    "app.waitingMessage": "ត្រូវ​បាន​ផ្តាច់! នឹង​ព្យាយាម​ភ្ជាប់​វិញ​ក្នុងរយៈពេល {0} វិនាទី...",
-    "app.navBar.settingsDropdown.optionsLabel": "ជម្រើស",
-    "app.navBar.settingsDropdown.fullscreenLabel": "បើក​ពេញ​អេក្រង់",
-    "app.navBar.settingsDropdown.settingsLabel": "បើក​ការ​កំណត់",
-    "app.navBar.settingsDropdown.aboutLabel": "អំពី",
-    "app.navBar.settingsDropdown.leaveSessionLabel": "ចាកចេញ",
-    "app.navBar.settingsDropdown.exitFullscreenLabel": "ចាកចេញ​ពី​អេក្រង់​ពេញ",
-    "app.navBar.settingsDropdown.fullscreenDesc": "បើក​ម៉ឺនុយ​សម្រាប់​ការ​កំណត់​ពេញ​អេក្រង់",
-    "app.navBar.settingsDropdown.settingsDesc": "ប្តូរ​ការ​កំណត់​ទូទៅ",
-    "app.navBar.settingsDropdown.aboutDesc": "បង្ហាញ​ព័ត៌មាន​ពី​ម៉ាស៊ីន​ភ្ញៀវ",
-    "app.navBar.settingsDropdown.leaveSessionDesc": "ចាកចេញ​ពី​ការ​ប្រជុំ",
-    "app.navBar.settingsDropdown.exitFullscreenDesc": "ចាកចេញ​ពី​អេក្រង់​ពេញ",
-    "app.navBar.userListToggleBtnLabel": "បិទ​បើក​បញ្ជី​អ្នកប្រើប្រាស់",
-    "app.navBar.toggleUserList.newMessages": "ជាមួយ​ការ​ជូន​ដំណឹង​ពី​សារ​ថ្មី",
-    "app.leaveConfirmation.title": "ចាកចេញ​ពី​វគ្គ​នេះ",
-    "app.leaveConfirmation.message": "តើ​អ្នក​ពិត​ជា​ចង់​ចាកចេញ​ពី​ការប្រជុំ​នេះ​មែន​ទេ?",
-    "app.leaveConfirmation.confirmLabel": "ចាកចេញ",
-    "app.leaveConfirmation.confirmDesc": "ដក​អ្នក​ចេញ​ពី​ការ​ប្រជុំ",
-    "app.leaveConfirmation.dismissLabel": "បោះបង់",
-    "app.leaveConfirmation.dismissDesc": "បិទ​និង​បដិសេធ​ការ​បញ្ជាក់​ពី​ការ​ចាកចេញ",
-    "app.leaveConfirmation.endMeetingLabel": "យល់ព្រម និងបិទវគ្គនេះ",
-    "app.leaveConfirmation.endMeetingDesc": "បិទ​និង​បញ្ចប់ការ​បញ្ជាក់​ពី​ការ​ប្រជំុ",
-    "app.about.title": "អំពី",
-    "app.about.version": "ជំនាន់​កសាង​របស់​ម៉ាស៊ីន​ភ្ញៀវ ៖",
-    "app.about.copyright": "សិទ្ធិ​អ្នកនិពន្ធ ៖",
-    "app.about.confirmLabel": "យល់ព្រម",
-    "app.about.confirmDesc": "យល់ព្រម",
-    "app.about.dismissLabel": "បោះបង់",
-    "app.about.dismissDesc": "បិទ​ព័ត៌មាន​ពី​ម៉ាស៊ីន​ភ្ញៀវ",
-    "app.actionsBar.changeStatusLabel": "ប្តូរ​ស្ថានភាព",
-    "app.actionsBar.muteLabel": "បិទ​សម្លេង",
-    "app.actionsBar.unmuteLabel": "បើក​សម្លេង",
-    "app.actionsBar.camOffLabel": "បិទ​កាមេរ៉ា",
-    "app.actionsBar.raiseLabel": "លើកដៃ",
-    "app.actionsBar.label": "របារ​សកម្មភាព",
-    "app.submenu.application.applicationSectionTitle": "កម្មវិធី",
-    "app.submenu.application.fontSizeControlLabel": "ទំហំ​អក្សរ​",
-    "app.submenu.application.increaseFontBtnLabel": "បង្កើន​ទំហំ​អក្សរ​ក្នុង​កម្មវិធី",
-    "app.submenu.application.decreaseFontBtnLabel": "បន្ថយ​ទំហំ​អក្សរ​ក្នុង​កម្មវិធី",
-    "app.submenu.application.languageLabel": "ភាសា​របស់​កម្មវិធី",
-    "app.submenu.application.ariaLanguageLabel": "ប្តូរ​ភាសា​របស់​កម្មវិធី",
-    "app.submenu.application.languageOptionLabel": "ជ្រើសរើស​ភាសា",
-    "app.submenu.application.noLocaleOptionLabel": "មិន​មាន​ភាសា​ទេ",
-    "app.submenu.audio.micSourceLabel": "ប្រភព​មីក្រូហ្វូន",
-    "app.submenu.audio.speakerSourceLabel": "ប្រភព​ឧបករណ៍​បញ្ចេញ​សម្លេង",
-    "app.submenu.audio.streamVolumeLabel": "កម្រិត​សម្លេង",
-    "app.submenu.video.title": "វីដេអូ",
-    "app.submenu.video.videoSourceLabel": "បង្ហាញ​ប្រភព",
-    "app.submenu.video.videoOptionLabel": "ជ្រើសរើស​បង្ហាញ​ប្រភព",
-    "app.submenu.video.videoQualityLabel": "កម្រិត​គុណភាព​វីដេអូ",
-    "app.submenu.video.qualityOptionLabel": "ជ្រើសរើស​គុណភាព​វីដេអូ",
-    "app.submenu.video.participantsCamLabel": "កំពុង​បង្ហាញ​វេបខេម​របស់​អ្នក​ចូលរួម",
-    "app.submenu.closedCaptions.closedCaptionsLabel": "ចំណងជើង​ភ្ជាប់",
-    "app.submenu.closedCaptions.takeOwnershipLabel": "យក​ធ្វើ​ជា​របស់​ខ្លួន​ឯង",
-    "app.submenu.closedCaptions.languageLabel": "ភាសា",
-    "app.submenu.closedCaptions.localeOptionLabel": "ជ្រើសរើស​ភាសា",
-    "app.submenu.closedCaptions.noLocaleOptionLabel": "មិន​មាន​ភាសា",
-    "app.submenu.closedCaptions.fontFamilyLabel": "ពុម្ព​អក្សរ",
-    "app.submenu.closedCaptions.fontFamilyOptionLabel": "ជ្រើសរើស​ពុម្ព​អក្សរ",
-    "app.submenu.closedCaptions.fontSizeLabel": "ទំហំ​អក្សរ",
-    "app.submenu.closedCaptions.fontSizeOptionLabel": "ជ្រើសរើស​ទំហំ​អក្សរ",
-    "app.submenu.closedCaptions.backgroundColorLabel": "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ",
-    "app.submenu.closedCaptions.fontColorLabel": "ពណ៌​អក្សរ​",
-    "app.submenu.participants.muteAllLabel": "បិទ​សម្លេង​ទាំងអស់​លើក​លែង​តែ​អ្នក​ធ្វើ​បទ​បង្ហាញ",
-    "app.submenu.participants.lockAllLabel": "បិទ​អ្នកចូលរួម​ទាំងអស់",
-    "app.submenu.participants.lockItemLabel": "អ្នកចូលរួម {0}",
-    "app.submenu.participants.lockMicDesc": "បិទ​មីក្រូហ្វូន​សម្រាប់​អ្នកចូលរួម​ដែល​បាន​បិទ​ទាំងអស់",
-    "app.submenu.participants.lockCamDesc": "បិទ​វេបខេម​សម្រាប់​អ្នកចូលរួម​ដែល​បាន​បិទ​ទាំងអស់",
-    "app.submenu.participants.lockPublicChatDesc": "បិទ​ការ​ជជែក​សាធារណៈ​សម្រាប់​អ្នក​ចូលរួម​ដែល​បាន​បិទ​ទាំងអស់",
-    "app.submenu.participants.lockPrivateChatDesc": "បិទ​ការ​ជជែក​ឯកជន​សម្រាប់​អ្នកចូលរួម​ដែល​បាន​បិទ​ទាំងអស់",
-    "app.submenu.participants.lockLayoutDesc": "បិទ​ទម្រង់​សម្រាប់​អ្នកចូលរួម​ដែល​បាន​បិទ​ទាំងអស់",
-    "app.submenu.participants.lockMicAriaLabel": "ការ​បិទ​មីក្រូហ្វូន",
-    "app.submenu.participants.lockCamAriaLabel": "ការ​បិទ​វេបខេម",
-    "app.submenu.participants.lockPublicChatAriaLabel": "ការ​បិទ​ការ​ជជែក​សាធារណៈ",
-    "app.submenu.participants.lockPrivateChatAriaLabel": "ការ​បិទ​ការ​ជជែក​ឯកជន",
-    "app.submenu.participants.lockLayoutAriaLabel": "ការ​បិទ​ទម្រង់",
-    "app.submenu.participants.lockMicLabel": "មីក្រូហ្វូន",
-    "app.submenu.participants.lockCamLabel": "វេបខេម",
-    "app.submenu.participants.lockPublicChatLabel": "ជជែក​សាធារណៈ",
-    "app.submenu.participants.lockPrivateChatLabel": "ជជែក​ឯកជន",
-    "app.submenu.participants.lockLayoutLabel": "ទម្រង់",
-    "app.settings.applicationTab.label": "កម្មវិធី",
-    "app.settings.audioTab.label": "សម្លេង",
-    "app.settings.videoTab.label": "វីដេអូ",
-    "app.settings.closedcaptionTab.label": "ចំណងជើង​ភ្ជាប់",
-    "app.settings.usersTab.label": "អ្នកចូលរួម",
-    "app.settings.main.label": "ការកំណត់",
-    "app.settings.main.cancel.label": "បោះបង់",
-    "app.settings.main.cancel.label.description": "បោះបង់​ការ​ផ្លាស់ប្ដូរ​ និង​បិទ​ម៉ឺនុយ​សម្រាប់​ការ​កំណត់",
-    "app.settings.main.save.label": "រក្សាទុក",
-    "app.settings.main.save.label.description": "រក្សា​ការ​ផ្លាស់​ប្តូរ និង​បិទ​ម៉ឺនុយ​សម្រាប់​ការ​កំណត់",
-    "app.actionsBar.actionsDropdown.actionsLabel": "សកម្មភាព",
-    "app.actionsBar.actionsDropdown.presentationLabel": "ផ្ទុក​ឡើង​បទ​បង្ហាញ",
-    "app.actionsBar.actionsDropdown.initPollLabel": "ចាប់ផ្តើម​ការ​ស្ទង់​មតិ",
-    "app.actionsBar.actionsDropdown.desktopShareLabel": "ចែក​រំលែក​អេក្រង់​របស់​អ្នក",
-    "app.actionsBar.actionsDropdown.presentationDesc": "ផ្ទុក​ឡើង​បទ​បង្ហាញ​របស់​អ្នក",
-    "app.actionsBar.actionsDropdown.initPollDesc": "ចាប់​ផ្តើម​ការ​ស្ទង់មតិ",
-    "app.actionsBar.actionsDropdown.desktopShareDesc": "ចែក​រំលែក​អេក្រង់​របស់​អ្នក​ជាមួយ​អ្នក​ដទៃ",
-    "app.actionsBar.emojiMenu.awayLabel": "នៅ​ឆ្ងាយ",
-    "app.actionsBar.emojiMenu.awayDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"នៅឆ្ងាយ\"",
-    "app.actionsBar.emojiMenu.confusedLabel": "ច្រឡំ",
-    "app.actionsBar.emojiMenu.confusedDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"ច្រឡំ\"",
-    "app.actionsBar.emojiMenu.sadLabel": "មិន​សប្បាយ​ចិត្ត",
-    "app.actionsBar.emojiMenu.sadDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ \"មិន​សប្បាយ​ចិត្ត\"",
-    "app.actionsBar.emojiMenu.happyLabel": "សប្បាយចិត្ត",
-    "app.actionsBar.emojiMenu.happyDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ \"សប្បាយចិត្ត\"",
-    "app.actionsBar.emojiMenu.applauseLabel": "ទះដៃ",
-    "app.actionsBar.emojiMenu.applauseDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"ទះដៃ\"",
-    "app.actionsBar.emojiMenu.thumbsUpLabel": "មេដៃ​ឡើង",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"មេដៃ​ឡើង\"",
-    "app.actionsBar.emojiMenu.thumbsDownLabel": "មេ​ដៃ​ចុះ",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"មេ​ដៃ​ចុះ\"",
-    "app.actionsBar.currentStatusDesc": "ស្ថានភាព​បច្ចុប្បន្ន {0}",
-    "app.audioNotification.audioFailedError1001": "កំហុស 1001: WebSocket មិនបានភ្ជាប់",
-    "app.audioNotification.audioFailedError1002": "កំហុស 1002: មិនអាចធ្វើការតភ្ជាប់ WebSocket បាន",
-    "app.audioNotification.audioFailedError1003": "កំហុស 1003: កំណែកម្មវិធីរុករកមិនត្រូវបានគាំទ្រទេ",
-    "app.audioNotification.audioFailedError1004": "កំហុស 1004: បរាជ័យក្នុងការហៅ",
-    "app.audioNotification.audioFailedError1005": "កំហុស 1005: ការហៅបានបញ្ចប់ដោយមិនបានរំពឹងទុក",
-    "app.audioNotification.audioFailedError1006": "កំហុស 1006: ការហៅបានអស់ពេល",
-    "app.audioNotification.audioFailedError1007": "កំហុស 1007: ការចរចា ICE បរាជ័យ",
-    "app.audioNotification.audioFailedError1008": "កំហុស 1008: ផ្ទេរបានបរាជ័យ",
-    "app.audioNotification.audioFailedError1009": "កំហុស 1009: មិនអាចទៅយកពត៌មានរបស់ម៉ាស៊ីនបម្រើ STUN / TURN",
-    "app.audioNotification.audioFailedError1010": "កំហុស 1010: អស់ពេលចរចា ICE",
-    "app.audioNotification.audioFailedError1011": "កំហុស 1011: អស់ពេលប្រមូលផ្តុំ ICE",
-    "app.audioNotification.audioFailedMessage": "ការ​តភ្ជាប់​សម្លេង​របស់​អ្នក​មិន​បាន​ជោគជ័យ",
-    "app.audioNotification.mediaFailedMessage": "getUserMicMedia មិន​បាន​ជោគជ័យ។ មាន​តែ​ប្រភព​ដើម​ដែល​មាន​សុវត្ថិភាព​ទេ​ទើប​ត្រូវ​បាន​អនុញ្ញាត។",
-    "app.audioNotification.closeLabel": "បិទ",
-    "app.breakoutJoinConfirmation.title": "ចូល​រួម​បន្ទប់​ពិភាក្សា",
-    "app.breakoutJoinConfirmation.message": "តើ​អ្នក​ចង់​ចូល​រួម",
-    "app.breakoutJoinConfirmation.confirmLabel": "ចូលរួម",
-    "app.breakoutJoinConfirmation.confirmDesc": "ដាក់​អ្នក​ទៅ​ក្នុង​បន្ទប់​ពិភាក្សា",
-    "app.breakoutJoinConfirmation.dismissLabel": "បោះបង់",
-    "app.breakoutJoinConfirmation.dismissDesc": "បិទ និង​បដិសេធ​ការ​ចូលរួម​ក្នុង​បន្ទប់​ពិភាក្សា",
-    "app.breakoutTimeRemainingMessage": "រយៈពេល​នៅ​សល់​ក្នុង​បន្ទប់​ពិភាក្សា៖ {0}",
-    "app.breakoutWillCloseMessage": "អស់​ពេល! បន្ទប់​ពិភាក្សា​នឹង​បិទ​នៅ​ពេល​បន្តិច​ទៀត",
-    "app.calculatingBreakoutTimeRemaining": "កំពុង​គណនា​ពេល​នៅ​សល់ ...​",
-    "app.audioModal.microphoneLabel": "មីក្រូហ្វូន",
-    "app.audioModal.listenOnlyLabel": "គ្រាន់តែ​ស្តាប់",
-    "app.audioModal.audioChoiceLabel": "តើ​អ្នក​ចង់​ចូលរួម​ដោយ​ប្រើ​សម្លេង​របៀប​ណា?",
-    "app.audioModal.audioChoiceDesc": "ជ្រើសរើស​របៀប​ចូលរួម​សម្លេង​ក្នុង​ការ​ប្រជុំ​នេះ",
-    "app.audioModal.closeLabel": "បិទ",
-    "app.audioModal.yes": "បាទ/ចាស",
-    "app.audioModal.no": "ទេ",
-    "app.audioModal.echoTestTitle": "នេះគឺជាការសាកល្បងអេកូឯកជន។ និយាយពាក្យពីរបី។ តើអ្នកឮសំឡេងទេ?",
-    "app.audioModal.settingsTitle": "ប្តូរ​ការ​កំណត់​​សម្រាប់សំឡេង",
-    "app.audioModal.connecting": "កំពុងភ្ជាប់",
-    "app.audioModal.connectingEchoTest": "កំពុងភ្ជាប់ទៅការសាកល្បងអេកូ",
-    "app.audioManager.joinedAudio": "អ្នកបានចូលរួមក្នុងសន្និសិតជាសម្លេង",
-    "app.audioManager.joinedEcho": "អ្នកបានចូលរួមក្នុងការសាកល្បងអេកូ",
-    "app.audioManager.leftAudio": "អ្នកបានចាកចេញពីសន្និសិតជាសម្លេង",
-    "app.audioManager.genericError": "កំហុសៈ កំហុសមួយបានកើតឡើង។ សូមព្យាយាមម្តងទៀត។",
-    "app.audioManager.connectionError": "កំហុសៈ កំហុសក្នុងការតភ្ជាប់",
-    "app.audioManager.requestTimeout": "កំហុសៈ មានការផុតកំណត់ក្នុងសំណើសុំ",
-    "app.audioManager.invalidTarget": "កំហុសៈ បានព្យាយាមស្នើសុំនូវអ្វីមួយទៅកាន់គោលដៅមិនត្រឹមត្រូវ",
-    "app.audio.joinAudio": "ប្រើ​សម្លេង",
-    "app.audio.leaveAudio": "ចាកចេញ​ពី​ការ​សម្លេង",
-    "app.audio.enterSessionLabel": "ចូល​វគ្គនេះ",
-    "app.audio.playSoundLabel": "លេង​សម្លេង",
-    "app.audio.backLabel": "ត្រឡប់",
-    "app.audio.audioSettings.titleLabel": "ជ្រើសរើស​ការ​កំណត់​សម្លេង​របស់​អ្នក",
-    "app.audio.audioSettings.descriptionLabel": "សូម​កត់​សំគាល់​ថា​ផ្ទាំង​មួយ​នឹង​លេច​ឡើង​ក្នុង​កម្មវិធី​រុករក​របស់​អ្នក​ដែល​ទាមទារ​ឲ្យ​អ្នក​យល់ព្រម​ក្នុង​ការ​ចែក​រំលែក​មីក្រូហ្វូន​របស់​អ្នក។",
-    "app.audio.audioSettings.microphoneSourceLabel": "ប្រភព​មីក្រូហ្វូន",
-    "app.audio.audioSettings.speakerSourceLabel": "ប្រភព​ឧបករណ៍​បញ្ចេញ​សម្លេង",
-    "app.audio.audioSettings.microphoneStreamLabel": "កម្រិត​សម្លេង",
-    "app.audio.audioSettings.retryLabel": "ព្យាយាមម្តងទៀត",
-    "app.audio.listenOnly.backLabel": "ត្រឡប់",
-    "app.audio.listenOnly.closeLabel": "បិទ",
-    "app.error.meeting.ended": "អ្នកបានចាកចេញពីសន្និសិត",
-    "app.dropdown.close": "បិទ",
-    "app.error.500": "អុញ! មាន​បញ្ហា​អ្វី​មួយ​ហើយ",
-    "app.error.404": "រក​មិន​ឃើញ",
-    "app.error.401": "មិន​អនុញ្ញាត",
-    "app.error.403": "ត្រូវ​បាន​ហាម​ឃាត់",
-    "app.error.leaveLabel": "ចូល​ម្តង​ទៀត",
-    "app.guest.waiting": "កំពុងរង់ចាំការយល់ព្រមដើម្បីចូលរួម",
-    "app.notification.recordingStart": "វគ្គនេះកំពុងត្រូវបានថតទុក",
-    "app.notification.recordingStop": "វគ្គនេះមិនកំពុងត្រូវបានថតទុកទៀតទេ"
-
-}
-

From 3fe058db31ff1ead597279d1a51b82771ac24267 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <antobinary@users.noreply.github.com>
Date: Mon, 21 Jan 2019 12:08:04 -0500
Subject: [PATCH 121/163] Enable kurento webcams [video] by default

---
 bigbluebutton-html5/private/config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 559bd360f5..0c22a16124 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -95,7 +95,7 @@ public:
       height:
         max: 480
     enableScreensharing: false
-    enableVideo: false
+    enableVideo: true
     enableVideoStats: false
     enableListenOnly: false
     autoShareWebcam: false

From 743caa2d15e02c7132be12486f49a80f484169ed Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Fri, 18 Jan 2019 11:51:22 -0800
Subject: [PATCH 122/163] remove WebRTC blocks for Edge and update adapter.js

---
 .../resources/prod/lib/adapter.js             | 6026 +++++++++--------
 .../prod/lib/bbb_webrtc_bridge_sip.js         |    6 +-
 .../utils/WebRTCScreenshareUtility.as         |    2 +
 .../util/browser/BrowserCheck.as              |    4 +
 4 files changed, 3384 insertions(+), 2654 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/adapter.js b/bigbluebutton-client/resources/prod/lib/adapter.js
index ac7d7a5ace..0f873d2230 100755
--- a/bigbluebutton-client/resources/prod/lib/adapter.js
+++ b/bigbluebutton-client/resources/prod/lib/adapter.js
@@ -1,4 +1,2608 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.adapter = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.adapter = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+
+'use strict';
+
+var _adapter_factory = require('./adapter_factory.js');
+
+var adapter = (0, _adapter_factory.adapterFactory)({ window: window });
+module.exports = adapter; // this is the difference from adapter_core.
+
+},{"./adapter_factory.js":2}],2:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.adapterFactory = adapterFactory;
+
+var _utils = require('./utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+var _chrome_shim = require('./chrome/chrome_shim');
+
+var chromeShim = _interopRequireWildcard(_chrome_shim);
+
+var _edge_shim = require('./edge/edge_shim');
+
+var edgeShim = _interopRequireWildcard(_edge_shim);
+
+var _firefox_shim = require('./firefox/firefox_shim');
+
+var firefoxShim = _interopRequireWildcard(_firefox_shim);
+
+var _safari_shim = require('./safari/safari_shim');
+
+var safariShim = _interopRequireWildcard(_safari_shim);
+
+var _common_shim = require('./common_shim');
+
+var commonShim = _interopRequireWildcard(_common_shim);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+// Shimming starts here.
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+function adapterFactory() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      window = _ref.window;
+
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    shimChrome: true,
+    shimFirefox: true,
+    shimEdge: true,
+    shimSafari: true
+  };
+
+  // Utils.
+  var logging = utils.log;
+  var browserDetails = utils.detectBrowser(window);
+
+  var adapter = {
+    browserDetails: browserDetails,
+    commonShim: commonShim,
+    extractVersion: utils.extractVersion,
+    disableLog: utils.disableLog,
+    disableWarnings: utils.disableWarnings
+  };
+
+  // Shim browser if found.
+  switch (browserDetails.browser) {
+    case 'chrome':
+      if (!chromeShim || !chromeShim.shimPeerConnection || !options.shimChrome) {
+        logging('Chrome shim is not included in this adapter release.');
+        return adapter;
+      }
+      logging('adapter.js shimming chrome.');
+      // Export to the adapter global object visible in the browser.
+      adapter.browserShim = chromeShim;
+
+      chromeShim.shimGetUserMedia(window);
+      chromeShim.shimMediaStream(window);
+      chromeShim.shimPeerConnection(window);
+      chromeShim.shimOnTrack(window);
+      chromeShim.shimAddTrackRemoveTrack(window);
+      chromeShim.shimGetSendersWithDtmf(window);
+      chromeShim.shimSenderReceiverGetStats(window);
+      chromeShim.fixNegotiationNeeded(window);
+
+      commonShim.shimRTCIceCandidate(window);
+      commonShim.shimConnectionState(window);
+      commonShim.shimMaxMessageSize(window);
+      commonShim.shimSendThrowTypeError(window);
+      break;
+    case 'firefox':
+      if (!firefoxShim || !firefoxShim.shimPeerConnection || !options.shimFirefox) {
+        logging('Firefox shim is not included in this adapter release.');
+        return adapter;
+      }
+      logging('adapter.js shimming firefox.');
+      // Export to the adapter global object visible in the browser.
+      adapter.browserShim = firefoxShim;
+
+      firefoxShim.shimGetUserMedia(window);
+      firefoxShim.shimPeerConnection(window);
+      firefoxShim.shimOnTrack(window);
+      firefoxShim.shimRemoveStream(window);
+      firefoxShim.shimSenderGetStats(window);
+      firefoxShim.shimReceiverGetStats(window);
+      firefoxShim.shimRTCDataChannel(window);
+
+      commonShim.shimRTCIceCandidate(window);
+      commonShim.shimConnectionState(window);
+      commonShim.shimMaxMessageSize(window);
+      commonShim.shimSendThrowTypeError(window);
+      break;
+    case 'edge':
+      if (!edgeShim || !edgeShim.shimPeerConnection || !options.shimEdge) {
+        logging('MS edge shim is not included in this adapter release.');
+        return adapter;
+      }
+      logging('adapter.js shimming edge.');
+      // Export to the adapter global object visible in the browser.
+      adapter.browserShim = edgeShim;
+
+      edgeShim.shimGetUserMedia(window);
+      edgeShim.shimGetDisplayMedia(window);
+      edgeShim.shimPeerConnection(window);
+      edgeShim.shimReplaceTrack(window);
+
+      // the edge shim implements the full RTCIceCandidate object.
+
+      commonShim.shimMaxMessageSize(window);
+      commonShim.shimSendThrowTypeError(window);
+      break;
+    case 'safari':
+      if (!safariShim || !options.shimSafari) {
+        logging('Safari shim is not included in this adapter release.');
+        return adapter;
+      }
+      logging('adapter.js shimming safari.');
+      // Export to the adapter global object visible in the browser.
+      adapter.browserShim = safariShim;
+
+      safariShim.shimRTCIceServerUrls(window);
+      safariShim.shimCreateOfferLegacy(window);
+      safariShim.shimCallbacksAPI(window);
+      safariShim.shimLocalStreamsAPI(window);
+      safariShim.shimRemoteStreamsAPI(window);
+      safariShim.shimTrackEventTransceiver(window);
+      safariShim.shimGetUserMedia(window);
+
+      commonShim.shimRTCIceCandidate(window);
+      commonShim.shimMaxMessageSize(window);
+      commonShim.shimSendThrowTypeError(window);
+      break;
+    default:
+      logging('Unsupported browser!');
+      break;
+  }
+
+  return adapter;
+}
+
+// Browser shims.
+
+},{"./chrome/chrome_shim":3,"./common_shim":6,"./edge/edge_shim":7,"./firefox/firefox_shim":11,"./safari/safari_shim":14,"./utils":15}],3:[function(require,module,exports){
+
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetDisplayMedia = exports.shimGetUserMedia = undefined;
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+var _getusermedia = require('./getusermedia');
+
+Object.defineProperty(exports, 'shimGetUserMedia', {
+  enumerable: true,
+  get: function get() {
+    return _getusermedia.shimGetUserMedia;
+  }
+});
+
+var _getdisplaymedia = require('./getdisplaymedia');
+
+Object.defineProperty(exports, 'shimGetDisplayMedia', {
+  enumerable: true,
+  get: function get() {
+    return _getdisplaymedia.shimGetDisplayMedia;
+  }
+});
+exports.shimMediaStream = shimMediaStream;
+exports.shimOnTrack = shimOnTrack;
+exports.shimGetSendersWithDtmf = shimGetSendersWithDtmf;
+exports.shimSenderReceiverGetStats = shimSenderReceiverGetStats;
+exports.shimAddTrackRemoveTrackWithNative = shimAddTrackRemoveTrackWithNative;
+exports.shimAddTrackRemoveTrack = shimAddTrackRemoveTrack;
+exports.shimPeerConnection = shimPeerConnection;
+exports.fixNegotiationNeeded = fixNegotiationNeeded;
+
+var _utils = require('../utils.js');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+/* iterates the stats graph recursively. */
+function walkStats(stats, base, resultSet) {
+  if (!base || resultSet.has(base.id)) {
+    return;
+  }
+  resultSet.set(base.id, base);
+  Object.keys(base).forEach(function (name) {
+    if (name.endsWith('Id')) {
+      walkStats(stats, stats.get(base[name]), resultSet);
+    } else if (name.endsWith('Ids')) {
+      base[name].forEach(function (id) {
+        walkStats(stats, stats.get(id), resultSet);
+      });
+    }
+  });
+}
+
+/* filter getStats for a sender/receiver track. */
+function filterStats(result, track, outbound) {
+  var streamStatsType = outbound ? 'outbound-rtp' : 'inbound-rtp';
+  var filteredResult = new Map();
+  if (track === null) {
+    return filteredResult;
+  }
+  var trackStats = [];
+  result.forEach(function (value) {
+    if (value.type === 'track' && value.trackIdentifier === track.id) {
+      trackStats.push(value);
+    }
+  });
+  trackStats.forEach(function (trackStat) {
+    result.forEach(function (stats) {
+      if (stats.type === streamStatsType && stats.trackId === trackStat.id) {
+        walkStats(result, stats, filteredResult);
+      }
+    });
+  });
+  return filteredResult;
+}
+
+function shimMediaStream(window) {
+  window.MediaStream = window.MediaStream || window.webkitMediaStream;
+}
+
+function shimOnTrack(window) {
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && !('ontrack' in window.RTCPeerConnection.prototype)) {
+    Object.defineProperty(window.RTCPeerConnection.prototype, 'ontrack', {
+      get: function get() {
+        return this._ontrack;
+      },
+      set: function set(f) {
+        if (this._ontrack) {
+          this.removeEventListener('track', this._ontrack);
+        }
+        this.addEventListener('track', this._ontrack = f);
+      },
+
+      enumerable: true,
+      configurable: true
+    });
+    var origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+    window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+      var _this = this;
+
+      if (!this._ontrackpoly) {
+        this._ontrackpoly = function (e) {
+          // onaddstream does not fire when a track is added to an existing
+          // stream. But stream.onaddtrack is implemented so we use that.
+          e.stream.addEventListener('addtrack', function (te) {
+            var receiver = void 0;
+            if (window.RTCPeerConnection.prototype.getReceivers) {
+              receiver = _this.getReceivers().find(function (r) {
+                return r.track && r.track.id === te.track.id;
+              });
+            } else {
+              receiver = { track: te.track };
+            }
+
+            var event = new Event('track');
+            event.track = te.track;
+            event.receiver = receiver;
+            event.transceiver = { receiver: receiver };
+            event.streams = [e.stream];
+            _this.dispatchEvent(event);
+          });
+          e.stream.getTracks().forEach(function (track) {
+            var receiver = void 0;
+            if (window.RTCPeerConnection.prototype.getReceivers) {
+              receiver = _this.getReceivers().find(function (r) {
+                return r.track && r.track.id === track.id;
+              });
+            } else {
+              receiver = { track: track };
+            }
+            var event = new Event('track');
+            event.track = track;
+            event.receiver = receiver;
+            event.transceiver = { receiver: receiver };
+            event.streams = [e.stream];
+            _this.dispatchEvent(event);
+          });
+        };
+        this.addEventListener('addstream', this._ontrackpoly);
+      }
+      return origSetRemoteDescription.apply(this, arguments);
+    };
+  } else {
+    // even if RTCRtpTransceiver is in window, it is only used and
+    // emitted in unified-plan. Unfortunately this means we need
+    // to unconditionally wrap the event.
+    utils.wrapPeerConnectionEvent(window, 'track', function (e) {
+      if (!e.transceiver) {
+        Object.defineProperty(e, 'transceiver', { value: { receiver: e.receiver } });
+      }
+      return e;
+    });
+  }
+}
+
+function shimGetSendersWithDtmf(window) {
+  // Overrides addTrack/removeTrack, depends on shimAddTrackRemoveTrack.
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && !('getSenders' in window.RTCPeerConnection.prototype) && 'createDTMFSender' in window.RTCPeerConnection.prototype) {
+    var shimSenderWithDtmf = function shimSenderWithDtmf(pc, track) {
+      return {
+        track: track,
+        get dtmf() {
+          if (this._dtmf === undefined) {
+            if (track.kind === 'audio') {
+              this._dtmf = pc.createDTMFSender(track);
+            } else {
+              this._dtmf = null;
+            }
+          }
+          return this._dtmf;
+        },
+        _pc: pc
+      };
+    };
+
+    // augment addTrack when getSenders is not available.
+    if (!window.RTCPeerConnection.prototype.getSenders) {
+      window.RTCPeerConnection.prototype.getSenders = function () {
+        this._senders = this._senders || [];
+        return this._senders.slice(); // return a copy of the internal state.
+      };
+      var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+      window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+        var sender = origAddTrack.apply(this, arguments);
+        if (!sender) {
+          sender = shimSenderWithDtmf(this, track);
+          this._senders.push(sender);
+        }
+        return sender;
+      };
+
+      var origRemoveTrack = window.RTCPeerConnection.prototype.removeTrack;
+      window.RTCPeerConnection.prototype.removeTrack = function (sender) {
+        origRemoveTrack.apply(this, arguments);
+        var idx = this._senders.indexOf(sender);
+        if (idx !== -1) {
+          this._senders.splice(idx, 1);
+        }
+      };
+    }
+    var origAddStream = window.RTCPeerConnection.prototype.addStream;
+    window.RTCPeerConnection.prototype.addStream = function (stream) {
+      var _this2 = this;
+
+      this._senders = this._senders || [];
+      origAddStream.apply(this, [stream]);
+      stream.getTracks().forEach(function (track) {
+        _this2._senders.push(shimSenderWithDtmf(_this2, track));
+      });
+    };
+
+    var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
+    window.RTCPeerConnection.prototype.removeStream = function (stream) {
+      var _this3 = this;
+
+      this._senders = this._senders || [];
+      origRemoveStream.apply(this, [stream]);
+
+      stream.getTracks().forEach(function (track) {
+        var sender = _this3._senders.find(function (s) {
+          return s.track === track;
+        });
+        if (sender) {
+          // remove sender
+          _this3._senders.splice(_this3._senders.indexOf(sender), 1);
+        }
+      });
+    };
+  } else if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && 'getSenders' in window.RTCPeerConnection.prototype && 'createDTMFSender' in window.RTCPeerConnection.prototype && window.RTCRtpSender && !('dtmf' in window.RTCRtpSender.prototype)) {
+    var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
+    window.RTCPeerConnection.prototype.getSenders = function () {
+      var _this4 = this;
+
+      var senders = origGetSenders.apply(this, []);
+      senders.forEach(function (sender) {
+        return sender._pc = _this4;
+      });
+      return senders;
+    };
+
+    Object.defineProperty(window.RTCRtpSender.prototype, 'dtmf', {
+      get: function get() {
+        if (this._dtmf === undefined) {
+          if (this.track.kind === 'audio') {
+            this._dtmf = this._pc.createDTMFSender(this.track);
+          } else {
+            this._dtmf = null;
+          }
+        }
+        return this._dtmf;
+      }
+    });
+  }
+}
+
+function shimSenderReceiverGetStats(window) {
+  if (!((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && window.RTCRtpSender && window.RTCRtpReceiver)) {
+    return;
+  }
+
+  // shim sender stats.
+  if (!('getStats' in window.RTCRtpSender.prototype)) {
+    var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
+    if (origGetSenders) {
+      window.RTCPeerConnection.prototype.getSenders = function () {
+        var _this5 = this;
+
+        var senders = origGetSenders.apply(this, []);
+        senders.forEach(function (sender) {
+          return sender._pc = _this5;
+        });
+        return senders;
+      };
+    }
+
+    var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+    if (origAddTrack) {
+      window.RTCPeerConnection.prototype.addTrack = function () {
+        var sender = origAddTrack.apply(this, arguments);
+        sender._pc = this;
+        return sender;
+      };
+    }
+    window.RTCRtpSender.prototype.getStats = function () {
+      var sender = this;
+      return this._pc.getStats().then(function (result) {
+        return (
+          /* Note: this will include stats of all senders that
+           *   send a track with the same id as sender.track as
+           *   it is not possible to identify the RTCRtpSender.
+           */
+          filterStats(result, sender.track, true)
+        );
+      });
+    };
+  }
+
+  // shim receiver stats.
+  if (!('getStats' in window.RTCRtpReceiver.prototype)) {
+    var origGetReceivers = window.RTCPeerConnection.prototype.getReceivers;
+    if (origGetReceivers) {
+      window.RTCPeerConnection.prototype.getReceivers = function () {
+        var _this6 = this;
+
+        var receivers = origGetReceivers.apply(this, []);
+        receivers.forEach(function (receiver) {
+          return receiver._pc = _this6;
+        });
+        return receivers;
+      };
+    }
+    utils.wrapPeerConnectionEvent(window, 'track', function (e) {
+      e.receiver._pc = e.srcElement;
+      return e;
+    });
+    window.RTCRtpReceiver.prototype.getStats = function () {
+      var receiver = this;
+      return this._pc.getStats().then(function (result) {
+        return filterStats(result, receiver.track, false);
+      });
+    };
+  }
+
+  if (!('getStats' in window.RTCRtpSender.prototype && 'getStats' in window.RTCRtpReceiver.prototype)) {
+    return;
+  }
+
+  // shim RTCPeerConnection.getStats(track).
+  var origGetStats = window.RTCPeerConnection.prototype.getStats;
+  window.RTCPeerConnection.prototype.getStats = function () {
+    if (arguments.length > 0 && arguments[0] instanceof window.MediaStreamTrack) {
+      var track = arguments[0];
+      var sender = void 0;
+      var receiver = void 0;
+      var err = void 0;
+      this.getSenders().forEach(function (s) {
+        if (s.track === track) {
+          if (sender) {
+            err = true;
+          } else {
+            sender = s;
+          }
+        }
+      });
+      this.getReceivers().forEach(function (r) {
+        if (r.track === track) {
+          if (receiver) {
+            err = true;
+          } else {
+            receiver = r;
+          }
+        }
+        return r.track === track;
+      });
+      if (err || sender && receiver) {
+        return Promise.reject(new DOMException('There are more than one sender or receiver for the track.', 'InvalidAccessError'));
+      } else if (sender) {
+        return sender.getStats();
+      } else if (receiver) {
+        return receiver.getStats();
+      }
+      return Promise.reject(new DOMException('There is no sender or receiver for the track.', 'InvalidAccessError'));
+    }
+    return origGetStats.apply(this, arguments);
+  };
+}
+
+function shimAddTrackRemoveTrackWithNative(window) {
+  // shim addTrack/removeTrack with native variants in order to make
+  // the interactions with legacy getLocalStreams behave as in other browsers.
+  // Keeps a mapping stream.id => [stream, rtpsenders...]
+  window.RTCPeerConnection.prototype.getLocalStreams = function () {
+    var _this7 = this;
+
+    this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+    return Object.keys(this._shimmedLocalStreams).map(function (streamId) {
+      return _this7._shimmedLocalStreams[streamId][0];
+    });
+  };
+
+  var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+  window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+    if (!stream) {
+      return origAddTrack.apply(this, arguments);
+    }
+    this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+
+    var sender = origAddTrack.apply(this, arguments);
+    if (!this._shimmedLocalStreams[stream.id]) {
+      this._shimmedLocalStreams[stream.id] = [stream, sender];
+    } else if (this._shimmedLocalStreams[stream.id].indexOf(sender) === -1) {
+      this._shimmedLocalStreams[stream.id].push(sender);
+    }
+    return sender;
+  };
+
+  var origAddStream = window.RTCPeerConnection.prototype.addStream;
+  window.RTCPeerConnection.prototype.addStream = function (stream) {
+    var _this8 = this;
+
+    this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+
+    stream.getTracks().forEach(function (track) {
+      var alreadyExists = _this8.getSenders().find(function (s) {
+        return s.track === track;
+      });
+      if (alreadyExists) {
+        throw new DOMException('Track already exists.', 'InvalidAccessError');
+      }
+    });
+    var existingSenders = this.getSenders();
+    origAddStream.apply(this, arguments);
+    var newSenders = this.getSenders().filter(function (newSender) {
+      return existingSenders.indexOf(newSender) === -1;
+    });
+    this._shimmedLocalStreams[stream.id] = [stream].concat(newSenders);
+  };
+
+  var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
+  window.RTCPeerConnection.prototype.removeStream = function (stream) {
+    this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+    delete this._shimmedLocalStreams[stream.id];
+    return origRemoveStream.apply(this, arguments);
+  };
+
+  var origRemoveTrack = window.RTCPeerConnection.prototype.removeTrack;
+  window.RTCPeerConnection.prototype.removeTrack = function (sender) {
+    var _this9 = this;
+
+    this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+    if (sender) {
+      Object.keys(this._shimmedLocalStreams).forEach(function (streamId) {
+        var idx = _this9._shimmedLocalStreams[streamId].indexOf(sender);
+        if (idx !== -1) {
+          _this9._shimmedLocalStreams[streamId].splice(idx, 1);
+        }
+        if (_this9._shimmedLocalStreams[streamId].length === 1) {
+          delete _this9._shimmedLocalStreams[streamId];
+        }
+      });
+    }
+    return origRemoveTrack.apply(this, arguments);
+  };
+}
+
+function shimAddTrackRemoveTrack(window) {
+  if (!window.RTCPeerConnection) {
+    return;
+  }
+  var browserDetails = utils.detectBrowser(window);
+  // shim addTrack and removeTrack.
+  if (window.RTCPeerConnection.prototype.addTrack && browserDetails.version >= 65) {
+    return shimAddTrackRemoveTrackWithNative(window);
+  }
+
+  // also shim pc.getLocalStreams when addTrack is shimmed
+  // to return the original streams.
+  var origGetLocalStreams = window.RTCPeerConnection.prototype.getLocalStreams;
+  window.RTCPeerConnection.prototype.getLocalStreams = function () {
+    var _this10 = this;
+
+    var nativeStreams = origGetLocalStreams.apply(this);
+    this._reverseStreams = this._reverseStreams || {};
+    return nativeStreams.map(function (stream) {
+      return _this10._reverseStreams[stream.id];
+    });
+  };
+
+  var origAddStream = window.RTCPeerConnection.prototype.addStream;
+  window.RTCPeerConnection.prototype.addStream = function (stream) {
+    var _this11 = this;
+
+    this._streams = this._streams || {};
+    this._reverseStreams = this._reverseStreams || {};
+
+    stream.getTracks().forEach(function (track) {
+      var alreadyExists = _this11.getSenders().find(function (s) {
+        return s.track === track;
+      });
+      if (alreadyExists) {
+        throw new DOMException('Track already exists.', 'InvalidAccessError');
+      }
+    });
+    // Add identity mapping for consistency with addTrack.
+    // Unless this is being used with a stream from addTrack.
+    if (!this._reverseStreams[stream.id]) {
+      var newStream = new window.MediaStream(stream.getTracks());
+      this._streams[stream.id] = newStream;
+      this._reverseStreams[newStream.id] = stream;
+      stream = newStream;
+    }
+    origAddStream.apply(this, [stream]);
+  };
+
+  var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
+  window.RTCPeerConnection.prototype.removeStream = function (stream) {
+    this._streams = this._streams || {};
+    this._reverseStreams = this._reverseStreams || {};
+
+    origRemoveStream.apply(this, [this._streams[stream.id] || stream]);
+    delete this._reverseStreams[this._streams[stream.id] ? this._streams[stream.id].id : stream.id];
+    delete this._streams[stream.id];
+  };
+
+  window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+    var _this12 = this;
+
+    if (this.signalingState === 'closed') {
+      throw new DOMException('The RTCPeerConnection\'s signalingState is \'closed\'.', 'InvalidStateError');
+    }
+    var streams = [].slice.call(arguments, 1);
+    if (streams.length !== 1 || !streams[0].getTracks().find(function (t) {
+      return t === track;
+    })) {
+      // this is not fully correct but all we can manage without
+      // [[associated MediaStreams]] internal slot.
+      throw new DOMException('The adapter.js addTrack polyfill only supports a single ' + ' stream which is associated with the specified track.', 'NotSupportedError');
+    }
+
+    var alreadyExists = this.getSenders().find(function (s) {
+      return s.track === track;
+    });
+    if (alreadyExists) {
+      throw new DOMException('Track already exists.', 'InvalidAccessError');
+    }
+
+    this._streams = this._streams || {};
+    this._reverseStreams = this._reverseStreams || {};
+    var oldStream = this._streams[stream.id];
+    if (oldStream) {
+      // this is using odd Chrome behaviour, use with caution:
+      // https://bugs.chromium.org/p/webrtc/issues/detail?id=7815
+      // Note: we rely on the high-level addTrack/dtmf shim to
+      // create the sender with a dtmf sender.
+      oldStream.addTrack(track);
+
+      // Trigger ONN async.
+      Promise.resolve().then(function () {
+        _this12.dispatchEvent(new Event('negotiationneeded'));
+      });
+    } else {
+      var newStream = new window.MediaStream([track]);
+      this._streams[stream.id] = newStream;
+      this._reverseStreams[newStream.id] = stream;
+      this.addStream(newStream);
+    }
+    return this.getSenders().find(function (s) {
+      return s.track === track;
+    });
+  };
+
+  // replace the internal stream id with the external one and
+  // vice versa.
+  function replaceInternalStreamId(pc, description) {
+    var sdp = description.sdp;
+    Object.keys(pc._reverseStreams || []).forEach(function (internalId) {
+      var externalStream = pc._reverseStreams[internalId];
+      var internalStream = pc._streams[externalStream.id];
+      sdp = sdp.replace(new RegExp(internalStream.id, 'g'), externalStream.id);
+    });
+    return new RTCSessionDescription({
+      type: description.type,
+      sdp: sdp
+    });
+  }
+  function replaceExternalStreamId(pc, description) {
+    var sdp = description.sdp;
+    Object.keys(pc._reverseStreams || []).forEach(function (internalId) {
+      var externalStream = pc._reverseStreams[internalId];
+      var internalStream = pc._streams[externalStream.id];
+      sdp = sdp.replace(new RegExp(externalStream.id, 'g'), internalStream.id);
+    });
+    return new RTCSessionDescription({
+      type: description.type,
+      sdp: sdp
+    });
+  }
+  ['createOffer', 'createAnswer'].forEach(function (method) {
+    var nativeMethod = window.RTCPeerConnection.prototype[method];
+    window.RTCPeerConnection.prototype[method] = function () {
+      var _this13 = this;
+
+      var args = arguments;
+      var isLegacyCall = arguments.length && typeof arguments[0] === 'function';
+      if (isLegacyCall) {
+        return nativeMethod.apply(this, [function (description) {
+          var desc = replaceInternalStreamId(_this13, description);
+          args[0].apply(null, [desc]);
+        }, function (err) {
+          if (args[1]) {
+            args[1].apply(null, err);
+          }
+        }, arguments[2]]);
+      }
+      return nativeMethod.apply(this, arguments).then(function (description) {
+        return replaceInternalStreamId(_this13, description);
+      });
+    };
+  });
+
+  var origSetLocalDescription = window.RTCPeerConnection.prototype.setLocalDescription;
+  window.RTCPeerConnection.prototype.setLocalDescription = function () {
+    if (!arguments.length || !arguments[0].type) {
+      return origSetLocalDescription.apply(this, arguments);
+    }
+    arguments[0] = replaceExternalStreamId(this, arguments[0]);
+    return origSetLocalDescription.apply(this, arguments);
+  };
+
+  // TODO: mangle getStats: https://w3c.github.io/webrtc-stats/#dom-rtcmediastreamstats-streamidentifier
+
+  var origLocalDescription = Object.getOwnPropertyDescriptor(window.RTCPeerConnection.prototype, 'localDescription');
+  Object.defineProperty(window.RTCPeerConnection.prototype, 'localDescription', {
+    get: function get() {
+      var description = origLocalDescription.get.apply(this);
+      if (description.type === '') {
+        return description;
+      }
+      return replaceInternalStreamId(this, description);
+    }
+  });
+
+  window.RTCPeerConnection.prototype.removeTrack = function (sender) {
+    var _this14 = this;
+
+    if (this.signalingState === 'closed') {
+      throw new DOMException('The RTCPeerConnection\'s signalingState is \'closed\'.', 'InvalidStateError');
+    }
+    // We can not yet check for sender instanceof RTCRtpSender
+    // since we shim RTPSender. So we check if sender._pc is set.
+    if (!sender._pc) {
+      throw new DOMException('Argument 1 of RTCPeerConnection.removeTrack ' + 'does not implement interface RTCRtpSender.', 'TypeError');
+    }
+    var isLocal = sender._pc === this;
+    if (!isLocal) {
+      throw new DOMException('Sender was not created by this connection.', 'InvalidAccessError');
+    }
+
+    // Search for the native stream the senders track belongs to.
+    this._streams = this._streams || {};
+    var stream = void 0;
+    Object.keys(this._streams).forEach(function (streamid) {
+      var hasTrack = _this14._streams[streamid].getTracks().find(function (track) {
+        return sender.track === track;
+      });
+      if (hasTrack) {
+        stream = _this14._streams[streamid];
+      }
+    });
+
+    if (stream) {
+      if (stream.getTracks().length === 1) {
+        // if this is the last track of the stream, remove the stream. This
+        // takes care of any shimmed _senders.
+        this.removeStream(this._reverseStreams[stream.id]);
+      } else {
+        // relying on the same odd chrome behaviour as above.
+        stream.removeTrack(sender.track);
+      }
+      this.dispatchEvent(new Event('negotiationneeded'));
+    }
+  };
+}
+
+function shimPeerConnection(window) {
+  if (!window.RTCPeerConnection && window.webkitRTCPeerConnection) {
+    // very basic support for old versions.
+    window.RTCPeerConnection = window.webkitRTCPeerConnection;
+  }
+  if (!window.RTCPeerConnection) {
+    return;
+  }
+
+  var origGetStats = window.RTCPeerConnection.prototype.getStats;
+  window.RTCPeerConnection.prototype.getStats = function (selector, successCallback, errorCallback) {
+    var _this15 = this;
+
+    var args = arguments;
+
+    // If selector is a function then we are in the old style stats so just
+    // pass back the original getStats format to avoid breaking old users.
+    if (arguments.length > 0 && typeof selector === 'function') {
+      return origGetStats.apply(this, arguments);
+    }
+
+    // When spec-style getStats is supported, return those when called with
+    // either no arguments or the selector argument is null.
+    if (origGetStats.length === 0 && (arguments.length === 0 || typeof arguments[0] !== 'function')) {
+      return origGetStats.apply(this, []);
+    }
+
+    var fixChromeStats_ = function fixChromeStats_(response) {
+      var standardReport = {};
+      var reports = response.result();
+      reports.forEach(function (report) {
+        var standardStats = {
+          id: report.id,
+          timestamp: report.timestamp,
+          type: {
+            localcandidate: 'local-candidate',
+            remotecandidate: 'remote-candidate'
+          }[report.type] || report.type
+        };
+        report.names().forEach(function (name) {
+          standardStats[name] = report.stat(name);
+        });
+        standardReport[standardStats.id] = standardStats;
+      });
+
+      return standardReport;
+    };
+
+    // shim getStats with maplike support
+    var makeMapStats = function makeMapStats(stats) {
+      return new Map(Object.keys(stats).map(function (key) {
+        return [key, stats[key]];
+      }));
+    };
+
+    if (arguments.length >= 2) {
+      var successCallbackWrapper_ = function successCallbackWrapper_(response) {
+        args[1](makeMapStats(fixChromeStats_(response)));
+      };
+
+      return origGetStats.apply(this, [successCallbackWrapper_, arguments[0]]);
+    }
+
+    // promise-support
+    return new Promise(function (resolve, reject) {
+      origGetStats.apply(_this15, [function (response) {
+        resolve(makeMapStats(fixChromeStats_(response)));
+      }, reject]);
+    }).then(successCallback, errorCallback);
+  };
+
+  // shim implicit creation of RTCSessionDescription/RTCIceCandidate
+  ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate'].forEach(function (method) {
+    var nativeMethod = window.RTCPeerConnection.prototype[method];
+    window.RTCPeerConnection.prototype[method] = function () {
+      arguments[0] = new (method === 'addIceCandidate' ? window.RTCIceCandidate : window.RTCSessionDescription)(arguments[0]);
+      return nativeMethod.apply(this, arguments);
+    };
+  });
+
+  // support for addIceCandidate(null or undefined)
+  var nativeAddIceCandidate = window.RTCPeerConnection.prototype.addIceCandidate;
+  window.RTCPeerConnection.prototype.addIceCandidate = function () {
+    if (!arguments[0]) {
+      if (arguments[1]) {
+        arguments[1].apply(null);
+      }
+      return Promise.resolve();
+    }
+    return nativeAddIceCandidate.apply(this, arguments);
+  };
+}
+
+function fixNegotiationNeeded(window) {
+  utils.wrapPeerConnectionEvent(window, 'negotiationneeded', function (e) {
+    var pc = e.target;
+    if (pc.signalingState !== 'stable') {
+      return;
+    }
+    return e;
+  });
+}
+
+},{"../utils.js":15,"./getdisplaymedia":4,"./getusermedia":5}],4:[function(require,module,exports){
+/*
+ *  Copyright (c) 2018 The adapter.js project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetDisplayMedia = shimGetDisplayMedia;
+function shimGetDisplayMedia(window, getSourceId) {
+  if (window.navigator.mediaDevices && 'getDisplayMedia' in window.navigator.mediaDevices) {
+    return;
+  }
+  if (!window.navigator.mediaDevices) {
+    return;
+  }
+  // getSourceId is a function that returns a promise resolving with
+  // the sourceId of the screen/window/tab to be shared.
+  if (typeof getSourceId !== 'function') {
+    console.error('shimGetDisplayMedia: getSourceId argument is not ' + 'a function');
+    return;
+  }
+  window.navigator.mediaDevices.getDisplayMedia = function (constraints) {
+    return getSourceId(constraints).then(function (sourceId) {
+      var widthSpecified = constraints.video && constraints.video.width;
+      var heightSpecified = constraints.video && constraints.video.height;
+      var frameRateSpecified = constraints.video && constraints.video.frameRate;
+      constraints.video = {
+        mandatory: {
+          chromeMediaSource: 'desktop',
+          chromeMediaSourceId: sourceId,
+          maxFrameRate: frameRateSpecified || 3
+        }
+      };
+      if (widthSpecified) {
+        constraints.video.mandatory.maxWidth = widthSpecified;
+      }
+      if (heightSpecified) {
+        constraints.video.mandatory.maxHeight = heightSpecified;
+      }
+      return window.navigator.mediaDevices.getUserMedia(constraints);
+    });
+  };
+}
+
+},{}],5:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+exports.shimGetUserMedia = shimGetUserMedia;
+
+var _utils = require('../utils.js');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+var logging = utils.log;
+
+function shimGetUserMedia(window) {
+  var navigator = window && window.navigator;
+
+  if (!navigator.mediaDevices) {
+    return;
+  }
+
+  var browserDetails = utils.detectBrowser(window);
+
+  var constraintsToChrome_ = function constraintsToChrome_(c) {
+    if ((typeof c === 'undefined' ? 'undefined' : _typeof(c)) !== 'object' || c.mandatory || c.optional) {
+      return c;
+    }
+    var cc = {};
+    Object.keys(c).forEach(function (key) {
+      if (key === 'require' || key === 'advanced' || key === 'mediaSource') {
+        return;
+      }
+      var r = _typeof(c[key]) === 'object' ? c[key] : { ideal: c[key] };
+      if (r.exact !== undefined && typeof r.exact === 'number') {
+        r.min = r.max = r.exact;
+      }
+      var oldname_ = function oldname_(prefix, name) {
+        if (prefix) {
+          return prefix + name.charAt(0).toUpperCase() + name.slice(1);
+        }
+        return name === 'deviceId' ? 'sourceId' : name;
+      };
+      if (r.ideal !== undefined) {
+        cc.optional = cc.optional || [];
+        var oc = {};
+        if (typeof r.ideal === 'number') {
+          oc[oldname_('min', key)] = r.ideal;
+          cc.optional.push(oc);
+          oc = {};
+          oc[oldname_('max', key)] = r.ideal;
+          cc.optional.push(oc);
+        } else {
+          oc[oldname_('', key)] = r.ideal;
+          cc.optional.push(oc);
+        }
+      }
+      if (r.exact !== undefined && typeof r.exact !== 'number') {
+        cc.mandatory = cc.mandatory || {};
+        cc.mandatory[oldname_('', key)] = r.exact;
+      } else {
+        ['min', 'max'].forEach(function (mix) {
+          if (r[mix] !== undefined) {
+            cc.mandatory = cc.mandatory || {};
+            cc.mandatory[oldname_(mix, key)] = r[mix];
+          }
+        });
+      }
+    });
+    if (c.advanced) {
+      cc.optional = (cc.optional || []).concat(c.advanced);
+    }
+    return cc;
+  };
+
+  var shimConstraints_ = function shimConstraints_(constraints, func) {
+    if (browserDetails.version >= 61) {
+      return func(constraints);
+    }
+    constraints = JSON.parse(JSON.stringify(constraints));
+    if (constraints && _typeof(constraints.audio) === 'object') {
+      var remap = function remap(obj, a, b) {
+        if (a in obj && !(b in obj)) {
+          obj[b] = obj[a];
+          delete obj[a];
+        }
+      };
+      constraints = JSON.parse(JSON.stringify(constraints));
+      remap(constraints.audio, 'autoGainControl', 'googAutoGainControl');
+      remap(constraints.audio, 'noiseSuppression', 'googNoiseSuppression');
+      constraints.audio = constraintsToChrome_(constraints.audio);
+    }
+    if (constraints && _typeof(constraints.video) === 'object') {
+      // Shim facingMode for mobile & surface pro.
+      var face = constraints.video.facingMode;
+      face = face && ((typeof face === 'undefined' ? 'undefined' : _typeof(face)) === 'object' ? face : { ideal: face });
+      var getSupportedFacingModeLies = browserDetails.version < 66;
+
+      if (face && (face.exact === 'user' || face.exact === 'environment' || face.ideal === 'user' || face.ideal === 'environment') && !(navigator.mediaDevices.getSupportedConstraints && navigator.mediaDevices.getSupportedConstraints().facingMode && !getSupportedFacingModeLies)) {
+        delete constraints.video.facingMode;
+        var matches = void 0;
+        if (face.exact === 'environment' || face.ideal === 'environment') {
+          matches = ['back', 'rear'];
+        } else if (face.exact === 'user' || face.ideal === 'user') {
+          matches = ['front'];
+        }
+        if (matches) {
+          // Look for matches in label, or use last cam for back (typical).
+          return navigator.mediaDevices.enumerateDevices().then(function (devices) {
+            devices = devices.filter(function (d) {
+              return d.kind === 'videoinput';
+            });
+            var dev = devices.find(function (d) {
+              return matches.some(function (match) {
+                return d.label.toLowerCase().includes(match);
+              });
+            });
+            if (!dev && devices.length && matches.includes('back')) {
+              dev = devices[devices.length - 1]; // more likely the back cam
+            }
+            if (dev) {
+              constraints.video.deviceId = face.exact ? { exact: dev.deviceId } : { ideal: dev.deviceId };
+            }
+            constraints.video = constraintsToChrome_(constraints.video);
+            logging('chrome: ' + JSON.stringify(constraints));
+            return func(constraints);
+          });
+        }
+      }
+      constraints.video = constraintsToChrome_(constraints.video);
+    }
+    logging('chrome: ' + JSON.stringify(constraints));
+    return func(constraints);
+  };
+
+  var shimError_ = function shimError_(e) {
+    if (browserDetails.version >= 64) {
+      return e;
+    }
+    return {
+      name: {
+        PermissionDeniedError: 'NotAllowedError',
+        PermissionDismissedError: 'NotAllowedError',
+        InvalidStateError: 'NotAllowedError',
+        DevicesNotFoundError: 'NotFoundError',
+        ConstraintNotSatisfiedError: 'OverconstrainedError',
+        TrackStartError: 'NotReadableError',
+        MediaDeviceFailedDueToShutdown: 'NotAllowedError',
+        MediaDeviceKillSwitchOn: 'NotAllowedError',
+        TabCaptureError: 'AbortError',
+        ScreenCaptureError: 'AbortError',
+        DeviceCaptureError: 'AbortError'
+      }[e.name] || e.name,
+      message: e.message,
+      constraint: e.constraint || e.constraintName,
+      toString: function toString() {
+        return this.name + (this.message && ': ') + this.message;
+      }
+    };
+  };
+
+  var getUserMedia_ = function getUserMedia_(constraints, onSuccess, onError) {
+    shimConstraints_(constraints, function (c) {
+      navigator.webkitGetUserMedia(c, onSuccess, function (e) {
+        if (onError) {
+          onError(shimError_(e));
+        }
+      });
+    });
+  };
+  navigator.getUserMedia = getUserMedia_.bind(navigator);
+
+  // Even though Chrome 45 has navigator.mediaDevices and a getUserMedia
+  // function which returns a Promise, it does not accept spec-style
+  // constraints.
+  var origGetUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+  navigator.mediaDevices.getUserMedia = function (cs) {
+    return shimConstraints_(cs, function (c) {
+      return origGetUserMedia(c).then(function (stream) {
+        if (c.audio && !stream.getAudioTracks().length || c.video && !stream.getVideoTracks().length) {
+          stream.getTracks().forEach(function (track) {
+            track.stop();
+          });
+          throw new DOMException('', 'NotFoundError');
+        }
+        return stream;
+      }, function (e) {
+        return Promise.reject(shimError_(e));
+      });
+    });
+  };
+}
+
+},{"../utils.js":15}],6:[function(require,module,exports){
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+exports.shimRTCIceCandidate = shimRTCIceCandidate;
+exports.shimMaxMessageSize = shimMaxMessageSize;
+exports.shimSendThrowTypeError = shimSendThrowTypeError;
+exports.shimConnectionState = shimConnectionState;
+
+var _sdp = require('sdp');
+
+var _sdp2 = _interopRequireDefault(_sdp);
+
+var _utils = require('./utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function shimRTCIceCandidate(window) {
+  // foundation is arbitrarily chosen as an indicator for full support for
+  // https://w3c.github.io/webrtc-pc/#rtcicecandidate-interface
+  if (!window.RTCIceCandidate || window.RTCIceCandidate && 'foundation' in window.RTCIceCandidate.prototype) {
+    return;
+  }
+
+  var NativeRTCIceCandidate = window.RTCIceCandidate;
+  window.RTCIceCandidate = function (args) {
+    // Remove the a= which shouldn't be part of the candidate string.
+    if ((typeof args === 'undefined' ? 'undefined' : _typeof(args)) === 'object' && args.candidate && args.candidate.indexOf('a=') === 0) {
+      args = JSON.parse(JSON.stringify(args));
+      args.candidate = args.candidate.substr(2);
+    }
+
+    if (args.candidate && args.candidate.length) {
+      // Augment the native candidate with the parsed fields.
+      var nativeCandidate = new NativeRTCIceCandidate(args);
+      var parsedCandidate = _sdp2.default.parseCandidate(args.candidate);
+      var augmentedCandidate = Object.assign(nativeCandidate, parsedCandidate);
+
+      // Add a serializer that does not serialize the extra attributes.
+      augmentedCandidate.toJSON = function () {
+        return {
+          candidate: augmentedCandidate.candidate,
+          sdpMid: augmentedCandidate.sdpMid,
+          sdpMLineIndex: augmentedCandidate.sdpMLineIndex,
+          usernameFragment: augmentedCandidate.usernameFragment
+        };
+      };
+      return augmentedCandidate;
+    }
+    return new NativeRTCIceCandidate(args);
+  };
+  window.RTCIceCandidate.prototype = NativeRTCIceCandidate.prototype;
+
+  // Hook up the augmented candidate in onicecandidate and
+  // addEventListener('icecandidate', ...)
+  utils.wrapPeerConnectionEvent(window, 'icecandidate', function (e) {
+    if (e.candidate) {
+      Object.defineProperty(e, 'candidate', {
+        value: new window.RTCIceCandidate(e.candidate),
+        writable: 'false'
+      });
+    }
+    return e;
+  });
+}
+
+function shimMaxMessageSize(window) {
+  if (window.RTCSctpTransport || !window.RTCPeerConnection) {
+    return;
+  }
+  var browserDetails = utils.detectBrowser(window);
+
+  if (!('sctp' in window.RTCPeerConnection.prototype)) {
+    Object.defineProperty(window.RTCPeerConnection.prototype, 'sctp', {
+      get: function get() {
+        return typeof this._sctp === 'undefined' ? null : this._sctp;
+      }
+    });
+  }
+
+  var sctpInDescription = function sctpInDescription(description) {
+    var sections = _sdp2.default.splitSections(description.sdp);
+    sections.shift();
+    return sections.some(function (mediaSection) {
+      var mLine = _sdp2.default.parseMLine(mediaSection);
+      return mLine && mLine.kind === 'application' && mLine.protocol.indexOf('SCTP') !== -1;
+    });
+  };
+
+  var getRemoteFirefoxVersion = function getRemoteFirefoxVersion(description) {
+    // TODO: Is there a better solution for detecting Firefox?
+    var match = description.sdp.match(/mozilla...THIS_IS_SDPARTA-(\d+)/);
+    if (match === null || match.length < 2) {
+      return -1;
+    }
+    var version = parseInt(match[1], 10);
+    // Test for NaN (yes, this is ugly)
+    return version !== version ? -1 : version;
+  };
+
+  var getCanSendMaxMessageSize = function getCanSendMaxMessageSize(remoteIsFirefox) {
+    // Every implementation we know can send at least 64 KiB.
+    // Note: Although Chrome is technically able to send up to 256 KiB, the
+    //       data does not reach the other peer reliably.
+    //       See: https://bugs.chromium.org/p/webrtc/issues/detail?id=8419
+    var canSendMaxMessageSize = 65536;
+    if (browserDetails.browser === 'firefox') {
+      if (browserDetails.version < 57) {
+        if (remoteIsFirefox === -1) {
+          // FF < 57 will send in 16 KiB chunks using the deprecated PPID
+          // fragmentation.
+          canSendMaxMessageSize = 16384;
+        } else {
+          // However, other FF (and RAWRTC) can reassemble PPID-fragmented
+          // messages. Thus, supporting ~2 GiB when sending.
+          canSendMaxMessageSize = 2147483637;
+        }
+      } else if (browserDetails.version < 60) {
+        // Currently, all FF >= 57 will reset the remote maximum message size
+        // to the default value when a data channel is created at a later
+        // stage. :(
+        // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1426831
+        canSendMaxMessageSize = browserDetails.version === 57 ? 65535 : 65536;
+      } else {
+        // FF >= 60 supports sending ~2 GiB
+        canSendMaxMessageSize = 2147483637;
+      }
+    }
+    return canSendMaxMessageSize;
+  };
+
+  var getMaxMessageSize = function getMaxMessageSize(description, remoteIsFirefox) {
+    // Note: 65536 bytes is the default value from the SDP spec. Also,
+    //       every implementation we know supports receiving 65536 bytes.
+    var maxMessageSize = 65536;
+
+    // FF 57 has a slightly incorrect default remote max message size, so
+    // we need to adjust it here to avoid a failure when sending.
+    // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1425697
+    if (browserDetails.browser === 'firefox' && browserDetails.version === 57) {
+      maxMessageSize = 65535;
+    }
+
+    var match = _sdp2.default.matchPrefix(description.sdp, 'a=max-message-size:');
+    if (match.length > 0) {
+      maxMessageSize = parseInt(match[0].substr(19), 10);
+    } else if (browserDetails.browser === 'firefox' && remoteIsFirefox !== -1) {
+      // If the maximum message size is not present in the remote SDP and
+      // both local and remote are Firefox, the remote peer can receive
+      // ~2 GiB.
+      maxMessageSize = 2147483637;
+    }
+    return maxMessageSize;
+  };
+
+  var origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+  window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+    this._sctp = null;
+
+    if (sctpInDescription(arguments[0])) {
+      // Check if the remote is FF.
+      var isFirefox = getRemoteFirefoxVersion(arguments[0]);
+
+      // Get the maximum message size the local peer is capable of sending
+      var canSendMMS = getCanSendMaxMessageSize(isFirefox);
+
+      // Get the maximum message size of the remote peer.
+      var remoteMMS = getMaxMessageSize(arguments[0], isFirefox);
+
+      // Determine final maximum message size
+      var maxMessageSize = void 0;
+      if (canSendMMS === 0 && remoteMMS === 0) {
+        maxMessageSize = Number.POSITIVE_INFINITY;
+      } else if (canSendMMS === 0 || remoteMMS === 0) {
+        maxMessageSize = Math.max(canSendMMS, remoteMMS);
+      } else {
+        maxMessageSize = Math.min(canSendMMS, remoteMMS);
+      }
+
+      // Create a dummy RTCSctpTransport object and the 'maxMessageSize'
+      // attribute.
+      var sctp = {};
+      Object.defineProperty(sctp, 'maxMessageSize', {
+        get: function get() {
+          return maxMessageSize;
+        }
+      });
+      this._sctp = sctp;
+    }
+
+    return origSetRemoteDescription.apply(this, arguments);
+  };
+}
+
+function shimSendThrowTypeError(window) {
+  if (!(window.RTCPeerConnection && 'createDataChannel' in window.RTCPeerConnection.prototype)) {
+    return;
+  }
+
+  // Note: Although Firefox >= 57 has a native implementation, the maximum
+  //       message size can be reset for all data channels at a later stage.
+  //       See: https://bugzilla.mozilla.org/show_bug.cgi?id=1426831
+
+  function wrapDcSend(dc, pc) {
+    var origDataChannelSend = dc.send;
+    dc.send = function () {
+      var data = arguments[0];
+      var length = data.length || data.size || data.byteLength;
+      if (dc.readyState === 'open' && pc.sctp && length > pc.sctp.maxMessageSize) {
+        throw new TypeError('Message too large (can send a maximum of ' + pc.sctp.maxMessageSize + ' bytes)');
+      }
+      return origDataChannelSend.apply(dc, arguments);
+    };
+  }
+  var origCreateDataChannel = window.RTCPeerConnection.prototype.createDataChannel;
+  window.RTCPeerConnection.prototype.createDataChannel = function () {
+    var dataChannel = origCreateDataChannel.apply(this, arguments);
+    wrapDcSend(dataChannel, this);
+    return dataChannel;
+  };
+  utils.wrapPeerConnectionEvent(window, 'datachannel', function (e) {
+    wrapDcSend(e.channel, e.target);
+    return e;
+  });
+}
+
+/* shims RTCConnectionState by pretending it is the same as iceConnectionState.
+ * See https://bugs.chromium.org/p/webrtc/issues/detail?id=6145#c12
+ * for why this is a valid hack in Chrome. In Firefox it is slightly incorrect
+ * since DTLS failures would be hidden. See
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1265827
+ * for the Firefox tracking bug.
+ */
+function shimConnectionState(window) {
+  if (!window.RTCPeerConnection || 'connectionState' in window.RTCPeerConnection.prototype) {
+    return;
+  }
+  var proto = window.RTCPeerConnection.prototype;
+  Object.defineProperty(proto, 'connectionState', {
+    get: function get() {
+      return {
+        completed: 'connected',
+        checking: 'connecting'
+      }[this.iceConnectionState] || this.iceConnectionState;
+    },
+
+    enumerable: true,
+    configurable: true
+  });
+  Object.defineProperty(proto, 'onconnectionstatechange', {
+    get: function get() {
+      return this._onconnectionstatechange || null;
+    },
+    set: function set(cb) {
+      if (this._onconnectionstatechange) {
+        this.removeEventListener('connectionstatechange', this._onconnectionstatechange);
+        delete this._onconnectionstatechange;
+      }
+      if (cb) {
+        this.addEventListener('connectionstatechange', this._onconnectionstatechange = cb);
+      }
+    },
+
+    enumerable: true,
+    configurable: true
+  });
+
+  ['setLocalDescription', 'setRemoteDescription'].forEach(function (method) {
+    var origMethod = proto[method];
+    proto[method] = function () {
+      if (!this._connectionstatechangepoly) {
+        this._connectionstatechangepoly = function (e) {
+          var pc = e.target;
+          if (pc._lastConnectionState !== pc.connectionState) {
+            pc._lastConnectionState = pc.connectionState;
+            var newEvent = new Event('connectionstatechange', e);
+            pc.dispatchEvent(newEvent);
+          }
+          return e;
+        };
+        this.addEventListener('iceconnectionstatechange', this._connectionstatechangepoly);
+      }
+      return origMethod.apply(this, arguments);
+    };
+  });
+}
+
+},{"./utils":15,"sdp":17}],7:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetDisplayMedia = exports.shimGetUserMedia = undefined;
+
+var _getusermedia = require('./getusermedia');
+
+Object.defineProperty(exports, 'shimGetUserMedia', {
+  enumerable: true,
+  get: function get() {
+    return _getusermedia.shimGetUserMedia;
+  }
+});
+
+var _getdisplaymedia = require('./getdisplaymedia');
+
+Object.defineProperty(exports, 'shimGetDisplayMedia', {
+  enumerable: true,
+  get: function get() {
+    return _getdisplaymedia.shimGetDisplayMedia;
+  }
+});
+exports.shimPeerConnection = shimPeerConnection;
+exports.shimReplaceTrack = shimReplaceTrack;
+
+var _utils = require('../utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+var _filtericeservers = require('./filtericeservers');
+
+var _rtcpeerconnectionShim = require('rtcpeerconnection-shim');
+
+var _rtcpeerconnectionShim2 = _interopRequireDefault(_rtcpeerconnectionShim);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function shimPeerConnection(window) {
+  var browserDetails = utils.detectBrowser(window);
+
+  if (window.RTCIceGatherer) {
+    if (!window.RTCIceCandidate) {
+      window.RTCIceCandidate = function (args) {
+        return args;
+      };
+    }
+    if (!window.RTCSessionDescription) {
+      window.RTCSessionDescription = function (args) {
+        return args;
+      };
+    }
+    // this adds an additional event listener to MediaStrackTrack that signals
+    // when a tracks enabled property was changed. Workaround for a bug in
+    // addStream, see below. No longer required in 15025+
+    if (browserDetails.version < 15025) {
+      var origMSTEnabled = Object.getOwnPropertyDescriptor(window.MediaStreamTrack.prototype, 'enabled');
+      Object.defineProperty(window.MediaStreamTrack.prototype, 'enabled', {
+        set: function set(value) {
+          origMSTEnabled.set.call(this, value);
+          var ev = new Event('enabled');
+          ev.enabled = value;
+          this.dispatchEvent(ev);
+        }
+      });
+    }
+  }
+
+  // ORTC defines the DTMF sender a bit different.
+  // https://github.com/w3c/ortc/issues/714
+  if (window.RTCRtpSender && !('dtmf' in window.RTCRtpSender.prototype)) {
+    Object.defineProperty(window.RTCRtpSender.prototype, 'dtmf', {
+      get: function get() {
+        if (this._dtmf === undefined) {
+          if (this.track.kind === 'audio') {
+            this._dtmf = new window.RTCDtmfSender(this);
+          } else if (this.track.kind === 'video') {
+            this._dtmf = null;
+          }
+        }
+        return this._dtmf;
+      }
+    });
+  }
+  // Edge currently only implements the RTCDtmfSender, not the
+  // RTCDTMFSender alias. See http://draft.ortc.org/#rtcdtmfsender2*
+  if (window.RTCDtmfSender && !window.RTCDTMFSender) {
+    window.RTCDTMFSender = window.RTCDtmfSender;
+  }
+
+  var RTCPeerConnectionShim = (0, _rtcpeerconnectionShim2.default)(window, browserDetails.version);
+  window.RTCPeerConnection = function (config) {
+    if (config && config.iceServers) {
+      config.iceServers = (0, _filtericeservers.filterIceServers)(config.iceServers, browserDetails.version);
+      utils.log('ICE servers after filtering:', config.iceServers);
+    }
+    return new RTCPeerConnectionShim(config);
+  };
+  window.RTCPeerConnection.prototype = RTCPeerConnectionShim.prototype;
+}
+
+function shimReplaceTrack(window) {
+  // ORTC has replaceTrack -- https://github.com/w3c/ortc/issues/614
+  if (window.RTCRtpSender && !('replaceTrack' in window.RTCRtpSender.prototype)) {
+    window.RTCRtpSender.prototype.replaceTrack = window.RTCRtpSender.prototype.setTrack;
+  }
+}
+
+},{"../utils":15,"./filtericeservers":8,"./getdisplaymedia":9,"./getusermedia":10,"rtcpeerconnection-shim":16}],8:[function(require,module,exports){
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterIceServers = filterIceServers;
+
+var _utils = require('../utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+// Edge does not like
+// 1) stun: filtered after 14393 unless ?transport=udp is present
+// 2) turn: that does not have all of turn:host:port?transport=udp
+// 3) turn: with ipv6 addresses
+// 4) turn: occurring muliple times
+function filterIceServers(iceServers, edgeVersion) {
+  var hasTurn = false;
+  iceServers = JSON.parse(JSON.stringify(iceServers));
+  return iceServers.filter(function (server) {
+    if (server && (server.urls || server.url)) {
+      var urls = server.urls || server.url;
+      if (server.url && !server.urls) {
+        utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
+      }
+      var isString = typeof urls === 'string';
+      if (isString) {
+        urls = [urls];
+      }
+      urls = urls.filter(function (url) {
+        // filter STUN unconditionally.
+        if (url.indexOf('stun:') === 0) {
+          return false;
+        }
+
+        var validTurn = url.startsWith('turn') && !url.startsWith('turn:[') && url.includes('transport=udp');
+        if (validTurn && !hasTurn) {
+          hasTurn = true;
+          return true;
+        }
+        return validTurn && !hasTurn;
+      });
+
+      delete server.url;
+      server.urls = isString ? urls[0] : urls;
+      return !!urls.length;
+    }
+  });
+}
+
+},{"../utils":15}],9:[function(require,module,exports){
+/*
+ *  Copyright (c) 2018 The adapter.js project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetDisplayMedia = shimGetDisplayMedia;
+function shimGetDisplayMedia(window) {
+  if (!('getDisplayMedia' in window.navigator)) {
+    return;
+  }
+  if (!window.navigator.mediaDevices) {
+    return;
+  }
+  if (window.navigator.mediaDevices && 'getDisplayMedia' in window.navigator.mediaDevices) {
+    return;
+  }
+  window.navigator.mediaDevices.getDisplayMedia = window.navigator.getDisplayMedia.bind(window.navigator.mediaDevices);
+}
+
+},{}],10:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetUserMedia = shimGetUserMedia;
+function shimGetUserMedia(window) {
+  var navigator = window && window.navigator;
+
+  var shimError_ = function shimError_(e) {
+    return {
+      name: { PermissionDeniedError: 'NotAllowedError' }[e.name] || e.name,
+      message: e.message,
+      constraint: e.constraint,
+      toString: function toString() {
+        return this.name;
+      }
+    };
+  };
+
+  // getUserMedia error shim.
+  var origGetUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+  navigator.mediaDevices.getUserMedia = function (c) {
+    return origGetUserMedia(c).catch(function (e) {
+      return Promise.reject(shimError_(e));
+    });
+  };
+}
+
+},{}],11:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetDisplayMedia = exports.shimGetUserMedia = undefined;
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+var _getusermedia = require('./getusermedia');
+
+Object.defineProperty(exports, 'shimGetUserMedia', {
+  enumerable: true,
+  get: function get() {
+    return _getusermedia.shimGetUserMedia;
+  }
+});
+
+var _getdisplaymedia = require('./getdisplaymedia');
+
+Object.defineProperty(exports, 'shimGetDisplayMedia', {
+  enumerable: true,
+  get: function get() {
+    return _getdisplaymedia.shimGetDisplayMedia;
+  }
+});
+exports.shimOnTrack = shimOnTrack;
+exports.shimPeerConnection = shimPeerConnection;
+exports.shimSenderGetStats = shimSenderGetStats;
+exports.shimReceiverGetStats = shimReceiverGetStats;
+exports.shimRemoveStream = shimRemoveStream;
+exports.shimRTCDataChannel = shimRTCDataChannel;
+
+var _utils = require('../utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function shimOnTrack(window) {
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCTrackEvent && 'receiver' in window.RTCTrackEvent.prototype && !('transceiver' in window.RTCTrackEvent.prototype)) {
+    Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
+      get: function get() {
+        return { receiver: this.receiver };
+      }
+    });
+  }
+}
+
+function shimPeerConnection(window) {
+  var browserDetails = utils.detectBrowser(window);
+
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !(window.RTCPeerConnection || window.mozRTCPeerConnection)) {
+    return; // probably media.peerconnection.enabled=false in about:config
+  }
+  if (!window.RTCPeerConnection && window.mozRTCPeerConnection) {
+    // very basic support for old versions.
+    window.RTCPeerConnection = window.mozRTCPeerConnection;
+  }
+
+  // shim away need for obsolete RTCIceCandidate/RTCSessionDescription.
+  ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate'].forEach(function (method) {
+    var nativeMethod = window.RTCPeerConnection.prototype[method];
+    window.RTCPeerConnection.prototype[method] = function () {
+      arguments[0] = new (method === 'addIceCandidate' ? window.RTCIceCandidate : window.RTCSessionDescription)(arguments[0]);
+      return nativeMethod.apply(this, arguments);
+    };
+  });
+
+  // support for addIceCandidate(null or undefined)
+  var nativeAddIceCandidate = window.RTCPeerConnection.prototype.addIceCandidate;
+  window.RTCPeerConnection.prototype.addIceCandidate = function () {
+    if (!arguments[0]) {
+      if (arguments[1]) {
+        arguments[1].apply(null);
+      }
+      return Promise.resolve();
+    }
+    return nativeAddIceCandidate.apply(this, arguments);
+  };
+
+  var modernStatsTypes = {
+    inboundrtp: 'inbound-rtp',
+    outboundrtp: 'outbound-rtp',
+    candidatepair: 'candidate-pair',
+    localcandidate: 'local-candidate',
+    remotecandidate: 'remote-candidate'
+  };
+
+  var nativeGetStats = window.RTCPeerConnection.prototype.getStats;
+  window.RTCPeerConnection.prototype.getStats = function (selector, onSucc, onErr) {
+    return nativeGetStats.apply(this, [selector || null]).then(function (stats) {
+      if (browserDetails.version < 53 && !onSucc) {
+        // Shim only promise getStats with spec-hyphens in type names
+        // Leave callback version alone; misc old uses of forEach before Map
+        try {
+          stats.forEach(function (stat) {
+            stat.type = modernStatsTypes[stat.type] || stat.type;
+          });
+        } catch (e) {
+          if (e.name !== 'TypeError') {
+            throw e;
+          }
+          // Avoid TypeError: "type" is read-only, in old versions. 34-43ish
+          stats.forEach(function (stat, i) {
+            stats.set(i, Object.assign({}, stat, {
+              type: modernStatsTypes[stat.type] || stat.type
+            }));
+          });
+        }
+      }
+      return stats;
+    }).then(onSucc, onErr);
+  };
+}
+
+function shimSenderGetStats(window) {
+  if (!((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && window.RTCRtpSender)) {
+    return;
+  }
+  if (window.RTCRtpSender && 'getStats' in window.RTCRtpSender.prototype) {
+    return;
+  }
+  var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
+  if (origGetSenders) {
+    window.RTCPeerConnection.prototype.getSenders = function () {
+      var _this = this;
+
+      var senders = origGetSenders.apply(this, []);
+      senders.forEach(function (sender) {
+        return sender._pc = _this;
+      });
+      return senders;
+    };
+  }
+
+  var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+  if (origAddTrack) {
+    window.RTCPeerConnection.prototype.addTrack = function () {
+      var sender = origAddTrack.apply(this, arguments);
+      sender._pc = this;
+      return sender;
+    };
+  }
+  window.RTCRtpSender.prototype.getStats = function () {
+    return this.track ? this._pc.getStats(this.track) : Promise.resolve(new Map());
+  };
+}
+
+function shimReceiverGetStats(window) {
+  if (!((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && window.RTCRtpSender)) {
+    return;
+  }
+  if (window.RTCRtpSender && 'getStats' in window.RTCRtpReceiver.prototype) {
+    return;
+  }
+  var origGetReceivers = window.RTCPeerConnection.prototype.getReceivers;
+  if (origGetReceivers) {
+    window.RTCPeerConnection.prototype.getReceivers = function () {
+      var _this2 = this;
+
+      var receivers = origGetReceivers.apply(this, []);
+      receivers.forEach(function (receiver) {
+        return receiver._pc = _this2;
+      });
+      return receivers;
+    };
+  }
+  utils.wrapPeerConnectionEvent(window, 'track', function (e) {
+    e.receiver._pc = e.srcElement;
+    return e;
+  });
+  window.RTCRtpReceiver.prototype.getStats = function () {
+    return this._pc.getStats(this.track);
+  };
+}
+
+function shimRemoveStream(window) {
+  if (!window.RTCPeerConnection || 'removeStream' in window.RTCPeerConnection.prototype) {
+    return;
+  }
+  window.RTCPeerConnection.prototype.removeStream = function (stream) {
+    var _this3 = this;
+
+    utils.deprecated('removeStream', 'removeTrack');
+    this.getSenders().forEach(function (sender) {
+      if (sender.track && stream.getTracks().includes(sender.track)) {
+        _this3.removeTrack(sender);
+      }
+    });
+  };
+}
+
+function shimRTCDataChannel(window) {
+  // rename DataChannel to RTCDataChannel (native fix in FF60):
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1173851
+  if (window.DataChannel && !window.RTCDataChannel) {
+    window.RTCDataChannel = window.DataChannel;
+  }
+}
+
+},{"../utils":15,"./getdisplaymedia":12,"./getusermedia":13}],12:[function(require,module,exports){
+/*
+ *  Copyright (c) 2018 The adapter.js project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shimGetDisplayMedia = shimGetDisplayMedia;
+function shimGetDisplayMedia(window, preferredMediaSource) {
+  if (window.navigator.mediaDevices && 'getDisplayMedia' in window.navigator.mediaDevices) {
+    return;
+  }
+  if (!window.navigator.mediaDevices) {
+    return;
+  }
+  window.navigator.mediaDevices.getDisplayMedia = function (constraints) {
+    if (!(constraints && constraints.video)) {
+      var err = new DOMException('getDisplayMedia without video ' + 'constraints is undefined');
+      err.name = 'NotFoundError';
+      // from https://heycam.github.io/webidl/#idl-DOMException-error-names
+      err.code = 8;
+      return Promise.reject(err);
+    }
+    if (constraints.video === true) {
+      constraints.video = { mediaSource: preferredMediaSource };
+    } else {
+      constraints.video.mediaSource = preferredMediaSource;
+    }
+    return window.navigator.mediaDevices.getUserMedia(constraints);
+  };
+}
+
+},{}],13:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+exports.shimGetUserMedia = shimGetUserMedia;
+
+var _utils = require('../utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function shimGetUserMedia(window) {
+  var browserDetails = utils.detectBrowser(window);
+  var navigator = window && window.navigator;
+  var MediaStreamTrack = window && window.MediaStreamTrack;
+
+  navigator.getUserMedia = function (constraints, onSuccess, onError) {
+    // Replace Firefox 44+'s deprecation warning with unprefixed version.
+    utils.deprecated('navigator.getUserMedia', 'navigator.mediaDevices.getUserMedia');
+    navigator.mediaDevices.getUserMedia(constraints).then(onSuccess, onError);
+  };
+
+  if (!(browserDetails.version > 55 && 'autoGainControl' in navigator.mediaDevices.getSupportedConstraints())) {
+    var remap = function remap(obj, a, b) {
+      if (a in obj && !(b in obj)) {
+        obj[b] = obj[a];
+        delete obj[a];
+      }
+    };
+
+    var nativeGetUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+    navigator.mediaDevices.getUserMedia = function (c) {
+      if ((typeof c === 'undefined' ? 'undefined' : _typeof(c)) === 'object' && _typeof(c.audio) === 'object') {
+        c = JSON.parse(JSON.stringify(c));
+        remap(c.audio, 'autoGainControl', 'mozAutoGainControl');
+        remap(c.audio, 'noiseSuppression', 'mozNoiseSuppression');
+      }
+      return nativeGetUserMedia(c);
+    };
+
+    if (MediaStreamTrack && MediaStreamTrack.prototype.getSettings) {
+      var nativeGetSettings = MediaStreamTrack.prototype.getSettings;
+      MediaStreamTrack.prototype.getSettings = function () {
+        var obj = nativeGetSettings.apply(this, arguments);
+        remap(obj, 'mozAutoGainControl', 'autoGainControl');
+        remap(obj, 'mozNoiseSuppression', 'noiseSuppression');
+        return obj;
+      };
+    }
+
+    if (MediaStreamTrack && MediaStreamTrack.prototype.applyConstraints) {
+      var nativeApplyConstraints = MediaStreamTrack.prototype.applyConstraints;
+      MediaStreamTrack.prototype.applyConstraints = function (c) {
+        if (this.kind === 'audio' && (typeof c === 'undefined' ? 'undefined' : _typeof(c)) === 'object') {
+          c = JSON.parse(JSON.stringify(c));
+          remap(c, 'autoGainControl', 'mozAutoGainControl');
+          remap(c, 'noiseSuppression', 'mozNoiseSuppression');
+        }
+        return nativeApplyConstraints.apply(this, [c]);
+      };
+    }
+  }
+}
+
+},{"../utils":15}],14:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+exports.shimLocalStreamsAPI = shimLocalStreamsAPI;
+exports.shimRemoteStreamsAPI = shimRemoteStreamsAPI;
+exports.shimCallbacksAPI = shimCallbacksAPI;
+exports.shimGetUserMedia = shimGetUserMedia;
+exports.shimRTCIceServerUrls = shimRTCIceServerUrls;
+exports.shimTrackEventTransceiver = shimTrackEventTransceiver;
+exports.shimCreateOfferLegacy = shimCreateOfferLegacy;
+
+var _utils = require('../utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function shimLocalStreamsAPI(window) {
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !window.RTCPeerConnection) {
+    return;
+  }
+  if (!('getLocalStreams' in window.RTCPeerConnection.prototype)) {
+    window.RTCPeerConnection.prototype.getLocalStreams = function () {
+      if (!this._localStreams) {
+        this._localStreams = [];
+      }
+      return this._localStreams;
+    };
+  }
+  if (!('addStream' in window.RTCPeerConnection.prototype)) {
+    var _addTrack = window.RTCPeerConnection.prototype.addTrack;
+    window.RTCPeerConnection.prototype.addStream = function (stream) {
+      var _this = this;
+
+      if (!this._localStreams) {
+        this._localStreams = [];
+      }
+      if (!this._localStreams.includes(stream)) {
+        this._localStreams.push(stream);
+      }
+      stream.getTracks().forEach(function (track) {
+        return _addTrack.call(_this, track, stream);
+      });
+    };
+
+    window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+      if (stream) {
+        if (!this._localStreams) {
+          this._localStreams = [stream];
+        } else if (!this._localStreams.includes(stream)) {
+          this._localStreams.push(stream);
+        }
+      }
+      return _addTrack.call(this, track, stream);
+    };
+  }
+  if (!('removeStream' in window.RTCPeerConnection.prototype)) {
+    window.RTCPeerConnection.prototype.removeStream = function (stream) {
+      var _this2 = this;
+
+      if (!this._localStreams) {
+        this._localStreams = [];
+      }
+      var index = this._localStreams.indexOf(stream);
+      if (index === -1) {
+        return;
+      }
+      this._localStreams.splice(index, 1);
+      var tracks = stream.getTracks();
+      this.getSenders().forEach(function (sender) {
+        if (tracks.includes(sender.track)) {
+          _this2.removeTrack(sender);
+        }
+      });
+    };
+  }
+}
+
+function shimRemoteStreamsAPI(window) {
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !window.RTCPeerConnection) {
+    return;
+  }
+  if (!('getRemoteStreams' in window.RTCPeerConnection.prototype)) {
+    window.RTCPeerConnection.prototype.getRemoteStreams = function () {
+      return this._remoteStreams ? this._remoteStreams : [];
+    };
+  }
+  if (!('onaddstream' in window.RTCPeerConnection.prototype)) {
+    Object.defineProperty(window.RTCPeerConnection.prototype, 'onaddstream', {
+      get: function get() {
+        return this._onaddstream;
+      },
+      set: function set(f) {
+        var _this3 = this;
+
+        if (this._onaddstream) {
+          this.removeEventListener('addstream', this._onaddstream);
+          this.removeEventListener('track', this._onaddstreampoly);
+        }
+        this.addEventListener('addstream', this._onaddstream = f);
+        this.addEventListener('track', this._onaddstreampoly = function (e) {
+          e.streams.forEach(function (stream) {
+            if (!_this3._remoteStreams) {
+              _this3._remoteStreams = [];
+            }
+            if (_this3._remoteStreams.includes(stream)) {
+              return;
+            }
+            _this3._remoteStreams.push(stream);
+            var event = new Event('addstream');
+            event.stream = stream;
+            _this3.dispatchEvent(event);
+          });
+        });
+      }
+    });
+    var origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+    window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+      var pc = this;
+      if (!this._onaddstreampoly) {
+        this.addEventListener('track', this._onaddstreampoly = function (e) {
+          e.streams.forEach(function (stream) {
+            if (!pc._remoteStreams) {
+              pc._remoteStreams = [];
+            }
+            if (pc._remoteStreams.indexOf(stream) >= 0) {
+              return;
+            }
+            pc._remoteStreams.push(stream);
+            var event = new Event('addstream');
+            event.stream = stream;
+            pc.dispatchEvent(event);
+          });
+        });
+      }
+      return origSetRemoteDescription.apply(pc, arguments);
+    };
+  }
+}
+
+function shimCallbacksAPI(window) {
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !window.RTCPeerConnection) {
+    return;
+  }
+  var prototype = window.RTCPeerConnection.prototype;
+  var createOffer = prototype.createOffer;
+  var createAnswer = prototype.createAnswer;
+  var setLocalDescription = prototype.setLocalDescription;
+  var setRemoteDescription = prototype.setRemoteDescription;
+  var addIceCandidate = prototype.addIceCandidate;
+
+  prototype.createOffer = function (successCallback, failureCallback) {
+    var options = arguments.length >= 2 ? arguments[2] : arguments[0];
+    var promise = createOffer.apply(this, [options]);
+    if (!failureCallback) {
+      return promise;
+    }
+    promise.then(successCallback, failureCallback);
+    return Promise.resolve();
+  };
+
+  prototype.createAnswer = function (successCallback, failureCallback) {
+    var options = arguments.length >= 2 ? arguments[2] : arguments[0];
+    var promise = createAnswer.apply(this, [options]);
+    if (!failureCallback) {
+      return promise;
+    }
+    promise.then(successCallback, failureCallback);
+    return Promise.resolve();
+  };
+
+  var withCallback = function withCallback(description, successCallback, failureCallback) {
+    var promise = setLocalDescription.apply(this, [description]);
+    if (!failureCallback) {
+      return promise;
+    }
+    promise.then(successCallback, failureCallback);
+    return Promise.resolve();
+  };
+  prototype.setLocalDescription = withCallback;
+
+  withCallback = function withCallback(description, successCallback, failureCallback) {
+    var promise = setRemoteDescription.apply(this, [description]);
+    if (!failureCallback) {
+      return promise;
+    }
+    promise.then(successCallback, failureCallback);
+    return Promise.resolve();
+  };
+  prototype.setRemoteDescription = withCallback;
+
+  withCallback = function withCallback(candidate, successCallback, failureCallback) {
+    var promise = addIceCandidate.apply(this, [candidate]);
+    if (!failureCallback) {
+      return promise;
+    }
+    promise.then(successCallback, failureCallback);
+    return Promise.resolve();
+  };
+  prototype.addIceCandidate = withCallback;
+}
+
+function shimGetUserMedia(window) {
+  var navigator = window && window.navigator;
+
+  if (!navigator.getUserMedia && navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+    navigator.getUserMedia = function (constraints, cb, errcb) {
+      navigator.mediaDevices.getUserMedia(constraints).then(cb, errcb);
+    }.bind(navigator);
+  }
+}
+
+function shimRTCIceServerUrls(window) {
+  // migrate from non-spec RTCIceServer.url to RTCIceServer.urls
+  var OrigPeerConnection = window.RTCPeerConnection;
+  window.RTCPeerConnection = function (pcConfig, pcConstraints) {
+    if (pcConfig && pcConfig.iceServers) {
+      var newIceServers = [];
+      for (var i = 0; i < pcConfig.iceServers.length; i++) {
+        var server = pcConfig.iceServers[i];
+        if (!server.hasOwnProperty('urls') && server.hasOwnProperty('url')) {
+          utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
+          server = JSON.parse(JSON.stringify(server));
+          server.urls = server.url;
+          delete server.url;
+          newIceServers.push(server);
+        } else {
+          newIceServers.push(pcConfig.iceServers[i]);
+        }
+      }
+      pcConfig.iceServers = newIceServers;
+    }
+    return new OrigPeerConnection(pcConfig, pcConstraints);
+  };
+  window.RTCPeerConnection.prototype = OrigPeerConnection.prototype;
+  // wrap static methods. Currently just generateCertificate.
+  if ('generateCertificate' in window.RTCPeerConnection) {
+    Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
+      get: function get() {
+        return OrigPeerConnection.generateCertificate;
+      }
+    });
+  }
+}
+
+function shimTrackEventTransceiver(window) {
+  // Add event.transceiver member over deprecated event.receiver
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && 'receiver' in window.RTCTrackEvent.prototype &&
+  // can't check 'transceiver' in window.RTCTrackEvent.prototype, as it is
+  // defined for some reason even when window.RTCTransceiver is not.
+  !window.RTCTransceiver) {
+    Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
+      get: function get() {
+        return { receiver: this.receiver };
+      }
+    });
+  }
+}
+
+function shimCreateOfferLegacy(window) {
+  var origCreateOffer = window.RTCPeerConnection.prototype.createOffer;
+  window.RTCPeerConnection.prototype.createOffer = function (offerOptions) {
+    if (offerOptions) {
+      if (typeof offerOptions.offerToReceiveAudio !== 'undefined') {
+        // support bit values
+        offerOptions.offerToReceiveAudio = !!offerOptions.offerToReceiveAudio;
+      }
+      var audioTransceiver = this.getTransceivers().find(function (transceiver) {
+        return transceiver.sender.track && transceiver.sender.track.kind === 'audio';
+      });
+      if (offerOptions.offerToReceiveAudio === false && audioTransceiver) {
+        if (audioTransceiver.direction === 'sendrecv') {
+          if (audioTransceiver.setDirection) {
+            audioTransceiver.setDirection('sendonly');
+          } else {
+            audioTransceiver.direction = 'sendonly';
+          }
+        } else if (audioTransceiver.direction === 'recvonly') {
+          if (audioTransceiver.setDirection) {
+            audioTransceiver.setDirection('inactive');
+          } else {
+            audioTransceiver.direction = 'inactive';
+          }
+        }
+      } else if (offerOptions.offerToReceiveAudio === true && !audioTransceiver) {
+        this.addTransceiver('audio');
+      }
+
+      if (typeof offerOptions.offerToReceiveVideo !== 'undefined') {
+        // support bit values
+        offerOptions.offerToReceiveVideo = !!offerOptions.offerToReceiveVideo;
+      }
+      var videoTransceiver = this.getTransceivers().find(function (transceiver) {
+        return transceiver.sender.track && transceiver.sender.track.kind === 'video';
+      });
+      if (offerOptions.offerToReceiveVideo === false && videoTransceiver) {
+        if (videoTransceiver.direction === 'sendrecv') {
+          if (videoTransceiver.setDirection) {
+            videoTransceiver.setDirection('sendonly');
+          } else {
+            videoTransceiver.direction = 'sendonly';
+          }
+        } else if (videoTransceiver.direction === 'recvonly') {
+          if (videoTransceiver.setDirection) {
+            videoTransceiver.setDirection('inactive');
+          } else {
+            videoTransceiver.direction = 'inactive';
+          }
+        }
+      } else if (offerOptions.offerToReceiveVideo === true && !videoTransceiver) {
+        this.addTransceiver('video');
+      }
+    }
+    return origCreateOffer.apply(this, arguments);
+  };
+}
+
+},{"../utils":15}],15:[function(require,module,exports){
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+/* eslint-env node */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+exports.extractVersion = extractVersion;
+exports.wrapPeerConnectionEvent = wrapPeerConnectionEvent;
+exports.disableLog = disableLog;
+exports.disableWarnings = disableWarnings;
+exports.log = log;
+exports.deprecated = deprecated;
+exports.detectBrowser = detectBrowser;
+var logDisabled_ = true;
+var deprecationWarnings_ = true;
+
+/**
+ * Extract browser version out of the provided user agent string.
+ *
+ * @param {!string} uastring userAgent string.
+ * @param {!string} expr Regular expression used as match criteria.
+ * @param {!number} pos position in the version string to be returned.
+ * @return {!number} browser version.
+ */
+function extractVersion(uastring, expr, pos) {
+  var match = uastring.match(expr);
+  return match && match.length >= pos && parseInt(match[pos], 10);
+}
+
+// Wraps the peerconnection event eventNameToWrap in a function
+// which returns the modified event object (or false to prevent
+// the event).
+function wrapPeerConnectionEvent(window, eventNameToWrap, wrapper) {
+  if (!window.RTCPeerConnection) {
+    return;
+  }
+  var proto = window.RTCPeerConnection.prototype;
+  var nativeAddEventListener = proto.addEventListener;
+  proto.addEventListener = function (nativeEventName, cb) {
+    if (nativeEventName !== eventNameToWrap) {
+      return nativeAddEventListener.apply(this, arguments);
+    }
+    var wrappedCallback = function wrappedCallback(e) {
+      var modifiedEvent = wrapper(e);
+      if (modifiedEvent) {
+        cb(modifiedEvent);
+      }
+    };
+    this._eventMap = this._eventMap || {};
+    this._eventMap[cb] = wrappedCallback;
+    return nativeAddEventListener.apply(this, [nativeEventName, wrappedCallback]);
+  };
+
+  var nativeRemoveEventListener = proto.removeEventListener;
+  proto.removeEventListener = function (nativeEventName, cb) {
+    if (nativeEventName !== eventNameToWrap || !this._eventMap || !this._eventMap[cb]) {
+      return nativeRemoveEventListener.apply(this, arguments);
+    }
+    var unwrappedCb = this._eventMap[cb];
+    delete this._eventMap[cb];
+    return nativeRemoveEventListener.apply(this, [nativeEventName, unwrappedCb]);
+  };
+
+  Object.defineProperty(proto, 'on' + eventNameToWrap, {
+    get: function get() {
+      return this['_on' + eventNameToWrap];
+    },
+    set: function set(cb) {
+      if (this['_on' + eventNameToWrap]) {
+        this.removeEventListener(eventNameToWrap, this['_on' + eventNameToWrap]);
+        delete this['_on' + eventNameToWrap];
+      }
+      if (cb) {
+        this.addEventListener(eventNameToWrap, this['_on' + eventNameToWrap] = cb);
+      }
+    },
+
+    enumerable: true,
+    configurable: true
+  });
+}
+
+function disableLog(bool) {
+  if (typeof bool !== 'boolean') {
+    return new Error('Argument type: ' + (typeof bool === 'undefined' ? 'undefined' : _typeof(bool)) + '. Please use a boolean.');
+  }
+  logDisabled_ = bool;
+  return bool ? 'adapter.js logging disabled' : 'adapter.js logging enabled';
+}
+
+/**
+ * Disable or enable deprecation warnings
+ * @param {!boolean} bool set to true to disable warnings.
+ */
+function disableWarnings(bool) {
+  if (typeof bool !== 'boolean') {
+    return new Error('Argument type: ' + (typeof bool === 'undefined' ? 'undefined' : _typeof(bool)) + '. Please use a boolean.');
+  }
+  deprecationWarnings_ = !bool;
+  return 'adapter.js deprecation warnings ' + (bool ? 'disabled' : 'enabled');
+}
+
+function log() {
+  if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object') {
+    if (logDisabled_) {
+      return;
+    }
+    if (typeof console !== 'undefined' && typeof console.log === 'function') {
+      console.log.apply(console, arguments);
+    }
+  }
+}
+
+/**
+ * Shows a deprecation warning suggesting the modern and spec-compatible API.
+ */
+function deprecated(oldMethod, newMethod) {
+  if (!deprecationWarnings_) {
+    return;
+  }
+  console.warn(oldMethod + ' is deprecated, please use ' + newMethod + ' instead.');
+}
+
+/**
+ * Browser detector.
+ *
+ * @return {object} result containing browser and version
+ *     properties.
+ */
+function detectBrowser(window) {
+  var navigator = window.navigator;
+
+  // Returned result object.
+
+  var result = { browser: null, version: null };
+
+  // Fail early if it's not a browser
+  if (typeof window === 'undefined' || !window.navigator) {
+    result.browser = 'Not a browser.';
+    return result;
+  }
+
+  if (navigator.mozGetUserMedia) {
+    // Firefox.
+    result.browser = 'firefox';
+    result.version = extractVersion(navigator.userAgent, /Firefox\/(\d+)\./, 1);
+  } else if (navigator.webkitGetUserMedia) {
+    // Chrome, Chromium, Webview, Opera.
+    // Version matches Chrome/WebRTC version.
+    result.browser = 'chrome';
+    result.version = extractVersion(navigator.userAgent, /Chrom(e|ium)\/(\d+)\./, 2);
+  } else if (navigator.mediaDevices && navigator.userAgent.match(/Edge\/(\d+).(\d+)$/)) {
+    // Edge.
+    result.browser = 'edge';
+    result.version = extractVersion(navigator.userAgent, /Edge\/(\d+).(\d+)$/, 2);
+  } else if (window.RTCPeerConnection && navigator.userAgent.match(/AppleWebKit\/(\d+)\./)) {
+    // Safari.
+    result.browser = 'safari';
+    result.version = extractVersion(navigator.userAgent, /AppleWebKit\/(\d+)\./, 1);
+  } else {
+    // Default fallthrough: not supported.
+    result.browser = 'Not a supported browser.';
+    return result;
+  }
+
+  return result;
+}
+
+},{}],16:[function(require,module,exports){
 /*
  *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
  *
@@ -11,6 +2615,16 @@
 
 var SDPUtils = require('sdp');
 
+function fixStatsType(stat) {
+  return {
+    inboundrtp: 'inbound-rtp',
+    outboundrtp: 'outbound-rtp',
+    candidatepair: 'candidate-pair',
+    localcandidate: 'local-candidate',
+    remotecandidate: 'remote-candidate'
+  }[stat.type] || stat.type;
+}
+
 function writeMediaSection(transceiver, caps, type, stream, dtlsRole) {
   var sdp = SDPUtils.writeRtpDescription(transceiver.kind, caps);
 
@@ -25,9 +2639,7 @@ function writeMediaSection(transceiver, caps, type, stream, dtlsRole) {
 
   sdp += 'a=mid:' + transceiver.mid + '\r\n';
 
-  if (transceiver.direction) {
-    sdp += 'a=' + transceiver.direction + '\r\n';
-  } else if (transceiver.rtpSender && transceiver.rtpReceiver) {
+  if (transceiver.rtpSender && transceiver.rtpReceiver) {
     sdp += 'a=sendrecv\r\n';
   } else if (transceiver.rtpSender) {
     sdp += 'a=sendonly\r\n';
@@ -38,14 +2650,18 @@ function writeMediaSection(transceiver, caps, type, stream, dtlsRole) {
   }
 
   if (transceiver.rtpSender) {
+    var trackId = transceiver.rtpSender._initialTrackId ||
+        transceiver.rtpSender.track.id;
+    transceiver.rtpSender._initialTrackId = trackId;
     // spec.
-    var msid = 'msid:' + stream.id + ' ' +
-        transceiver.rtpSender.track.id + '\r\n';
+    var msid = 'msid:' + (stream ? stream.id : '-') + ' ' +
+        trackId + '\r\n';
     sdp += 'a=' + msid;
-
-    // for Chrome.
+    // for Chrome. Legacy should no longer be required.
     sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
         ' ' + msid;
+
+    // RTX
     if (transceiver.sendEncodingParameters[0].rtx) {
       sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
           ' ' + msid;
@@ -101,7 +2717,6 @@ function filterIceServers(iceServers, edgeVersion) {
       server.urls = isString ? urls[0] : urls;
       return !!urls.length;
     }
-    return false;
   });
 }
 
@@ -215,25 +2830,57 @@ function maybeAddCandidate(iceTransport, candidate) {
   return !alreadyAdded;
 }
 
+
+function makeError(name, description) {
+  var e = new Error(description);
+  e.name = name;
+  // legacy error codes from https://heycam.github.io/webidl/#idl-DOMException-error-names
+  e.code = {
+    NotSupportedError: 9,
+    InvalidStateError: 11,
+    InvalidAccessError: 15,
+    TypeError: undefined,
+    OperationError: undefined
+  }[name];
+  return e;
+}
+
 module.exports = function(window, edgeVersion) {
+  // https://w3c.github.io/mediacapture-main/#mediastream
+  // Helper function to add the track to the stream and
+  // dispatch the event ourselves.
+  function addTrackToStreamAndFireEvent(track, stream) {
+    stream.addTrack(track);
+    stream.dispatchEvent(new window.MediaStreamTrackEvent('addtrack',
+        {track: track}));
+  }
+
+  function removeTrackFromStreamAndFireEvent(track, stream) {
+    stream.removeTrack(track);
+    stream.dispatchEvent(new window.MediaStreamTrackEvent('removetrack',
+        {track: track}));
+  }
+
+  function fireAddTrack(pc, track, receiver, streams) {
+    var trackEvent = new Event('track');
+    trackEvent.track = track;
+    trackEvent.receiver = receiver;
+    trackEvent.transceiver = {receiver: receiver};
+    trackEvent.streams = streams;
+    window.setTimeout(function() {
+      pc._dispatchEvent('track', trackEvent);
+    });
+  }
+
   var RTCPeerConnection = function(config) {
-    var self = this;
+    var pc = this;
 
     var _eventTarget = document.createDocumentFragment();
     ['addEventListener', 'removeEventListener', 'dispatchEvent']
         .forEach(function(method) {
-          self[method] = _eventTarget[method].bind(_eventTarget);
+          pc[method] = _eventTarget[method].bind(_eventTarget);
         });
 
-    this.onicecandidate = null;
-    this.onaddstream = null;
-    this.ontrack = null;
-    this.onremovestream = null;
-    this.onsignalingstatechange = null;
-    this.oniceconnectionstatechange = null;
-    this.onicegatheringstatechange = null;
-    this.onnegotiationneeded = null;
-    this.ondatachannel = null;
     this.canTrickleIceCandidates = null;
 
     this.needNegotiation = false;
@@ -241,20 +2888,20 @@ module.exports = function(window, edgeVersion) {
     this.localStreams = [];
     this.remoteStreams = [];
 
-    this.localDescription = null;
-    this.remoteDescription = null;
+    this._localDescription = null;
+    this._remoteDescription = null;
 
     this.signalingState = 'stable';
     this.iceConnectionState = 'new';
+    this.connectionState = 'new';
     this.iceGatheringState = 'new';
 
     config = JSON.parse(JSON.stringify(config || {}));
 
     this.usingBundle = config.bundlePolicy === 'max-bundle';
     if (config.rtcpMuxPolicy === 'negotiate') {
-      var e = new Error('rtcpMuxPolicy \'negotiate\' is not supported');
-      e.name = 'NotSupportedError';
-      throw(e);
+      throw(makeError('NotSupportedError',
+          'rtcpMuxPolicy \'negotiate\' is not supported'));
     } else if (!config.rtcpMuxPolicy) {
       config.rtcpMuxPolicy = 'require';
     }
@@ -283,10 +2930,10 @@ module.exports = function(window, edgeVersion) {
     this._iceGatherers = [];
     if (config.iceCandidatePoolSize) {
       for (var i = config.iceCandidatePoolSize; i > 0; i--) {
-        this._iceGatherers = new window.RTCIceGatherer({
+        this._iceGatherers.push(new window.RTCIceGatherer({
           iceServers: config.iceServers,
           gatherPolicy: config.iceTransportPolicy
-        });
+        }));
       }
     } else {
       config.iceCandidatePoolSize = 0;
@@ -302,14 +2949,48 @@ module.exports = function(window, edgeVersion) {
     this._sdpSessionVersion = 0;
 
     this._dtlsRole = undefined; // role for a=setup to use in answers.
+
+    this._isClosed = false;
+  };
+
+  Object.defineProperty(RTCPeerConnection.prototype, 'localDescription', {
+    configurable: true,
+    get: function() {
+      return this._localDescription;
+    }
+  });
+  Object.defineProperty(RTCPeerConnection.prototype, 'remoteDescription', {
+    configurable: true,
+    get: function() {
+      return this._remoteDescription;
+    }
+  });
+
+  // set up event handlers on prototype
+  RTCPeerConnection.prototype.onicecandidate = null;
+  RTCPeerConnection.prototype.onaddstream = null;
+  RTCPeerConnection.prototype.ontrack = null;
+  RTCPeerConnection.prototype.onremovestream = null;
+  RTCPeerConnection.prototype.onsignalingstatechange = null;
+  RTCPeerConnection.prototype.oniceconnectionstatechange = null;
+  RTCPeerConnection.prototype.onconnectionstatechange = null;
+  RTCPeerConnection.prototype.onicegatheringstatechange = null;
+  RTCPeerConnection.prototype.onnegotiationneeded = null;
+  RTCPeerConnection.prototype.ondatachannel = null;
+
+  RTCPeerConnection.prototype._dispatchEvent = function(name, event) {
+    if (this._isClosed) {
+      return;
+    }
+    this.dispatchEvent(event);
+    if (typeof this['on' + name] === 'function') {
+      this['on' + name](event);
+    }
   };
 
   RTCPeerConnection.prototype._emitGatheringStateChange = function() {
     var event = new Event('icegatheringstatechange');
-    this.dispatchEvent(event);
-    if (typeof this.onicegatheringstatechange === 'function') {
-      this.onicegatheringstatechange(event);
-    }
+    this._dispatchEvent('icegatheringstatechange', event);
   };
 
   RTCPeerConnection.prototype.getConfiguration = function() {
@@ -325,8 +3006,8 @@ module.exports = function(window, edgeVersion) {
   };
 
   // internal helper to create a transceiver object.
-  // (whih is not yet the same as the WebRTC 1.0 transceiver)
-  RTCPeerConnection.prototype._createTransceiver = function(kind) {
+  // (which is not yet the same as the WebRTC 1.0 transceiver)
+  RTCPeerConnection.prototype._createTransceiver = function(kind, doNotAdd) {
     var hasBundleTransport = this.transceivers.length > 0;
     var transceiver = {
       track: null,
@@ -342,6 +3023,7 @@ module.exports = function(window, edgeVersion) {
       sendEncodingParameters: null,
       recvEncodingParameters: null,
       stream: null,
+      associatedRemoteMediaStreams: [],
       wantReceive: true
     };
     if (this.usingBundle && hasBundleTransport) {
@@ -352,11 +3034,26 @@ module.exports = function(window, edgeVersion) {
       transceiver.iceTransport = transports.iceTransport;
       transceiver.dtlsTransport = transports.dtlsTransport;
     }
-    this.transceivers.push(transceiver);
+    if (!doNotAdd) {
+      this.transceivers.push(transceiver);
+    }
     return transceiver;
   };
 
   RTCPeerConnection.prototype.addTrack = function(track, stream) {
+    if (this._isClosed) {
+      throw makeError('InvalidStateError',
+          'Attempted to call addTrack on a closed peerconnection.');
+    }
+
+    var alreadyExists = this.transceivers.find(function(s) {
+      return s.track === track;
+    });
+
+    if (alreadyExists) {
+      throw makeError('InvalidAccessError', 'Track already exists.');
+    }
+
     var transceiver;
     for (var i = 0; i < this.transceivers.length; i++) {
       if (!this.transceivers[i].track &&
@@ -382,10 +3079,10 @@ module.exports = function(window, edgeVersion) {
   };
 
   RTCPeerConnection.prototype.addStream = function(stream) {
-    var self = this;
+    var pc = this;
     if (edgeVersion >= 15025) {
       stream.getTracks().forEach(function(track) {
-        self.addTrack(track, stream);
+        pc.addTrack(track, stream);
       });
     } else {
       // Clone is necessary for local demos mostly, attaching directly
@@ -399,17 +3096,59 @@ module.exports = function(window, edgeVersion) {
         });
       });
       clonedStream.getTracks().forEach(function(track) {
-        self.addTrack(track, clonedStream);
+        pc.addTrack(track, clonedStream);
       });
     }
   };
 
-  RTCPeerConnection.prototype.removeStream = function(stream) {
-    var idx = this.localStreams.indexOf(stream);
-    if (idx > -1) {
-      this.localStreams.splice(idx, 1);
-      this._maybeFireNegotiationNeeded();
+  RTCPeerConnection.prototype.removeTrack = function(sender) {
+    if (this._isClosed) {
+      throw makeError('InvalidStateError',
+          'Attempted to call removeTrack on a closed peerconnection.');
     }
+
+    if (!(sender instanceof window.RTCRtpSender)) {
+      throw new TypeError('Argument 1 of RTCPeerConnection.removeTrack ' +
+          'does not implement interface RTCRtpSender.');
+    }
+
+    var transceiver = this.transceivers.find(function(t) {
+      return t.rtpSender === sender;
+    });
+
+    if (!transceiver) {
+      throw makeError('InvalidAccessError',
+          'Sender was not created by this connection.');
+    }
+    var stream = transceiver.stream;
+
+    transceiver.rtpSender.stop();
+    transceiver.rtpSender = null;
+    transceiver.track = null;
+    transceiver.stream = null;
+
+    // remove the stream from the set of local streams
+    var localStreams = this.transceivers.map(function(t) {
+      return t.stream;
+    });
+    if (localStreams.indexOf(stream) === -1 &&
+        this.localStreams.indexOf(stream) > -1) {
+      this.localStreams.splice(this.localStreams.indexOf(stream), 1);
+    }
+
+    this._maybeFireNegotiationNeeded();
+  };
+
+  RTCPeerConnection.prototype.removeStream = function(stream) {
+    var pc = this;
+    stream.getTracks().forEach(function(track) {
+      var sender = pc.getSenders().find(function(s) {
+        return s.track === track;
+      });
+      if (sender) {
+        pc.removeTrack(sender);
+      }
+    });
   };
 
   RTCPeerConnection.prototype.getSenders = function() {
@@ -433,7 +3172,7 @@ module.exports = function(window, edgeVersion) {
 
   RTCPeerConnection.prototype._createIceGatherer = function(sdpMLineIndex,
       usingBundle) {
-    var self = this;
+    var pc = this;
     if (usingBundle && sdpMLineIndex > 0) {
       return this.transceivers[0].iceGatherer;
     } else if (this._iceGatherers.length) {
@@ -447,14 +3186,14 @@ module.exports = function(window, edgeVersion) {
         {value: 'new', writable: true}
     );
 
-    this.transceivers[sdpMLineIndex].candidates = [];
+    this.transceivers[sdpMLineIndex].bufferedCandidateEvents = [];
     this.transceivers[sdpMLineIndex].bufferCandidates = function(event) {
       var end = !event.candidate || Object.keys(event.candidate).length === 0;
       // polyfill since RTCIceGatherer.state is not implemented in
       // Edge 10547 yet.
       iceGatherer.state = end ? 'completed' : 'gathering';
-      if (self.transceivers[sdpMLineIndex].candidates !== null) {
-        self.transceivers[sdpMLineIndex].candidates.push(event.candidate);
+      if (pc.transceivers[sdpMLineIndex].bufferedCandidateEvents !== null) {
+        pc.transceivers[sdpMLineIndex].bufferedCandidateEvents.push(event);
       }
     };
     iceGatherer.addEventListener('localcandidate',
@@ -464,17 +3203,18 @@ module.exports = function(window, edgeVersion) {
 
   // start gathering from an RTCIceGatherer.
   RTCPeerConnection.prototype._gather = function(mid, sdpMLineIndex) {
-    var self = this;
+    var pc = this;
     var iceGatherer = this.transceivers[sdpMLineIndex].iceGatherer;
     if (iceGatherer.onlocalcandidate) {
       return;
     }
-    var candidates = this.transceivers[sdpMLineIndex].candidates;
-    this.transceivers[sdpMLineIndex].candidates = null;
+    var bufferedCandidateEvents =
+      this.transceivers[sdpMLineIndex].bufferedCandidateEvents;
+    this.transceivers[sdpMLineIndex].bufferedCandidateEvents = null;
     iceGatherer.removeEventListener('localcandidate',
       this.transceivers[sdpMLineIndex].bufferCandidates);
     iceGatherer.onlocalcandidate = function(evt) {
-      if (self.usingBundle && sdpMLineIndex > 0) {
+      if (pc.usingBundle && sdpMLineIndex > 0) {
         // if we know that we use bundle we can drop candidates with
         // ѕdpMLineIndex > 0. If we don't do this then our state gets
         // confused since we dispose the extra ice gatherer.
@@ -498,52 +3238,61 @@ module.exports = function(window, edgeVersion) {
         }
         // RTCIceCandidate doesn't have a component, needs to be added
         cand.component = 1;
-        event.candidate.candidate = SDPUtils.writeCandidate(cand);
+        // also the usernameFragment. TODO: update SDP to take both variants.
+        cand.ufrag = iceGatherer.getLocalParameters().usernameFragment;
+
+        var serializedCandidate = SDPUtils.writeCandidate(cand);
+        event.candidate = Object.assign(event.candidate,
+            SDPUtils.parseCandidate(serializedCandidate));
+
+        event.candidate.candidate = serializedCandidate;
+        event.candidate.toJSON = function() {
+          return {
+            candidate: event.candidate.candidate,
+            sdpMid: event.candidate.sdpMid,
+            sdpMLineIndex: event.candidate.sdpMLineIndex,
+            usernameFragment: event.candidate.usernameFragment
+          };
+        };
       }
 
       // update local description.
-      var sections = SDPUtils.splitSections(self.localDescription.sdp);
+      var sections = SDPUtils.getMediaSections(pc._localDescription.sdp);
       if (!end) {
-        sections[event.candidate.sdpMLineIndex + 1] +=
+        sections[event.candidate.sdpMLineIndex] +=
             'a=' + event.candidate.candidate + '\r\n';
       } else {
-        sections[event.candidate.sdpMLineIndex + 1] +=
+        sections[event.candidate.sdpMLineIndex] +=
             'a=end-of-candidates\r\n';
       }
-      self.localDescription.sdp = sections.join('');
-      var complete = self.transceivers.every(function(transceiver) {
+      pc._localDescription.sdp =
+          SDPUtils.getDescription(pc._localDescription.sdp) +
+          sections.join('');
+      var complete = pc.transceivers.every(function(transceiver) {
         return transceiver.iceGatherer &&
             transceiver.iceGatherer.state === 'completed';
       });
 
-      if (self.iceGatheringState !== 'gathering') {
-        self.iceGatheringState = 'gathering';
-        self._emitGatheringStateChange();
+      if (pc.iceGatheringState !== 'gathering') {
+        pc.iceGatheringState = 'gathering';
+        pc._emitGatheringStateChange();
       }
 
       // Emit candidate. Also emit null candidate when all gatherers are
       // complete.
       if (!end) {
-        self.dispatchEvent(event);
-        if (typeof self.onicecandidate === 'function') {
-          self.onicecandidate(event);
-        }
+        pc._dispatchEvent('icecandidate', event);
       }
       if (complete) {
-        self.dispatchEvent(new Event('icecandidate'));
-        if (typeof self.onicecandidate === 'function') {
-          self.onicecandidate(new Event('icecandidate'));
-        }
-        self.iceGatheringState = 'complete';
-        self._emitGatheringStateChange();
+        pc._dispatchEvent('icecandidate', new Event('icecandidate'));
+        pc.iceGatheringState = 'complete';
+        pc._emitGatheringStateChange();
       }
     };
 
     // emit already gathered candidates.
     window.setTimeout(function() {
-      candidates.forEach(function(candidate) {
-        var e = new Event('RTCIceGatherEvent');
-        e.candidate = candidate;
+      bufferedCandidateEvents.forEach(function(e) {
         iceGatherer.onlocalcandidate(e);
       });
     }, 0);
@@ -551,21 +3300,22 @@ module.exports = function(window, edgeVersion) {
 
   // Create ICE transport and DTLS transport.
   RTCPeerConnection.prototype._createIceAndDtlsTransports = function() {
-    var self = this;
+    var pc = this;
     var iceTransport = new window.RTCIceTransport(null);
     iceTransport.onicestatechange = function() {
-      self._updateConnectionState();
+      pc._updateIceConnectionState();
+      pc._updateConnectionState();
     };
 
     var dtlsTransport = new window.RTCDtlsTransport(iceTransport);
     dtlsTransport.ondtlsstatechange = function() {
-      self._updateConnectionState();
+      pc._updateConnectionState();
     };
     dtlsTransport.onerror = function() {
       // onerror does not set state to failed by itself.
       Object.defineProperty(dtlsTransport, 'state',
           {value: 'failed', writable: true});
-      self._updateConnectionState();
+      pc._updateConnectionState();
     };
 
     return {
@@ -621,11 +3371,17 @@ module.exports = function(window, edgeVersion) {
           delete p.rtx;
         });
       }
-      params.encodings = transceiver.recvEncodingParameters;
+      if (transceiver.recvEncodingParameters.length) {
+        params.encodings = transceiver.recvEncodingParameters;
+      } else {
+        params.encodings = [{}];
+      }
       params.rtcp = {
-        cname: transceiver.rtcpParameters.cname,
         compound: transceiver.rtcpParameters.compound
       };
+      if (transceiver.rtcpParameters.cname) {
+        params.rtcp.cname = transceiver.rtcpParameters.cname;
+      }
       if (transceiver.sendEncodingParameters.length) {
         params.rtcp.ssrc = transceiver.sendEncodingParameters[0].ssrc;
       }
@@ -634,20 +3390,19 @@ module.exports = function(window, edgeVersion) {
   };
 
   RTCPeerConnection.prototype.setLocalDescription = function(description) {
-    var self = this;
-    var args = arguments;
+    var pc = this;
+
+    // Note: pranswer is not supported.
+    if (['offer', 'answer'].indexOf(description.type) === -1) {
+      return Promise.reject(makeError('TypeError',
+          'Unsupported type "' + description.type + '"'));
+    }
 
     if (!isActionAllowedInSignalingState('setLocalDescription',
-        description.type, this.signalingState)) {
-      return new Promise(function(resolve, reject) {
-        var e = new Error('Can not set local ' + description.type +
-            ' in state ' + self.signalingState);
-        e.name = 'InvalidStateError';
-        if (args.length > 2 && typeof args[2] === 'function') {
-          args[2].apply(null, [e]);
-        }
-        reject(e);
-      });
+        description.type, pc.signalingState) || pc._isClosed) {
+      return Promise.reject(makeError('InvalidStateError',
+          'Can not set local ' + description.type +
+          ' in state ' + pc.signalingState));
     }
 
     var sections;
@@ -659,19 +3414,19 @@ module.exports = function(window, edgeVersion) {
       sessionpart = sections.shift();
       sections.forEach(function(mediaSection, sdpMLineIndex) {
         var caps = SDPUtils.parseRtpParameters(mediaSection);
-        self.transceivers[sdpMLineIndex].localCapabilities = caps;
+        pc.transceivers[sdpMLineIndex].localCapabilities = caps;
       });
 
-      this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
-        self._gather(transceiver.mid, sdpMLineIndex);
+      pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+        pc._gather(transceiver.mid, sdpMLineIndex);
       });
     } else if (description.type === 'answer') {
-      sections = SDPUtils.splitSections(self.remoteDescription.sdp);
+      sections = SDPUtils.splitSections(pc._remoteDescription.sdp);
       sessionpart = sections.shift();
       var isIceLite = SDPUtils.matchPrefix(sessionpart,
           'a=ice-lite').length > 0;
       sections.forEach(function(mediaSection, sdpMLineIndex) {
-        var transceiver = self.transceivers[sdpMLineIndex];
+        var transceiver = pc.transceivers[sdpMLineIndex];
         var iceGatherer = transceiver.iceGatherer;
         var iceTransport = transceiver.iceTransport;
         var dtlsTransport = transceiver.dtlsTransport;
@@ -680,9 +3435,9 @@ module.exports = function(window, edgeVersion) {
 
         // treat bundle-only as not-rejected.
         var rejected = SDPUtils.isRejected(mediaSection) &&
-            !SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 1;
+            SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 0;
 
-        if (!rejected && !transceiver.isDatachannel) {
+        if (!rejected && !transceiver.rejected) {
           var remoteIceParameters = SDPUtils.getIceParameters(
               mediaSection, sessionpart);
           var remoteDtlsParameters = SDPUtils.getDtlsParameters(
@@ -691,8 +3446,8 @@ module.exports = function(window, edgeVersion) {
             remoteDtlsParameters.role = 'server';
           }
 
-          if (!self.usingBundle || sdpMLineIndex === 0) {
-            self._gather(transceiver.mid, sdpMLineIndex);
+          if (!pc.usingBundle || sdpMLineIndex === 0) {
+            pc._gather(transceiver.mid, sdpMLineIndex);
             if (iceTransport.state === 'new') {
               iceTransport.start(iceGatherer, remoteIceParameters,
                   isIceLite ? 'controlling' : 'controlled');
@@ -708,61 +3463,44 @@ module.exports = function(window, edgeVersion) {
 
           // Start the RTCRtpSender. The RTCRtpReceiver for this
           // transceiver has already been started in setRemoteDescription.
-          self._transceive(transceiver,
+          pc._transceive(transceiver,
               params.codecs.length > 0,
               false);
         }
       });
     }
 
-    this.localDescription = {
+    pc._localDescription = {
       type: description.type,
       sdp: description.sdp
     };
-    switch (description.type) {
-      case 'offer':
-        this._updateSignalingState('have-local-offer');
-        break;
-      case 'answer':
-        this._updateSignalingState('stable');
-        break;
-      default:
-        throw new TypeError('unsupported type "' + description.type +
-            '"');
+    if (description.type === 'offer') {
+      pc._updateSignalingState('have-local-offer');
+    } else {
+      pc._updateSignalingState('stable');
     }
 
-    // If a success callback was provided, emit ICE candidates after it
-    // has been executed. Otherwise, emit callback after the Promise is
-    // resolved.
-    var cb = arguments.length > 1 && typeof arguments[1] === 'function' &&
-        arguments[1];
-    return new Promise(function(resolve) {
-      if (cb) {
-        cb.apply(null);
-      }
-      resolve();
-    });
+    return Promise.resolve();
   };
 
   RTCPeerConnection.prototype.setRemoteDescription = function(description) {
-    var self = this;
-    var args = arguments;
+    var pc = this;
+
+    // Note: pranswer is not supported.
+    if (['offer', 'answer'].indexOf(description.type) === -1) {
+      return Promise.reject(makeError('TypeError',
+          'Unsupported type "' + description.type + '"'));
+    }
 
     if (!isActionAllowedInSignalingState('setRemoteDescription',
-        description.type, this.signalingState)) {
-      return new Promise(function(resolve, reject) {
-        var e = new Error('Can not set remote ' + description.type +
-            ' in state ' + self.signalingState);
-        e.name = 'InvalidStateError';
-        if (args.length > 2 && typeof args[2] === 'function') {
-          args[2].apply(null, [e]);
-        }
-        reject(e);
-      });
+        description.type, pc.signalingState) || pc._isClosed) {
+      return Promise.reject(makeError('InvalidStateError',
+          'Can not set remote ' + description.type +
+          ' in state ' + pc.signalingState));
     }
 
     var streams = {};
-    this.remoteStreams.forEach(function(stream) {
+    pc.remoteStreams.forEach(function(stream) {
       streams[stream.id] = stream;
     });
     var receiverList = [];
@@ -772,14 +3510,14 @@ module.exports = function(window, edgeVersion) {
         'a=ice-lite').length > 0;
     var usingBundle = SDPUtils.matchPrefix(sessionpart,
         'a=group:BUNDLE ').length > 0;
-    this.usingBundle = usingBundle;
+    pc.usingBundle = usingBundle;
     var iceOptions = SDPUtils.matchPrefix(sessionpart,
         'a=ice-options:')[0];
     if (iceOptions) {
-      this.canTrickleIceCandidates = iceOptions.substr(14).split(' ')
+      pc.canTrickleIceCandidates = iceOptions.substr(14).split(' ')
           .indexOf('trickle') >= 0;
     } else {
-      this.canTrickleIceCandidates = false;
+      pc.canTrickleIceCandidates = false;
     }
 
     sections.forEach(function(mediaSection, sdpMLineIndex) {
@@ -787,7 +3525,7 @@ module.exports = function(window, edgeVersion) {
       var kind = SDPUtils.getKind(mediaSection);
       // treat bundle-only as not-rejected.
       var rejected = SDPUtils.isRejected(mediaSection) &&
-          !SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 1;
+          SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 0;
       var protocol = lines[0].substr(2).split(' ')[2];
 
       var direction = SDPUtils.getDirection(mediaSection, sessionpart);
@@ -796,14 +3534,25 @@ module.exports = function(window, edgeVersion) {
       var mid = SDPUtils.getMid(mediaSection) || SDPUtils.generateIdentifier();
 
       // Reject datachannels which are not implemented yet.
-      if (kind === 'application' && protocol === 'DTLS/SCTP') {
-        self.transceivers[sdpMLineIndex] = {
+      if (rejected || (kind === 'application' && (protocol === 'DTLS/SCTP' ||
+          protocol === 'UDP/DTLS/SCTP'))) {
+        // TODO: this is dangerous in the case where a non-rejected m-line
+        //     becomes rejected.
+        pc.transceivers[sdpMLineIndex] = {
           mid: mid,
-          isDatachannel: true
+          kind: kind,
+          protocol: protocol,
+          rejected: true
         };
         return;
       }
 
+      if (!rejected && pc.transceivers[sdpMLineIndex] &&
+          pc.transceivers[sdpMLineIndex].rejected) {
+        // recycle a rejected transceiver.
+        pc.transceivers[sdpMLineIndex] = pc._createTransceiver(kind, true);
+      }
+
       var transceiver;
       var iceGatherer;
       var iceTransport;
@@ -843,30 +3592,30 @@ module.exports = function(window, edgeVersion) {
       // Check if we can use BUNDLE and dispose transports.
       if ((description.type === 'offer' || description.type === 'answer') &&
           !rejected && usingBundle && sdpMLineIndex > 0 &&
-          self.transceivers[sdpMLineIndex]) {
-        self._disposeIceAndDtlsTransports(sdpMLineIndex);
-        self.transceivers[sdpMLineIndex].iceGatherer =
-            self.transceivers[0].iceGatherer;
-        self.transceivers[sdpMLineIndex].iceTransport =
-            self.transceivers[0].iceTransport;
-        self.transceivers[sdpMLineIndex].dtlsTransport =
-            self.transceivers[0].dtlsTransport;
-        if (self.transceivers[sdpMLineIndex].rtpSender) {
-          self.transceivers[sdpMLineIndex].rtpSender.setTransport(
-              self.transceivers[0].dtlsTransport);
+          pc.transceivers[sdpMLineIndex]) {
+        pc._disposeIceAndDtlsTransports(sdpMLineIndex);
+        pc.transceivers[sdpMLineIndex].iceGatherer =
+            pc.transceivers[0].iceGatherer;
+        pc.transceivers[sdpMLineIndex].iceTransport =
+            pc.transceivers[0].iceTransport;
+        pc.transceivers[sdpMLineIndex].dtlsTransport =
+            pc.transceivers[0].dtlsTransport;
+        if (pc.transceivers[sdpMLineIndex].rtpSender) {
+          pc.transceivers[sdpMLineIndex].rtpSender.setTransport(
+              pc.transceivers[0].dtlsTransport);
         }
-        if (self.transceivers[sdpMLineIndex].rtpReceiver) {
-          self.transceivers[sdpMLineIndex].rtpReceiver.setTransport(
-              self.transceivers[0].dtlsTransport);
+        if (pc.transceivers[sdpMLineIndex].rtpReceiver) {
+          pc.transceivers[sdpMLineIndex].rtpReceiver.setTransport(
+              pc.transceivers[0].dtlsTransport);
         }
       }
       if (description.type === 'offer' && !rejected) {
-        transceiver = self.transceivers[sdpMLineIndex] ||
-            self._createTransceiver(kind);
+        transceiver = pc.transceivers[sdpMLineIndex] ||
+            pc._createTransceiver(kind);
         transceiver.mid = mid;
 
         if (!transceiver.iceGatherer) {
-          transceiver.iceGatherer = self._createIceGatherer(sdpMLineIndex,
+          transceiver.iceGatherer = pc._createIceGatherer(sdpMLineIndex,
               usingBundle);
         }
 
@@ -895,6 +3644,7 @@ module.exports = function(window, edgeVersion) {
           ssrc: (2 * sdpMLineIndex + 2) * 1001
         }];
 
+        // TODO: rewrite to use http://w3c.github.io/webrtc-pc/#set-associated-remote-streams
         var isNewTrack = false;
         if (direction === 'sendrecv' || direction === 'sendonly') {
           isNewTrack = !transceiver.rtpReceiver;
@@ -905,7 +3655,9 @@ module.exports = function(window, edgeVersion) {
             var stream;
             track = rtpReceiver.track;
             // FIXME: does not work with Plan B.
-            if (remoteMsid) {
+            if (remoteMsid && remoteMsid.stream === '-') {
+              // no-op. a stream id of '-' means: no associated stream.
+            } else if (remoteMsid) {
               if (!streams[remoteMsid.stream]) {
                 streams[remoteMsid.stream] = new window.MediaStream();
                 Object.defineProperty(streams[remoteMsid.stream], 'id', {
@@ -926,9 +3678,22 @@ module.exports = function(window, edgeVersion) {
               }
               stream = streams.default;
             }
-            stream.addTrack(track);
+            if (stream) {
+              addTrackToStreamAndFireEvent(track, stream);
+              transceiver.associatedRemoteMediaStreams.push(stream);
+            }
             receiverList.push([track, rtpReceiver, stream]);
           }
+        } else if (transceiver.rtpReceiver && transceiver.rtpReceiver.track) {
+          transceiver.associatedRemoteMediaStreams.forEach(function(s) {
+            var nativeTrack = s.getTracks().find(function(t) {
+              return t.id === transceiver.rtpReceiver.track.id;
+            });
+            if (nativeTrack) {
+              removeTrackFromStreamAndFireEvent(nativeTrack, s);
+            }
+          });
+          transceiver.associatedRemoteMediaStreams = [];
         }
 
         transceiver.localCapabilities = localCapabilities;
@@ -940,11 +3705,11 @@ module.exports = function(window, edgeVersion) {
 
         // Start the RTCRtpReceiver now. The RTPSender is started in
         // setLocalDescription.
-        self._transceive(self.transceivers[sdpMLineIndex],
+        pc._transceive(pc.transceivers[sdpMLineIndex],
             false,
             isNewTrack);
       } else if (description.type === 'answer' && !rejected) {
-        transceiver = self.transceivers[sdpMLineIndex];
+        transceiver = pc.transceivers[sdpMLineIndex];
         iceGatherer = transceiver.iceGatherer;
         iceTransport = transceiver.iceTransport;
         dtlsTransport = transceiver.dtlsTransport;
@@ -952,11 +3717,11 @@ module.exports = function(window, edgeVersion) {
         sendEncodingParameters = transceiver.sendEncodingParameters;
         localCapabilities = transceiver.localCapabilities;
 
-        self.transceivers[sdpMLineIndex].recvEncodingParameters =
+        pc.transceivers[sdpMLineIndex].recvEncodingParameters =
             recvEncodingParameters;
-        self.transceivers[sdpMLineIndex].remoteCapabilities =
+        pc.transceivers[sdpMLineIndex].remoteCapabilities =
             remoteCapabilities;
-        self.transceivers[sdpMLineIndex].rtcpParameters = rtcpParameters;
+        pc.transceivers[sdpMLineIndex].rtcpParameters = rtcpParameters;
 
         if (cands.length && iceTransport.state === 'new') {
           if ((isIceLite || isComplete) &&
@@ -979,10 +3744,24 @@ module.exports = function(window, edgeVersion) {
           }
         }
 
-        self._transceive(transceiver,
+        // If the offer contained RTX but the answer did not,
+        // remove RTX from sendEncodingParameters.
+        var commonCapabilities = getCommonCapabilities(
+          transceiver.localCapabilities,
+          transceiver.remoteCapabilities);
+
+        var hasRtx = commonCapabilities.codecs.filter(function(c) {
+          return c.name.toLowerCase() === 'rtx';
+        }).length;
+        if (!hasRtx && transceiver.sendEncodingParameters[0].rtx) {
+          delete transceiver.sendEncodingParameters[0].rtx;
+        }
+
+        pc._transceive(transceiver,
             direction === 'sendrecv' || direction === 'recvonly',
             direction === 'sendrecv' || direction === 'sendonly');
 
+        // TODO: rewrite to use http://w3c.github.io/webrtc-pc/#set-associated-remote-streams
         if (rtpReceiver &&
             (direction === 'sendrecv' || direction === 'sendonly')) {
           track = rtpReceiver.track;
@@ -990,13 +3769,13 @@ module.exports = function(window, edgeVersion) {
             if (!streams[remoteMsid.stream]) {
               streams[remoteMsid.stream] = new window.MediaStream();
             }
-            streams[remoteMsid.stream].addTrack(track);
+            addTrackToStreamAndFireEvent(track, streams[remoteMsid.stream]);
             receiverList.push([track, rtpReceiver, streams[remoteMsid.stream]]);
           } else {
             if (!streams.default) {
               streams.default = new window.MediaStream();
             }
-            streams.default.addTrack(track);
+            addTrackToStreamAndFireEvent(track, streams.default);
             receiverList.push([track, rtpReceiver, streams.default]);
           }
         } else {
@@ -1006,37 +3785,28 @@ module.exports = function(window, edgeVersion) {
       }
     });
 
-    if (this._dtlsRole === undefined) {
-      this._dtlsRole = description.type === 'offer' ? 'active' : 'passive';
+    if (pc._dtlsRole === undefined) {
+      pc._dtlsRole = description.type === 'offer' ? 'active' : 'passive';
     }
 
-    this.remoteDescription = {
+    pc._remoteDescription = {
       type: description.type,
       sdp: description.sdp
     };
-    switch (description.type) {
-      case 'offer':
-        this._updateSignalingState('have-remote-offer');
-        break;
-      case 'answer':
-        this._updateSignalingState('stable');
-        break;
-      default:
-        throw new TypeError('unsupported type "' + description.type +
-            '"');
+    if (description.type === 'offer') {
+      pc._updateSignalingState('have-remote-offer');
+    } else {
+      pc._updateSignalingState('stable');
     }
     Object.keys(streams).forEach(function(sid) {
       var stream = streams[sid];
       if (stream.getTracks().length) {
-        if (self.remoteStreams.indexOf(stream) === -1) {
-          self.remoteStreams.push(stream);
+        if (pc.remoteStreams.indexOf(stream) === -1) {
+          pc.remoteStreams.push(stream);
           var event = new Event('addstream');
           event.stream = stream;
           window.setTimeout(function() {
-            self.dispatchEvent(event);
-            if (typeof self.onaddstream === 'function') {
-              self.onaddstream(event);
-            }
+            pc._dispatchEvent('addstream', event);
           });
         }
 
@@ -1046,28 +3816,24 @@ module.exports = function(window, edgeVersion) {
           if (stream.id !== item[2].id) {
             return;
           }
-          var trackEvent = new Event('track');
-          trackEvent.track = track;
-          trackEvent.receiver = receiver;
-          trackEvent.transceiver = {receiver: receiver};
-          trackEvent.streams = [stream];
-          window.setTimeout(function() {
-            self.dispatchEvent(trackEvent);
-            if (typeof self.ontrack === 'function') {
-              self.ontrack(trackEvent);
-            }
-          });
+          fireAddTrack(pc, track, receiver, [stream]);
         });
       }
     });
+    receiverList.forEach(function(item) {
+      if (item[2]) {
+        return;
+      }
+      fireAddTrack(pc, item[0], item[1], []);
+    });
 
     // check whether addIceCandidate({}) was called within four seconds after
     // setRemoteDescription.
     window.setTimeout(function() {
-      if (!(self && self.transceivers)) {
+      if (!(pc && pc.transceivers)) {
         return;
       }
-      self.transceivers.forEach(function(transceiver) {
+      pc.transceivers.forEach(function(transceiver) {
         if (transceiver.iceTransport &&
             transceiver.iceTransport.state === 'new' &&
             transceiver.iceTransport.getRemoteCandidates().length > 0) {
@@ -1078,12 +3844,7 @@ module.exports = function(window, edgeVersion) {
       });
     }, 4000);
 
-    return new Promise(function(resolve) {
-      if (args.length > 1 && typeof args[1] === 'function') {
-        args[1].apply(null);
-      }
-      resolve();
-    });
+    return Promise.resolve();
   };
 
   RTCPeerConnection.prototype.close = function() {
@@ -1107,6 +3868,7 @@ module.exports = function(window, edgeVersion) {
       }
     });
     // FIXME: clean up tracks, local streams, remote streams, etc
+    this._isClosed = true;
     this._updateSignalingState('closed');
   };
 
@@ -1114,32 +3876,65 @@ module.exports = function(window, edgeVersion) {
   RTCPeerConnection.prototype._updateSignalingState = function(newState) {
     this.signalingState = newState;
     var event = new Event('signalingstatechange');
-    this.dispatchEvent(event);
-    if (typeof this.onsignalingstatechange === 'function') {
-      this.onsignalingstatechange(event);
-    }
+    this._dispatchEvent('signalingstatechange', event);
   };
 
   // Determine whether to fire the negotiationneeded event.
   RTCPeerConnection.prototype._maybeFireNegotiationNeeded = function() {
-    var self = this;
+    var pc = this;
     if (this.signalingState !== 'stable' || this.needNegotiation === true) {
       return;
     }
     this.needNegotiation = true;
     window.setTimeout(function() {
-      if (self.needNegotiation === false) {
-        return;
-      }
-      self.needNegotiation = false;
-      var event = new Event('negotiationneeded');
-      self.dispatchEvent(event);
-      if (typeof self.onnegotiationneeded === 'function') {
-        self.onnegotiationneeded(event);
+      if (pc.needNegotiation) {
+        pc.needNegotiation = false;
+        var event = new Event('negotiationneeded');
+        pc._dispatchEvent('negotiationneeded', event);
       }
     }, 0);
   };
 
+  // Update the ice connection state.
+  RTCPeerConnection.prototype._updateIceConnectionState = function() {
+    var newState;
+    var states = {
+      'new': 0,
+      closed: 0,
+      checking: 0,
+      connected: 0,
+      completed: 0,
+      disconnected: 0,
+      failed: 0
+    };
+    this.transceivers.forEach(function(transceiver) {
+      if (transceiver.iceTransport && !transceiver.rejected) {
+        states[transceiver.iceTransport.state]++;
+      }
+    });
+
+    newState = 'new';
+    if (states.failed > 0) {
+      newState = 'failed';
+    } else if (states.checking > 0) {
+      newState = 'checking';
+    } else if (states.disconnected > 0) {
+      newState = 'disconnected';
+    } else if (states.new > 0) {
+      newState = 'new';
+    } else if (states.connected > 0) {
+      newState = 'connected';
+    } else if (states.completed > 0) {
+      newState = 'completed';
+    }
+
+    if (newState !== this.iceConnectionState) {
+      this.iceConnectionState = newState;
+      var event = new Event('iceconnectionstatechange');
+      this._dispatchEvent('iceconnectionstatechange', event);
+    }
+  };
+
   // Update the connection state.
   RTCPeerConnection.prototype._updateConnectionState = function() {
     var newState;
@@ -1147,15 +3942,17 @@ module.exports = function(window, edgeVersion) {
       'new': 0,
       closed: 0,
       connecting: 0,
-      checking: 0,
       connected: 0,
       completed: 0,
       disconnected: 0,
       failed: 0
     };
     this.transceivers.forEach(function(transceiver) {
-      states[transceiver.iceTransport.state]++;
-      states[transceiver.dtlsTransport.state]++;
+      if (transceiver.iceTransport && transceiver.dtlsTransport &&
+          !transceiver.rejected) {
+        states[transceiver.iceTransport.state]++;
+        states[transceiver.dtlsTransport.state]++;
+      }
     });
     // ICETransport.completed and connected are the same for this purpose.
     states.connected += states.completed;
@@ -1163,45 +3960,40 @@ module.exports = function(window, edgeVersion) {
     newState = 'new';
     if (states.failed > 0) {
       newState = 'failed';
-    } else if (states.connecting > 0 || states.checking > 0) {
+    } else if (states.connecting > 0) {
       newState = 'connecting';
     } else if (states.disconnected > 0) {
       newState = 'disconnected';
     } else if (states.new > 0) {
       newState = 'new';
-    } else if (states.connected > 0 || states.completed > 0) {
+    } else if (states.connected > 0) {
       newState = 'connected';
     }
 
-    if (newState !== this.iceConnectionState) {
-      this.iceConnectionState = newState;
-      var event = new Event('iceconnectionstatechange');
-      this.dispatchEvent(event);
-      if (typeof this.oniceconnectionstatechange === 'function') {
-        this.oniceconnectionstatechange(event);
-      }
+    if (newState !== this.connectionState) {
+      this.connectionState = newState;
+      var event = new Event('connectionstatechange');
+      this._dispatchEvent('connectionstatechange', event);
     }
   };
 
   RTCPeerConnection.prototype.createOffer = function() {
-    var self = this;
-    var args = arguments;
+    var pc = this;
 
-    var offerOptions;
-    if (arguments.length === 1 && typeof arguments[0] !== 'function') {
-      offerOptions = arguments[0];
-    } else if (arguments.length === 3) {
-      offerOptions = arguments[2];
+    if (pc._isClosed) {
+      return Promise.reject(makeError('InvalidStateError',
+          'Can not call createOffer after close'));
     }
 
-    var numAudioTracks = this.transceivers.filter(function(t) {
+    var numAudioTracks = pc.transceivers.filter(function(t) {
       return t.kind === 'audio';
     }).length;
-    var numVideoTracks = this.transceivers.filter(function(t) {
+    var numVideoTracks = pc.transceivers.filter(function(t) {
       return t.kind === 'video';
     }).length;
 
     // Determine number of audio and video tracks we need to send/recv.
+    var offerOptions = arguments[0];
     if (offerOptions) {
       // Reject Chrome legacy constraints.
       if (offerOptions.mandatory || offerOptions.optional) {
@@ -1228,7 +4020,7 @@ module.exports = function(window, edgeVersion) {
       }
     }
 
-    this.transceivers.forEach(function(transceiver) {
+    pc.transceivers.forEach(function(transceiver) {
       if (transceiver.kind === 'audio') {
         numAudioTracks--;
         if (numAudioTracks < 0) {
@@ -1245,28 +4037,28 @@ module.exports = function(window, edgeVersion) {
     // Create M-lines for recvonly streams.
     while (numAudioTracks > 0 || numVideoTracks > 0) {
       if (numAudioTracks > 0) {
-        this._createTransceiver('audio');
+        pc._createTransceiver('audio');
         numAudioTracks--;
       }
       if (numVideoTracks > 0) {
-        this._createTransceiver('video');
+        pc._createTransceiver('video');
         numVideoTracks--;
       }
     }
 
-    var sdp = SDPUtils.writeSessionBoilerplate(this._sdpSessionId,
-        this._sdpSessionVersion++);
-    this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+    var sdp = SDPUtils.writeSessionBoilerplate(pc._sdpSessionId,
+        pc._sdpSessionVersion++);
+    pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
       // For each track, create an ice gatherer, ice transport,
       // dtls transport, potentially rtpsender and rtpreceiver.
       var track = transceiver.track;
       var kind = transceiver.kind;
-      var mid = SDPUtils.generateIdentifier();
+      var mid = transceiver.mid || SDPUtils.generateIdentifier();
       transceiver.mid = mid;
 
       if (!transceiver.iceGatherer) {
-        transceiver.iceGatherer = self._createIceGatherer(sdpMLineIndex,
-            self.usingBundle);
+        transceiver.iceGatherer = pc._createIceGatherer(sdpMLineIndex,
+            pc.usingBundle);
       }
 
       var localCapabilities = window.RTCRtpSender.getCapabilities(kind);
@@ -1285,6 +4077,27 @@ module.exports = function(window, edgeVersion) {
             codec.parameters['level-asymmetry-allowed'] === undefined) {
           codec.parameters['level-asymmetry-allowed'] = '1';
         }
+
+        // for subsequent offers, we might have to re-use the payload
+        // type of the last offer.
+        if (transceiver.remoteCapabilities &&
+            transceiver.remoteCapabilities.codecs) {
+          transceiver.remoteCapabilities.codecs.forEach(function(remoteCodec) {
+            if (codec.name.toLowerCase() === remoteCodec.name.toLowerCase() &&
+                codec.clockRate === remoteCodec.clockRate) {
+              codec.preferredPayloadType = remoteCodec.payloadType;
+            }
+          });
+        }
+      });
+      localCapabilities.headerExtensions.forEach(function(hdrExt) {
+        var remoteExtensions = transceiver.remoteCapabilities &&
+            transceiver.remoteCapabilities.headerExtensions || [];
+        remoteExtensions.forEach(function(rHdrExt) {
+          if (hdrExt.uri === rHdrExt.uri) {
+            hdrExt.id = rHdrExt.id;
+          }
+        });
       });
 
       // generate an ssrc now, to be used later in rtpSender.send
@@ -1311,20 +4124,20 @@ module.exports = function(window, edgeVersion) {
     });
 
     // always offer BUNDLE and dispose on return if not supported.
-    if (this._config.bundlePolicy !== 'max-compat') {
-      sdp += 'a=group:BUNDLE ' + this.transceivers.map(function(t) {
+    if (pc._config.bundlePolicy !== 'max-compat') {
+      sdp += 'a=group:BUNDLE ' + pc.transceivers.map(function(t) {
         return t.mid;
       }).join(' ') + '\r\n';
     }
     sdp += 'a=ice-options:trickle\r\n';
 
-    this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+    pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
       sdp += writeMediaSection(transceiver, transceiver.localCapabilities,
-          'offer', transceiver.stream, self._dtlsRole);
+          'offer', transceiver.stream, pc._dtlsRole);
       sdp += 'a=rtcp-rsize\r\n';
 
-      if (transceiver.iceGatherer && self.iceGatheringState !== 'new' &&
-          (sdpMLineIndex === 0 || !self.usingBundle)) {
+      if (transceiver.iceGatherer && pc.iceGatheringState !== 'new' &&
+          (sdpMLineIndex === 0 || !pc.usingBundle)) {
         transceiver.iceGatherer.getLocalCandidates().forEach(function(cand) {
           cand.component = 1;
           sdp += 'a=' + SDPUtils.writeCandidate(cand) + '\r\n';
@@ -1340,36 +4153,55 @@ module.exports = function(window, edgeVersion) {
       type: 'offer',
       sdp: sdp
     });
-    return new Promise(function(resolve) {
-      if (args.length > 0 && typeof args[0] === 'function') {
-        args[0].apply(null, [desc]);
-        resolve();
-        return;
-      }
-      resolve(desc);
-    });
+    return Promise.resolve(desc);
   };
 
   RTCPeerConnection.prototype.createAnswer = function() {
-    var self = this;
-    var args = arguments;
+    var pc = this;
 
-    var sdp = SDPUtils.writeSessionBoilerplate(this._sdpSessionId,
-        this._sdpSessionVersion++);
-    if (this.usingBundle) {
-      sdp += 'a=group:BUNDLE ' + this.transceivers.map(function(t) {
+    if (pc._isClosed) {
+      return Promise.reject(makeError('InvalidStateError',
+          'Can not call createAnswer after close'));
+    }
+
+    if (!(pc.signalingState === 'have-remote-offer' ||
+        pc.signalingState === 'have-local-pranswer')) {
+      return Promise.reject(makeError('InvalidStateError',
+          'Can not call createAnswer in signalingState ' + pc.signalingState));
+    }
+
+    var sdp = SDPUtils.writeSessionBoilerplate(pc._sdpSessionId,
+        pc._sdpSessionVersion++);
+    if (pc.usingBundle) {
+      sdp += 'a=group:BUNDLE ' + pc.transceivers.map(function(t) {
         return t.mid;
       }).join(' ') + '\r\n';
     }
-    var mediaSectionsInOffer = SDPUtils.splitSections(
-        this.remoteDescription.sdp).length - 1;
-    this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+    sdp += 'a=ice-options:trickle\r\n';
+
+    var mediaSectionsInOffer = SDPUtils.getMediaSections(
+        pc._remoteDescription.sdp).length;
+    pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
       if (sdpMLineIndex + 1 > mediaSectionsInOffer) {
         return;
       }
-      if (transceiver.isDatachannel) {
-        sdp += 'm=application 0 DTLS/SCTP 5000\r\n' +
-            'c=IN IP4 0.0.0.0\r\n' +
+      if (transceiver.rejected) {
+        if (transceiver.kind === 'application') {
+          if (transceiver.protocol === 'DTLS/SCTP') { // legacy fmt
+            sdp += 'm=application 0 DTLS/SCTP 5000\r\n';
+          } else {
+            sdp += 'm=application 0 ' + transceiver.protocol +
+                ' webrtc-datachannel\r\n';
+          }
+        } else if (transceiver.kind === 'audio') {
+          sdp += 'm=audio 0 UDP/TLS/RTP/SAVPF 0\r\n' +
+              'a=rtpmap:0 PCMU/8000\r\n';
+        } else if (transceiver.kind === 'video') {
+          sdp += 'm=video 0 UDP/TLS/RTP/SAVPF 120\r\n' +
+              'a=rtpmap:120 VP8/90000\r\n';
+        }
+        sdp += 'c=IN IP4 0.0.0.0\r\n' +
+            'a=inactive\r\n' +
             'a=mid:' + transceiver.mid + '\r\n';
         return;
       }
@@ -1406,7 +4238,7 @@ module.exports = function(window, edgeVersion) {
       }
 
       sdp += writeMediaSection(transceiver, commonCapabilities,
-          'answer', transceiver.stream, self._dtlsRole);
+          'answer', transceiver.stream, pc._dtlsRole);
       if (transceiver.rtcpParameters &&
           transceiver.rtcpParameters.reducedSize) {
         sdp += 'a=rtcp-rsize\r\n';
@@ -1417,107 +4249,111 @@ module.exports = function(window, edgeVersion) {
       type: 'answer',
       sdp: sdp
     });
-    return new Promise(function(resolve) {
-      if (args.length > 0 && typeof args[0] === 'function') {
-        args[0].apply(null, [desc]);
-        resolve();
-        return;
-      }
-      resolve(desc);
-    });
+    return Promise.resolve(desc);
   };
 
   RTCPeerConnection.prototype.addIceCandidate = function(candidate) {
-    var err;
+    var pc = this;
     var sections;
-    if (!candidate || candidate.candidate === '') {
-      for (var j = 0; j < this.transceivers.length; j++) {
-        if (this.transceivers[j].isDatachannel) {
-          continue;
-        }
-        this.transceivers[j].iceTransport.addRemoteCandidate({});
-        sections = SDPUtils.splitSections(this.remoteDescription.sdp);
-        sections[j + 1] += 'a=end-of-candidates\r\n';
-        this.remoteDescription.sdp = sections.join('');
-        if (this.usingBundle) {
-          break;
-        }
-      }
-    } else if (!(candidate.sdpMLineIndex !== undefined || candidate.sdpMid)) {
-      throw new TypeError('sdpMLineIndex or sdpMid required');
-    } else if (!this.remoteDescription) {
-      err = new Error('Can not add ICE candidate without ' +
-          'a remote description');
-      err.name = 'InvalidStateError';
-    } else {
-      var sdpMLineIndex = candidate.sdpMLineIndex;
-      if (candidate.sdpMid) {
-        for (var i = 0; i < this.transceivers.length; i++) {
-          if (this.transceivers[i].mid === candidate.sdpMid) {
-            sdpMLineIndex = i;
+    if (candidate && !(candidate.sdpMLineIndex !== undefined ||
+        candidate.sdpMid)) {
+      return Promise.reject(new TypeError('sdpMLineIndex or sdpMid required'));
+    }
+
+    // TODO: needs to go into ops queue.
+    return new Promise(function(resolve, reject) {
+      if (!pc._remoteDescription) {
+        return reject(makeError('InvalidStateError',
+            'Can not add ICE candidate without a remote description'));
+      } else if (!candidate || candidate.candidate === '') {
+        for (var j = 0; j < pc.transceivers.length; j++) {
+          if (pc.transceivers[j].rejected) {
+            continue;
+          }
+          pc.transceivers[j].iceTransport.addRemoteCandidate({});
+          sections = SDPUtils.getMediaSections(pc._remoteDescription.sdp);
+          sections[j] += 'a=end-of-candidates\r\n';
+          pc._remoteDescription.sdp =
+              SDPUtils.getDescription(pc._remoteDescription.sdp) +
+              sections.join('');
+          if (pc.usingBundle) {
             break;
           }
         }
-      }
-      var transceiver = this.transceivers[sdpMLineIndex];
-      if (transceiver) {
-        if (transceiver.isDatachannel) {
-          return Promise.resolve();
-        }
-        var cand = Object.keys(candidate.candidate).length > 0 ?
-            SDPUtils.parseCandidate(candidate.candidate) : {};
-        // Ignore Chrome's invalid candidates since Edge does not like them.
-        if (cand.protocol === 'tcp' && (cand.port === 0 || cand.port === 9)) {
-          return Promise.resolve();
-        }
-        // Ignore RTCP candidates, we assume RTCP-MUX.
-        if (cand.component && cand.component !== 1) {
-          return Promise.resolve();
-        }
-        // when using bundle, avoid adding candidates to the wrong
-        // ice transport. And avoid adding candidates added in the SDP.
-        if (sdpMLineIndex === 0 || (sdpMLineIndex > 0 &&
-            transceiver.iceTransport !== this.transceivers[0].iceTransport)) {
-          if (!maybeAddCandidate(transceiver.iceTransport, cand)) {
-            err = new Error('Can not add ICE candidate');
-            err.name = 'OperationError';
+      } else {
+        var sdpMLineIndex = candidate.sdpMLineIndex;
+        if (candidate.sdpMid) {
+          for (var i = 0; i < pc.transceivers.length; i++) {
+            if (pc.transceivers[i].mid === candidate.sdpMid) {
+              sdpMLineIndex = i;
+              break;
+            }
           }
         }
+        var transceiver = pc.transceivers[sdpMLineIndex];
+        if (transceiver) {
+          if (transceiver.rejected) {
+            return resolve();
+          }
+          var cand = Object.keys(candidate.candidate).length > 0 ?
+              SDPUtils.parseCandidate(candidate.candidate) : {};
+          // Ignore Chrome's invalid candidates since Edge does not like them.
+          if (cand.protocol === 'tcp' && (cand.port === 0 || cand.port === 9)) {
+            return resolve();
+          }
+          // Ignore RTCP candidates, we assume RTCP-MUX.
+          if (cand.component && cand.component !== 1) {
+            return resolve();
+          }
+          // when using bundle, avoid adding candidates to the wrong
+          // ice transport. And avoid adding candidates added in the SDP.
+          if (sdpMLineIndex === 0 || (sdpMLineIndex > 0 &&
+              transceiver.iceTransport !== pc.transceivers[0].iceTransport)) {
+            if (!maybeAddCandidate(transceiver.iceTransport, cand)) {
+              return reject(makeError('OperationError',
+                  'Can not add ICE candidate'));
+            }
+          }
 
-        if (!err) {
           // update the remoteDescription.
           var candidateString = candidate.candidate.trim();
           if (candidateString.indexOf('a=') === 0) {
             candidateString = candidateString.substr(2);
           }
-          sections = SDPUtils.splitSections(this.remoteDescription.sdp);
-          sections[sdpMLineIndex + 1] += 'a=' +
+          sections = SDPUtils.getMediaSections(pc._remoteDescription.sdp);
+          sections[sdpMLineIndex] += 'a=' +
               (cand.type ? candidateString : 'end-of-candidates')
               + '\r\n';
-          this.remoteDescription.sdp = sections.join('');
+          pc._remoteDescription.sdp =
+              SDPUtils.getDescription(pc._remoteDescription.sdp) +
+              sections.join('');
+        } else {
+          return reject(makeError('OperationError',
+              'Can not add ICE candidate'));
         }
-      } else {
-        err = new Error('Can not add ICE candidate');
-        err.name = 'OperationError';
-      }
-    }
-    var args = arguments;
-    return new Promise(function(resolve, reject) {
-      if (err) {
-        if (args.length > 2 && typeof args[2] === 'function') {
-          args[2].apply(null, [err]);
-        }
-        reject(err);
-      } else {
-        if (args.length > 1 && typeof args[1] === 'function') {
-          args[1].apply(null);
-        }
-        resolve();
       }
+      resolve();
     });
   };
 
-  RTCPeerConnection.prototype.getStats = function() {
+  RTCPeerConnection.prototype.getStats = function(selector) {
+    if (selector && selector instanceof window.MediaStreamTrack) {
+      var senderOrReceiver = null;
+      this.transceivers.forEach(function(transceiver) {
+        if (transceiver.rtpSender &&
+            transceiver.rtpSender.track === selector) {
+          senderOrReceiver = transceiver.rtpSender;
+        } else if (transceiver.rtpReceiver &&
+            transceiver.rtpReceiver.track === selector) {
+          senderOrReceiver = transceiver.rtpReceiver;
+        }
+      });
+      if (!senderOrReceiver) {
+        throw makeError('InvalidAccessError', 'Invalid selector.');
+      }
+      return senderOrReceiver.getStats();
+    }
+
     var promises = [];
     this.transceivers.forEach(function(transceiver) {
       ['rtpSender', 'rtpReceiver', 'iceGatherer', 'iceTransport',
@@ -1527,38 +4363,105 @@ module.exports = function(window, edgeVersion) {
             }
           });
     });
-    var cb = arguments.length > 1 && typeof arguments[1] === 'function' &&
-        arguments[1];
-    var fixStatsType = function(stat) {
-      return {
-        inboundrtp: 'inbound-rtp',
-        outboundrtp: 'outbound-rtp',
-        candidatepair: 'candidate-pair',
-        localcandidate: 'local-candidate',
-        remotecandidate: 'remote-candidate'
-      }[stat.type] || stat.type;
-    };
-    return new Promise(function(resolve) {
-      // shim getStats with maplike support
+    return Promise.all(promises).then(function(allStats) {
       var results = new Map();
-      Promise.all(promises).then(function(res) {
-        res.forEach(function(result) {
-          Object.keys(result).forEach(function(id) {
-            result[id].type = fixStatsType(result[id]);
-            results.set(id, result[id]);
-          });
+      allStats.forEach(function(stats) {
+        stats.forEach(function(stat) {
+          results.set(stat.id, stat);
         });
-        if (cb) {
-          cb.apply(null, results);
-        }
-        resolve(results);
       });
+      return results;
     });
   };
+
+  // fix low-level stat names and return Map instead of object.
+  var ortcObjects = ['RTCRtpSender', 'RTCRtpReceiver', 'RTCIceGatherer',
+    'RTCIceTransport', 'RTCDtlsTransport'];
+  ortcObjects.forEach(function(ortcObjectName) {
+    var obj = window[ortcObjectName];
+    if (obj && obj.prototype && obj.prototype.getStats) {
+      var nativeGetstats = obj.prototype.getStats;
+      obj.prototype.getStats = function() {
+        return nativeGetstats.apply(this)
+        .then(function(nativeStats) {
+          var mapStats = new Map();
+          Object.keys(nativeStats).forEach(function(id) {
+            nativeStats[id].type = fixStatsType(nativeStats[id]);
+            mapStats.set(id, nativeStats[id]);
+          });
+          return mapStats;
+        });
+      };
+    }
+  });
+
+  // legacy callback shims. Should be moved to adapter.js some days.
+  var methods = ['createOffer', 'createAnswer'];
+  methods.forEach(function(method) {
+    var nativeMethod = RTCPeerConnection.prototype[method];
+    RTCPeerConnection.prototype[method] = function() {
+      var args = arguments;
+      if (typeof args[0] === 'function' ||
+          typeof args[1] === 'function') { // legacy
+        return nativeMethod.apply(this, [arguments[2]])
+        .then(function(description) {
+          if (typeof args[0] === 'function') {
+            args[0].apply(null, [description]);
+          }
+        }, function(error) {
+          if (typeof args[1] === 'function') {
+            args[1].apply(null, [error]);
+          }
+        });
+      }
+      return nativeMethod.apply(this, arguments);
+    };
+  });
+
+  methods = ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate'];
+  methods.forEach(function(method) {
+    var nativeMethod = RTCPeerConnection.prototype[method];
+    RTCPeerConnection.prototype[method] = function() {
+      var args = arguments;
+      if (typeof args[1] === 'function' ||
+          typeof args[2] === 'function') { // legacy
+        return nativeMethod.apply(this, arguments)
+        .then(function() {
+          if (typeof args[1] === 'function') {
+            args[1].apply(null);
+          }
+        }, function(error) {
+          if (typeof args[2] === 'function') {
+            args[2].apply(null, [error]);
+          }
+        });
+      }
+      return nativeMethod.apply(this, arguments);
+    };
+  });
+
+  // getStats is special. It doesn't have a spec legacy method yet we support
+  // getStats(something, cb) without error callbacks.
+  ['getStats'].forEach(function(method) {
+    var nativeMethod = RTCPeerConnection.prototype[method];
+    RTCPeerConnection.prototype[method] = function() {
+      var args = arguments;
+      if (typeof args[1] === 'function') {
+        return nativeMethod.apply(this, arguments)
+        .then(function() {
+          if (typeof args[1] === 'function') {
+            args[1].apply(null);
+          }
+        });
+      }
+      return nativeMethod.apply(this, arguments);
+    };
+  });
+
   return RTCPeerConnection;
 };
 
-},{"sdp":2}],2:[function(require,module,exports){
+},{"sdp":17}],17:[function(require,module,exports){
  /* eslint-env node */
 'use strict';
 
@@ -1588,6 +4491,19 @@ SDPUtils.splitSections = function(blob) {
   });
 };
 
+// returns the session description.
+SDPUtils.getDescription = function(blob) {
+  var sections = SDPUtils.splitSections(blob);
+  return sections && sections[0];
+};
+
+// returns the individual media sections.
+SDPUtils.getMediaSections = function(blob) {
+  var sections = SDPUtils.splitSections(blob);
+  sections.shift();
+  return sections;
+};
+
 // Returns lines that start with a certain prefix.
 SDPUtils.matchPrefix = function(blob, prefix) {
   return SDPUtils.splitLines(blob).filter(function(line) {
@@ -1613,6 +4529,7 @@ SDPUtils.parseCandidate = function(line) {
     protocol: parts[2].toLowerCase(),
     priority: parseInt(parts[3], 10),
     ip: parts[4],
+    address: parts[4], // address is an alias for ip.
     port: parseInt(parts[5], 10),
     // skip parts[6] == 'typ'
     type: parts[7]
@@ -1648,7 +4565,7 @@ SDPUtils.writeCandidate = function(candidate) {
   sdp.push(candidate.component);
   sdp.push(candidate.protocol.toUpperCase());
   sdp.push(candidate.priority);
-  sdp.push(candidate.ip);
+  sdp.push(candidate.address || candidate.ip);
   sdp.push(candidate.port);
 
   var type = candidate.type;
@@ -1657,17 +4574,17 @@ SDPUtils.writeCandidate = function(candidate) {
   if (type !== 'host' && candidate.relatedAddress &&
       candidate.relatedPort) {
     sdp.push('raddr');
-    sdp.push(candidate.relatedAddress); // was: relAddr
+    sdp.push(candidate.relatedAddress);
     sdp.push('rport');
-    sdp.push(candidate.relatedPort); // was: relPort
+    sdp.push(candidate.relatedPort);
   }
   if (candidate.tcpType && candidate.protocol.toLowerCase() === 'tcp') {
     sdp.push('tcptype');
     sdp.push(candidate.tcpType);
   }
-  if (candidate.ufrag) {
+  if (candidate.usernameFragment || candidate.ufrag) {
     sdp.push('ufrag');
-    sdp.push(candidate.ufrag);
+    sdp.push(candidate.usernameFragment || candidate.ufrag);
   }
   return 'candidate:' + sdp.join(' ');
 };
@@ -1676,7 +4593,7 @@ SDPUtils.writeCandidate = function(candidate) {
 // a=ice-options:foo bar
 SDPUtils.parseIceOptions = function(line) {
   return line.substr(14).split(' ');
-}
+};
 
 // Parses an rtpmap line, returns RTCRtpCoddecParameters. Sample input:
 // a=rtpmap:111 opus/48000/2
@@ -1690,8 +4607,9 @@ SDPUtils.parseRtpMap = function(line) {
 
   parsed.name = parts[0];
   parsed.clockRate = parseInt(parts[1], 10); // was: clockrate
-  // was: channels
-  parsed.numChannels = parts.length === 3 ? parseInt(parts[2], 10) : 1;
+  parsed.channels = parts.length === 3 ? parseInt(parts[2], 10) : 1;
+  // legacy alias, got renamed back to channels in ORTC.
+  parsed.numChannels = parsed.channels;
   return parsed;
 };
 
@@ -1702,8 +4620,9 @@ SDPUtils.writeRtpMap = function(codec) {
   if (codec.preferredPayloadType !== undefined) {
     pt = codec.preferredPayloadType;
   }
+  var channels = codec.channels || codec.numChannels || 1;
   return 'a=rtpmap:' + pt + ' ' + codec.name + '/' + codec.clockRate +
-      (codec.numChannels !== 1 ? '/' + codec.numChannels : '') + '\r\n';
+      (channels !== 1 ? '/' + channels : '') + '\r\n';
 };
 
 // Parses an a=extmap line (headerextension from RFC 5285). Sample input:
@@ -1752,7 +4671,11 @@ SDPUtils.writeFmtp = function(codec) {
   if (codec.parameters && Object.keys(codec.parameters).length) {
     var params = [];
     Object.keys(codec.parameters).forEach(function(param) {
-      params.push(param + '=' + codec.parameters[param]);
+      if (codec.parameters[param]) {
+        params.push(param + '=' + codec.parameters[param]);
+      } else {
+        params.push(param);
+      }
     });
     line += 'a=fmtp:' + pt + ' ' + params.join(';') + '\r\n';
   }
@@ -1803,6 +4726,16 @@ SDPUtils.parseSsrcMedia = function(line) {
   return parts;
 };
 
+SDPUtils.parseSsrcGroup = function(line) {
+  var parts = line.substr(13).split(' ');
+  return {
+    semantics: parts.shift(),
+    ssrcs: parts.map(function(ssrc) {
+      return parseInt(ssrc, 10);
+    })
+  };
+};
+
 // Extracts the MID (RFC 5888) from a media section.
 // returns the MID or undefined if no mid line was found.
 SDPUtils.getMid = function(mediaSection) {
@@ -1810,7 +4743,7 @@ SDPUtils.getMid = function(mediaSection) {
   if (mid) {
     return mid.substr(6);
   }
-}
+};
 
 SDPUtils.parseFingerprint = function(line) {
   var parts = line.substr(14).split(' ');
@@ -1944,9 +4877,11 @@ SDPUtils.writeRtpDescription = function(kind, caps) {
   }
   sdp += 'a=rtcp-mux\r\n';
 
-  caps.headerExtensions.forEach(function(extension) {
-    sdp += SDPUtils.writeExtmap(extension);
-  });
+  if (caps.headerExtensions) {
+    caps.headerExtensions.forEach(function(extension) {
+      sdp += SDPUtils.writeExtmap(extension);
+    });
+  }
   // FIXME: write fecMechanisms.
   return sdp;
 };
@@ -1972,8 +4907,7 @@ SDPUtils.parseRtpEncodingParameters = function(mediaSection) {
 
   var flows = SDPUtils.matchPrefix(mediaSection, 'a=ssrc-group:FID')
   .map(function(line) {
-    var parts = line.split(' ');
-    parts.shift();
+    var parts = line.substr(17).split(' ');
     return parts.map(function(part) {
       return parseInt(part, 10);
     });
@@ -1986,16 +4920,16 @@ SDPUtils.parseRtpEncodingParameters = function(mediaSection) {
     if (codec.name.toUpperCase() === 'RTX' && codec.parameters.apt) {
       var encParam = {
         ssrc: primarySsrc,
-        codecPayloadType: parseInt(codec.parameters.apt, 10),
-        rtx: {
-          ssrc: secondarySsrc
-        }
+        codecPayloadType: parseInt(codec.parameters.apt, 10)
       };
+      if (primarySsrc && secondarySsrc) {
+        encParam.rtx = {ssrc: secondarySsrc};
+      }
       encodingParameters.push(encParam);
       if (hasRed) {
         encParam = JSON.parse(JSON.stringify(encParam));
         encParam.fec = {
-          ssrc: secondarySsrc,
+          ssrc: primarySsrc,
           mechanism: hasUlpfec ? 'red+ulpfec' : 'red'
         };
         encodingParameters.push(encParam);
@@ -2031,8 +4965,7 @@ SDPUtils.parseRtpEncodingParameters = function(mediaSection) {
 SDPUtils.parseRtcpParameters = function(mediaSection) {
   var rtcpParameters = {};
 
-  var cname;
-  // Gets the first SSRC. Note that with RTX there might be multiple
+  // Gets the first SSRC. Note tha with RTX there might be multiple
   // SSRCs.
   var remoteSsrc = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
       .map(function(line) {
@@ -2073,8 +5006,8 @@ SDPUtils.parseMsid = function(mediaSection) {
   .map(function(line) {
     return SDPUtils.parseSsrcMedia(line);
   })
-  .filter(function(parts) {
-    return parts.attribute === 'msid';
+  .filter(function(msidParts) {
+    return msidParts.attribute === 'msid';
   });
   if (planB.length > 0) {
     parts = planB[0].value.split(' ');
@@ -2094,7 +5027,8 @@ SDPUtils.generateSessionId = function() {
 // sessId argument is optional - if not supplied it will
 // be generated randomly
 // sessVersion is optional and defaults to 2
-SDPUtils.writeSessionBoilerplate = function(sessId, sessVer) {
+// sessUser is optional and defaults to 'thisisadapterortc'
+SDPUtils.writeSessionBoilerplate = function(sessId, sessVer, sessUser) {
   var sessionId;
   var version = sessVer !== undefined ? sessVer : 2;
   if (sessId) {
@@ -2102,9 +5036,11 @@ SDPUtils.writeSessionBoilerplate = function(sessId, sessVer) {
   } else {
     sessionId = SDPUtils.generateSessionId();
   }
+  var user = sessUser || 'thisisadapterortc';
   // FIXME: sess-id should be an NTP timestamp.
   return 'v=0\r\n' +
-      'o=thisisadapterortc ' + sessionId + ' ' + version + ' IN IP4 127.0.0.1\r\n' +
+      'o=' + user + ' ' + sessionId + ' ' + version +
+        ' IN IP4 127.0.0.1\r\n' +
       's=-\r\n' +
       't=0 0\r\n';
 };
@@ -2196,2255 +5132,47 @@ SDPUtils.isRejected = function(mediaSection) {
 
 SDPUtils.parseMLine = function(mediaSection) {
   var lines = SDPUtils.splitLines(mediaSection);
-  var mline = lines[0].split(' ');
+  var parts = lines[0].substr(2).split(' ');
   return {
-    kind: mline[0].substr(2),
-    port: parseInt(mline[1], 10),
-    protocol: mline[2],
-    fmt: mline.slice(3).join(' ')
+    kind: parts[0],
+    port: parseInt(parts[1], 10),
+    protocol: parts[2],
+    fmt: parts.slice(3).join(' ')
   };
 };
 
+SDPUtils.parseOLine = function(mediaSection) {
+  var line = SDPUtils.matchPrefix(mediaSection, 'o=')[0];
+  var parts = line.substr(2).split(' ');
+  return {
+    username: parts[0],
+    sessionId: parts[1],
+    sessionVersion: parseInt(parts[2], 10),
+    netType: parts[3],
+    addressType: parts[4],
+    address: parts[5]
+  };
+};
+
+// a very naive interpretation of a valid SDP.
+SDPUtils.isValidSDP = function(blob) {
+  if (typeof blob !== 'string' || blob.length === 0) {
+    return false;
+  }
+  var lines = SDPUtils.splitLines(blob);
+  for (var i = 0; i < lines.length; i++) {
+    if (lines[i].length < 2 || lines[i].charAt(1) !== '=') {
+      return false;
+    }
+    // TODO: check the modifier a bit more.
+  }
+  return true;
+};
+
 // Expose public methods.
 if (typeof module === 'object') {
   module.exports = SDPUtils;
 }
 
-},{}],3:[function(require,module,exports){
-(function (global){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-
-'use strict';
-
-var adapterFactory = require('./adapter_factory.js');
-module.exports = adapterFactory({window: global.window});
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./adapter_factory.js":4}],4:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-
-'use strict';
-
-var utils = require('./utils');
-// Shimming starts here.
-module.exports = function(dependencies, opts) {
-  var window = dependencies && dependencies.window;
-
-  var options = {
-    shimChrome: true,
-    shimFirefox: true,
-    shimEdge: true,
-    shimSafari: true,
-  };
-
-  for (var key in opts) {
-    if (hasOwnProperty.call(opts, key)) {
-      options[key] = opts[key];
-    }
-  }
-
-  // Utils.
-  var logging = utils.log;
-  var browserDetails = utils.detectBrowser(window);
-
-  // Export to the adapter global object visible in the browser.
-  var adapter = {
-    browserDetails: browserDetails,
-    extractVersion: utils.extractVersion,
-    disableLog: utils.disableLog,
-    disableWarnings: utils.disableWarnings
-  };
-
-  // Uncomment the line below if you want logging to occur, including logging
-  // for the switch statement below. Can also be turned on in the browser via
-  // adapter.disableLog(false), but then logging from the switch statement below
-  // will not appear.
-  // require('./utils').disableLog(false);
-
-  // Browser shims.
-  var chromeShim = require('./chrome/chrome_shim') || null;
-  var edgeShim = require('./edge/edge_shim') || null;
-  var firefoxShim = require('./firefox/firefox_shim') || null;
-  var safariShim = require('./safari/safari_shim') || null;
-  var commonShim = require('./common_shim') || null;
-
-  // Shim browser if found.
-  switch (browserDetails.browser) {
-    case 'chrome':
-      if (!chromeShim || !chromeShim.shimPeerConnection ||
-          !options.shimChrome) {
-        logging('Chrome shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming chrome.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = chromeShim;
-      commonShim.shimCreateObjectURL(window);
-
-      chromeShim.shimGetUserMedia(window);
-      chromeShim.shimMediaStream(window);
-      chromeShim.shimSourceObject(window);
-      chromeShim.shimPeerConnection(window);
-      chromeShim.shimOnTrack(window);
-      chromeShim.shimAddTrackRemoveTrack(window);
-      chromeShim.shimGetSendersWithDtmf(window);
-
-      commonShim.shimRTCIceCandidate(window);
-      break;
-    case 'firefox':
-      if (!firefoxShim || !firefoxShim.shimPeerConnection ||
-          !options.shimFirefox) {
-        logging('Firefox shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming firefox.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = firefoxShim;
-      commonShim.shimCreateObjectURL(window);
-
-      firefoxShim.shimGetUserMedia(window);
-      firefoxShim.shimSourceObject(window);
-      firefoxShim.shimPeerConnection(window);
-      firefoxShim.shimOnTrack(window);
-
-      commonShim.shimRTCIceCandidate(window);
-      break;
-    case 'edge':
-      if (!edgeShim || !edgeShim.shimPeerConnection || !options.shimEdge) {
-        logging('MS edge shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming edge.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = edgeShim;
-      commonShim.shimCreateObjectURL(window);
-
-      edgeShim.shimGetUserMedia(window);
-      edgeShim.shimPeerConnection(window);
-      edgeShim.shimReplaceTrack(window);
-
-      // the edge shim implements the full RTCIceCandidate object.
-      break;
-    case 'safari':
-      if (!safariShim || !options.shimSafari) {
-        logging('Safari shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming safari.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = safariShim;
-      commonShim.shimCreateObjectURL(window);
-
-      safariShim.shimRTCIceServerUrls(window);
-      safariShim.shimCallbacksAPI(window);
-      safariShim.shimLocalStreamsAPI(window);
-      safariShim.shimRemoteStreamsAPI(window);
-      safariShim.shimTrackEventTransceiver(window);
-      safariShim.shimGetUserMedia(window);
-      safariShim.shimCreateOfferLegacy(window);
-
-      commonShim.shimRTCIceCandidate(window);
-      break;
-    default:
-      logging('Unsupported browser!');
-      break;
-  }
-
-  return adapter;
-};
-
-},{"./chrome/chrome_shim":5,"./common_shim":7,"./edge/edge_shim":8,"./firefox/firefox_shim":10,"./safari/safari_shim":12,"./utils":13}],5:[function(require,module,exports){
-
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-var utils = require('../utils.js');
-var logging = utils.log;
-
-var chromeShim = {
-  shimMediaStream: function(window) {
-    window.MediaStream = window.MediaStream || window.webkitMediaStream;
-  },
-
-  shimOnTrack: function(window) {
-    if (typeof window === 'object' && window.RTCPeerConnection && !('ontrack' in
-        window.RTCPeerConnection.prototype)) {
-      Object.defineProperty(window.RTCPeerConnection.prototype, 'ontrack', {
-        get: function() {
-          return this._ontrack;
-        },
-        set: function(f) {
-          if (this._ontrack) {
-            this.removeEventListener('track', this._ontrack);
-          }
-          this.addEventListener('track', this._ontrack = f);
-        }
-      });
-      var origSetRemoteDescription =
-          window.RTCPeerConnection.prototype.setRemoteDescription;
-      window.RTCPeerConnection.prototype.setRemoteDescription = function() {
-        var pc = this;
-        if (!pc._ontrackpoly) {
-          pc._ontrackpoly = function(e) {
-            // onaddstream does not fire when a track is added to an existing
-            // stream. But stream.onaddtrack is implemented so we use that.
-            e.stream.addEventListener('addtrack', function(te) {
-              var receiver;
-              if (window.RTCPeerConnection.prototype.getReceivers) {
-                receiver = pc.getReceivers().find(function(r) {
-                  return r.track && r.track.id === te.track.id;
-                });
-              } else {
-                receiver = {track: te.track};
-              }
-
-              var event = new Event('track');
-              event.track = te.track;
-              event.receiver = receiver;
-              event.transceiver = {receiver: receiver};
-              event.streams = [e.stream];
-              pc.dispatchEvent(event);
-            });
-            e.stream.getTracks().forEach(function(track) {
-              var receiver;
-              if (window.RTCPeerConnection.prototype.getReceivers) {
-                receiver = pc.getReceivers().find(function(r) {
-                  return r.track && r.track.id === track.id;
-                });
-              } else {
-                receiver = {track: track};
-              }
-              var event = new Event('track');
-              event.track = track;
-              event.receiver = receiver;
-              event.transceiver = {receiver: receiver};
-              event.streams = [e.stream];
-              pc.dispatchEvent(event);
-            });
-          };
-          pc.addEventListener('addstream', pc._ontrackpoly);
-        }
-        return origSetRemoteDescription.apply(pc, arguments);
-      };
-    }
-  },
-
-  shimGetSendersWithDtmf: function(window) {
-    // Overrides addTrack/removeTrack, depends on shimAddTrackRemoveTrack.
-    if (typeof window === 'object' && window.RTCPeerConnection &&
-        !('getSenders' in window.RTCPeerConnection.prototype) &&
-        'createDTMFSender' in window.RTCPeerConnection.prototype) {
-      var shimSenderWithDtmf = function(pc, track) {
-        return {
-          track: track,
-          get dtmf() {
-            if (this._dtmf === undefined) {
-              if (track.kind === 'audio') {
-                this._dtmf = pc.createDTMFSender(track);
-              } else {
-                this._dtmf = null;
-              }
-            }
-            return this._dtmf;
-          },
-          _pc: pc
-        };
-      };
-
-      // augment addTrack when getSenders is not available.
-      if (!window.RTCPeerConnection.prototype.getSenders) {
-        window.RTCPeerConnection.prototype.getSenders = function() {
-          this._senders = this._senders || [];
-          return this._senders.slice(); // return a copy of the internal state.
-        };
-        var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
-        window.RTCPeerConnection.prototype.addTrack = function(track, stream) {
-          var pc = this;
-          var sender = origAddTrack.apply(pc, arguments);
-          if (!sender) {
-            sender = shimSenderWithDtmf(pc, track);
-            pc._senders.push(sender);
-          }
-          return sender;
-        };
-
-        var origRemoveTrack = window.RTCPeerConnection.prototype.removeTrack;
-        window.RTCPeerConnection.prototype.removeTrack = function(sender) {
-          var pc = this;
-          origRemoveTrack.apply(pc, arguments);
-          var idx = pc._senders.indexOf(sender);
-          if (idx !== -1) {
-            pc._senders.splice(idx, 1);
-          }
-        };
-      }
-      var origAddStream = window.RTCPeerConnection.prototype.addStream;
-      window.RTCPeerConnection.prototype.addStream = function(stream) {
-        var pc = this;
-        pc._senders = pc._senders || [];
-        origAddStream.apply(pc, [stream]);
-        stream.getTracks().forEach(function(track) {
-          pc._senders.push(shimSenderWithDtmf(pc, track));
-        });
-      };
-
-      var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
-      window.RTCPeerConnection.prototype.removeStream = function(stream) {
-        var pc = this;
-        pc._senders = pc._senders || [];
-        origRemoveStream.apply(pc, [stream]);
-
-        stream.getTracks().forEach(function(track) {
-          var sender = pc._senders.find(function(s) {
-            return s.track === track;
-          });
-          if (sender) {
-            pc._senders.splice(pc._senders.indexOf(sender), 1); // remove sender
-          }
-        });
-      };
-    } else if (typeof window === 'object' && window.RTCPeerConnection &&
-               'getSenders' in window.RTCPeerConnection.prototype &&
-               'createDTMFSender' in window.RTCPeerConnection.prototype &&
-               window.RTCRtpSender &&
-               !('dtmf' in window.RTCRtpSender.prototype)) {
-      var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
-      window.RTCPeerConnection.prototype.getSenders = function() {
-        var pc = this;
-        var senders = origGetSenders.apply(pc, []);
-        senders.forEach(function(sender) {
-          sender._pc = pc;
-        });
-        return senders;
-      };
-
-      Object.defineProperty(window.RTCRtpSender.prototype, 'dtmf', {
-        get: function() {
-          if (this._dtmf === undefined) {
-            if (this.track.kind === 'audio') {
-              this._dtmf = this._pc.createDTMFSender(this.track);
-            } else {
-              this._dtmf = null;
-            }
-          }
-          return this._dtmf;
-        }
-      });
-    }
-  },
-
-  shimSourceObject: function(window) {
-    var URL = window && window.URL;
-
-    if (typeof window === 'object') {
-      if (window.HTMLMediaElement &&
-        !('srcObject' in window.HTMLMediaElement.prototype)) {
-        // Shim the srcObject property, once, when HTMLMediaElement is found.
-        Object.defineProperty(window.HTMLMediaElement.prototype, 'srcObject', {
-          get: function() {
-            return this._srcObject;
-          },
-          set: function(stream) {
-            var self = this;
-            // Use _srcObject as a private property for this shim
-            this._srcObject = stream;
-            if (this.src) {
-              URL.revokeObjectURL(this.src);
-            }
-
-            if (!stream) {
-              this.src = '';
-              return undefined;
-            }
-            this.src = URL.createObjectURL(stream);
-            // We need to recreate the blob url when a track is added or
-            // removed. Doing it manually since we want to avoid a recursion.
-            stream.addEventListener('addtrack', function() {
-              if (self.src) {
-                URL.revokeObjectURL(self.src);
-              }
-              self.src = URL.createObjectURL(stream);
-            });
-            stream.addEventListener('removetrack', function() {
-              if (self.src) {
-                URL.revokeObjectURL(self.src);
-              }
-              self.src = URL.createObjectURL(stream);
-            });
-          }
-        });
-      }
-    }
-  },
-
-  shimAddTrackRemoveTrack: function(window) {
-    var browserDetails = utils.detectBrowser(window);
-    // shim addTrack and removeTrack.
-    if (window.RTCPeerConnection.prototype.addTrack &&
-        browserDetails.version >= 63) {
-      return;
-    }
-
-    // also shim pc.getLocalStreams when addTrack is shimmed
-    // to return the original streams.
-    var origGetLocalStreams = window.RTCPeerConnection.prototype
-        .getLocalStreams;
-    window.RTCPeerConnection.prototype.getLocalStreams = function() {
-      var self = this;
-      var nativeStreams = origGetLocalStreams.apply(this);
-      self._reverseStreams = self._reverseStreams || {};
-      return nativeStreams.map(function(stream) {
-        return self._reverseStreams[stream.id];
-      });
-    };
-
-    var origAddStream = window.RTCPeerConnection.prototype.addStream;
-    window.RTCPeerConnection.prototype.addStream = function(stream) {
-      var pc = this;
-      pc._streams = pc._streams || {};
-      pc._reverseStreams = pc._reverseStreams || {};
-
-      stream.getTracks().forEach(function(track) {
-        var alreadyExists = pc.getSenders().find(function(s) {
-          return s.track === track;
-        });
-        if (alreadyExists) {
-          throw new DOMException('Track already exists.',
-              'InvalidAccessError');
-        }
-      });
-      // Add identity mapping for consistency with addTrack.
-      // Unless this is being used with a stream from addTrack.
-      if (!pc._reverseStreams[stream.id]) {
-        var newStream = new window.MediaStream(stream.getTracks());
-        pc._streams[stream.id] = newStream;
-        pc._reverseStreams[newStream.id] = stream;
-        stream = newStream;
-      }
-      origAddStream.apply(pc, [stream]);
-    };
-
-    var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
-    window.RTCPeerConnection.prototype.removeStream = function(stream) {
-      var pc = this;
-      pc._streams = pc._streams || {};
-      pc._reverseStreams = pc._reverseStreams || {};
-
-      origRemoveStream.apply(pc, [(pc._streams[stream.id] || stream)]);
-      delete pc._reverseStreams[(pc._streams[stream.id] ?
-          pc._streams[stream.id].id : stream.id)];
-      delete pc._streams[stream.id];
-    };
-
-    window.RTCPeerConnection.prototype.addTrack = function(track, stream) {
-      var pc = this;
-      if (pc.signalingState === 'closed') {
-        throw new DOMException(
-          'The RTCPeerConnection\'s signalingState is \'closed\'.',
-          'InvalidStateError');
-      }
-      var streams = [].slice.call(arguments, 1);
-      if (streams.length !== 1 ||
-          !streams[0].getTracks().find(function(t) {
-            return t === track;
-          })) {
-        // this is not fully correct but all we can manage without
-        // [[associated MediaStreams]] internal slot.
-        throw new DOMException(
-          'The adapter.js addTrack polyfill only supports a single ' +
-          ' stream which is associated with the specified track.',
-          'NotSupportedError');
-      }
-
-      var alreadyExists = pc.getSenders().find(function(s) {
-        return s.track === track;
-      });
-      if (alreadyExists) {
-        throw new DOMException('Track already exists.',
-            'InvalidAccessError');
-      }
-
-      pc._streams = pc._streams || {};
-      pc._reverseStreams = pc._reverseStreams || {};
-      var oldStream = pc._streams[stream.id];
-      if (oldStream) {
-        // this is using odd Chrome behaviour, use with caution:
-        // https://bugs.chromium.org/p/webrtc/issues/detail?id=7815
-        // Note: we rely on the high-level addTrack/dtmf shim to
-        // create the sender with a dtmf sender.
-        oldStream.addTrack(track);
-
-        // Trigger ONN async.
-        Promise.resolve().then(function() {
-          pc.dispatchEvent(new Event('negotiationneeded'));
-        });
-      } else {
-        var newStream = new window.MediaStream([track]);
-        pc._streams[stream.id] = newStream;
-        pc._reverseStreams[newStream.id] = stream;
-        pc.addStream(newStream);
-      }
-      return pc.getSenders().find(function(s) {
-        return s.track === track;
-      });
-    };
-
-    // replace the internal stream id with the external one and
-    // vice versa.
-    function replaceInternalStreamId(pc, description) {
-      var sdp = description.sdp;
-      Object.keys(pc._reverseStreams || []).forEach(function(internalId) {
-        var externalStream = pc._reverseStreams[internalId];
-        var internalStream = pc._streams[externalStream.id];
-        sdp = sdp.replace(new RegExp(internalStream.id, 'g'),
-            externalStream.id);
-      });
-      return new RTCSessionDescription({
-        type: description.type,
-        sdp: sdp
-      });
-    }
-    function replaceExternalStreamId(pc, description) {
-      var sdp = description.sdp;
-      Object.keys(pc._reverseStreams || []).forEach(function(internalId) {
-        var externalStream = pc._reverseStreams[internalId];
-        var internalStream = pc._streams[externalStream.id];
-        sdp = sdp.replace(new RegExp(externalStream.id, 'g'),
-            internalStream.id);
-      });
-      return new RTCSessionDescription({
-        type: description.type,
-        sdp: sdp
-      });
-    }
-    ['createOffer', 'createAnswer'].forEach(function(method) {
-      var nativeMethod = window.RTCPeerConnection.prototype[method];
-      window.RTCPeerConnection.prototype[method] = function() {
-        var pc = this;
-        var args = arguments;
-        var isLegacyCall = arguments.length &&
-            typeof arguments[0] === 'function';
-        if (isLegacyCall) {
-          return nativeMethod.apply(pc, [
-            function(description) {
-              var desc = replaceInternalStreamId(pc, description);
-              args[0].apply(null, [desc]);
-            },
-            function(err) {
-              if (args[1]) {
-                args[1].apply(null, err);
-              }
-            }, arguments[2]
-          ]);
-        }
-        return nativeMethod.apply(pc, arguments)
-        .then(function(description) {
-          return replaceInternalStreamId(pc, description);
-        });
-      };
-    });
-
-    var origSetLocalDescription =
-        window.RTCPeerConnection.prototype.setLocalDescription;
-    window.RTCPeerConnection.prototype.setLocalDescription = function() {
-      var pc = this;
-      if (!arguments.length || !arguments[0].type) {
-        return origSetLocalDescription.apply(pc, arguments);
-      }
-      arguments[0] = replaceExternalStreamId(pc, arguments[0]);
-      return origSetLocalDescription.apply(pc, arguments);
-    };
-
-    // TODO: mangle getStats: https://w3c.github.io/webrtc-stats/#dom-rtcmediastreamstats-streamidentifier
-
-    var origLocalDescription = Object.getOwnPropertyDescriptor(
-        window.RTCPeerConnection.prototype, 'localDescription');
-    Object.defineProperty(window.RTCPeerConnection.prototype,
-        'localDescription', {
-          get: function() {
-            var pc = this;
-            var description = origLocalDescription.get.apply(this);
-            if (description.type === '') {
-              return description;
-            }
-            return replaceInternalStreamId(pc, description);
-          }
-        });
-
-    window.RTCPeerConnection.prototype.removeTrack = function(sender) {
-      var pc = this;
-      if (pc.signalingState === 'closed') {
-        throw new DOMException(
-          'The RTCPeerConnection\'s signalingState is \'closed\'.',
-          'InvalidStateError');
-      }
-      // We can not yet check for sender instanceof RTCRtpSender
-      // since we shim RTPSender. So we check if sender._pc is set.
-      if (!sender._pc) {
-        throw new DOMException('Argument 1 of RTCPeerConnection.removeTrack ' +
-            'does not implement interface RTCRtpSender.', 'TypeError');
-      }
-      var isLocal = sender._pc === pc;
-      if (!isLocal) {
-        throw new DOMException('Sender was not created by this connection.',
-            'InvalidAccessError');
-      }
-
-      // Search for the native stream the senders track belongs to.
-      pc._streams = pc._streams || {};
-      var stream;
-      Object.keys(pc._streams).forEach(function(streamid) {
-        var hasTrack = pc._streams[streamid].getTracks().find(function(track) {
-          return sender.track === track;
-        });
-        if (hasTrack) {
-          stream = pc._streams[streamid];
-        }
-      });
-
-      if (stream) {
-        if (stream.getTracks().length === 1) {
-          // if this is the last track of the stream, remove the stream. This
-          // takes care of any shimmed _senders.
-          pc.removeStream(pc._reverseStreams[stream.id]);
-        } else {
-          // relying on the same odd chrome behaviour as above.
-          stream.removeTrack(sender.track);
-        }
-        pc.dispatchEvent(new Event('negotiationneeded'));
-      }
-    };
-  },
-
-  shimPeerConnection: function(window) {
-    var browserDetails = utils.detectBrowser(window);
-
-    // The RTCPeerConnection object.
-    if (!window.RTCPeerConnection) {
-      window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-        // Translate iceTransportPolicy to iceTransports,
-        // see https://code.google.com/p/webrtc/issues/detail?id=4869
-        // this was fixed in M56 along with unprefixing RTCPeerConnection.
-        logging('PeerConnection');
-        if (pcConfig && pcConfig.iceTransportPolicy) {
-          pcConfig.iceTransports = pcConfig.iceTransportPolicy;
-        }
-
-        return new window.webkitRTCPeerConnection(pcConfig, pcConstraints);
-      };
-      window.RTCPeerConnection.prototype =
-          window.webkitRTCPeerConnection.prototype;
-      // wrap static methods. Currently just generateCertificate.
-      if (window.webkitRTCPeerConnection.generateCertificate) {
-        Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-          get: function() {
-            return window.webkitRTCPeerConnection.generateCertificate;
-          }
-        });
-      }
-    } else {
-      // migrate from non-spec RTCIceServer.url to RTCIceServer.urls
-      var OrigPeerConnection = window.RTCPeerConnection;
-      window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-        if (pcConfig && pcConfig.iceServers) {
-          var newIceServers = [];
-          for (var i = 0; i < pcConfig.iceServers.length; i++) {
-            var server = pcConfig.iceServers[i];
-            if (!server.hasOwnProperty('urls') &&
-                server.hasOwnProperty('url')) {
-              utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
-              server = JSON.parse(JSON.stringify(server));
-              server.urls = server.url;
-              newIceServers.push(server);
-            } else {
-              newIceServers.push(pcConfig.iceServers[i]);
-            }
-          }
-          pcConfig.iceServers = newIceServers;
-        }
-        return new OrigPeerConnection(pcConfig, pcConstraints);
-      };
-      window.RTCPeerConnection.prototype = OrigPeerConnection.prototype;
-      // wrap static methods. Currently just generateCertificate.
-      Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-        get: function() {
-          return OrigPeerConnection.generateCertificate;
-        }
-      });
-    }
-
-    var origGetStats = window.RTCPeerConnection.prototype.getStats;
-    window.RTCPeerConnection.prototype.getStats = function(selector,
-        successCallback, errorCallback) {
-      var self = this;
-      var args = arguments;
-
-      // If selector is a function then we are in the old style stats so just
-      // pass back the original getStats format to avoid breaking old users.
-      if (arguments.length > 0 && typeof selector === 'function') {
-        return origGetStats.apply(this, arguments);
-      }
-
-      // When spec-style getStats is supported, return those when called with
-      // either no arguments or the selector argument is null.
-      if (origGetStats.length === 0 && (arguments.length === 0 ||
-          typeof arguments[0] !== 'function')) {
-        return origGetStats.apply(this, []);
-      }
-
-      var fixChromeStats_ = function(response) {
-        var standardReport = {};
-        var reports = response.result();
-        reports.forEach(function(report) {
-          var standardStats = {
-            id: report.id,
-            timestamp: report.timestamp,
-            type: {
-              localcandidate: 'local-candidate',
-              remotecandidate: 'remote-candidate'
-            }[report.type] || report.type
-          };
-          report.names().forEach(function(name) {
-            standardStats[name] = report.stat(name);
-          });
-          standardReport[standardStats.id] = standardStats;
-        });
-
-        return standardReport;
-      };
-
-      // shim getStats with maplike support
-      var makeMapStats = function(stats) {
-        return new Map(Object.keys(stats).map(function(key) {
-          return [key, stats[key]];
-        }));
-      };
-
-      if (arguments.length >= 2) {
-        var successCallbackWrapper_ = function(response) {
-          args[1](makeMapStats(fixChromeStats_(response)));
-        };
-
-        return origGetStats.apply(this, [successCallbackWrapper_,
-          arguments[0]]);
-      }
-
-      // promise-support
-      return new Promise(function(resolve, reject) {
-        origGetStats.apply(self, [
-          function(response) {
-            resolve(makeMapStats(fixChromeStats_(response)));
-          }, reject]);
-      }).then(successCallback, errorCallback);
-    };
-
-    // add promise support -- natively available in Chrome 51
-    if (browserDetails.version < 51) {
-      ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate']
-          .forEach(function(method) {
-            var nativeMethod = window.RTCPeerConnection.prototype[method];
-            window.RTCPeerConnection.prototype[method] = function() {
-              var args = arguments;
-              var self = this;
-              var promise = new Promise(function(resolve, reject) {
-                nativeMethod.apply(self, [args[0], resolve, reject]);
-              });
-              if (args.length < 2) {
-                return promise;
-              }
-              return promise.then(function() {
-                args[1].apply(null, []);
-              },
-              function(err) {
-                if (args.length >= 3) {
-                  args[2].apply(null, [err]);
-                }
-              });
-            };
-          });
-    }
-
-    // promise support for createOffer and createAnswer. Available (without
-    // bugs) since M52: crbug/619289
-    if (browserDetails.version < 52) {
-      ['createOffer', 'createAnswer'].forEach(function(method) {
-        var nativeMethod = window.RTCPeerConnection.prototype[method];
-        window.RTCPeerConnection.prototype[method] = function() {
-          var self = this;
-          if (arguments.length < 1 || (arguments.length === 1 &&
-              typeof arguments[0] === 'object')) {
-            var opts = arguments.length === 1 ? arguments[0] : undefined;
-            return new Promise(function(resolve, reject) {
-              nativeMethod.apply(self, [resolve, reject, opts]);
-            });
-          }
-          return nativeMethod.apply(this, arguments);
-        };
-      });
-    }
-
-    // shim implicit creation of RTCSessionDescription/RTCIceCandidate
-    ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate']
-        .forEach(function(method) {
-          var nativeMethod = window.RTCPeerConnection.prototype[method];
-          window.RTCPeerConnection.prototype[method] = function() {
-            arguments[0] = new ((method === 'addIceCandidate') ?
-                window.RTCIceCandidate :
-                window.RTCSessionDescription)(arguments[0]);
-            return nativeMethod.apply(this, arguments);
-          };
-        });
-
-    // support for addIceCandidate(null or undefined)
-    var nativeAddIceCandidate =
-        window.RTCPeerConnection.prototype.addIceCandidate;
-    window.RTCPeerConnection.prototype.addIceCandidate = function() {
-      if (!arguments[0]) {
-        if (arguments[1]) {
-          arguments[1].apply(null);
-        }
-        return Promise.resolve();
-      }
-      return nativeAddIceCandidate.apply(this, arguments);
-    };
-  }
-};
-
-
-// Expose public methods.
-module.exports = {
-  shimMediaStream: chromeShim.shimMediaStream,
-  shimOnTrack: chromeShim.shimOnTrack,
-  shimAddTrackRemoveTrack: chromeShim.shimAddTrackRemoveTrack,
-  shimGetSendersWithDtmf: chromeShim.shimGetSendersWithDtmf,
-  shimSourceObject: chromeShim.shimSourceObject,
-  shimPeerConnection: chromeShim.shimPeerConnection,
-  shimGetUserMedia: require('./getusermedia')
-};
-
-},{"../utils.js":13,"./getusermedia":6}],6:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-var utils = require('../utils.js');
-var logging = utils.log;
-
-// Expose public methods.
-module.exports = function(window) {
-  var browserDetails = utils.detectBrowser(window);
-  var navigator = window && window.navigator;
-
-  var constraintsToChrome_ = function(c) {
-    if (typeof c !== 'object' || c.mandatory || c.optional) {
-      return c;
-    }
-    var cc = {};
-    Object.keys(c).forEach(function(key) {
-      if (key === 'require' || key === 'advanced' || key === 'mediaSource') {
-        return;
-      }
-      var r = (typeof c[key] === 'object') ? c[key] : {ideal: c[key]};
-      if (r.exact !== undefined && typeof r.exact === 'number') {
-        r.min = r.max = r.exact;
-      }
-      var oldname_ = function(prefix, name) {
-        if (prefix) {
-          return prefix + name.charAt(0).toUpperCase() + name.slice(1);
-        }
-        return (name === 'deviceId') ? 'sourceId' : name;
-      };
-      if (r.ideal !== undefined) {
-        cc.optional = cc.optional || [];
-        var oc = {};
-        if (typeof r.ideal === 'number') {
-          oc[oldname_('min', key)] = r.ideal;
-          cc.optional.push(oc);
-          oc = {};
-          oc[oldname_('max', key)] = r.ideal;
-          cc.optional.push(oc);
-        } else {
-          oc[oldname_('', key)] = r.ideal;
-          cc.optional.push(oc);
-        }
-      }
-      if (r.exact !== undefined && typeof r.exact !== 'number') {
-        cc.mandatory = cc.mandatory || {};
-        cc.mandatory[oldname_('', key)] = r.exact;
-      } else {
-        ['min', 'max'].forEach(function(mix) {
-          if (r[mix] !== undefined) {
-            cc.mandatory = cc.mandatory || {};
-            cc.mandatory[oldname_(mix, key)] = r[mix];
-          }
-        });
-      }
-    });
-    if (c.advanced) {
-      cc.optional = (cc.optional || []).concat(c.advanced);
-    }
-    return cc;
-  };
-
-  var shimConstraints_ = function(constraints, func) {
-    constraints = JSON.parse(JSON.stringify(constraints));
-    if (constraints && typeof constraints.audio === 'object') {
-      var remap = function(obj, a, b) {
-        if (a in obj && !(b in obj)) {
-          obj[b] = obj[a];
-          delete obj[a];
-        }
-      };
-      constraints = JSON.parse(JSON.stringify(constraints));
-      remap(constraints.audio, 'autoGainControl', 'googAutoGainControl');
-      remap(constraints.audio, 'noiseSuppression', 'googNoiseSuppression');
-      constraints.audio = constraintsToChrome_(constraints.audio);
-    }
-    if (constraints && typeof constraints.video === 'object') {
-      // Shim facingMode for mobile & surface pro.
-      var face = constraints.video.facingMode;
-      face = face && ((typeof face === 'object') ? face : {ideal: face});
-      var getSupportedFacingModeLies = browserDetails.version < 66;
-
-      if ((face && (face.exact === 'user' || face.exact === 'environment' ||
-                    face.ideal === 'user' || face.ideal === 'environment')) &&
-          !(navigator.mediaDevices.getSupportedConstraints &&
-            navigator.mediaDevices.getSupportedConstraints().facingMode &&
-            !getSupportedFacingModeLies)) {
-        delete constraints.video.facingMode;
-        var matches;
-        if (face.exact === 'environment' || face.ideal === 'environment') {
-          matches = ['back', 'rear'];
-        } else if (face.exact === 'user' || face.ideal === 'user') {
-          matches = ['front'];
-        }
-        if (matches) {
-          // Look for matches in label, or use last cam for back (typical).
-          return navigator.mediaDevices.enumerateDevices()
-          .then(function(devices) {
-            devices = devices.filter(function(d) {
-              return d.kind === 'videoinput';
-            });
-            var dev = devices.find(function(d) {
-              return matches.some(function(match) {
-                return d.label.toLowerCase().indexOf(match) !== -1;
-              });
-            });
-            if (!dev && devices.length && matches.indexOf('back') !== -1) {
-              dev = devices[devices.length - 1]; // more likely the back cam
-            }
-            if (dev) {
-              constraints.video.deviceId = face.exact ? {exact: dev.deviceId} :
-                                                        {ideal: dev.deviceId};
-            }
-            constraints.video = constraintsToChrome_(constraints.video);
-            logging('chrome: ' + JSON.stringify(constraints));
-            return func(constraints);
-          });
-        }
-      }
-      constraints.video = constraintsToChrome_(constraints.video);
-    }
-    logging('chrome: ' + JSON.stringify(constraints));
-    return func(constraints);
-  };
-
-  var shimError_ = function(e) {
-    return {
-      name: {
-        PermissionDeniedError: 'NotAllowedError',
-        InvalidStateError: 'NotReadableError',
-        DevicesNotFoundError: 'NotFoundError',
-        ConstraintNotSatisfiedError: 'OverconstrainedError',
-        TrackStartError: 'NotReadableError',
-        MediaDeviceFailedDueToShutdown: 'NotReadableError',
-        MediaDeviceKillSwitchOn: 'NotReadableError'
-      }[e.name] || e.name,
-      message: e.message,
-      constraint: e.constraintName,
-      toString: function() {
-        return this.name + (this.message && ': ') + this.message;
-      }
-    };
-  };
-
-  var getUserMedia_ = function(constraints, onSuccess, onError) {
-    shimConstraints_(constraints, function(c) {
-      navigator.webkitGetUserMedia(c, onSuccess, function(e) {
-        if (onError) {
-          onError(shimError_(e));
-        }
-      });
-    });
-  };
-
-  navigator.getUserMedia = getUserMedia_;
-
-  // Returns the result of getUserMedia as a Promise.
-  var getUserMediaPromise_ = function(constraints) {
-    return new Promise(function(resolve, reject) {
-      navigator.getUserMedia(constraints, resolve, reject);
-    });
-  };
-
-  if (!navigator.mediaDevices) {
-    navigator.mediaDevices = {
-      getUserMedia: getUserMediaPromise_,
-      enumerateDevices: function() {
-        return new Promise(function(resolve) {
-          var kinds = {audio: 'audioinput', video: 'videoinput'};
-          return window.MediaStreamTrack.getSources(function(devices) {
-            resolve(devices.map(function(device) {
-              return {label: device.label,
-                kind: kinds[device.kind],
-                deviceId: device.id,
-                groupId: ''};
-            }));
-          });
-        });
-      },
-      getSupportedConstraints: function() {
-        return {
-          deviceId: true, echoCancellation: true, facingMode: true,
-          frameRate: true, height: true, width: true
-        };
-      }
-    };
-  }
-
-  // A shim for getUserMedia method on the mediaDevices object.
-  // TODO(KaptenJansson) remove once implemented in Chrome stable.
-  if (!navigator.mediaDevices.getUserMedia) {
-    navigator.mediaDevices.getUserMedia = function(constraints) {
-      return getUserMediaPromise_(constraints);
-    };
-  } else {
-    // Even though Chrome 45 has navigator.mediaDevices and a getUserMedia
-    // function which returns a Promise, it does not accept spec-style
-    // constraints.
-    var origGetUserMedia = navigator.mediaDevices.getUserMedia.
-        bind(navigator.mediaDevices);
-    navigator.mediaDevices.getUserMedia = function(cs) {
-      return shimConstraints_(cs, function(c) {
-        return origGetUserMedia(c).then(function(stream) {
-          if (c.audio && !stream.getAudioTracks().length ||
-              c.video && !stream.getVideoTracks().length) {
-            stream.getTracks().forEach(function(track) {
-              track.stop();
-            });
-            throw new DOMException('', 'NotFoundError');
-          }
-          return stream;
-        }, function(e) {
-          return Promise.reject(shimError_(e));
-        });
-      });
-    };
-  }
-
-  // Dummy devicechange event methods.
-  // TODO(KaptenJansson) remove once implemented in Chrome stable.
-  if (typeof navigator.mediaDevices.addEventListener === 'undefined') {
-    navigator.mediaDevices.addEventListener = function() {
-      logging('Dummy mediaDevices.addEventListener called.');
-    };
-  }
-  if (typeof navigator.mediaDevices.removeEventListener === 'undefined') {
-    navigator.mediaDevices.removeEventListener = function() {
-      logging('Dummy mediaDevices.removeEventListener called.');
-    };
-  }
-};
-
-},{"../utils.js":13}],7:[function(require,module,exports){
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var SDPUtils = require('sdp');
-var utils = require('./utils');
-
-// Wraps the peerconnection event eventNameToWrap in a function
-// which returns the modified event object.
-function wrapPeerConnectionEvent(window, eventNameToWrap, wrapper) {
-  if (!window.RTCPeerConnection) {
-    return;
-  }
-  var proto = window.RTCPeerConnection.prototype;
-  var nativeAddEventListener = proto.addEventListener;
-  proto.addEventListener = function(nativeEventName, cb) {
-    if (nativeEventName !== eventNameToWrap) {
-      return nativeAddEventListener.apply(this, arguments);
-    }
-    var wrappedCallback = function(e) {
-      cb(wrapper(e));
-    };
-    this._eventMap = this._eventMap || {};
-    this._eventMap[cb] = wrappedCallback;
-    return nativeAddEventListener.apply(this, [nativeEventName,
-      wrappedCallback]);
-  };
-
-  var nativeRemoveEventListener = proto.removeEventListener;
-  proto.removeEventListener = function(nativeEventName, cb) {
-    if (nativeEventName !== eventNameToWrap || !this._eventMap
-        || !this._eventMap[cb]) {
-      return nativeRemoveEventListener.apply(this, arguments);
-    }
-    var unwrappedCb = this._eventMap[cb];
-    delete this._eventMap[cb];
-    return nativeRemoveEventListener.apply(this, [nativeEventName,
-      unwrappedCb]);
-  };
-
-  Object.defineProperty(proto, 'on' + eventNameToWrap, {
-    get: function() {
-      return this['_on' + eventNameToWrap];
-    },
-    set: function(cb) {
-      if (this['_on' + eventNameToWrap]) {
-        this.removeEventListener(eventNameToWrap,
-            this['_on' + eventNameToWrap]);
-        delete this['_on' + eventNameToWrap];
-      }
-      if (cb) {
-        this.addEventListener(eventNameToWrap,
-            this['_on' + eventNameToWrap] = cb);
-      }
-    }
-  });
-}
-
-module.exports = {
-  shimRTCIceCandidate: function(window) {
-    // foundation is arbitrarily chosen as an indicator for full support for
-    // https://w3c.github.io/webrtc-pc/#rtcicecandidate-interface
-    if (window.RTCIceCandidate && 'foundation' in
-        window.RTCIceCandidate.prototype) {
-      return;
-    }
-
-    var NativeRTCIceCandidate = window.RTCIceCandidate;
-    window.RTCIceCandidate = function(args) {
-      // Remove the a= which shouldn't be part of the candidate string.
-      if (typeof args === 'object' && args.candidate &&
-          args.candidate.indexOf('a=') === 0) {
-        args = JSON.parse(JSON.stringify(args));
-        args.candidate = args.candidate.substr(2);
-      }
-
-      // Augment the native candidate with the parsed fields.
-      var nativeCandidate = new NativeRTCIceCandidate(args);
-      var parsedCandidate = SDPUtils.parseCandidate(args.candidate);
-      var augmentedCandidate = Object.assign(nativeCandidate,
-          parsedCandidate);
-
-      // Add a serializer that does not serialize the extra attributes.
-      augmentedCandidate.toJSON = function() {
-        return {
-          candidate: augmentedCandidate.candidate,
-          sdpMid: augmentedCandidate.sdpMid,
-          sdpMLineIndex: augmentedCandidate.sdpMLineIndex,
-          usernameFragment: augmentedCandidate.usernameFragment,
-        };
-      };
-      return augmentedCandidate;
-    };
-
-    // Hook up the augmented candidate in onicecandidate and
-    // addEventListener('icecandidate', ...)
-    wrapPeerConnectionEvent(window, 'icecandidate', function(e) {
-      if (e.candidate) {
-        Object.defineProperty(e, 'candidate', {
-          value: new window.RTCIceCandidate(e.candidate),
-          writable: 'false'
-        });
-      }
-      return e;
-    });
-  },
-
-  // shimCreateObjectURL must be called before shimSourceObject to avoid loop.
-
-  shimCreateObjectURL: function(window) {
-    var URL = window && window.URL;
-
-    if (!(typeof window === 'object' && window.HTMLMediaElement &&
-          'srcObject' in window.HTMLMediaElement.prototype &&
-        URL.createObjectURL && URL.revokeObjectURL)) {
-      // Only shim CreateObjectURL using srcObject if srcObject exists.
-      return undefined;
-    }
-
-    var nativeCreateObjectURL = URL.createObjectURL.bind(URL);
-    var nativeRevokeObjectURL = URL.revokeObjectURL.bind(URL);
-    var streams = new Map(), newId = 0;
-
-    URL.createObjectURL = function(stream) {
-      if ('getTracks' in stream) {
-        var url = 'polyblob:' + (++newId);
-        streams.set(url, stream);
-        utils.deprecated('URL.createObjectURL(stream)',
-            'elem.srcObject = stream');
-        return url;
-      }
-      return nativeCreateObjectURL(stream);
-    };
-    URL.revokeObjectURL = function(url) {
-      nativeRevokeObjectURL(url);
-      streams.delete(url);
-    };
-
-    var dsc = Object.getOwnPropertyDescriptor(window.HTMLMediaElement.prototype,
-                                              'src');
-    Object.defineProperty(window.HTMLMediaElement.prototype, 'src', {
-      get: function() {
-        return dsc.get.apply(this);
-      },
-      set: function(url) {
-        this.srcObject = streams.get(url) || null;
-        return dsc.set.apply(this, [url]);
-      }
-    });
-
-    var nativeSetAttribute = window.HTMLMediaElement.prototype.setAttribute;
-    window.HTMLMediaElement.prototype.setAttribute = function() {
-      if (arguments.length === 2 &&
-          ('' + arguments[0]).toLowerCase() === 'src') {
-        this.srcObject = streams.get(arguments[1]) || null;
-      }
-      return nativeSetAttribute.apply(this, arguments);
-    };
-  }
-};
-
-},{"./utils":13,"sdp":2}],8:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var utils = require('../utils');
-var shimRTCPeerConnection = require('rtcpeerconnection-shim');
-
-module.exports = {
-  shimGetUserMedia: require('./getusermedia'),
-  shimPeerConnection: function(window) {
-    var browserDetails = utils.detectBrowser(window);
-
-    if (window.RTCIceGatherer) {
-      // ORTC defines an RTCIceCandidate object but no constructor.
-      // Not implemented in Edge.
-      if (!window.RTCIceCandidate) {
-        window.RTCIceCandidate = function(args) {
-          return args;
-        };
-      }
-      // ORTC does not have a session description object but
-      // other browsers (i.e. Chrome) that will support both PC and ORTC
-      // in the future might have this defined already.
-      if (!window.RTCSessionDescription) {
-        window.RTCSessionDescription = function(args) {
-          return args;
-        };
-      }
-      // this adds an additional event listener to MediaStrackTrack that signals
-      // when a tracks enabled property was changed. Workaround for a bug in
-      // addStream, see below. No longer required in 15025+
-      if (browserDetails.version < 15025) {
-        var origMSTEnabled = Object.getOwnPropertyDescriptor(
-            window.MediaStreamTrack.prototype, 'enabled');
-        Object.defineProperty(window.MediaStreamTrack.prototype, 'enabled', {
-          set: function(value) {
-            origMSTEnabled.set.call(this, value);
-            var ev = new Event('enabled');
-            ev.enabled = value;
-            this.dispatchEvent(ev);
-          }
-        });
-      }
-    }
-
-    // ORTC defines the DTMF sender a bit different.
-    // https://github.com/w3c/ortc/issues/714
-    if (window.RTCRtpSender && !('dtmf' in window.RTCRtpSender.prototype)) {
-      Object.defineProperty(window.RTCRtpSender.prototype, 'dtmf', {
-        get: function() {
-          if (this._dtmf === undefined) {
-            if (this.track.kind === 'audio') {
-              this._dtmf = new window.RTCDtmfSender(this);
-            } else if (this.track.kind === 'video') {
-              this._dtmf = null;
-            }
-          }
-          return this._dtmf;
-        }
-      });
-    }
-
-    window.RTCPeerConnection =
-        shimRTCPeerConnection(window, browserDetails.version);
-  },
-  shimReplaceTrack: function(window) {
-    // ORTC has replaceTrack -- https://github.com/w3c/ortc/issues/614
-    if (window.RTCRtpSender &&
-        !('replaceTrack' in window.RTCRtpSender.prototype)) {
-      window.RTCRtpSender.prototype.replaceTrack =
-          window.RTCRtpSender.prototype.setTrack;
-    }
-  }
-};
-
-},{"../utils":13,"./getusermedia":9,"rtcpeerconnection-shim":1}],9:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-// Expose public methods.
-module.exports = function(window) {
-  var navigator = window && window.navigator;
-
-  var shimError_ = function(e) {
-    return {
-      name: {PermissionDeniedError: 'NotAllowedError'}[e.name] || e.name,
-      message: e.message,
-      constraint: e.constraint,
-      toString: function() {
-        return this.name;
-      }
-    };
-  };
-
-  // getUserMedia error shim.
-  var origGetUserMedia = navigator.mediaDevices.getUserMedia.
-      bind(navigator.mediaDevices);
-  navigator.mediaDevices.getUserMedia = function(c) {
-    return origGetUserMedia(c).catch(function(e) {
-      return Promise.reject(shimError_(e));
-    });
-  };
-};
-
-},{}],10:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var utils = require('../utils');
-
-var firefoxShim = {
-  shimOnTrack: function(window) {
-    if (typeof window === 'object' && window.RTCPeerConnection && !('ontrack' in
-        window.RTCPeerConnection.prototype)) {
-      Object.defineProperty(window.RTCPeerConnection.prototype, 'ontrack', {
-        get: function() {
-          return this._ontrack;
-        },
-        set: function(f) {
-          if (this._ontrack) {
-            this.removeEventListener('track', this._ontrack);
-            this.removeEventListener('addstream', this._ontrackpoly);
-          }
-          this.addEventListener('track', this._ontrack = f);
-          this.addEventListener('addstream', this._ontrackpoly = function(e) {
-            e.stream.getTracks().forEach(function(track) {
-              var event = new Event('track');
-              event.track = track;
-              event.receiver = {track: track};
-              event.transceiver = {receiver: event.receiver};
-              event.streams = [e.stream];
-              this.dispatchEvent(event);
-            }.bind(this));
-          }.bind(this));
-        }
-      });
-    }
-    if (typeof window === 'object' && window.RTCTrackEvent &&
-        ('receiver' in window.RTCTrackEvent.prototype) &&
-        !('transceiver' in window.RTCTrackEvent.prototype)) {
-      Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
-        get: function() {
-          return {receiver: this.receiver};
-        }
-      });
-    }
-  },
-
-  shimSourceObject: function(window) {
-    // Firefox has supported mozSrcObject since FF22, unprefixed in 42.
-    if (typeof window === 'object') {
-      if (window.HTMLMediaElement &&
-        !('srcObject' in window.HTMLMediaElement.prototype)) {
-        // Shim the srcObject property, once, when HTMLMediaElement is found.
-        Object.defineProperty(window.HTMLMediaElement.prototype, 'srcObject', {
-          get: function() {
-            return this.mozSrcObject;
-          },
-          set: function(stream) {
-            this.mozSrcObject = stream;
-          }
-        });
-      }
-    }
-  },
-
-  shimPeerConnection: function(window) {
-    var browserDetails = utils.detectBrowser(window);
-
-    if (typeof window !== 'object' || !(window.RTCPeerConnection ||
-        window.mozRTCPeerConnection)) {
-      return; // probably media.peerconnection.enabled=false in about:config
-    }
-    // The RTCPeerConnection object.
-    if (!window.RTCPeerConnection) {
-      window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-        if (browserDetails.version < 38) {
-          // .urls is not supported in FF < 38.
-          // create RTCIceServers with a single url.
-          if (pcConfig && pcConfig.iceServers) {
-            var newIceServers = [];
-            for (var i = 0; i < pcConfig.iceServers.length; i++) {
-              var server = pcConfig.iceServers[i];
-              if (server.hasOwnProperty('urls')) {
-                for (var j = 0; j < server.urls.length; j++) {
-                  var newServer = {
-                    url: server.urls[j]
-                  };
-                  if (server.urls[j].indexOf('turn') === 0) {
-                    newServer.username = server.username;
-                    newServer.credential = server.credential;
-                  }
-                  newIceServers.push(newServer);
-                }
-              } else {
-                newIceServers.push(pcConfig.iceServers[i]);
-              }
-            }
-            pcConfig.iceServers = newIceServers;
-          }
-        }
-        return new window.mozRTCPeerConnection(pcConfig, pcConstraints);
-      };
-      window.RTCPeerConnection.prototype =
-          window.mozRTCPeerConnection.prototype;
-
-      // wrap static methods. Currently just generateCertificate.
-      if (window.mozRTCPeerConnection.generateCertificate) {
-        Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-          get: function() {
-            return window.mozRTCPeerConnection.generateCertificate;
-          }
-        });
-      }
-
-      window.RTCSessionDescription = window.mozRTCSessionDescription;
-      window.RTCIceCandidate = window.mozRTCIceCandidate;
-    }
-
-    // shim away need for obsolete RTCIceCandidate/RTCSessionDescription.
-    ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate']
-        .forEach(function(method) {
-          var nativeMethod = window.RTCPeerConnection.prototype[method];
-          window.RTCPeerConnection.prototype[method] = function() {
-            arguments[0] = new ((method === 'addIceCandidate') ?
-                window.RTCIceCandidate :
-                window.RTCSessionDescription)(arguments[0]);
-            return nativeMethod.apply(this, arguments);
-          };
-        });
-
-    // support for addIceCandidate(null or undefined)
-    var nativeAddIceCandidate =
-        window.RTCPeerConnection.prototype.addIceCandidate;
-    window.RTCPeerConnection.prototype.addIceCandidate = function() {
-      if (!arguments[0]) {
-        if (arguments[1]) {
-          arguments[1].apply(null);
-        }
-        return Promise.resolve();
-      }
-      return nativeAddIceCandidate.apply(this, arguments);
-    };
-
-    // shim getStats with maplike support
-    var makeMapStats = function(stats) {
-      var map = new Map();
-      Object.keys(stats).forEach(function(key) {
-        map.set(key, stats[key]);
-        map[key] = stats[key];
-      });
-      return map;
-    };
-
-    var modernStatsTypes = {
-      inboundrtp: 'inbound-rtp',
-      outboundrtp: 'outbound-rtp',
-      candidatepair: 'candidate-pair',
-      localcandidate: 'local-candidate',
-      remotecandidate: 'remote-candidate'
-    };
-
-    var nativeGetStats = window.RTCPeerConnection.prototype.getStats;
-    window.RTCPeerConnection.prototype.getStats = function(
-      selector,
-      onSucc,
-      onErr
-    ) {
-      return nativeGetStats.apply(this, [selector || null])
-        .then(function(stats) {
-          if (browserDetails.version < 48) {
-            stats = makeMapStats(stats);
-          }
-          if (browserDetails.version < 53 && !onSucc) {
-            // Shim only promise getStats with spec-hyphens in type names
-            // Leave callback version alone; misc old uses of forEach before Map
-            try {
-              stats.forEach(function(stat) {
-                stat.type = modernStatsTypes[stat.type] || stat.type;
-              });
-            } catch (e) {
-              if (e.name !== 'TypeError') {
-                throw e;
-              }
-              // Avoid TypeError: "type" is read-only, in old versions. 34-43ish
-              stats.forEach(function(stat, i) {
-                stats.set(i, Object.assign({}, stat, {
-                  type: modernStatsTypes[stat.type] || stat.type
-                }));
-              });
-            }
-          }
-          return stats;
-        })
-        .then(onSucc, onErr);
-    };
-  }
-};
-
-// Expose public methods.
-module.exports = {
-  shimOnTrack: firefoxShim.shimOnTrack,
-  shimSourceObject: firefoxShim.shimSourceObject,
-  shimPeerConnection: firefoxShim.shimPeerConnection,
-  shimGetUserMedia: require('./getusermedia')
-};
-
-},{"../utils":13,"./getusermedia":11}],11:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var utils = require('../utils');
-var logging = utils.log;
-
-// Expose public methods.
-module.exports = function(window) {
-  var browserDetails = utils.detectBrowser(window);
-  var navigator = window && window.navigator;
-  var MediaStreamTrack = window && window.MediaStreamTrack;
-
-  var shimError_ = function(e) {
-    return {
-      name: {
-        InternalError: 'NotReadableError',
-        NotSupportedError: 'TypeError',
-        PermissionDeniedError: 'NotAllowedError',
-        SecurityError: 'NotAllowedError'
-      }[e.name] || e.name,
-      message: {
-        'The operation is insecure.': 'The request is not allowed by the ' +
-        'user agent or the platform in the current context.'
-      }[e.message] || e.message,
-      constraint: e.constraint,
-      toString: function() {
-        return this.name + (this.message && ': ') + this.message;
-      }
-    };
-  };
-
-  // getUserMedia constraints shim.
-  var getUserMedia_ = function(constraints, onSuccess, onError) {
-    var constraintsToFF37_ = function(c) {
-      if (typeof c !== 'object' || c.require) {
-        return c;
-      }
-      var require = [];
-      Object.keys(c).forEach(function(key) {
-        if (key === 'require' || key === 'advanced' || key === 'mediaSource') {
-          return;
-        }
-        var r = c[key] = (typeof c[key] === 'object') ?
-            c[key] : {ideal: c[key]};
-        if (r.min !== undefined ||
-            r.max !== undefined || r.exact !== undefined) {
-          require.push(key);
-        }
-        if (r.exact !== undefined) {
-          if (typeof r.exact === 'number') {
-            r. min = r.max = r.exact;
-          } else {
-            c[key] = r.exact;
-          }
-          delete r.exact;
-        }
-        if (r.ideal !== undefined) {
-          c.advanced = c.advanced || [];
-          var oc = {};
-          if (typeof r.ideal === 'number') {
-            oc[key] = {min: r.ideal, max: r.ideal};
-          } else {
-            oc[key] = r.ideal;
-          }
-          c.advanced.push(oc);
-          delete r.ideal;
-          if (!Object.keys(r).length) {
-            delete c[key];
-          }
-        }
-      });
-      if (require.length) {
-        c.require = require;
-      }
-      return c;
-    };
-    constraints = JSON.parse(JSON.stringify(constraints));
-    if (browserDetails.version < 38) {
-      logging('spec: ' + JSON.stringify(constraints));
-      if (constraints.audio) {
-        constraints.audio = constraintsToFF37_(constraints.audio);
-      }
-      if (constraints.video) {
-        constraints.video = constraintsToFF37_(constraints.video);
-      }
-      logging('ff37: ' + JSON.stringify(constraints));
-    }
-    return navigator.mozGetUserMedia(constraints, onSuccess, function(e) {
-      onError(shimError_(e));
-    });
-  };
-
-  // Returns the result of getUserMedia as a Promise.
-  var getUserMediaPromise_ = function(constraints) {
-    return new Promise(function(resolve, reject) {
-      getUserMedia_(constraints, resolve, reject);
-    });
-  };
-
-  // Shim for mediaDevices on older versions.
-  if (!navigator.mediaDevices) {
-    navigator.mediaDevices = {getUserMedia: getUserMediaPromise_,
-      addEventListener: function() { },
-      removeEventListener: function() { }
-    };
-  }
-  navigator.mediaDevices.enumerateDevices =
-      navigator.mediaDevices.enumerateDevices || function() {
-        return new Promise(function(resolve) {
-          var infos = [
-            {kind: 'audioinput', deviceId: 'default', label: '', groupId: ''},
-            {kind: 'videoinput', deviceId: 'default', label: '', groupId: ''}
-          ];
-          resolve(infos);
-        });
-      };
-
-  if (browserDetails.version < 41) {
-    // Work around http://bugzil.la/1169665
-    var orgEnumerateDevices =
-        navigator.mediaDevices.enumerateDevices.bind(navigator.mediaDevices);
-    navigator.mediaDevices.enumerateDevices = function() {
-      return orgEnumerateDevices().then(undefined, function(e) {
-        if (e.name === 'NotFoundError') {
-          return [];
-        }
-        throw e;
-      });
-    };
-  }
-  if (browserDetails.version < 49) {
-    var origGetUserMedia = navigator.mediaDevices.getUserMedia.
-        bind(navigator.mediaDevices);
-    navigator.mediaDevices.getUserMedia = function(c) {
-      return origGetUserMedia(c).then(function(stream) {
-        // Work around https://bugzil.la/802326
-        if (c.audio && !stream.getAudioTracks().length ||
-            c.video && !stream.getVideoTracks().length) {
-          stream.getTracks().forEach(function(track) {
-            track.stop();
-          });
-          throw new DOMException('The object can not be found here.',
-                                 'NotFoundError');
-        }
-        return stream;
-      }, function(e) {
-        return Promise.reject(shimError_(e));
-      });
-    };
-  }
-  if (!(browserDetails.version > 55 &&
-      'autoGainControl' in navigator.mediaDevices.getSupportedConstraints())) {
-    var remap = function(obj, a, b) {
-      if (a in obj && !(b in obj)) {
-        obj[b] = obj[a];
-        delete obj[a];
-      }
-    };
-
-    var nativeGetUserMedia = navigator.mediaDevices.getUserMedia.
-        bind(navigator.mediaDevices);
-    navigator.mediaDevices.getUserMedia = function(c) {
-      if (typeof c === 'object' && typeof c.audio === 'object') {
-        c = JSON.parse(JSON.stringify(c));
-        remap(c.audio, 'autoGainControl', 'mozAutoGainControl');
-        remap(c.audio, 'noiseSuppression', 'mozNoiseSuppression');
-      }
-      return nativeGetUserMedia(c);
-    };
-
-    if (MediaStreamTrack && MediaStreamTrack.prototype.getSettings) {
-      var nativeGetSettings = MediaStreamTrack.prototype.getSettings;
-      MediaStreamTrack.prototype.getSettings = function() {
-        var obj = nativeGetSettings.apply(this, arguments);
-        remap(obj, 'mozAutoGainControl', 'autoGainControl');
-        remap(obj, 'mozNoiseSuppression', 'noiseSuppression');
-        return obj;
-      };
-    }
-
-    if (MediaStreamTrack && MediaStreamTrack.prototype.applyConstraints) {
-      var nativeApplyConstraints = MediaStreamTrack.prototype.applyConstraints;
-      MediaStreamTrack.prototype.applyConstraints = function(c) {
-        if (this.kind === 'audio' && typeof c === 'object') {
-          c = JSON.parse(JSON.stringify(c));
-          remap(c, 'autoGainControl', 'mozAutoGainControl');
-          remap(c, 'noiseSuppression', 'mozNoiseSuppression');
-        }
-        return nativeApplyConstraints.apply(this, [c]);
-      };
-    }
-  }
-  navigator.getUserMedia = function(constraints, onSuccess, onError) {
-    if (browserDetails.version < 44) {
-      return getUserMedia_(constraints, onSuccess, onError);
-    }
-    // Replace Firefox 44+'s deprecation warning with unprefixed version.
-    utils.deprecated('navigator.getUserMedia',
-        'navigator.mediaDevices.getUserMedia');
-    navigator.mediaDevices.getUserMedia(constraints).then(onSuccess, onError);
-  };
-};
-
-},{"../utils":13}],12:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
-'use strict';
-var utils = require('../utils');
-
-var safariShim = {
-  // TODO: DrAlex, should be here, double check against LayoutTests
-
-  // TODO: once the back-end for the mac port is done, add.
-  // TODO: check for webkitGTK+
-  // shimPeerConnection: function() { },
-
-  shimLocalStreamsAPI: function(window) {
-    if (typeof window !== 'object' || !window.RTCPeerConnection) {
-      return;
-    }
-    if (!('getLocalStreams' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.getLocalStreams = function() {
-        if (!this._localStreams) {
-          this._localStreams = [];
-        }
-        return this._localStreams;
-      };
-    }
-    if (!('getStreamById' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.getStreamById = function(id) {
-        var result = null;
-        if (this._localStreams) {
-          this._localStreams.forEach(function(stream) {
-            if (stream.id === id) {
-              result = stream;
-            }
-          });
-        }
-        if (this._remoteStreams) {
-          this._remoteStreams.forEach(function(stream) {
-            if (stream.id === id) {
-              result = stream;
-            }
-          });
-        }
-        return result;
-      };
-    }
-    if (!('addStream' in window.RTCPeerConnection.prototype)) {
-      var _addTrack = window.RTCPeerConnection.prototype.addTrack;
-      window.RTCPeerConnection.prototype.addStream = function(stream) {
-        if (!this._localStreams) {
-          this._localStreams = [];
-        }
-        if (this._localStreams.indexOf(stream) === -1) {
-          this._localStreams.push(stream);
-        }
-        var self = this;
-        stream.getTracks().forEach(function(track) {
-          _addTrack.call(self, track, stream);
-        });
-      };
-
-      window.RTCPeerConnection.prototype.addTrack = function(track, stream) {
-        if (stream) {
-          if (!this._localStreams) {
-            this._localStreams = [stream];
-          } else if (this._localStreams.indexOf(stream) === -1) {
-            this._localStreams.push(stream);
-          }
-        }
-        _addTrack.call(this, track, stream);
-      };
-    }
-    if (!('removeStream' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.removeStream = function(stream) {
-        if (!this._localStreams) {
-          this._localStreams = [];
-        }
-        var index = this._localStreams.indexOf(stream);
-        if (index === -1) {
-          return;
-        }
-        this._localStreams.splice(index, 1);
-        var self = this;
-        var tracks = stream.getTracks();
-        this.getSenders().forEach(function(sender) {
-          if (tracks.indexOf(sender.track) !== -1) {
-            self.removeTrack(sender);
-          }
-        });
-      };
-    }
-  },
-  shimRemoteStreamsAPI: function(window) {
-    if (typeof window !== 'object' || !window.RTCPeerConnection) {
-      return;
-    }
-    if (!('getRemoteStreams' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.getRemoteStreams = function() {
-        return this._remoteStreams ? this._remoteStreams : [];
-      };
-    }
-    if (!('onaddstream' in window.RTCPeerConnection.prototype)) {
-      Object.defineProperty(window.RTCPeerConnection.prototype, 'onaddstream', {
-        get: function() {
-          return this._onaddstream;
-        },
-        set: function(f) {
-          if (this._onaddstream) {
-            this.removeEventListener('addstream', this._onaddstream);
-            this.removeEventListener('track', this._onaddstreampoly);
-          }
-          this.addEventListener('addstream', this._onaddstream = f);
-          this.addEventListener('track', this._onaddstreampoly = function(e) {
-            var stream = e.streams[0];
-            if (!this._remoteStreams) {
-              this._remoteStreams = [];
-            }
-            if (this._remoteStreams.indexOf(stream) >= 0) {
-              return;
-            }
-            this._remoteStreams.push(stream);
-            var event = new Event('addstream');
-            event.stream = e.streams[0];
-            this.dispatchEvent(event);
-          }.bind(this));
-        }
-      });
-    }
-  },
-  shimCallbacksAPI: function(window) {
-    if (typeof window !== 'object' || !window.RTCPeerConnection) {
-      return;
-    }
-    var prototype = window.RTCPeerConnection.prototype;
-    var createOffer = prototype.createOffer;
-    var createAnswer = prototype.createAnswer;
-    var setLocalDescription = prototype.setLocalDescription;
-    var setRemoteDescription = prototype.setRemoteDescription;
-    var addIceCandidate = prototype.addIceCandidate;
-
-    prototype.createOffer = function(successCallback, failureCallback) {
-      var options = (arguments.length >= 2) ? arguments[2] : arguments[0];
-      var promise = createOffer.apply(this, [options]);
-      if (!failureCallback) {
-        return promise;
-      }
-      promise.then(successCallback, failureCallback);
-      return Promise.resolve();
-    };
-
-    prototype.createAnswer = function(successCallback, failureCallback) {
-      var options = (arguments.length >= 2) ? arguments[2] : arguments[0];
-      var promise = createAnswer.apply(this, [options]);
-      if (!failureCallback) {
-        return promise;
-      }
-      promise.then(successCallback, failureCallback);
-      return Promise.resolve();
-    };
-
-    var withCallback = function(description, successCallback, failureCallback) {
-      var promise = setLocalDescription.apply(this, [description]);
-      if (!failureCallback) {
-        return promise;
-      }
-      promise.then(successCallback, failureCallback);
-      return Promise.resolve();
-    };
-    prototype.setLocalDescription = withCallback;
-
-    withCallback = function(description, successCallback, failureCallback) {
-      var promise = setRemoteDescription.apply(this, [description]);
-      if (!failureCallback) {
-        return promise;
-      }
-      promise.then(successCallback, failureCallback);
-      return Promise.resolve();
-    };
-    prototype.setRemoteDescription = withCallback;
-
-    withCallback = function(candidate, successCallback, failureCallback) {
-      var promise = addIceCandidate.apply(this, [candidate]);
-      if (!failureCallback) {
-        return promise;
-      }
-      promise.then(successCallback, failureCallback);
-      return Promise.resolve();
-    };
-    prototype.addIceCandidate = withCallback;
-  },
-  shimGetUserMedia: function(window) {
-    var navigator = window && window.navigator;
-
-    if (!navigator.getUserMedia) {
-      if (navigator.webkitGetUserMedia) {
-        navigator.getUserMedia = navigator.webkitGetUserMedia.bind(navigator);
-      } else if (navigator.mediaDevices &&
-          navigator.mediaDevices.getUserMedia) {
-        navigator.getUserMedia = function(constraints, cb, errcb) {
-          navigator.mediaDevices.getUserMedia(constraints)
-          .then(cb, errcb);
-        }.bind(navigator);
-      }
-    }
-  },
-  shimRTCIceServerUrls: function(window) {
-    // migrate from non-spec RTCIceServer.url to RTCIceServer.urls
-    var OrigPeerConnection = window.RTCPeerConnection;
-    window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-      if (pcConfig && pcConfig.iceServers) {
-        var newIceServers = [];
-        for (var i = 0; i < pcConfig.iceServers.length; i++) {
-          var server = pcConfig.iceServers[i];
-          if (!server.hasOwnProperty('urls') &&
-              server.hasOwnProperty('url')) {
-            utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
-            server = JSON.parse(JSON.stringify(server));
-            server.urls = server.url;
-            delete server.url;
-            newIceServers.push(server);
-          } else {
-            newIceServers.push(pcConfig.iceServers[i]);
-          }
-        }
-        pcConfig.iceServers = newIceServers;
-      }
-      return new OrigPeerConnection(pcConfig, pcConstraints);
-    };
-    window.RTCPeerConnection.prototype = OrigPeerConnection.prototype;
-    // wrap static methods. Currently just generateCertificate.
-    if ('generateCertificate' in window.RTCPeerConnection) {
-      Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-        get: function() {
-          return OrigPeerConnection.generateCertificate;
-        }
-      });
-    }
-  },
-  shimTrackEventTransceiver: function(window) {
-    // Add event.transceiver member over deprecated event.receiver
-    if (typeof window === 'object' && window.RTCPeerConnection &&
-        ('receiver' in window.RTCTrackEvent.prototype) &&
-        // can't check 'transceiver' in window.RTCTrackEvent.prototype, as it is
-        // defined for some reason even when window.RTCTransceiver is not.
-        !window.RTCTransceiver) {
-      Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
-        get: function() {
-          return {receiver: this.receiver};
-        }
-      });
-    }
-  },
-
-  shimCreateOfferLegacy: function(window) {
-    var origCreateOffer = window.RTCPeerConnection.prototype.createOffer;
-    window.RTCPeerConnection.prototype.createOffer = function(offerOptions) {
-      var pc = this;
-      if (offerOptions) {
-        var audioTransceiver = pc.getTransceivers().find(function(transceiver) {
-          return transceiver.sender.track &&
-              transceiver.sender.track.kind === 'audio';
-        });
-        if (offerOptions.offerToReceiveAudio === false && audioTransceiver) {
-          if (audioTransceiver.direction === 'sendrecv') {
-            audioTransceiver.setDirection('sendonly');
-          } else if (audioTransceiver.direction === 'recvonly') {
-            audioTransceiver.setDirection('inactive');
-          }
-        } else if (offerOptions.offerToReceiveAudio === true &&
-            !audioTransceiver) {
-          pc.addTransceiver('audio');
-        }
-
-        var videoTransceiver = pc.getTransceivers().find(function(transceiver) {
-          return transceiver.sender.track &&
-              transceiver.sender.track.kind === 'video';
-        });
-        if (offerOptions.offerToReceiveVideo === false && videoTransceiver) {
-          if (videoTransceiver.direction === 'sendrecv') {
-            videoTransceiver.setDirection('sendonly');
-          } else if (videoTransceiver.direction === 'recvonly') {
-            videoTransceiver.setDirection('inactive');
-          }
-        } else if (offerOptions.offerToReceiveVideo === true &&
-            !videoTransceiver) {
-          pc.addTransceiver('video');
-        }
-      }
-      return origCreateOffer.apply(pc, arguments);
-    };
-  }
-};
-
-// Expose public methods.
-module.exports = {
-  shimCallbacksAPI: safariShim.shimCallbacksAPI,
-  shimLocalStreamsAPI: safariShim.shimLocalStreamsAPI,
-  shimRemoteStreamsAPI: safariShim.shimRemoteStreamsAPI,
-  shimGetUserMedia: safariShim.shimGetUserMedia,
-  shimRTCIceServerUrls: safariShim.shimRTCIceServerUrls,
-  shimTrackEventTransceiver: safariShim.shimTrackEventTransceiver,
-  shimCreateOfferLegacy: safariShim.shimCreateOfferLegacy
-  // TODO
-  // shimPeerConnection: safariShim.shimPeerConnection
-};
-
-},{"../utils":13}],13:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var logDisabled_ = true;
-var deprecationWarnings_ = true;
-
-// Utility methods.
-var utils = {
-  disableLog: function(bool) {
-    if (typeof bool !== 'boolean') {
-      return new Error('Argument type: ' + typeof bool +
-          '. Please use a boolean.');
-    }
-    logDisabled_ = bool;
-    return (bool) ? 'adapter.js logging disabled' :
-        'adapter.js logging enabled';
-  },
-
-  /**
-   * Disable or enable deprecation warnings
-   * @param {!boolean} bool set to true to disable warnings.
-   */
-  disableWarnings: function(bool) {
-    if (typeof bool !== 'boolean') {
-      return new Error('Argument type: ' + typeof bool +
-          '. Please use a boolean.');
-    }
-    deprecationWarnings_ = !bool;
-    return 'adapter.js deprecation warnings ' + (bool ? 'disabled' : 'enabled');
-  },
-
-  log: function() {
-    if (typeof window === 'object') {
-      if (logDisabled_) {
-        return;
-      }
-      if (typeof console !== 'undefined' && typeof console.log === 'function') {
-        console.log.apply(console, arguments);
-      }
-    }
-  },
-
-  /**
-   * Shows a deprecation warning suggesting the modern and spec-compatible API.
-   */
-  deprecated: function(oldMethod, newMethod) {
-    if (!deprecationWarnings_) {
-      return;
-    }
-    console.warn(oldMethod + ' is deprecated, please use ' + newMethod +
-        ' instead.');
-  },
-
-  /**
-   * Extract browser version out of the provided user agent string.
-   *
-   * @param {!string} uastring userAgent string.
-   * @param {!string} expr Regular expression used as match criteria.
-   * @param {!number} pos position in the version string to be returned.
-   * @return {!number} browser version.
-   */
-  extractVersion: function(uastring, expr, pos) {
-    var match = uastring.match(expr);
-    return match && match.length >= pos && parseInt(match[pos], 10);
-  },
-
-  /**
-   * Browser detector.
-   *
-   * @return {object} result containing browser and version
-   *     properties.
-   */
-  detectBrowser: function(window) {
-    var navigator = window && window.navigator;
-
-    // Returned result object.
-    var result = {};
-    result.browser = null;
-    result.version = null;
-
-    // Fail early if it's not a browser
-    if (typeof window === 'undefined' || !window.navigator) {
-      result.browser = 'Not a browser.';
-      return result;
-    }
-
-    // Firefox.
-    if (navigator.mozGetUserMedia) {
-      result.browser = 'firefox';
-      result.version = this.extractVersion(navigator.userAgent,
-          /Firefox\/(\d+)\./, 1);
-    } else if (navigator.webkitGetUserMedia) {
-      // Chrome, Chromium, Webview, Opera, all use the chrome shim for now
-      if (window.webkitRTCPeerConnection) {
-        result.browser = 'chrome';
-        result.version = this.extractVersion(navigator.userAgent,
-          /Chrom(e|ium)\/(\d+)\./, 2);
-      } else { // Safari (in an unpublished version) or unknown webkit-based.
-        if (navigator.userAgent.match(/Version\/(\d+).(\d+)/)) {
-          result.browser = 'safari';
-          result.version = this.extractVersion(navigator.userAgent,
-            /AppleWebKit\/(\d+)\./, 1);
-        } else { // unknown webkit-based browser.
-          result.browser = 'Unsupported webkit-based browser ' +
-              'with GUM support but no WebRTC support.';
-          return result;
-        }
-      }
-    } else if (navigator.mediaDevices &&
-        navigator.userAgent.match(/Edge\/(\d+).(\d+)$/)) { // Edge.
-      result.browser = 'edge';
-      result.version = this.extractVersion(navigator.userAgent,
-          /Edge\/(\d+).(\d+)$/, 2);
-    } else if (navigator.mediaDevices &&
-        navigator.userAgent.match(/AppleWebKit\/(\d+)\./)) {
-        // Safari, with webkitGetUserMedia removed.
-      result.browser = 'safari';
-      result.version = this.extractVersion(navigator.userAgent,
-          /AppleWebKit\/(\d+)\./, 1);
-    } else { // Default fallthrough: not supported.
-      result.browser = 'Not a supported browser.';
-      return result;
-    }
-
-    return result;
-  },
-
-};
-
-// Export.
-module.exports = {
-  log: utils.log,
-  deprecated: utils.deprecated,
-  disableLog: utils.disableLog,
-  disableWarnings: utils.disableWarnings,
-  extractVersion: utils.extractVersion,
-  shimCreateObjectURL: utils.shimCreateObjectURL,
-  detectBrowser: utils.detectBrowser.bind(utils)
-};
-
-},{}]},{},[3])(3)
+},{}]},{},[1])(1)
 });
\ No newline at end of file
diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index 754e3b7c75..bb17ee6a32 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -588,11 +588,7 @@ function releaseUserMedia() {
 }
 
 function isWebRTCAvailable() {
-	if (bowser.msedge) {
-		return false;
-	} else {
-		return SIP.WebRTC.isSupported();
-	}
+	return SIP.WebRTC.isSupported();
 }
 
 function getCallStatus() {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
index 5b21d425ac..33dbaa8ac0 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
@@ -110,6 +110,8 @@ package org.bigbluebutton.modules.screenshare.utils
         ExternalInterface.addCallback("onSuccess", onSuccess);
         // check if the extension exists
         ExternalInterface.call("checkChromeExtInstalled", "onSuccess", WebRTCScreenshareUtility.chromeExtensionKey);
+      } else if (BrowserCheck.isEdge()) {
+        webRTCWorksAndConfigured("Edge, lets try");
       } else {
         cannotUseWebRTC("Web browser doesn't support WebRTC");
         return;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/util/browser/BrowserCheck.as b/bigbluebutton-client/src/org/bigbluebutton/util/browser/BrowserCheck.as
index 82352cebe0..aa09b32102 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/util/browser/BrowserCheck.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/util/browser/BrowserCheck.as
@@ -65,6 +65,10 @@ package org.bigbluebutton.util.browser {
 		public static function isFirefox():Boolean {
 			return _browserName.toLowerCase() == "firefox";
 		}
+		
+		public static function isEdge():Boolean {
+			return _browserName.toLowerCase() == "edge";
+		}
 
 		public static function isPuffinBelow46():Boolean {
 			return _browserName.toLowerCase() == "puffin" && String(_fullVersion).substr(0, 3) < "4.6";

From 120c4712dc0c5ede918549d94c2257faddacb35d Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Mon, 21 Jan 2019 20:05:52 +0000
Subject: [PATCH 123/163] remove ping-pong logs for webcams

---
 .../ui/components/video-provider/component.jsx        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index 008f885e60..01ea325d79 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -101,7 +101,6 @@ const MAX_CAMERA_SHARE_FAILED_WAIT_TIME = 60000;
 const PING_INTERVAL = 15000;
 
 class VideoProvider extends Component {
-  
   constructor(props) {
     super(props);
 
@@ -139,7 +138,6 @@ class VideoProvider extends Component {
     this.customGetStats = this.customGetStats.bind(this);
   }
 
-  
 
   componentWillMount() {
     this.ws.onopen = this.onWsOpen;
@@ -202,6 +200,7 @@ class VideoProvider extends Component {
   onWsMessage(msg) {
     const parsedMessage = JSON.parse(msg.data);
 
+    if (parsedMessage.id === 'pong') return;
     this.logger('debug', `Received new message '${parsedMessage.id}'`, { topic: 'ws', message: parsedMessage });
 
     switch (parsedMessage.id) {
@@ -287,7 +286,7 @@ class VideoProvider extends Component {
       });
     }
   }
-  
+
   logger(type, message, options = {}) {
     const { userId, userName } = this.props;
     const topic = options.topic || 'video';
@@ -339,7 +338,9 @@ class VideoProvider extends Component {
 
     if (this.connectedToMediaServer()) {
       const jsonMessage = JSON.stringify(message);
-      this.logger('debug', `Sending message '${message.id}'`, { topic: 'ws', message });
+      if (message.id !== 'ping') {
+        this.logger('debug', `Sending message '${message.id}'`, { topic: 'ws', message });
+      }
       ws.send(jsonMessage, (error) => {
         if (error) {
           this.logger(`client: Websocket error '${error}' on message '${message.id}'`, { topic: 'ws' });
@@ -520,8 +521,6 @@ class VideoProvider extends Component {
             voiceBridge,
           };
           this.sendMessage(message);
-
-
         });
       });
       if (this.webRtcPeers[id].peerConnection) {

From 7df4349609d8494babfeed0d55e30e6e1827d9ae Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Mon, 21 Jan 2019 20:25:00 +0000
Subject: [PATCH 124/163] Reverted a change on kurento-utils that caused
 problems with the SDP offer generation

---
 .../client/compatibility/kurento-utils.js     | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index d15bf65cd8..6b3c227761 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -201,7 +201,7 @@ function WebRtcPeer(mode, options, callback) {
                 pc.addTransceiver('video');
             } catch(e) {}
         }
-        
+
         if (useDataChannels && !dataChannel) {
             var dcId = 'WebRtcPeer-' + self.id;
             var dcOptions = undefined;
@@ -267,19 +267,6 @@ function WebRtcPeer(mode, options, callback) {
     };
     this.generateOffer = function (callback) {
         callback = callback.bind(this);
-
-        pc.onicegatheringstatechange = function (event) {
-            if(event.target.iceGatheringState == "complete") {
-                var localDescription = pc.localDescription;
-                // logger.debug('Local description set', localDescription.sdp);
-                if (multistream && usePlanB) {
-                    localDescription = interop.toUnifiedPlan(localDescription);
-                    logger.debug('offer::origPlanB->UnifiedPlan', dumpSDP(localDescription));
-                }
-                callback(null, localDescription.sdp, self.processAnswer.bind(self));
-            }
-        }
-
         var offerAudio = true;
         var offerVideo = true;
         if (mediaConstraints) {
@@ -296,7 +283,15 @@ function WebRtcPeer(mode, options, callback) {
             // logger.debug('Created SDP offer');
             offer = mangleSdpToAddSimulcast(offer);
             return pc.setLocalDescription(offer);
-        });
+        }).then(function () {
+            var localDescription = pc.localDescription;
+            // logger.debug('Local description set', localDescription.sdp);
+            if (multistream && usePlanB) {
+              localDescription = interop.toUnifiedPlan(localDescription);
+              logger.debug('offer::origPlanB->UnifiedPlan', dumpSDP(localDescription));
+            }
+            callback(null, localDescription.sdp, self.processAnswer.bind(self));
+        }).catch(callback);
     };
     this.getLocalSessionDescriptor = function () {
         return pc.localDescription;
@@ -1232,7 +1227,7 @@ if (typeof Object.create === 'function') {
 ;(function(isNode) {
 
 	/**
-	 * Merge one or more objects 
+	 * Merge one or more objects
 	 * @param bool? clone
 	 * @param mixed,... arguments
 	 * @return object
@@ -1245,7 +1240,7 @@ if (typeof Object.create === 'function') {
 	}, publicName = 'merge';
 
 	/**
-	 * Merge two or more objects recursively 
+	 * Merge two or more objects recursively
 	 * @param bool? clone
 	 * @param mixed,... arguments
 	 * @return object

From 544d2ad38ba034ce7c13b84f64ac38b1d80f8cce Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Mon, 21 Jan 2019 15:02:57 -0300
Subject: [PATCH 125/163] Improved getDisplayMedia detection

---
 .../resources/prod/lib/kurento-extension.js   |  3 ++-
 .../resources/prod/lib/kurento-utils.js       | 20 +++++++++++++------
 .../client/compatibility/kurento-extension.js |  3 ++-
 .../client/compatibility/kurento-utils.js     | 20 +++++++++++++------
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/kurento-extension.js b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
index dab7affe01..5eb162c3b0 100755
--- a/bigbluebutton-client/resources/prod/lib/kurento-extension.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
@@ -2,7 +2,8 @@ const isFirefox = typeof window.InstallTrigger !== 'undefined';
 const isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
 const isChrome = !!window.chrome && !isOpera;
 const isSafari = navigator.userAgent.indexOf('Safari') >= 0 && !isChrome;
-const hasDisplayMedia = typeof navigator.getDisplayMedia === 'function';
+const hasDisplayMedia = (typeof navigator.getDisplayMedia === 'function'
+  || typeof navigator.mediaDevices.getDisplayMedia === 'function');
 const kurentoHandler = null;
 const SEND_ROLE = "send";
 const RECV_ROLE = "recv";
diff --git a/bigbluebutton-client/resources/prod/lib/kurento-utils.js b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
index 78ea0604b7..2a8bfab960 100644
--- a/bigbluebutton-client/resources/prod/lib/kurento-utils.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
@@ -410,16 +410,24 @@ function WebRtcPeer(mode, options, callback) {
                     return callback(error);
                 constraints = [mediaConstraints];
                 constraints.unshift(constraints_);
-                if (typeof navigator.getDisplayMedia === 'function') {
-                    navigator.getDisplayMedia(recursive.apply(undefined, constraints)).then(stream => {
-                        stream.getTracks()[0].applyConstraints(constraints[0].optional).then(() => {
+                let gDMCallback = function(stream) {
+                    stream.getTracks()[0].applyConstraints(constraints[0].optional)
+                        .then(() => {
                             videoStream = stream;
                             start();
                         }).catch(() => {
-                          videoStream = stream;
-                          start();
+                            videoStream = stream;
+                            start();
                         });
-                    }).catch(callback);
+                }
+                if (typeof navigator.getDisplayMedia === 'function') {
+                    navigator.getDisplayMedia(recursive.apply(undefined, constraints))
+                        .then(gDMCallback)
+                        .catch(callback);
+                } else if (typeof navigator.mediaDevices.getDisplayMedia === 'function') {
+                    navigator.mediaDevices.getDisplayMedia(recursive.apply(undefined, constraints))
+                        .then(gDMCallback)
+                        .catch(callback);
                 } else {
                     getMedia(recursive.apply(undefined, constraints));
                 }
diff --git a/bigbluebutton-html5/client/compatibility/kurento-extension.js b/bigbluebutton-html5/client/compatibility/kurento-extension.js
index 229771c9f8..66e34642ad 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-extension.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-extension.js
@@ -3,7 +3,8 @@ const isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
 const isChrome = !!window.chrome && !isOpera;
 const isSafari = navigator.userAgent.indexOf('Safari') >= 0 && !isChrome;
 const isElectron = navigator.userAgent.toLowerCase().indexOf(' electron/') > -1;
-const hasDisplayMedia = typeof navigator.getDisplayMedia === 'function';
+const hasDisplayMedia = (typeof navigator.getDisplayMedia === 'function'
+  || typeof navigator.mediaDevices.getDisplayMedia === 'function');
 const kurentoHandler = null;
 
 Kurento = function (
diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index d15bf65cd8..60cbd94a52 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -446,16 +446,24 @@ function WebRtcPeer(mode, options, callback) {
                     return callback(error);
                 constraints = [mediaConstraints];
                 constraints.unshift(constraints_);
-                if (typeof navigator.getDisplayMedia === 'function') {
-                    navigator.getDisplayMedia(recursive.apply(undefined, constraints)).then(stream => {
-                        stream.getTracks()[0].applyConstraints(constraints[0].optional).then(() => {
+                let gDMCallback = function(stream) {
+                    stream.getTracks()[0].applyConstraints(constraints[0].optional)
+                        .then(() => {
                             videoStream = stream;
                             start();
                         }).catch(() => {
-                          videoStream = stream;
-                          start();
+                            videoStream = stream;
+                            start();
                         });
-                    }).catch(callback);
+                }
+                if (typeof navigator.getDisplayMedia === 'function') {
+                    navigator.getDisplayMedia(recursive.apply(undefined, constraints))
+                        .then(gDMCallback)
+                        .catch(callback);
+                } else if (typeof navigator.mediaDevices.getDisplayMedia === 'function') {
+                    navigator.mediaDevices.getDisplayMedia(recursive.apply(undefined, constraints))
+                        .then(gDMCallback)
+                        .catch(callback);
                 } else {
                     getMedia(recursive.apply(undefined, constraints));
                 }

From 1b4d956cb5f956e976fd48a0d9d0553846ba9be9 Mon Sep 17 00:00:00 2001
From: bobakoftadeh <bobakoftadeh@outlook.com>
Date: Mon, 21 Jan 2019 21:51:20 +0000
Subject: [PATCH 126/163] Fixed dropdown and removed gray border for webcams

---
 .../video-provider/video-list/component.jsx          | 12 ++++--------
 .../components/video-provider/video-list/styles.scss |  5 +----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx
index 3c1c1a676d..28e5e52b3c 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/component.jsx
@@ -93,7 +93,7 @@ class VideoList extends Component {
     }
 
     const { focusedId } = this.state;
-    const aspectRatio = 16 / 9;
+    const aspectRatio = 4 / 3;
     const { width: canvasWidth, height: canvasHeight } = this.canvas.getBoundingClientRect();
     const gridGutter = parseInt(window.getComputedStyle(this.grid).getPropertyValue('grid-row-gap'), 10);
 
@@ -143,7 +143,7 @@ class VideoList extends Component {
 
   renderVideoList() {
     const {
-      intl, users, onMount, getStats, stopGettingStats, enableVideoStats
+      intl, users, onMount, getStats, stopGettingStats, enableVideoStats,
     } = this.props;
     const { focusedId } = this.state;
 
@@ -172,12 +172,8 @@ class VideoList extends Component {
               this.handleCanvasResize();
               return onMount(user.id, videoRef);
             }}
-            getStats={(videoRef, callback) => {
-              return getStats(user.id, videoRef, callback);
-            }}
-            stopGettingStats={() => {
-              return stopGettingStats(user.id);
-            }}
+            getStats={(videoRef, callback) => getStats(user.id, videoRef, callback)}
+            stopGettingStats={() => stopGettingStats(user.id)}
             enableVideoStats={enableVideoStats}
           />
         </div>
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
index 3e42276c40..ba6f0b5c40 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
@@ -12,7 +12,6 @@
   left: 0;
   right: 0;
   bottom: 0;
-  overflow: hidden;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -21,7 +20,6 @@
 .videoList {
   display: grid;
 
-  overflow: hidden;
   grid-auto-flow: dense;
   grid-gap: 5px;
 
@@ -31,7 +29,6 @@
 }
 
 .videoListItem {
-  overflow: hidden;
   display: flex;
 
   &.focused {
@@ -43,7 +40,7 @@
 .content {
   position: relative;
   display: flex;
-  width: 100%;
+  min-width: 100%;
   height: 100%;
   border-radius: 5px;
 

From 1d03025705074e332da99e17c0a69e225d7ddd48 Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Mon, 21 Jan 2019 14:56:03 -0300
Subject: [PATCH 127/163] Fixed Chrome extension-based screensharing with the
 newest adapter on Flash

---
 .../resources/prod/lib/kurento-extension.js           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/kurento-extension.js b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
index 5eb162c3b0..9f48f5710b 100755
--- a/bigbluebutton-client/resources/prod/lib/kurento-extension.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
@@ -660,9 +660,14 @@ window.getScreenConstraints = function (sendSource, callback) {
 
         kurentoManager.kurentoScreenshare.extensionInstalled = true;
 
-        // this statement sets gets 'sourceId" and sets "chromeMediaSourceId"
-        screenConstraints.video.chromeMediaSource = { exact: [sendSource] };
-        screenConstraints.video.chromeMediaSourceId = sourceId;
+        // Re-wrap the video constraints into the mandatory object (latest adapter)
+        screenConstraints.video = {}
+        screenConstraints.video.mandatory = {};
+        screenConstraints.video.mandatory.maxFrameRate = 10;
+        screenConstraints.video.mandatory.maxHeight = kurentoManager.kurentoScreenshare.vid_max_height;
+        screenConstraints.video.mandatory.maxWidth = kurentoManager.kurentoScreenshare.vid_max_width;
+        screenConstraints.video.mandatory.chromeMediaSource = sendSource;
+        screenConstraints.video.mandatory.chromeMediaSourceId = sourceId;
         screenConstraints.optional = optionalConstraints;
 
         console.log('getScreenConstraints for Chrome returns => ', screenConstraints);

From 850e9bc7189d4043c47f7c54b4469fe0af1cb9ca Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Tue, 22 Jan 2019 21:56:30 +0000
Subject: [PATCH 128/163] Recovered matching 2.0 German strings manually

---
 bigbluebutton-html5/private/locales/de.json | 380 ++++++++++++++++++++
 1 file changed, 380 insertions(+)
 create mode 100644 bigbluebutton-html5/private/locales/de.json

diff --git a/bigbluebutton-html5/private/locales/de.json b/bigbluebutton-html5/private/locales/de.json
new file mode 100644
index 0000000000..0da1ad7e8e
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/de.json
@@ -0,0 +1,380 @@
+{
+    "app.home.greeting": "Willkommen! Ihre Präsentation wird in Kürze beginnen...",
+    "app.chat.submitLabel": "Nachricht senden",
+    "app.chat.errorMinMessageLength": "Die Nachricht ist {0} Buchstabe(n) zu kurz",
+    "app.chat.errorMaxMessageLength": "Die Nachricht ist {0} Buchstabe(n) zu lang",
+    "app.chat.inputLabel": "Chatnachricht eingeben für {0}",
+    "app.chat.inputPlaceholder": "Nachricht {0}",
+    "app.chat.titlePublic": "Öffentlicher Chat",
+    "app.chat.titlePrivate": "Privater Chat mit {0}",
+    "app.chat.partnerDisconnected": "{0} hat die Konferenz verlassen",
+    "app.chat.closeChatLabel": "Schließen {0}",
+    "app.chat.hideChatLabel": "Verstecken {0}",
+    "app.chat.moreMessages": "Weitere Nachrichten",
+    "app.chat.dropdown.options": "Chatoptionen",
+    "app.chat.dropdown.clear": "Löschen",
+    "app.chat.dropdown.copy": "Kopieren",
+    "app.chat.dropdown.save": "Speichern",
+    "app.chat.label": "Chat",
+    "app.chat.emptyLogLabel": "Chat-Log ist leer",
+    "app.chat.clearPublicChatMessage": "Der öffentliche Chatverlauf wurde durch einen Moderator gelöscht",
+    "app.userList.usersTitle": "Teilnehmer",
+    "app.userList.participantsTitle": "Teilnehmer",
+    "app.userList.messagesTitle": "Nachrichten",
+    "app.userList.presenter": "Präsentator",
+    "app.userList.you": "Sie",
+    "app.userList.locked": "Gesperrt",
+    "app.userList.label": "Teilnehmerlliste",
+    "app.userList.toggleCompactView.label": "Kompaktansichtmodus wechseln",
+    "app.userList.guest": "Gast",
+    "app.userList.menuTitleContext": "Verfügbare Optionen",
+    "app.userList.chatListItem.unreadSingular": "{0} Neue Nachricht",
+    "app.userList.chatListItem.unreadPlural": "{0} Neue Nachrichten",
+    "app.userList.menu.chat.label": "Chat",
+    "app.userList.menu.clearStatus.label": "Status löschen",
+    "app.userList.menu.makePresenter.label": "Präsentationsrechte geben",
+    "app.userList.menu.removeUser.label": "Teilnehmer entfernen",
+    "app.userList.menu.muteUserAudio.label": "Teilnehmer stummschalten",
+    "app.userList.menu.unmuteUserAudio.label": "Stummschaltung aufheben",
+    "app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
+    "app.userList.menu.promoteUser.label": "Zum Moderator befördern",
+    "app.userList.menu.demoteUser.label": "Zum Zuschauer zurückstufen",
+    "app.media.label": "Media",
+    "app.media.screenshare.start": "Bildschirmfreigabe wurde gestartet",
+    "app.media.screenshare.end": "Bildschirmfreigabe wurde gestoppt",
+    "app.media.screenshare.safariNotSupported": "Bildschirmfreigabe wird gegenwärtig von Safari nicht unterstützt. Bitte verwenden Sie Firefox oder Google Chrome.",
+    "app.meeting.ended": "Diese Konferenz wurde beendet\"",
+    "app.meeting.endedMessage": "Sie werden zum Startbildschirm weitergeleitet",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Vorherige Folie",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Präsentation zur vorherigen Folie wechseln",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Nächste Folie",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Präsentation zur nächsten Folie wechseln",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Folie auswählen",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Präsentation zu bestimmter Folie wechseln",
+    "app.presentation.presentationToolbar.fitWidthLabel": "An Breite anpassen",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Folie in voller Breite darstellen",
+    "app.presentation.presentationToolbar.fitScreenLabel": "An Bildschirm anpassen",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Gesamte Folie darstellen",
+    "app.presentation.presentationToolbar.zoomLabel": "Vergrößerungsgrad",
+    "app.presentation.presentationToolbar.zoomDesc": "Vergrößerungsstufe der Präsentation ändern",
+    "app.presentation.presentationToolbar.goToSlide": "Folie {0}",
+    "app.presentationUploder.title": "Präsentation",
+    "app.presentationUploder.message": "Als Präsentator haben Sie in BigBlueButton die Möglichkeit, jegliche Office-Dokumente oder PDF-Dateien hochzuladen. Die beste Qualität erzielen Sie mit PDF-Dateien.",
+    "app.presentationUploder.confirmLabel": "Start",
+    "app.presentationUploder.confirmDesc": "Änderungen speichern und Präsentation starten",
+    "app.presentationUploder.dismissLabel": "Abbrechen",
+    "app.presentationUploder.dismissDesc": "Fenster schließen und Änderungen verwerfen",
+    "app.presentationUploder.dropzoneLabel": "Hochzuladende Dateien hier hin ziehen",
+    "app.presentationUploder.browseFilesLabel": "oder nach Dateien suchen",
+    "app.presentationUploder.fileToUpload": "Hochzuladende Datei...",
+    "app.presentationUploder.currentBadge": "Aktuell",
+    "app.presentationUploder.genericError": "Ups, irgendwas ist schief gelaufen",
+    "app.presentationUploder.upload.progress": "Hochladen ({0}%)",
+    "app.presentationUploder.upload.413": "Die Datei ist zu groß",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Verarbeite Seite {0} von {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Konvertiere Datei...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Erzeuge Miniaturbild...",
+    "app.presentationUploder.conversion.generatedSlides": "Folien erzeugt...",
+    "app.presentationUploder.conversion.generatingSvg": "Erzeuge SVG Bilder...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Ups, die Seitenanzahl überschreitet das Limit",
+    "app.presentationUploder.conversion.timeout": "Ups, die Konvertierung dauert zu lange",
+    "app.polling.pollingTitle": "Umfrage Optionen",
+    "app.polling.pollAnswerLabel": "Umfrageantwort {0}",
+    "app.polling.pollAnswerDesc": "Diese Option auswählen für Umfrage {0}",
+    "app.failedMessage": "Es gibt Verbindungsprobleme mit dem Server.",
+    "app.connectingMessage": "Verbinde...",
+    "app.waitingMessage": "Verbindung getrennt. Versuche sie wiederherzustellen in {0} Sekunden...",
+    "app.navBar.settingsDropdown.optionsLabel": "Optionen",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Als Vollbild darstellen",
+    "app.navBar.settingsDropdown.settingsLabel": "Einstellungen öffnen",
+    "app.navBar.settingsDropdown.aboutLabel": "Versionsinfo",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Ausloggen",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Vollbilddarstellung beenden",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Das Einstellungsmenü als Vollbild darstellen",
+    "app.navBar.settingsDropdown.settingsDesc": "Basiseinstellungen verändern",
+    "app.navBar.settingsDropdown.aboutDesc": "Informationen über den Client anzeigen",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Konferenz verlassen",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Vollbildmodus beenden",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Tastaturkürzel",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Liste verfügbarer Tastaturkürzel",
+    "app.navBar.settingsDropdown.helpLabel": "Hilfe",
+    "app.navBar.settingsDropdown.helpDesc": "Verlinkt zu den Videoanleitungen",
+    "app.navBar.userListToggleBtnLabel": "Teilnehmerliste umschalten",
+    "app.navBar.toggleUserList.ariaLabel": "Teilnehmer/Nachrichten-Umschalter",
+    "app.navBar.toggleUserList.newMessages": "mit Benachrichtigung für neue Nachrichten",
+    "app.navBar.recording": "Diese Konferenz wird aufgezeichnet",
+    "app.navBar.recording.on": "Aufzeichnung läuft",
+    "app.navBar.recording.off": "Keine Aufnahme",
+    "app.leaveConfirmation.confirmLabel": "Verlassen",
+    "app.leaveConfirmation.confirmDesc": "Hiermit verlassen Sie Konferenz",
+    "app.about.title": "Versionsinfo",
+    "app.about.version": "Client Build:",
+    "app.about.copyright": "Copyright:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Abbrechen",
+    "app.about.dismissDesc": "Informationen über Client schließen",
+    "app.actionsBar.changeStatusLabel": "Status ändern",
+    "app.actionsBar.muteLabel": "Stummschalten",
+    "app.actionsBar.unmuteLabel": "Freischalten",
+    "app.actionsBar.camOffLabel": "Kamera aus",
+    "app.actionsBar.raiseLabel": "Hand heben",
+    "app.actionsBar.label": "Aktionsleiste",
+    "app.submenu.application.applicationSectionTitle": "Anwendung",
+    "app.submenu.application.audioAlertLabel": "Audiowarnungen für Chat",
+    "app.submenu.application.pushAlertLabel": "Popupwarnungen für Chat",
+    "app.submenu.application.fontSizeControlLabel": "Schriftgröße",
+    "app.submenu.application.increaseFontBtnLabel": "Schriftgröße erhöhen",
+    "app.submenu.application.decreaseFontBtnLabel": "Schriftgröße verringern",
+    "app.submenu.application.languageLabel": "Sprache",
+    "app.submenu.application.ariaLanguageLabel": "Sprache ändern",
+    "app.submenu.application.languageOptionLabel": "Sprache auswählen",
+    "app.submenu.application.noLocaleOptionLabel": "Keine Sprachschemata verfügbar",
+    "app.submenu.audio.micSourceLabel": "Mikrofonauswahl",
+    "app.submenu.audio.speakerSourceLabel": "Lautsprecherauswahl",
+    "app.submenu.audio.streamVolumeLabel": "Ihre Audiolautstärke",
+    "app.submenu.video.title": "Video",
+    "app.submenu.video.videoSourceLabel": "Videoquelle ansehen",
+    "app.submenu.video.videoOptionLabel": "Videoeingang auswählen",
+    "app.submenu.video.videoQualityLabel": "Videoqualität",
+    "app.submenu.video.qualityOptionLabel": "Videoqualität auswählen",
+    "app.submenu.video.participantsCamLabel": "Webcamvideo anderer Teilnehmer darstellen",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Untertitel",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Untertitelkontrolle übernehmen",
+    "app.submenu.closedCaptions.languageLabel": "Sprache",
+    "app.submenu.closedCaptions.localeOptionLabel": "Sprache auswählen",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Keine aktiven Gebietsschemata",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Schriftart",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Schriftart auswählen",
+    "app.submenu.closedCaptions.fontSizeLabel": "Schriftgröße",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Schriftgröße auswählen",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Hintergrundfarbe",
+    "app.submenu.closedCaptions.fontColorLabel": "Schriftfarbe",
+    "app.submenu.participants.muteAllLabel": "Alle stummschalten außer Präsentator",
+    "app.submenu.participants.lockAllLabel": "Alle Teilnehmer sperren",
+    "app.submenu.participants.lockItemLabel": "Teilnehmer {0}",
+    "app.submenu.participants.lockMicDesc": "Deaktiviert das Mikrofon für alle gesperrten Teilnehmer",
+    "app.submenu.participants.lockCamDesc": "Deaktiviert die Webcam für alle gesperrten Teilnehmer",
+    "app.submenu.participants.lockPublicChatDesc": "Deaktiviert den öffentlichen Chat für alle gesperrten Teilnehmer",
+    "app.submenu.participants.lockPrivateChatDesc": "Deaktiviert den privaten Chat für alle gesperrten Teilnehmer",
+    "app.submenu.participants.lockLayoutDesc": "Sperrt das Layout für alle gesperrten Teilnehmer",
+    "app.submenu.participants.lockMicAriaLabel": "Mikrofonsperre",
+    "app.submenu.participants.lockCamAriaLabel": "Webcamsperre",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Sperre für öffentlichen Chat",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Sperre für privaten Chat",
+    "app.submenu.participants.lockLayoutAriaLabel": "Layoutsperre",
+    "app.submenu.participants.lockMicLabel": "Mikrofon",
+    "app.submenu.participants.lockCamLabel": "Webcam",
+    "app.submenu.participants.lockPublicChatLabel": "Öffentlicher Chat",
+    "app.submenu.participants.lockPrivateChatLabel": "Privater Chat",
+    "app.submenu.participants.lockLayoutLabel": "Layout",
+    "app.settings.applicationTab.label": "Anwendung",
+    "app.settings.audioTab.label": "Audio",
+    "app.settings.videoTab.label": "Video",
+    "app.settings.closedcaptionTab.label": "Untertitel",
+    "app.settings.usersTab.label": "Teilnehmer",
+    "app.settings.main.label": "Einstellungen",
+    "app.settings.main.cancel.label": "Abbrechen",
+    "app.settings.main.cancel.label.description": "Verwirft die Änderungen und schließt das Einstellungsmenü",
+    "app.settings.main.save.label": "Speichern",
+    "app.settings.main.save.label.description": "Speichert die Einstellungen und schließt das Einstellungsmenü",
+    "app.settings.dataSavingTab.label": "Dateneinsparung",
+    "app.settings.dataSavingTab.webcam": "Webcams aktiviert",
+    "app.settings.dataSavingTab.screenShare": "Bildschirmfreigabe aktiviert",
+    "app.settings.dataSavingTab.description": "Um Datentransfervolumen zu sparen, können Sie hier einstellen, was angezeigt wird.",
+    "app.switch.onLabel": "AN",
+    "app.switch.offLabel": "AUS",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Aktionen",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Eine Präsentation hochladen",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Eine Umfrage starten",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Bildschirm freigeben",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Bildschirmfreigabe beenden",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Präsentation hochladen",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Eine Umfrage starten",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Ihren Bildschirm mit anderen teilen",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Bildschirmfreigabe beenden mit",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "Status setzen",
+    "app.actionsBar.emojiMenu.awayLabel": "Abwesend",
+    "app.actionsBar.emojiMenu.awayDesc": "Ihren Status auf abwesend setzen",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Hand heben",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Heben Sie Ihre Hand, um eine Frage zu stellen",
+    "app.actionsBar.emojiMenu.neutralLabel": "Unentschlossen",
+    "app.actionsBar.emojiMenu.neutralDesc": "Ihren Status auf unentschieden setzen",
+    "app.actionsBar.emojiMenu.confusedLabel": "Verwirrt",
+    "app.actionsBar.emojiMenu.confusedDesc": "Ihren Status auf verwirrt setzen",
+    "app.actionsBar.emojiMenu.sadLabel": "Traurig",
+    "app.actionsBar.emojiMenu.sadDesc": "Ihren Status auf traurig setzen",
+    "app.actionsBar.emojiMenu.happyLabel": "Glücklich",
+    "app.actionsBar.emojiMenu.happyDesc": "Ihren Status auf glücklich setzen",
+    "app.actionsBar.emojiMenu.noneLabel": "Status löschen",
+    "app.actionsBar.emojiMenu.noneDesc": "Status löschen",
+    "app.actionsBar.emojiMenu.applauseLabel": "Applaus",
+    "app.actionsBar.emojiMenu.applauseDesc": "Ihren Status auf Applaus setzen",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Daumen hoch",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Ihren Status auf Daumen hoch setzen",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Daumen runter",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Ihren Status auf Daumen runter setzen",
+    "app.actionsBar.currentStatusDesc": "Aktueller Status {0}",
+    "app.audioNotification.audioFailedError1001": "Fehler 1001: Websocket unterbrochen",
+    "app.audioNotification.audioFailedError1002": "Fehler 1002: Websocketverbindung konnte nicht hergestellt werden",
+    "app.audioNotification.audioFailedError1003": "Fehler 1003: Browserversion wird nicht unterstützt",
+    "app.audioNotification.audioFailedError1004": "Fehler 1004: Fehler beim Verbinden",
+    "app.audioNotification.audioFailedError1005": "Fehler 1005: Verbindung unerwartet beendet",
+    "app.audioNotification.audioFailedError1006": "Fehler 1006: Verbindungszeitüberschreitung",
+    "app.audioNotification.audioFailedError1007": "Fehler 1007: ICE Verbindung fehlgeschlagen",
+    "app.audioNotification.audioFailedError1008": "Fehler 1008: Transfer fehlgeschlagen",
+    "app.audioNotification.audioFailedError1009": "Fehler 1009: STUN/TURN Serverinformation konnten nicht abgerufen werden",
+    "app.audioNotification.audioFailedError1010": "Fehler 1010: Zeitüberschreitung bei ICE Verbindung",
+    "app.audioNotification.audioFailedError1011": "Fehler 1011: Zeitüberschreitung beim ICE Gathering",
+    "app.audioNotification.audioFailedMessage": "Audioverbindung konnte nicht hergestellt werden",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia fehlgeschlagen. Nur sichere Quellen sind erlaubt",
+    "app.audioNotification.closeLabel": "Schließen",
+    "app.audioNotificaion.reconnectingAsListenOnly": "Mikrofonfreigabe ist nur für Moderatoren erlaubt, Sie werden im Nur-zuhören-Modus verbunden",
+    "app.breakoutJoinConfirmation.title": "Dem Breakout-Raum beitreten",
+    "app.breakoutJoinConfirmation.message": "Möchten Sie beitreten",
+    "app.breakoutJoinConfirmation.confirmLabel": "Beitreten",
+    "app.breakoutJoinConfirmation.confirmDesc": "Dem Breakout-Raum beitreten",
+    "app.breakoutJoinConfirmation.dismissLabel": "Abbrechen",
+    "app.breakoutJoinConfirmation.dismissDesc": "Beitritt zum Breakout-Raum ablehnen",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Wählen Sie Ihren Breakout Raum aus",
+    "app.breakoutTimeRemainingMessage": "Verbleibende Breakout Raum Zeit: {0}",
+    "app.breakoutWillCloseMessage": "Zeit abgelaufen. Der Breakout-Raum wird in Kürze geschlossen",
+    "app.calculatingBreakoutTimeRemaining": "Berechne die verbleibende Zeit...",
+    "app.audioModal.microphoneLabel": "Mit Mikrofon",
+    "app.audioModal.listenOnlyLabel": "Nur zuhören",
+    "app.audioModal.audioChoiceLabel": "Wie möchten Sie der Konferenz beitreten?",
+    "app.audioModal.iOSBrowser": "Audio/Video wird nicht unterstützt",
+    "app.audioModal.iOSErrorDescription": "Gegenwärtig wird Audio und Video von Chrome für iOS nicht unterstützt.",
+    "app.audioModal.iOSErrorRecommendation": "Wir empfehlen Safari iOS zu verwenden.",
+    "app.audioModal.audioChoiceDesc": "Wie möchten Sie der Konferenz beitreten?",
+    "app.audioModal.closeLabel": "Schließen",
+    "app.audioModal.yes": "Ja",
+    "app.audioModal.no": "Nein",
+    "app.audioModal.yes.arialabel" : "Echo ist hörbar",
+    "app.audioModal.no.arialabel" : "Echo ist nicht hörbar",
+    "app.audioModal.echoTestTitle": "Dies ist ein persönlicher Echotest. Sprechen Sie ein paar Worte. Hören Sie sich selbst?",
+    "app.audioModal.settingsTitle": "Audioeinstellungen ändern",
+    "app.audioModal.helpTitle": "Es gab ein Problem mit ihren Mediengeräten (Mikrofon/Webcam)",
+    "app.audioModal.helpText": "Haben Sie BigBlueButton die Berechtigung gegeben, auf Ihr Mikrofon zuzugreifen? Beachten Sie, dass sich ein Dialogfenster öffnen sollte, sobald Sie versuchen der Audiokonferenz beizutreten. Dabei wird die Zugriffsberechtigung für Ihr Mediengerät (Mikrofon/Webcam) abgefragt. Bitte erteilen Sie diese Zugriffsberechtigung, um der Konferenz beizutreten. Falls dies nicht funktioniert, versuchen Sie die Mikrofon-Berechtigung in Ihren Browsereinstellungen zu ändern.",
+    "app.audioModal.connecting": "Verbinde",
+    "app.audioModal.connectingEchoTest": "Verbinde zum Echotest",
+    "app.audioManager.joinedAudio": "Sie sind der Konferenz beigetreten",
+    "app.audioManager.joinedEcho": "Der Echotest wurde gestartet",
+    "app.audioManager.leftAudio": "Sie haben die Audiokonferenz verlassen",
+    "app.audioManager.genericError": "Fehler: Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut",
+    "app.audioManager.connectionError": "Fehler: Verbindungsfehler",
+    "app.audioManager.requestTimeout": "Fehler: Zeitüberschreitung beim Aufruf",
+    "app.audioManager.invalidTarget": "Fehler: Beim Aufruf wurde ein ungültiges Ziel angegeben",
+    "app.audioManager.mediaError": "Fehler: Es gab ein Problem bei der Abfrage Ihrer Mediengeräte",
+    "app.audio.joinAudio": "Audio starten",
+    "app.audio.leaveAudio": "Audio beenden",
+    "app.audio.enterSessionLabel": "An Konferenz teilnehmen",
+    "app.audio.playSoundLabel": "Testmelodie abspielen",
+    "app.audio.backLabel": "Zurück",
+    "app.audio.audioSettings.titleLabel": "Audioeinstellungen vornehmen",
+    "app.audio.audioSettings.descriptionLabel": "Ein Dialogfenster wird sich in Ihrem Browser öffnen, in dem Sie der Freigabe Ihres Mikrofons zustimmen müssen.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Mikrofoneingang",
+    "app.audio.audioSettings.speakerSourceLabel": "Lautsprecherausgang",
+    "app.audio.audioSettings.microphoneStreamLabel": "Lautstärke Ihres Audiosignals",
+    "app.audio.audioSettings.retryLabel": "Erneut versuchen",
+    "app.audio.listenOnly.backLabel": "Zurück",
+    "app.audio.listenOnly.closeLabel": "Schließen",
+    "app.error.removed": "Sie wurden aus der Konferenz entfernt",
+    "app.error.meeting.ended": "Sie haben die Konferenz verlassen",
+    "app.dropdown.close": "Schließen",
+    "app.error.500": "Ups, irgendwas ist schiefgelaufen",
+    "app.error.404": "Nicht gefunden",
+    "app.error.401": "Nicht erlaubt",
+    "app.error.403": "Verboten",
+    "app.error.leaveLabel": "Erneut einloggen",
+    "app.guest.waiting": "Warte auf Erlaubnis zur Konferenzteilnahme",
+    "app.toast.breakoutRoomEnded": "Breakout Raum wurde beendet. Bitte klicken Sie aufs Mikrofon-Icon um wieder der Audiokonferenz im Hauptraum beizutreten",
+    "app.toast.chat.public": "Neue öffentliche Chatnachricht",
+    "app.toast.chat.private": "Neue private Chatnachricht",
+    "app.toast.chat.system": "System",
+    "app.notification.recordingStart": "Die Konferenz wird jetzt aufgezeichnet",
+    "app.notification.recordingStop": "Die Konferenz wird nicht mehr aufgezeichnet",
+    "app.shortcut-help.title": "Tastaturkürzel",
+    "app.shortcut-help.accessKeyNotAvailable": "Tastaturkürzel nicht verfügbar",
+    "app.shortcut-help.comboLabel": "Tastenkombination",
+    "app.shortcut-help.functionLabel": "Funktion",
+    "app.shortcut-help.closeLabel": "Schließen",
+    "app.shortcut-help.closeDesc": "Schließt den Tastaturkürzel-Dialog",
+    "app.shortcut-help.openOptions": "Einstellungen öffnen",
+    "app.shortcut-help.toggleUserList": "Teilnehmerliste öffnen/schließen",
+    "app.shortcut-help.toggleMute": "Stummschalten/Freischalten",
+    "app.shortcut-help.togglePublicChat": "Öffentlichen Chat öffnen/schließen (Teilnehmerliste muss geöffnet sein)",
+    "app.shortcut-help.hidePrivateChat": "Privaten Chat verbergen",
+    "app.shortcut-help.closePrivateChat": "Privaten Chat schließen",
+    "app.shortcut-help.openActions": "Aktionsmenü öffnen",
+    "app.shortcut-help.openStatus": "Statusmenü öffnen",
+    "app.video.swapCam": "Wechseln",
+    "app.video.swapCamDesc": "Ausrichtung der Webcams wechseln",
+    "app.video.videoMenu": "Videomenü",
+    "app.video.videoMenuDisabled": "Webcam in den Einstellungen deaktiviert",
+    "app.video.videoMenuDesc": "Videomenü öffnen",
+    "app.video.chromeExtensionError": "Sie müssen Folgendes installieren:",
+    "app.video.chromeExtensionErrorLink": "Diese Chrome Erweiterung",
+    "app.video.stats.title": "Verbindungsstatistiken",
+    "app.video.stats.packetsReceived": "Empfangene Pakete",
+    "app.video.stats.packetsSent": "Gesendete Pakete",
+    "app.video.stats.packetsLost": "Verlorene Pakete",
+    "app.video.stats.bitrate": "Bitrate",
+    "app.video.stats.lostPercentage": "Verlustprozente insgesamt",
+    "app.video.stats.lostRecentPercentage": "Verlustprozente kürzlich",
+    "app.video.stats.dimensions": "Dimensionen",
+    "app.video.stats.codec": "Codec",
+    "app.video.stats.decodeDelay": "Dekodierungsverzögerung",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "Enkodierungsnutzung",
+    "app.video.stats.currentDelay": "Aktuelle Verzögerung",
+    "app.deskshare.iceConnectionStateError": "Fehler 1108: ICE Verbindung während der Bildschirmfreigabe fehlgeschlagen",
+    "app.sfu.mediaServerConnectionError2000": "Fehler 2000: Verbindung zum Mediaserver kann nicht hergestellt werden",
+    "app.sfu.mediaServerOffline2001": "Fehler 2001: Mediaserver ist offline. Versuchen Sie es später nochmal.",
+    "app.sfu.mediaServerNoResources2002": "Fehler 2002: Mediaserver hat keine verfügbaren Resourcen",
+    "app.sfu.mediaServerRequestTimeout2003": "Fehler 2003: Zeitüberschreitung bei Anfragen an den Mediaserver",
+    "app.sfu.serverIceGatheringFailed2021": "Fehler 2021: Mediaserver kann ICE Kandidaten nicht erfassen",
+    "app.sfu.serverIceGatheringFailed2022": "Fehler 2022: Mediaserver ICE Verbindung fehlgeschlagen",
+    "app.sfu.invalidSdp2202":"Fehler 2202: Client hat ungültigen SDP generiert",
+    "app.sfu.noAvailableCodec2203": "Fehler 2203: Server konnte keinen passenden Codec finden",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.toolbar.tools": "Werkzeuge",
+    "app.whiteboard.toolbar.tools.pencil": "Stift",
+    "app.whiteboard.toolbar.tools.rectangle": "Rechteck",
+    "app.whiteboard.toolbar.tools.triangle": "Dreieck",
+    "app.whiteboard.toolbar.tools.ellipse": "Ellipse",
+    "app.whiteboard.toolbar.tools.line": "Linie",
+    "app.whiteboard.toolbar.tools.text": "Text",
+    "app.whiteboard.toolbar.thickness": "Strichdicke",
+    "app.whiteboard.toolbar.thicknessDisabled": "Strichdicke ist deaktiviert",
+    "app.whiteboard.toolbar.color": "Farben",
+    "app.whiteboard.toolbar.colorDisabled": "Farben sind deaktiviert",
+    "app.whiteboard.toolbar.color.black": "Schwarz",
+    "app.whiteboard.toolbar.color.white": "Weiß",
+    "app.whiteboard.toolbar.color.red": "Rot",
+    "app.whiteboard.toolbar.color.orange": "Orange",
+    "app.whiteboard.toolbar.color.eletricLime": "Gelbgrün",
+    "app.whiteboard.toolbar.color.lime": "Hellgrün",
+    "app.whiteboard.toolbar.color.cyan": "Cyan",
+    "app.whiteboard.toolbar.color.dodgerBlue": "Dodger blau",
+    "app.whiteboard.toolbar.color.blue": "Blau",
+    "app.whiteboard.toolbar.color.violet": "Violett",
+    "app.whiteboard.toolbar.color.magenta": "Magenta",
+    "app.whiteboard.toolbar.color.silver": "Silber",
+    "app.whiteboard.toolbar.undo": "Anmerkung zurücknehmen",
+    "app.whiteboard.toolbar.clear": "Alle Anmerkungen löschen",
+    "app.whiteboard.toolbar.multiUserOn": "Mehrbenutzermodus starten",
+    "app.whiteboard.toolbar.multiUserOff": "Mehrbenutzermodus beenden",
+    "app.whiteboard.toolbar.fontSize": "Schriftgrößenliste",
+    "app.feedback.title": "Sie haben sich aus der Konferenz ausgeloggt",
+    "app.feedback.subtitle": "Wir würden gerne erfahren, wie Sie BigBlueButton finden (optional)",
+    "app.feedback.textarea": "Wie können wir BigBlueButton verbessern?",
+    "app.feedback.sendFeedback": "Feedback senden",
+    "app.feedback.sendFeedbackDesc": "Feedback senden und Konferenz verlassen",
+    "app.videoDock.webcamFocusLabel": "Vergrößern",
+    "app.videoDock.webcamFocusDesc": "Ausgewählte Webcam vergrößern",
+    "app.videoDock.webcamUnfocusLabel": "Normalgröße",
+    "app.videoDock.webcamUnfocusDesc": "Ausgewählte Webcam auf Normalgröße verkleinern"
+
+}
+

From 4d9d0aaf2364172cd1ef24011a99bf019c61ce3d Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Tue, 22 Jan 2019 14:14:35 -0800
Subject: [PATCH 129/163] update the copyright in 2.2 Flash client to 2019

---
 bigbluebutton-client/resources/config.xml.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 bigbluebutton-client/resources/config.xml.template

diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
old mode 100644
new mode 100755
index 763979403d..a415ce534d
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -11,7 +11,7 @@
     		  localesConfig="http://HOST/client/conf/locales.xml"
     		  localesDirectory="http://HOST/client/locale/"/>
     <skinning url="http://HOST/client/branding/css/V2Theme.css.swf?v=VERSION" />
-    <branding logo="logos/logo.swf" copyright="&#169; 2018 &lt;u&gt;&lt;a href=&quot;http://HOST/home.html&quot; target=&quot;_blank&quot;&gt;BigBlueButton Inc.&lt;/a&gt;&lt;/u&gt; (build {0})" background="" toolbarColor="" showQuote="true"/>
+    <branding logo="logos/logo.swf" copyright="&#169; 2019 &lt;u&gt;&lt;a href=&quot;http://HOST/home.html&quot; target=&quot;_blank&quot;&gt;BigBlueButton Inc.&lt;/a&gt;&lt;/u&gt; (build {0})" background="" toolbarColor="" showQuote="true"/>
     <shortcutKeys showButton="true" />
     <browserVersions chrome="CHROME_VERSION" firefox="FIREFOX_VERSION" flash="FLASH_VERSION"/>
     <layout showLogButton="false" defaultLayout="bbb.layout.name.defaultlayout"

From 42eba49dcd1127ee68d30d55aaf23e1ab980824c Mon Sep 17 00:00:00 2001
From: Bobak Oftadeh <bobakoftadeh@outlook.com>
Date: Tue, 22 Jan 2019 14:50:25 -0800
Subject: [PATCH 130/163] Adjusted min-width for dropdown

---
 .../video-provider/video-list/styles.scss     |  4 +++
 .../video-list/video-list-item/component.jsx  | 30 ++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
index ba6f0b5c40..1d59173de0 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
@@ -152,6 +152,10 @@
   }
 }
 
+.dropdownContent {
+  min-width: 8.5rem;
+}
+
 .dropdownList {
   @include mq($medium-up) {
     font-size: .86rem;
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
index 47299f08ed..92c434dc45 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx
@@ -26,8 +26,8 @@ class VideoListItem extends Component {
 
     this.state = {
       showStats: false,
-      stats: {'video':{}},
-    }
+      stats: { video: {} },
+    };
 
     this.toggleStats = this.toggleStats.bind(this);
     this.setStats = this.setStats.bind(this);
@@ -40,10 +40,10 @@ class VideoListItem extends Component {
   componentDidUpdate() {
     const playElement = (elem) => {
       if (elem.paused) {
-        var p = elem.play();
+        const p = elem.play();
         if (p && (typeof Promise !== 'undefined') && (p instanceof Promise)) {
           // Catch exception when playing video
-          p.catch(function(e) {});
+          p.catch((e) => {});
         }
       }
     };
@@ -64,12 +64,12 @@ class VideoListItem extends Component {
       getStats(this.videoTag, this.setStats);
     }
 
-    this.setState({showStats: !this.state.showStats});
+    this.setState({ showStats: !this.state.showStats });
   }
 
   setStats(updatedStats) {
     const { audio, video } = updatedStats;
-    this.setState({ stats: { ...this.state.stats, video, audio }})
+    this.setState({ stats: { ...this.state.stats, video, audio } });
   }
 
   getAvailableActions() {
@@ -84,13 +84,15 @@ class VideoListItem extends Component {
       <DropdownListTitle className={styles.hiddenDesktop} key="name">{user.name}</DropdownListTitle>,
       <DropdownListSeparator className={styles.hiddenDesktop} key="sep" />,
       ...actions.map(action => (<DropdownListItem key={user.id} {...action} />)),
-      (enableVideoStats ?
-        <DropdownListItem
-          key={'list-item-stats-' + user.id}
-          onClick={() => {this.toggleStats();}}
-          label={intl.formatMessage(intlMessages.connectionStatsLabel)}
-        />
-      : null),
+      (enableVideoStats
+        ? (
+          <DropdownListItem
+            key={`list-item-stats-${user.id}`}
+            onClick={() => { this.toggleStats(); }}
+            label={intl.formatMessage(intlMessages.connectionStatsLabel)}
+          />
+        )
+        : null),
     ]);
   }
 
@@ -119,7 +121,7 @@ class VideoListItem extends Component {
             <DropdownTrigger className={styles.dropdownTrigger}>
               <span>{user.name}</span>
             </DropdownTrigger>
-            <DropdownContent placement="top left">
+            <DropdownContent placement="top left" className={styles.dropdownContent}>
               <DropdownList className={styles.dropdownList}>
                 {availableActions}
               </DropdownList>

From 1e71edb18a6274cd5f69ee284f15fcaa5d5741fe Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Wed, 23 Jan 2019 13:23:43 +0000
Subject: [PATCH 131/163] Add specific case for safari-specific devices on the
 SD offer release

---
 .../client/compatibility/kurento-utils.js     | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index 6b3c227761..2f14cbece1 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -267,6 +267,28 @@ function WebRtcPeer(mode, options, callback) {
     };
     this.generateOffer = function (callback) {
         callback = callback.bind(this);
+        const descriptionCallback = () => {
+            var localDescription = pc.localDescription;
+            // logger.debug('Local description set', localDescription.sdp);
+            if (multistream && usePlanB) {
+              localDescription = interop.toUnifiedPlan(localDescription);
+              logger.debug('offer::origPlanB->UnifiedPlan', dumpSDP(localDescription));
+            }
+            callback(null, localDescription.sdp, self.processAnswer.bind(self));
+        }
+
+        const userAgent = window.navigator.userAgent.toLocaleLowerCase();
+
+        // Bind the SDP release to the gathering state on Safari-based envs
+        if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1) || userAgent.indexOf('safari') > -1) {
+
+            pc.onicegatheringstatechange = function (event) {
+                if(event.target.iceGatheringState == "complete") {
+                  descriptionCallback();
+                }
+            }
+        }
+
         var offerAudio = true;
         var offerVideo = true;
         if (mediaConstraints) {
@@ -283,14 +305,12 @@ function WebRtcPeer(mode, options, callback) {
             // logger.debug('Created SDP offer');
             offer = mangleSdpToAddSimulcast(offer);
             return pc.setLocalDescription(offer);
-        }).then(function () {
-            var localDescription = pc.localDescription;
-            // logger.debug('Local description set', localDescription.sdp);
-            if (multistream && usePlanB) {
-              localDescription = interop.toUnifiedPlan(localDescription);
-              logger.debug('offer::origPlanB->UnifiedPlan', dumpSDP(localDescription));
+        }).then(() => {
+            // The Safari offer release was already binded to the gathering state
+            if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1) || userAgent.indexOf('safari') > -1) {
+                return;
             }
-            callback(null, localDescription.sdp, self.processAnswer.bind(self));
+            descriptionCallback();
         }).catch(callback);
     };
     this.getLocalSessionDescriptor = function () {

From 0cc53db3660b9042b1c1f8329c76a761b57104a5 Mon Sep 17 00:00:00 2001
From: Joao Siebel <joaos_desenv@imdt.com.br>
Date: Wed, 23 Jan 2019 14:06:14 -0200
Subject: [PATCH 132/163] show audio modal when microphone is locked, and fix a
 problem with listenOnly connection. close #6574

---
 .../server/methods/addUserSettings.js         |  2 +-
 .../imports/ui/components/app/component.jsx   |  4 +--
 .../imports/ui/components/app/container.jsx   |  1 -
 .../audio/audio-controls/container.jsx        |  7 +----
 .../audio/audio-modal/component.jsx           |  7 +++--
 .../ui/components/lock-viewers/component.jsx  | 26 -------------------
 6 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
index 4310a9fe0b..e69961db74 100644
--- a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
+++ b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
@@ -17,7 +17,7 @@ export default function addUserSettings(credentials, meetingId, userId, settings
       'forceListenOnly',
       'skipCheck',
       'clientTitle',
-      'lockOnJoin', // NOT IMPLEMENTED YET
+      'lockOnJoin',
       'askForFeedbackOnLogout',
       // BRANDING
       'displayBrandingArea',
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 435c131a01..1a7b13e38e 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -194,7 +194,7 @@ class App extends Component {
 
   render() {
     const {
-      customStyle, customStyleUrl, micsLocked, openPanel,
+      customStyle, customStyleUrl, openPanel,
     } = this.props;
 
     return (
@@ -211,7 +211,7 @@ class App extends Component {
         </section>
         <PollingContainer />
         <ModalContainer />
-        {micsLocked ? null : <AudioContainer />}
+        <AudioContainer />
         <ToastContainer />
         <ChatAlertContainer />
         {customStyleUrl ? <link rel="stylesheet" type="text/css" href={customStyleUrl} /> : null}
diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx
index a289c016da..999b09ea16 100755
--- a/bigbluebutton-html5/imports/ui/components/app/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx
@@ -116,7 +116,6 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls })
     chatIsOpen: Session.equals('openPanel', 'chat'),
     openPanel: Session.get('openPanel'),
     userListIsOpen: !Session.equals('openPanel', ''),
-    micsLocked: (currentUserIsLocked && meeting.lockSettingsProp.disableMic),
   };
 })(AppContainer)));
 
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx
index 11cf83edb8..3c97857f9e 100644
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx
@@ -44,12 +44,7 @@ export default withModalMounter(withTracker(({ mountModal }) => ({
   glow: Service.isTalking() && !Service.isMuted(),
   handleToggleMuteMicrophone: () => Service.toggleMuteMicrophone(),
   handleJoinAudio: () => {
-    const meeting = Meetings.findOne({ meetingId: Auth.meetingID });
-    const currentUser = Users.findOne({ userId: Auth.userID });
-    const currentUserIsLocked = mapUser(currentUser).isLocked;
-    const micsLocked = (currentUserIsLocked && meeting.lockSettingsProp.disableMic);
-
-    return micsLocked ? Service.joinListenOnly() : mountModal(<AudioModalContainer />);
+    return Service.isConnected() ? Service.joinListenOnly() : mountModal(<AudioModalContainer />);
   },
   handleLeaveAudio: () => Service.exitAudio(),
 }))(AudioControlsContainer));
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
index d06f46b383..5bd10c2965 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -129,6 +129,7 @@ class AudioModal extends Component {
       joinFullAudioImmediately,
       joinFullAudioEchoTest,
       forceListenOnlyAttendee,
+      audioLocked,
     } = this.props;
 
     if (joinFullAudioImmediately) {
@@ -139,7 +140,7 @@ class AudioModal extends Component {
       this.handleGoToEchoTest();
     }
 
-    if (forceListenOnlyAttendee) {
+    if (forceListenOnlyAttendee || audioLocked) {
       this.handleJoinListenOnly();
     }
   }
@@ -266,9 +267,11 @@ class AudioModal extends Component {
       audioLocked,
     } = this.props;
 
+    const showMicrophone = forceListenOnlyAttendee || audioLocked;
+
     return (
       <span className={styles.audioOptions}>
-        {!forceListenOnlyAttendee
+        {!showMicrophone
           ? (
             <Button
               className={styles.audioBtn}
diff --git a/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx b/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
index 261a55ebf2..604dc502b6 100755
--- a/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/lock-viewers/component.jsx
@@ -50,10 +50,6 @@ const intlMessages = defineMessages({
     id: 'app.lock-viewers.PrivateChatLable',
     description: 'description for close button',
   },
-  layoutLable: {
-    id: 'app.lock-viewers.Layout',
-    description: 'description for close button',
-  },
 });
 
 class LockViewersComponent extends React.PureComponent {
@@ -197,28 +193,6 @@ class LockViewersComponent extends React.PureComponent {
                 </div>
               </div>
             </div>
-            <div className={styles.row}>
-              <div className={styles.col} aria-hidden="true">
-                <div className={styles.formElement}>
-                  <div className={styles.label}>
-                    {intl.formatMessage(intlMessages.layoutLable)}
-                  </div>
-                </div>
-              </div>
-              <div className={styles.col}>
-                <div className={cx(styles.formElement, styles.pullContentRight)}>
-                  <Toggle
-                    icons={false}
-                    defaultChecked={meeting.lockSettingsProp.lockedLayout}
-                    onChange={() => {
-                      meeting.lockSettingsProp.lockedLayout = !meeting.lockSettingsProp.lockedLayout;
-                      toggleLockSettings(meeting);
-                    }}
-                    ariaLabel={intl.formatMessage(intlMessages.layoutLable)}
-                  />
-                </div>
-              </div>
-            </div>
           </div>
         </div>
       </Modal>

From 4a2c26cc6f035649707f715f59d6201726090c26 Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Wed, 23 Jan 2019 16:33:04 +0000
Subject: [PATCH 133/163] Fixed Safari check in kurento-utils

---
 bigbluebutton-html5/client/compatibility/kurento-utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index 2f14cbece1..ec53361773 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -278,10 +278,10 @@ function WebRtcPeer(mode, options, callback) {
         }
 
         const userAgent = window.navigator.userAgent.toLocaleLowerCase();
+        const isSafari = ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1) || browser.name.toLowerCase() == 'safari');
 
         // Bind the SDP release to the gathering state on Safari-based envs
-        if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1) || userAgent.indexOf('safari') > -1) {
-
+        if (isSafari) {
             pc.onicegatheringstatechange = function (event) {
                 if(event.target.iceGatheringState == "complete") {
                   descriptionCallback();
@@ -307,7 +307,7 @@ function WebRtcPeer(mode, options, callback) {
             return pc.setLocalDescription(offer);
         }).then(() => {
             // The Safari offer release was already binded to the gathering state
-            if ((userAgent.indexOf('iphone') > -1 || userAgent.indexOf('ipad') > -1) || userAgent.indexOf('safari') > -1) {
+            if (isSafari) {
                 return;
             }
             descriptionCallback();

From 6c576775878dee7698b517bd56258c06114adc8a Mon Sep 17 00:00:00 2001
From: Maxim Khlobystov <maxim.khlobystov@gmail.com>
Date: Wed, 23 Jan 2019 13:45:36 -0500
Subject: [PATCH 134/163] Properly use webcamDeviceId from state

---
 .../imports/ui/components/video-preview/component.jsx          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
index d05c8e86fd..33f66e942e 100644
--- a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -146,7 +146,6 @@ class VideoPreview extends Component {
 
   componentDidMount() {
     const { webcamDeviceId, changeWebcam } = this.props;
-    const { webcamDeviceId: savedWebcamDeviceId } = this.state;
     const constraints = {
       video: VIDEO_CONSTRAINTS,
     };
@@ -174,7 +173,7 @@ class VideoPreview extends Component {
         this.setState({ availableWebcams: webcams });
       }
 
-      constraints.video.deviceId = { exact: savedWebcamDeviceId };
+      constraints.video.deviceId = { exact: this.state.webcamDeviceId };
       navigator.mediaDevices.getUserMedia(constraints).then((stream) => {
         // display the preview
         this.video.srcObject = stream;

From 1cc91a79d0490c3c862a198cf0e84599fd7075a0 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Wed, 23 Jan 2019 17:03:48 -0200
Subject: [PATCH 135/163] Fix blank panel when breakout rooms ends

---
 .../ui/components/breakout-room/component.jsx | 62 ++++++++++++-------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx
index 0d580c4115..2b08385402 100644
--- a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx
@@ -65,19 +65,35 @@ class BreakoutRoom extends Component {
   }
 
   componentDidUpdate() {
-    const { breakoutRoomUser } = this.props;
-    if (this.state.waiting && !this.state.generated) {
-      const breakoutUser = breakoutRoomUser(this.state.requestedBreakoutId);
+    const {
+      breakoutRoomUser,
+      breakoutRooms,
+      closeBreakoutPanel,
+    } = this.props;
+
+    const {
+      waiting,
+      generated,
+      requestedBreakoutId,
+    } = this.state;
+
+    if (breakoutRooms.length <= 0) closeBreakoutPanel();
+
+    if (waiting && !generated) {
+      const breakoutUser = breakoutRoomUser(requestedBreakoutId);
+
       if (!breakoutUser) return;
       if (breakoutUser.redirectToHtml5JoinURL !== '') {
         _.delay(() => this.setState({ generated: true, waiting: false }), 1000);
       }
     }
   }
+
   getBreakoutURL(breakoutId) {
     const { requestJoinURL, breakoutRoomUser } = this.props;
+    const { waiting } = this.state;
     const hasUser = breakoutRoomUser(breakoutId);
-    if (!hasUser && !this.state.waiting) {
+    if (!hasUser && !waiting) {
       this.setState(
         { waiting: true, requestedBreakoutId: breakoutId },
         () => requestJoinURL(breakoutId),
@@ -96,6 +112,7 @@ class BreakoutRoom extends Component {
     transferToBreakout(breakoutId);
     this.setState({ joinedAudioOnly: true, breakoutId });
   }
+
   returnBackToMeeeting(breakoutId) {
     const { transferUserToMeeting, meetingId } = this.props;
     transferUserToMeeting(breakoutId, meetingId);
@@ -119,9 +136,9 @@ class BreakoutRoom extends Component {
 
     const moderatorJoinedAudio = isMicrophoneUser && isModerator;
     const disable = waiting && requestedBreakoutId !== breakoutId;
-    const audioAction = joinedAudioOnly ?
-      () => this.returnBackToMeeeting(breakoutId) :
-      () => this.transferUserToBreakoutRoom(breakoutId);
+    const audioAction = joinedAudioOnly
+      ? () => this.returnBackToMeeeting(breakoutId)
+      : () => this.transferUserToBreakoutRoom(breakoutId);
     return (
       <div className={styles.breakoutActions}>
         <Button
@@ -133,18 +150,17 @@ class BreakoutRoom extends Component {
           className={styles.joinButton}
         />
         {
-          moderatorJoinedAudio ?
-            [
+          moderatorJoinedAudio
+            ? [
               ('|'),
               (
                 <Button
                   label={
-                    moderatorJoinedAudio &&
-                    stateBreakoutId === breakoutId &&
-                    joinedAudioOnly
-                      ?
-                      intl.formatMessage(intlMessages.breakoutReturnAudio) :
-                      intl.formatMessage(intlMessages.breakoutJoinAudio)
+                    moderatorJoinedAudio
+                    && stateBreakoutId === breakoutId
+                    && joinedAudioOnly
+                      ? intl.formatMessage(intlMessages.breakoutReturnAudio)
+                      : intl.formatMessage(intlMessages.breakoutJoinAudio)
                   }
                   className={styles.button}
                   onClick={audioAction}
@@ -163,10 +179,15 @@ class BreakoutRoom extends Component {
       intl,
     } = this.props;
 
+    const {
+      waiting,
+      requestedBreakoutId,
+    } = this.state;
+
     const roomItems = breakoutRooms.map(item => (
       <div className={styles.content} key={`breakoutRoomList-${item.breakoutId}`}>
         <span>{intl.formatMessage(intlMessages.breakoutRoom, item.sequence.toString())}</span>
-        {this.state.waiting && this.state.requestedBreakoutId === item.breakoutId ? (
+        {waiting && requestedBreakoutId === item.breakoutId ? (
           <span>
             {intl.formatMessage(intlMessages.generatingURL)}
             <span className={styles.connectingAnimation} />
@@ -192,13 +213,12 @@ class BreakoutRoom extends Component {
 
   render() {
     const {
-      intl, endAllBreakouts, breakoutRooms, isModerator, closeBreakoutPanel,
+      intl, endAllBreakouts, isModerator, closeBreakoutPanel,
     } = this.props;
-    if (breakoutRooms.length <= 0) return null;
     return (
       <div className={styles.panel}>
         <div className={styles.header} role="button" onClick={closeBreakoutPanel} >
-          <span >
+          <span>
             <Icon iconName="left_arrow" />
             {intl.formatMessage(intlMessages.breakoutTitle)}
           </span>
@@ -206,8 +226,8 @@ class BreakoutRoom extends Component {
         {this.renderBreakoutRooms()}
         {this.renderDuration()}
         {
-          isModerator ?
-            (
+          isModerator
+            ? (
               <Button
                 color="primary"
                 size="lg"

From d7dadec51d8ba4eae7bd7d1cc998d162219947af Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 23 Jan 2019 21:16:33 +0000
Subject: [PATCH 136/163] add 2.2 html5 localized strings

---
 .../private/locales/bg_BG.json                | 213 ++++++++-
 bigbluebutton-html5/private/locales/de.json   |  34 +-
 .../private/locales/el_GR.json                |  69 +++
 .../private/locales/es_ES.json                | 231 ++++++++++
 .../private/locales/fa_IR.json                | 399 +++++++++++++++++
 bigbluebutton-html5/private/locales/fr.json   | 406 ++++++++++++++++++
 bigbluebutton-html5/private/locales/id.json   | 238 ++++++++++
 .../private/locales/it_IT.json                |   9 +
 bigbluebutton-html5/private/locales/ja.json   | 382 ++++++++++++++++
 .../private/locales/ja_JP.json                | 382 ++++++++++++++++
 bigbluebutton-html5/private/locales/km.json   |  43 +-
 .../private/locales/pt_BR.json                | 406 ++++++++++++++++++
 .../private/locales/ru_RU.json                | 406 ++++++++++++++++++
 .../private/locales/tr_TR.json                | 383 +++++++++++++++++
 .../private/locales/uk_UA.json                | 406 ++++++++++++++++++
 .../private/locales/zh_CN.json                | 406 ++++++++++++++++++
 16 files changed, 4394 insertions(+), 19 deletions(-)
 create mode 100644 bigbluebutton-html5/private/locales/el_GR.json
 create mode 100644 bigbluebutton-html5/private/locales/es_ES.json
 create mode 100644 bigbluebutton-html5/private/locales/fa_IR.json
 create mode 100644 bigbluebutton-html5/private/locales/fr.json
 create mode 100644 bigbluebutton-html5/private/locales/id.json
 create mode 100644 bigbluebutton-html5/private/locales/it_IT.json
 create mode 100644 bigbluebutton-html5/private/locales/ja.json
 create mode 100644 bigbluebutton-html5/private/locales/ja_JP.json
 create mode 100644 bigbluebutton-html5/private/locales/pt_BR.json
 create mode 100644 bigbluebutton-html5/private/locales/ru_RU.json
 create mode 100644 bigbluebutton-html5/private/locales/tr_TR.json
 create mode 100644 bigbluebutton-html5/private/locales/uk_UA.json
 create mode 100644 bigbluebutton-html5/private/locales/zh_CN.json

diff --git a/bigbluebutton-html5/private/locales/bg_BG.json b/bigbluebutton-html5/private/locales/bg_BG.json
index 38cc14a469..cbfb5645a8 100644
--- a/bigbluebutton-html5/private/locales/bg_BG.json
+++ b/bigbluebutton-html5/private/locales/bg_BG.json
@@ -1,7 +1,214 @@
 {
-    "app.chat.closeChatLabel": "Затвори {0}",
-    "app.chat.hideChatLabel": "Скрий {0}",
-    "app.chat.dropdown.save": "Запази"
+    "app.home.greeting": "Добре дошли, {name}! Вашата презентация ще започне всеки момент",
+    "app.chat.submitLabel": "Изпрати",
+    "app.chat.inputLabel": "Message input for chat {0}",
+    "app.chat.inputPlaceholder": "Message {0}",
+    "app.chat.titlePublic": "Общ чат",
+    "app.chat.titlePrivate": "Private Chat with {0}",
+    "app.chat.partnerDisconnected": "{0} has left the meeting",
+    "app.chat.closeChatLabel": "Close {0}",
+    "app.chat.hideChatLabel": "Hide {0}",
+    "app.chat.moreMessages": "More messages below",
+    "app.chat.dropdown.clear": "Clear",
+    "app.chat.dropdown.save": "Save",
+    "app.chat.label": "Chat",
+    "app.chat.emptyLogLabel": "Chat log empty",
+    "app.userList.usersTitle": "Потребители",
+    "app.userList.participantsTitle": "Participants",
+    "app.userList.messagesTitle": "Съобщения",
+    "app.userList.presenter": "Лектор",
+    "app.userList.you": "Вие",
+    "app.userList.locked": "Locked",
+    "app.userList.label": "User List",
+    "app.userList.chatListItem.unreadSingular": "{0} New Message",
+    "app.userList.chatListItem.unreadPlural": "{0} New Messages",
+    "app.userList.menu.chat.label": "Chat",
+    "app.userList.menu.clearStatus.label": "Clear Status",
+    "app.userList.menu.makePresenter.label": "Make Presenter",
+    "app.userList.menu.muteUserAudio.label": "Mute user",
+    "app.userList.menu.unmuteUserAudio.label": "Unmute user",
+    "app.media.label": "Media",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Previous slide",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Change the presentation to the previous slide",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Next slide",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Change the presentation to the next slide",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Skip slide",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Change the presentation to a specific slide",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Fit to width",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Display the whole width of the slide",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Fit to screen",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Display the whole slide",
+    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
+    "app.presentation.presentationToolbar.zoomDesc": "Change the zoom level of the presentation",
+    "app.presentation.presentationToolbar.fitToWidth": "Fit to width",
+    "app.presentationUploder.dismissLabel": "Cancel",
+    "app.presentationUploder.genericError": "Ops, something went wrong",
+    "app.poll.closeLabel": "Close",
+    "app.poll.liveResult.usersTitle": "Потребители",
+    "app.polling.pollingTitle": "Polling Options",
+    "app.failedMessage": "Apologies, trouble connecting to the server.",
+    "app.connectingMessage": "Connecting...",
+    "app.waitingMessage": "Disconnected. Trying to reconnect in {0} seconds...",
+    "app.navBar.settingsDropdown.optionsLabel": "Options",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
+    "app.navBar.settingsDropdown.settingsLabel": "Open settings",
+    "app.navBar.settingsDropdown.aboutLabel": "About",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Logout",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Exit fullscreen",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Make the settings menu fullscreen",
+    "app.navBar.settingsDropdown.settingsDesc": "Change the general settings",
+    "app.navBar.settingsDropdown.aboutDesc": "Show information about the client",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Leave the meeting",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Exit fullscreen mode",
+    "app.navBar.userListToggleBtnLabel": "User List Toggle",
+    "app.navBar.toggleUserList.newMessages": "with new message notification",
+    "app.leaveConfirmation.confirmLabel": "Leave",
+    "app.leaveConfirmation.confirmDesc": "Logs you out of the meeting",
+    "app.about.title": "About",
+    "app.about.version": "Client Build:",
+    "app.about.copyright": "Copyright:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Cancel",
+    "app.about.dismissDesc": "Close about client information",
+    "app.actionsBar.changeStatusLabel": "Change Status",
+    "app.actionsBar.muteLabel": "Mute",
+    "app.actionsBar.unmuteLabel": "Unmute",
+    "app.actionsBar.camOffLabel": "Cam Off",
+    "app.actionsBar.raiseLabel": "Raise",
+    "app.actionsBar.label": "Actions Bar",
+    "app.submenu.application.applicationSectionTitle": "Application",
+    "app.submenu.application.fontSizeControlLabel": "Font size",
+    "app.submenu.application.increaseFontBtnLabel": "Increase Application Font Size",
+    "app.submenu.application.decreaseFontBtnLabel": "Decrease Application Font Size",
+    "app.submenu.application.languageLabel": "Application Language",
+    "app.submenu.application.ariaLanguageLabel": "Change Application Language",
+    "app.submenu.application.languageOptionLabel": "Choose language",
+    "app.submenu.application.noLocaleOptionLabel": "No active locales",
+    "app.submenu.audio.micSourceLabel": "Microphone source",
+    "app.submenu.audio.speakerSourceLabel": "Speaker source",
+    "app.submenu.audio.streamVolumeLabel": "Your audio stream volume",
+    "app.submenu.video.title": "Video",
+    "app.submenu.video.videoSourceLabel": "View source",
+    "app.submenu.video.videoOptionLabel": "Choose view source",
+    "app.submenu.video.videoQualityLabel": "Video Quality",
+    "app.submenu.video.qualityOptionLabel": "Choose the video quality",
+    "app.submenu.video.participantsCamLabel": "Viewing participants webcams",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Closed Captions",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Take ownership",
+    "app.submenu.closedCaptions.languageLabel": "Language",
+    "app.submenu.closedCaptions.localeOptionLabel": "Choose language",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "No active locales",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Font family",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Choose Font-family",
+    "app.submenu.closedCaptions.fontSizeLabel": "Font size",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Choose Font size",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Background color",
+    "app.submenu.closedCaptions.fontColorLabel": "Font color",
+    "app.submenu.participants.muteAllLabel": "Mute all except the presenter",
+    "app.submenu.participants.lockAllLabel": "Lock all participants",
+    "app.submenu.participants.lockItemLabel": "Participants {0}",
+    "app.submenu.participants.lockMicDesc": "Disables the microphone for all locked participants",
+    "app.submenu.participants.lockCamDesc": "Disables the webcam for all locked participants",
+    "app.submenu.participants.lockPublicChatDesc": "Disables public chat for all locked participants",
+    "app.submenu.participants.lockPrivateChatDesc": "Disables private chat for all locked participants",
+    "app.submenu.participants.lockLayoutDesc": "Locks layout for all locked participants",
+    "app.submenu.participants.lockMicAriaLabel": "Microphone lock",
+    "app.submenu.participants.lockCamAriaLabel": "Webcam lock",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Public chat lock",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Private chat lock",
+    "app.submenu.participants.lockLayoutAriaLabel": "Layout lock",
+    "app.submenu.participants.lockMicLabel": "Microphone",
+    "app.submenu.participants.lockCamLabel": "Webcam",
+    "app.submenu.participants.lockPublicChatLabel": "Public Chat",
+    "app.submenu.participants.lockPrivateChatLabel": "Private Chat",
+    "app.submenu.participants.lockLayoutLabel": "Layout",
+    "app.settings.applicationTab.label": "Application",
+    "app.settings.audioTab.label": "Audio",
+    "app.settings.videoTab.label": "Video",
+    "app.settings.closedcaptionTab.label": "Closed Captions",
+    "app.settings.usersTab.label": "Participants",
+    "app.settings.main.label": "Settings",
+    "app.settings.main.cancel.label": "Cancel",
+    "app.settings.main.cancel.label.description": "Discards the changes and closes the settings menu",
+    "app.settings.main.save.label": "Save",
+    "app.settings.main.save.label.description": "Saves the changes and closes the settings menu",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Actions",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Upload a presentation",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Initiate a poll",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Share your screen",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",
+    "app.actionsBar.emojiMenu.awayLabel": "Away",
+    "app.actionsBar.emojiMenu.awayDesc": "Change your status to away",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Raise",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Raise your hand to ask a question",
+    "app.actionsBar.emojiMenu.neutralLabel": "Undecided",
+    "app.actionsBar.emojiMenu.neutralDesc": "Change your status to undecided",
+    "app.actionsBar.emojiMenu.confusedLabel": "Confused",
+    "app.actionsBar.emojiMenu.confusedDesc": "Change your status to confused",
+    "app.actionsBar.emojiMenu.sadLabel": "Sad",
+    "app.actionsBar.emojiMenu.sadDesc": "Change your status to sad",
+    "app.actionsBar.emojiMenu.happyLabel": "Happy",
+    "app.actionsBar.emojiMenu.happyDesc": "Change your status to happy",
+    "app.actionsBar.emojiMenu.noneLabel": "Clear Status",
+    "app.actionsBar.emojiMenu.noneDesc": "Clear your status",
+    "app.actionsBar.emojiMenu.applauseLabel": "Applaud",
+    "app.actionsBar.emojiMenu.applauseDesc": "Change your status to applause",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Thumbs up",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Change your status to thumbs up",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Thumbs down",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Change your status to thumbs down",
+    "app.actionsBar.currentStatusDesc": "current status {0}",
+    "app.audioNotification.audioFailedMessage": "Your audio connection failed to connect",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia failed, Only secure origins are allowed",
+    "app.audioNotification.closeLabel": "Close",
+    "app.breakoutJoinConfirmation.title": "Join Breakout Room",
+    "app.breakoutJoinConfirmation.message": "Do you want to join",
+    "app.breakoutJoinConfirmation.confirmLabel": "Join",
+    "app.breakoutJoinConfirmation.confirmDesc": "Join you to the Breakout Room",
+    "app.breakoutJoinConfirmation.dismissLabel": "Cancel",
+    "app.breakoutJoinConfirmation.dismissDesc": "Closes and rejects Joining the Breakout Room",
+    "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {0}",
+    "app.breakoutWillCloseMessage": "Time ended. Breakout Room will close soon",
+    "app.calculatingBreakoutTimeRemaining": "Calculating remaining time...",
+    "app.audioModal.microphoneLabel": "Microphone",
+    "app.audioModal.listenOnlyLabel": "Listen Only",
+    "app.audioModal.audioChoiceLabel": "How would you like to join the audio?",
+    "app.audioModal.audioChoiceDesc": "Select how to join the audio in this meeting",
+    "app.audioModal.closeLabel": "Close",
+    "app.audio.joinAudio": "Join Audio",
+    "app.audio.leaveAudio": "Leave Audio",
+    "app.audio.enterSessionLabel": "Enter Session",
+    "app.audio.playSoundLabel": "Play Sound",
+    "app.audio.backLabel": "Back",
+    "app.audio.audioSettings.titleLabel": "Choose your audio settings",
+    "app.audio.audioSettings.descriptionLabel": "Please note, a dialog will appear in your browser, requiring you to accept sharing your microphone.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Microphone source",
+    "app.audio.audioSettings.speakerSourceLabel": "Speaker source",
+    "app.audio.audioSettings.microphoneStreamLabel": "Your audio stream volume",
+    "app.audio.listenOnly.backLabel": "Back",
+    "app.audio.listenOnly.closeLabel": "Close",
+    "app.error.meeting.ended": "You have logged out of the conference",
+    "app.dropdown.close": "Close",
+    "app.error.500": "Ops, something went wrong",
+    "app.error.404": "Not found",
+    "app.error.401": "Unauthorized",
+    "app.error.403": "Forbidden",
+    "app.error.leaveLabel": "Log in again",
+    "app.shortcut-help.closeLabel": "Close",
+    "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.microphoneLable": "Microphone",
+    "app.lock-viewers.PublicChatLabel": "Public Chat",
+    "app.lock-viewers.PrivateChatLable": "Private Chat",
+    "app.lock-viewers.Layout": "Layout",
+    "app.videoPreview.cancelLabel": "Cancel",
+    "app.videoPreview.closeLabel": "Close",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.feedback.title": "You have logged out of the conference",
+    "app.createBreakoutRoom.joinAudio": "Join Audio",
+    "app.externalVideo.close": "Close"
 
 }
 
diff --git a/bigbluebutton-html5/private/locales/de.json b/bigbluebutton-html5/private/locales/de.json
index 0da1ad7e8e..ba68eac7d1 100644
--- a/bigbluebutton-html5/private/locales/de.json
+++ b/bigbluebutton-html5/private/locales/de.json
@@ -1,5 +1,5 @@
 {
-    "app.home.greeting": "Willkommen! Ihre Präsentation wird in Kürze beginnen...",
+    "app.home.greeting": "Willkommen {0}! Ihre Präsentation wird in Kürze beginnen...",
     "app.chat.submitLabel": "Nachricht senden",
     "app.chat.errorMinMessageLength": "Die Nachricht ist {0} Buchstabe(n) zu kurz",
     "app.chat.errorMaxMessageLength": "Die Nachricht ist {0} Buchstabe(n) zu lang",
@@ -36,14 +36,14 @@
     "app.userList.menu.removeUser.label": "Teilnehmer entfernen",
     "app.userList.menu.muteUserAudio.label": "Teilnehmer stummschalten",
     "app.userList.menu.unmuteUserAudio.label": "Stummschaltung aufheben",
-    "app.userList.userAriaLabel": "{0} {1} {2} Status {3}",
+    "app.userList.userAriaLabel": "{0} {1} {2}  Status {3}",
     "app.userList.menu.promoteUser.label": "Zum Moderator befördern",
     "app.userList.menu.demoteUser.label": "Zum Zuschauer zurückstufen",
     "app.media.label": "Media",
     "app.media.screenshare.start": "Bildschirmfreigabe wurde gestartet",
     "app.media.screenshare.end": "Bildschirmfreigabe wurde gestoppt",
     "app.media.screenshare.safariNotSupported": "Bildschirmfreigabe wird gegenwärtig von Safari nicht unterstützt. Bitte verwenden Sie Firefox oder Google Chrome.",
-    "app.meeting.ended": "Diese Konferenz wurde beendet\"",
+    "app.meeting.ended": "Diese Konferenz wurde beendet",
     "app.meeting.endedMessage": "Sie werden zum Startbildschirm weitergeleitet",
     "app.presentation.presentationToolbar.prevSlideLabel": "Vorherige Folie",
     "app.presentation.presentationToolbar.prevSlideDesc": "Präsentation zur vorherigen Folie wechseln",
@@ -57,6 +57,7 @@
     "app.presentation.presentationToolbar.fitScreenDesc": "Gesamte Folie darstellen",
     "app.presentation.presentationToolbar.zoomLabel": "Vergrößerungsgrad",
     "app.presentation.presentationToolbar.zoomDesc": "Vergrößerungsstufe der Präsentation ändern",
+    "app.presentation.presentationToolbar.fitToWidth": "An Breite anpassen",
     "app.presentation.presentationToolbar.goToSlide": "Folie {0}",
     "app.presentationUploder.title": "Präsentation",
     "app.presentationUploder.message": "Als Präsentator haben Sie in BigBlueButton die Möglichkeit, jegliche Office-Dokumente oder PDF-Dateien hochzuladen. Die beste Qualität erzielen Sie mit PDF-Dateien.",
@@ -78,6 +79,8 @@
     "app.presentationUploder.conversion.generatingSvg": "Erzeuge SVG Bilder...",
     "app.presentationUploder.conversion.pageCountExceeded": "Ups, die Seitenanzahl überschreitet das Limit",
     "app.presentationUploder.conversion.timeout": "Ups, die Konvertierung dauert zu lange",
+    "app.poll.closeLabel": "Schließen",
+    "app.poll.liveResult.usersTitle": "Teilnehmer",
     "app.polling.pollingTitle": "Umfrage Optionen",
     "app.polling.pollAnswerLabel": "Umfrageantwort {0}",
     "app.polling.pollAnswerDesc": "Diese Option auswählen für Umfrage {0}",
@@ -107,6 +110,8 @@
     "app.navBar.recording.off": "Keine Aufnahme",
     "app.leaveConfirmation.confirmLabel": "Verlassen",
     "app.leaveConfirmation.confirmDesc": "Hiermit verlassen Sie Konferenz",
+    "app.endMeeting.yesLabel": "Ja",
+    "app.endMeeting.noLabel": "Nein",
     "app.about.title": "Versionsinfo",
     "app.about.version": "Client Build:",
     "app.about.copyright": "Copyright:",
@@ -279,6 +284,8 @@
     "app.audio.audioSettings.retryLabel": "Erneut versuchen",
     "app.audio.listenOnly.backLabel": "Zurück",
     "app.audio.listenOnly.closeLabel": "Schließen",
+    "app.audio.permissionsOverlay.title": "Erlauben Sie BigBlueButton auf ihre Mediengeräte zuzugreifen",
+    "app.audio.permissionsOverlay.hint": "Es ist erforderlich, dass Sie BigBlueButton den Zugriff auf Ihre Mediengeräte erlauben, um an der Konferenz teilzunehmen :) ",
     "app.error.removed": "Sie wurden aus der Konferenz entfernt",
     "app.error.meeting.ended": "Sie haben die Konferenz verlassen",
     "app.dropdown.close": "Schließen",
@@ -308,6 +315,23 @@
     "app.shortcut-help.closePrivateChat": "Privaten Chat schließen",
     "app.shortcut-help.openActions": "Aktionsmenü öffnen",
     "app.shortcut-help.openStatus": "Statusmenü öffnen",
+    "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.microphoneLable": "Mit Mikrofon",
+    "app.lock-viewers.PublicChatLabel": "Öffentlicher Chat",
+    "app.lock-viewers.PrivateChatLable": "Privater Chat",
+    "app.lock-viewers.Layout": "Layout",
+    "app.videoPreview.cancelLabel": "Abbrechen",
+    "app.videoPreview.closeLabel": "Schließen",
+    "app.video.joinVideo": "Webcam freigeben",
+    "app.video.leaveVideo": "Webcam stoppen",
+    "app.video.iceCandidateError": "Fehler beim Hinzufügen vom ice candidate",
+    "app.video.iceConnectionStateError": "Fehler 1107: ICE Übertragung fehlgeschlagen",
+    "app.video.permissionError": "Fehler bei Freigabe der Webcam. Bitte Berechtigungen prüfen",
+    "app.video.sharingError": "Fehler bei Freigabe der Webcam",
+    "app.video.notFoundError": "Konnte keine Webcam finden. Stellen Sie sicher, dass sie angeschlossen ist",
+    "app.video.notAllowed": "Freigabeerlaubnis für die Webcam nicht erteilt, prüfen Sie Ihre Browerberechtigungen",
+    "app.video.notSupportedError": "Webcam kann nur über sichere Verbindung freigegeben werden, stellen Sie sicher, dass das SSL-Zertifikat gültig ist",
+    "app.video.notReadableError": "Konnte nicht auf die Webcam zugreifen. Stellen Sie sicher, dass kein anderes Programm auf die Webcam zugreift",
     "app.video.swapCam": "Wechseln",
     "app.video.swapCamDesc": "Ausrichtung der Webcams wechseln",
     "app.video.videoMenu": "Videomenü",
@@ -374,7 +398,9 @@
     "app.videoDock.webcamFocusLabel": "Vergrößern",
     "app.videoDock.webcamFocusDesc": "Ausgewählte Webcam vergrößern",
     "app.videoDock.webcamUnfocusLabel": "Normalgröße",
-    "app.videoDock.webcamUnfocusDesc": "Ausgewählte Webcam auf Normalgröße verkleinern"
+    "app.videoDock.webcamUnfocusDesc": "Ausgewählte Webcam auf Normalgröße verkleinern",
+    "app.createBreakoutRoom.joinAudio": "Audio starten",
+    "app.externalVideo.close": "Schließen"
 
 }
 
diff --git a/bigbluebutton-html5/private/locales/el_GR.json b/bigbluebutton-html5/private/locales/el_GR.json
new file mode 100644
index 0000000000..aa3ae038b2
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/el_GR.json
@@ -0,0 +1,69 @@
+{
+    "app.home.greeting": "Καλώς ήρθατε {0}! Η παρουσίαση θα ξεκινήσει σε λίγο...",
+    "app.chat.submitLabel": "Αποστολή Μηνύματος",
+    "app.chat.errorMinMessageLength": "Το μήνυμα είναι {0} χαρακτήρες(ας). Πολύ μικρό",
+    "app.chat.errorMaxMessageLength": "Το μήνυμα είναι {0} χαρακτήρες(ας). Πολύ μεγάλο",
+    "app.chat.inputPlaceholder": "Μήνυμα {0}",
+    "app.chat.titlePublic": "Δημόσια Συνομιλία",
+    "app.chat.titlePrivate": "Ιδιωτική Συνομιλία με {0}",
+    "app.chat.partnerDisconnected": "{0} έχει εγκαταλείψει τη συνάντηση",
+    "app.chat.closeChatLabel": "Κλείσιμο {0}",
+    "app.chat.hideChatLabel": "Απόκρυψη {0}",
+    "app.chat.dropdown.options": "Επιλογές Συνομιλίας",
+    "app.chat.dropdown.clear": "Καθαρισμός",
+    "app.chat.dropdown.copy": "Αντιγραφή",
+    "app.chat.dropdown.save": "Αποθήκευση",
+    "app.chat.label": "Συνομιλία",
+    "app.userList.usersTitle": "Χρήστες",
+    "app.userList.messagesTitle": "Μηνύματα",
+    "app.userList.presenter": "Παρουσιαστής",
+    "app.userList.you": "Εσείς",
+    "app.userList.label": "Λίστα Χρηστών",
+    "app.userList.guest": "Καλεσμένος",
+    "app.userList.menuTitleContext": "Διαθέσιμες Επιλογές",
+    "app.userList.chatListItem.unreadSingular": "{0} Νέο Μήνυμα",
+    "app.userList.chatListItem.unreadPlural": "{0} Νέα Μηνύματα",
+    "app.userList.menu.chat.label": "Συνομιλία",
+    "app.userList.menu.makePresenter.label": "Κάνε τον/την Παρουσιαστή",
+    "app.media.screenshare.start": "Ο διαμοιρασμός οθόνης έχει αρχίσει",
+    "app.media.screenshare.end": "Ο διαμοιρασμός οθόνης έχει τελειώσει",
+    "app.media.screenshare.safariNotSupported": "Ο διαμοιρασμός οθόνης δεν υποστηρίζεται ακόμα από τον Safari.
+Παρακαλούμε, χρησιμοποιείστε τον Firefox ή το Google Chrome.",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Επόμενη διαφάνεια",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Παρέλειψε διαφάνεια",
+    "app.presentation.presentationToolbar.goToSlide": "Διαφάνεια {0}",
+    "app.presentationUploder.title": "Παρουσίαση",
+    "app.presentationUploder.confirmLabel": "Εκκίνηση",
+    "app.presentationUploder.dismissLabel": "Ακύρωση",
+    "app.presentationUploder.genericError": "Ωχ, κάτι πήγε στραβά",
+    "app.presentationUploder.upload.progress": "Μεταφόρτωση ({0}%)",
+    "app.presentationUploder.upload.413": "Το μέγεθος του αρχείου είναι πολύ μεγάλο",
+    "app.presentationUploder.conversion.genericConversionStatus": "Μετατροπή αρχείου...",
+    "app.presentationUploder.conversion.generatedSlides": "Δημιουργία Διαφανειών...",
+    "app.poll.liveResult.usersTitle": "Χρήστες",
+    "app.waitingMessage": "Έχετε αποσυνδεθεί. Προσπαθήστε να επανασυνδεθείτε σε {0} δευτερόλεπτα...",
+    "app.navBar.settingsDropdown.optionsLabel": "Επιλογές",
+    "app.navBar.settingsDropdown.settingsLabel": "Άνοιγμα ρυθμίσεων",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Αποσύνδεση",
+    "app.navBar.settingsDropdown.helpLabel": "Βοήθεια",
+    "app.navBar.recording.on": "Εγγραφή",
+    "app.navBar.recording.off": "Μη καταγραφεί",
+    "app.about.dismissLabel": "Ακύρωση",
+    "app.actionsBar.changeStatusLabel": "Αλλαγή Κατάστασης",
+    "app.submenu.application.fontSizeControlLabel": "Μέγεθος γραμματοσειράς",
+    "app.submenu.application.languageOptionLabel": "Επιλογή γλώσσας",
+    "app.submenu.video.videoSourceLabel": "Προβολή πηγαίου",
+    "app.submenu.closedCaptions.languageLabel": "Γλώσσα",
+    "app.submenu.closedCaptions.localeOptionLabel": "Επιλογή γλώσσας",
+    "app.submenu.closedCaptions.fontSizeLabel": "Μέγεθος γραμματοσειράς",
+    "app.submenu.participants.lockPublicChatLabel": "Δημόσια Συνομιλία",
+    "app.settings.main.label": "Άνοιγμα ρυθμίσεων",
+    "app.settings.main.cancel.label": "Ακύρωση",
+    "app.settings.main.save.label": "Αποθήκευση",
+    "app.breakoutJoinConfirmation.dismissLabel": "Ακύρωση",
+    "app.error.500": "Ωχ, κάτι πήγε στραβά",
+    "app.lock-viewers.PublicChatLabel": "Δημόσια Συνομιλία",
+    "app.videoPreview.cancelLabel": "Ακύρωση"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/es_ES.json b/bigbluebutton-html5/private/locales/es_ES.json
new file mode 100644
index 0000000000..5a5f72140c
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/es_ES.json
@@ -0,0 +1,231 @@
+{
+    "app.home.greeting": "¡Bienvenido {0}! Tu presentación iniciará en breve...",
+    "app.chat.submitLabel": "Enviar mensaje",
+    "app.chat.inputLabel": "Entrada de mensaje para chat {0}",
+    "app.chat.inputPlaceholder": "Mensaje {0}",
+    "app.chat.titlePublic": "Chat público",
+    "app.chat.titlePrivate": "Chat privado con {0}",
+    "app.chat.partnerDisconnected": "{0} ha abandonado la reunión",
+    "app.chat.closeChatLabel": "Cerrar {0}",
+    "app.chat.hideChatLabel": "Ocultar  {0}",
+    "app.chat.moreMessages": "Más mensajes abajo",
+    "app.chat.dropdown.options": "Opciones de chat",
+    "app.chat.dropdown.clear": "Limpiar",
+    "app.chat.dropdown.copy": "Copiar",
+    "app.chat.dropdown.save": "Guardar",
+    "app.chat.label": "Chat",
+    "app.chat.emptyLogLabel": "Registro de chat vacío",
+    "app.userList.usersTitle": "Usuarios",
+    "app.userList.participantsTitle": "Participantes",
+    "app.userList.messagesTitle": "Mensajes",
+    "app.userList.presenter": "Presentador",
+    "app.userList.you": "Tu",
+    "app.userList.locked": "Bloqueado",
+    "app.userList.label": "Lista de usuarios",
+    "app.userList.toggleCompactView.label": "Cambiar a modo de vista compacta",
+    "app.userList.guest": "Huesped",
+    "app.userList.menuTitleContext": "Opciones disponibles",
+    "app.userList.chatListItem.unreadSingular": "{0} Nuevo Mensaje",
+    "app.userList.chatListItem.unreadPlural": "{0} Nuevos mensajes",
+    "app.userList.menu.chat.label": "Chat",
+    "app.userList.menu.clearStatus.label": "Limpiar estátus",
+    "app.userList.menu.makePresenter.label": "Hacer presentador",
+    "app.userList.menu.muteUserAudio.label": "Silenciar usuario",
+    "app.userList.menu.unmuteUserAudio.label": "Activar sonido de usuario",
+    "app.media.label": "Media",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Diapositiva anterior",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Cambiar presentación a diapositiva anterior",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Siguiente diapositiva",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Cambiar presentación a diapositiva siguiente",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Brincar diapositiva",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Cambiar presentación a diapositiva específica",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Ajustar a lo ancho",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Mostrar diapositiva a todo lo ancho",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Ajustar a la pantalla",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Mostrar toda la diapositiva",
+    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
+    "app.presentation.presentationToolbar.zoomDesc": "Cambiar el nivel de Zoom de la presentación",
+    "app.presentation.presentationToolbar.fitToWidth": "Ajustar a lo ancho",
+    "app.presentationUploder.dismissLabel": "Cancelar",
+    "app.presentationUploder.genericError": "Ups, algo salio mal",
+    "app.poll.closeLabel": "Cerrar",
+    "app.poll.liveResult.usersTitle": "Usuarios",
+    "app.polling.pollingTitle": "Opciones de votación",
+    "app.failedMessage": "Disculpas, problemas conectando al servidor.",
+    "app.connectingMessage": "Conectando...",
+    "app.waitingMessage": "Desconectado. Intentando reconectar en {0} segundos...",
+    "app.navBar.settingsDropdown.optionsLabel": "Opciones",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Desplegar a pantalla completa",
+    "app.navBar.settingsDropdown.settingsLabel": "Abrir configuración",
+    "app.navBar.settingsDropdown.aboutLabel": "Acerca de",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Cerrar sesión",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Salir de pantalla completa",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Hacer el menú de configuración a pantalla completa",
+    "app.navBar.settingsDropdown.settingsDesc": "Cambiar la configuración general",
+    "app.navBar.settingsDropdown.aboutDesc": "Mostrar información acerca del cliente",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Abandonar la reunión",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Salir del modo de pantalla completa",
+    "app.navBar.userListToggleBtnLabel": "Alternar lista de usuarios",
+    "app.navBar.toggleUserList.newMessages": "con nueva notificación de mensaje ",
+    "app.leaveConfirmation.confirmLabel": "Salir",
+    "app.leaveConfirmation.confirmDesc": "Te desconecta de la reunión",
+    "app.about.title": "Acerca de",
+    "app.about.version": "Construcción del cliente:",
+    "app.about.copyright": "Derechos de autor:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Cancelar",
+    "app.about.dismissDesc": "Cerrar información acerca del cliente",
+    "app.actionsBar.changeStatusLabel": "Cambiar estátus",
+    "app.actionsBar.muteLabel": "Silenciar",
+    "app.actionsBar.unmuteLabel": "De-silenciar",
+    "app.actionsBar.camOffLabel": "Cámara Apagada",
+    "app.actionsBar.raiseLabel": "Alzar",
+    "app.actionsBar.label": "Barra de acciones",
+    "app.submenu.application.applicationSectionTitle": "Aplicación",
+    "app.submenu.application.fontSizeControlLabel": "Tamaño de fuente",
+    "app.submenu.application.increaseFontBtnLabel": "Incrementar tamaño de fuente",
+    "app.submenu.application.decreaseFontBtnLabel": "Reducir tamaño de fuente",
+    "app.submenu.application.languageLabel": "Lenguaje de aplicación",
+    "app.submenu.application.ariaLanguageLabel": "Cambiar lenguaje de aplicación",
+    "app.submenu.application.languageOptionLabel": "Seleccionar lenguaje",
+    "app.submenu.application.noLocaleOptionLabel": "No hay locales activos",
+    "app.submenu.audio.micSourceLabel": "Fuente de micrófono",
+    "app.submenu.audio.speakerSourceLabel": "Fuente de altavoces",
+    "app.submenu.audio.streamVolumeLabel": "Volumen del flujo de audio",
+    "app.submenu.video.title": "Video",
+    "app.submenu.video.videoSourceLabel": "Fuente del video",
+    "app.submenu.video.videoOptionLabel": "Escoger ver fuente",
+    "app.submenu.video.videoQualityLabel": "Calidad del Video",
+    "app.submenu.video.qualityOptionLabel": "Escoger calidad del video",
+    "app.submenu.video.participantsCamLabel": "Viendo webcams de participantes",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Subtítulos",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Tomar el control",
+    "app.submenu.closedCaptions.languageLabel": "Lenguaje",
+    "app.submenu.closedCaptions.localeOptionLabel": "Seleccionar lenguaje",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "No hay locales activos",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Familia de fuente",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Seleccionar familia de fuente",
+    "app.submenu.closedCaptions.fontSizeLabel": "Tamaño de fuente",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Seleccionar tamaño de fuente",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Color de fondo",
+    "app.submenu.closedCaptions.fontColorLabel": "Color de fuente",
+    "app.submenu.participants.muteAllLabel": "Silenciar a todos menos al presentador",
+    "app.submenu.participants.lockAllLabel": "Bloquear a todos los participantes",
+    "app.submenu.participants.lockItemLabel": "Participantes {0}",
+    "app.submenu.participants.lockMicDesc": "Deshabilita micrófono a todos los participantes bloqueados",
+    "app.submenu.participants.lockCamDesc": "Deshabilita el webcam a todos los participantes bloqueados",
+    "app.submenu.participants.lockPublicChatDesc": "Deshabilita el chat público a todos los usuarios bloqueados",
+    "app.submenu.participants.lockPrivateChatDesc": "Deshabilita el chat privado a todos los usuarios bloqueados",
+    "app.submenu.participants.lockLayoutDesc": "Bloquea el diseño a todos los usuarios bloqueados",
+    "app.submenu.participants.lockMicAriaLabel": "Bloquea micrófono",
+    "app.submenu.participants.lockCamAriaLabel": "Bloquea webcam",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Bloquea el chat público",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Bloquea el chat privado",
+    "app.submenu.participants.lockLayoutAriaLabel": "Bloquea el diseño",
+    "app.submenu.participants.lockMicLabel": "Micrófono",
+    "app.submenu.participants.lockCamLabel": "Webcam",
+    "app.submenu.participants.lockPublicChatLabel": "Chat público",
+    "app.submenu.participants.lockPrivateChatLabel": "Chat privado",
+    "app.submenu.participants.lockLayoutLabel": "Diseño",
+    "app.settings.applicationTab.label": "Aplicación",
+    "app.settings.audioTab.label": "Audio",
+    "app.settings.videoTab.label": "Video",
+    "app.settings.closedcaptionTab.label": "Subtítulos",
+    "app.settings.usersTab.label": "Participantes",
+    "app.settings.main.label": "Configuración",
+    "app.settings.main.cancel.label": "Cancela",
+    "app.settings.main.cancel.label.description": "Deshecha los cambios y cierra el menú de configuración",
+    "app.settings.main.save.label": "Guardar",
+    "app.settings.main.save.label.description": "Gurada cambios y cierra el menú de configuración",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Acciones",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Subir una presentación",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar una encuesta",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir tu pantalla",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Subir tu presentación",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar una encuesta",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Compartir tu pantalla con otros",
+    "app.actionsBar.emojiMenu.awayLabel": "Ausente",
+    "app.actionsBar.emojiMenu.awayDesc": "Cambiar tu estatus a ausente",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Alzar",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Alzar la mano para preguntar",
+    "app.actionsBar.emojiMenu.neutralLabel": "Indeciso",
+    "app.actionsBar.emojiMenu.neutralDesc": "Cambiar tu estatus a indeciso",
+    "app.actionsBar.emojiMenu.confusedLabel": "Confundido",
+    "app.actionsBar.emojiMenu.confusedDesc": "Cambiar tu estatus a confundido",
+    "app.actionsBar.emojiMenu.sadLabel": "Triste",
+    "app.actionsBar.emojiMenu.sadDesc": "Cambiar tu estatus a triste",
+    "app.actionsBar.emojiMenu.happyLabel": "Feliz",
+    "app.actionsBar.emojiMenu.happyDesc": "Cambiar tu estatus a feliz",
+    "app.actionsBar.emojiMenu.noneLabel": "Limpiar estátus",
+    "app.actionsBar.emojiMenu.noneDesc": "Limpia tu estatus",
+    "app.actionsBar.emojiMenu.applauseLabel": "Aplausos",
+    "app.actionsBar.emojiMenu.applauseDesc": "Cambiar tu estatus a aplausos",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Señal de aprobación",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Cambiar tu estatus a señal de aprobación",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Señal de desaprobación",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Cambia tu estatus a señal de desaprobación",
+    "app.actionsBar.currentStatusDesc": "estatus actual {0}",
+    "app.audioNotification.audioFailedError1001": "Error 1001: WebSocket desconectado",
+    "app.audioNotification.audioFailedError1002": "Error 1002: No puede establecerse conexión de WebSocket",
+    "app.audioNotification.audioFailedError1003": "Error 1003: Versión de navegador no soportado ",
+    "app.audioNotification.audioFailedError1004": "Error 1004: Falla en llamada",
+    "app.audioNotification.audioFailedError1005": "Error 1005: La llamada terminó inesperadamente",
+    "app.audioNotification.audioFailedError1006": "Error 1006: Tiempo de espera de llamada agotado",
+    "app.audioNotification.audioFailedError1007": "Error 1007: Fallo de negociación ICE",
+    "app.audioNotification.audioFailedError1008": "Error 1008: Fallo de transferencia",
+    "app.audioNotification.audioFailedError1009": "Error 1009: No se pudo obtener información de servidor STUN/TURN",
+    "app.audioNotification.audioFailedError1010": "Error 1010: Se acabó tiempo de negociación ICE  ",
+    "app.audioNotification.audioFailedError1011": "Error 1011: Se acabó tiempo recolectando ICE",
+    "app.audioNotification.audioFailedMessage": "Tu conexión de audio falló en conectarse",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia falló, Solo orígenes seguros son admitidos",
+    "app.audioNotification.closeLabel": "Cerrar",
+    "app.breakoutJoinConfirmation.title": "Unirse a una sala de grupo",
+    "app.breakoutJoinConfirmation.message": "Quieres unirte",
+    "app.breakoutJoinConfirmation.confirmLabel": "Unirte",
+    "app.breakoutJoinConfirmation.confirmDesc": "Unirte a sala de grupo",
+    "app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
+    "app.breakoutJoinConfirmation.dismissDesc": "Cierra y rechaza Unirse a Sala de Grupo",
+    "app.breakoutTimeRemainingMessage": "Tiempo restante en Sala de Grupo",
+    "app.breakoutWillCloseMessage": "Tiempo transcurrido. Sala de Grupo de cerrará en breve.",
+    "app.calculatingBreakoutTimeRemaining": "Calculando tiempo restante...",
+    "app.audioModal.microphoneLabel": "Micrófono",
+    "app.audioModal.listenOnlyLabel": "Solo escuchar",
+    "app.audioModal.audioChoiceLabel": "¿Como quieres unirte al audio?",
+    "app.audioModal.audioChoiceDesc": "Selecciona como unirse al audio en esta reunión",
+    "app.audioModal.closeLabel": "Cerrar",
+    "app.audio.joinAudio": "Unirse al audio",
+    "app.audio.leaveAudio": "Abandonar audio",
+    "app.audio.enterSessionLabel": "Entrar a la sesión",
+    "app.audio.playSoundLabel": "Reproducir sonido",
+    "app.audio.backLabel": "Atrás",
+    "app.audio.audioSettings.titleLabel": "Seleccionar tu configuración de audio",
+    "app.audio.audioSettings.descriptionLabel": "Ten en cuenta que aparecerá un cuadro de diálogo en tu navegador, que te pide a aceptar compartir tu micrófono.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Fuente del micrófono",
+    "app.audio.audioSettings.speakerSourceLabel": "Fuente de altavoz",
+    "app.audio.audioSettings.microphoneStreamLabel": "Tu volúmen del flujo de audio",
+    "app.audio.listenOnly.backLabel": "Atrás",
+    "app.audio.listenOnly.closeLabel": "Cerrar",
+    "app.error.meeting.ended": "Haz salido de la conferencia",
+    "app.dropdown.close": "Cerrar",
+    "app.error.500": "Ups, algo salio mal",
+    "app.error.404": "No se encontró",
+    "app.error.401": "No autorizado",
+    "app.error.403": "Prohibido",
+    "app.error.leaveLabel": "Ingresa de nuevo",
+    "app.guest.waiting": "Esperando aprobación para unirse",
+    "app.shortcut-help.closeLabel": "Cerrar",
+    "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.microphoneLable": "Micrófono",
+    "app.lock-viewers.PublicChatLabel": "Chat público",
+    "app.lock-viewers.PrivateChatLable": "Chat privado",
+    "app.lock-viewers.Layout": "Diseño",
+    "app.videoPreview.cancelLabel": "Cancelar",
+    "app.videoPreview.closeLabel": "Cerrar",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.feedback.title": "Haz salido de la conferencia",
+    "app.createBreakoutRoom.joinAudio": "Unirse al audio",
+    "app.externalVideo.close": "Cerrar"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/fa_IR.json b/bigbluebutton-html5/private/locales/fa_IR.json
new file mode 100644
index 0000000000..38f82a5eaa
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/fa_IR.json
@@ -0,0 +1,399 @@
+{
+    "app.home.greeting": "خوش آمدید{0}. ارائه شما به زودی آغاز میشود.",
+    "app.chat.submitLabel": "ارسال پیام",
+    "app.chat.errorMinMessageLength": "پیام شما {0} کاراکتر(0) است، برای ارسال، کوتاه است.",
+    "app.chat.errorMaxMessageLength": "پیام شما {0} کارکتر(0) است  و برای ارسال خیلی طولانیست.",
+    "app.chat.inputLabel": "ورودی پیام برای چت{0}",
+    "app.chat.inputPlaceholder": "پیام{0}",
+    "app.chat.titlePublic": "گفتگوی عمومی",
+    "app.chat.titlePrivate": "گفتگوی خصوصی با{0}",
+    "app.chat.partnerDisconnected": "{0}کلاس را ترک کرد.",
+    "app.chat.closeChatLabel": "خروج{0}",
+    "app.chat.hideChatLabel": "مخفی کردن{0}",
+    "app.chat.moreMessages": "مشاهده ادامه پیام های پایین",
+    "app.chat.dropdown.options": "گزینه های گفتگو",
+    "app.chat.dropdown.clear": "پاک سازی",
+    "app.chat.dropdown.copy": "کپی کردن",
+    "app.chat.dropdown.save": "ذخیره کردن",
+    "app.chat.label": "گفتگو",
+    "app.chat.emptyLogLabel": "پاک کردن سابقه گفتگو",
+    "app.chat.clearPublicChatMessage": "سابقه گفتگوها توسط مدیر حذف گردید.",
+    "app.userList.usersTitle": "دانش آموزان",
+    "app.userList.participantsTitle": "دانش آموزان",
+    "app.userList.messagesTitle": "پیام ها",
+    "app.userList.presenter": "استاد",
+    "app.userList.you": "شما",
+    "app.userList.locked": "قفل شده",
+    "app.userList.label": "لیست دانش آموزان",
+    "app.userList.toggleCompactView.label": "مخفی کردن نوار ابزار",
+    "app.userList.guest": "مهمان",
+    "app.userList.menuTitleContext": "گزینه های قابل اعمال",
+    "app.userList.chatListItem.unreadSingular": "{0} پیام جدید",
+    "app.userList.chatListItem.unreadPlural": "{0} پیام های جدید",
+    "app.userList.menu.chat.label": "گفتگو",
+    "app.userList.menu.clearStatus.label": "پاک کردن وضعیت",
+    "app.userList.menu.makePresenter.label": "تبدیل به استاد",
+    "app.userList.menu.removeUser.label": "حذف کاربر",
+    "app.userList.menu.muteUserAudio.label": "بستن صدای کاربر",
+    "app.userList.menu.unmuteUserAudio.label": "فعال سازی میکروفن کاربر",
+    "app.userList.userAriaLabel": "{0} {1} {2} وضعیت {3}",
+    "app.userList.menu.promoteUser.label": "ارتقا نقش به مدیر",
+    "app.userList.menu.demoteUser.label": "تبدیل به دانش آموز",
+    "app.media.label": "مدیا",
+    "app.media.screenshare.start": "اشتراک صفحه نمایش شروع شد",
+    "app.media.screenshare.end": "اشتراک صفحه نمایش به پایان رسید.",
+    "app.media.screenshare.safariNotSupported": "در حال حاضر اشتراک صفحه نمایش در مرورگر سافاری پشتیبانی نمیشد، لطفا از کروم یا فایرفاکس استفاده کنید.",
+    "app.meeting.ended": "جلسه پایان یافت",
+    "app.meeting.endedMessage": "شما در حال انتقال به صفحه اصلی هستید.",
+    "app.presentation.presentationToolbar.prevSlideLabel": "اسلاید قبلی",
+    "app.presentation.presentationToolbar.prevSlideDesc": "تغییر ارائه به اسلاید قبلی",
+    "app.presentation.presentationToolbar.nextSlideLabel": "اسلاید بعدی",
+    "app.presentation.presentationToolbar.nextSlideDesc": "تغییر ارائه به اسلاید بعدی",
+    "app.presentation.presentationToolbar.skipSlideLabel": "بیرون رفتن از اسلاید",
+    "app.presentation.presentationToolbar.skipSlideDesc": "تغییر ارائه به یک اسلاید خاص",
+    "app.presentation.presentationToolbar.fitWidthLabel": "اندازه تصویر را متناسب با عرض صفحه کن.",
+    "app.presentation.presentationToolbar.fitWidthDesc": "کلیه عرض اسلاید را نمایش بده",
+    "app.presentation.presentationToolbar.fitScreenLabel": "ابعاد را به اندازه تمام  صفحه کن",
+    "app.presentation.presentationToolbar.fitScreenDesc": "کل اسلاید را نمایش بده",
+    "app.presentation.presentationToolbar.zoomLabel": "بزرگ نمایی",
+    "app.presentation.presentationToolbar.zoomDesc": "تغییر مقدار زوم ارائه",
+    "app.presentation.presentationToolbar.fitToWidth": "اندازه تصویر را متناسب با عرض صفحه کن.",
+    "app.presentation.presentationToolbar.goToSlide": "اسلاید {0}",
+    "app.presentationUploder.title": "ارائه",
+    "app.presentationUploder.message": "شما به عنوان عضوی از کلاس میتوانید جزوه خود را با فرمت فایل های Office آپلود کنید. پیشنهاد ما فایل های PDF است.",
+    "app.presentationUploder.confirmLabel": "شروع",
+    "app.presentationUploder.confirmDesc": "تغییرات خود را ذخیره کنید و ارائه را آغاز نمایید.",
+    "app.presentationUploder.dismissLabel": "کنسل",
+    "app.presentationUploder.dismissDesc": "بستن پنجره و حذف تغییرات شما",
+    "app.presentationUploder.dropzoneLabel": "فایل های خود را برای آپلود به اینجا بکشید.",
+    "app.presentationUploder.browseFilesLabel": "یا برای انتخاب فایل کلیک کنید.",
+    "app.presentationUploder.fileToUpload": "فایلهایی که آپلود خواهند شد.",
+    "app.presentationUploder.currentBadge": "جاری",
+    "app.presentationUploder.genericError": "اشتباهی اتفاق افتاد.",
+    "app.presentationUploder.upload.progress": "در حال آپلود ({0}%)",
+    "app.presentationUploder.upload.413": "حجم فایل خیلی زیاد است.",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "در حال پردازش صفحه {0} از {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "در حال تبدیل فایل",
+    "app.presentationUploder.conversion.generatingThumbnail": "در حال ساخت تصاویر کوچک از فایل",
+    "app.presentationUploder.conversion.generatedSlides": "اسلاید ها ساخته شدند.",
+    "app.presentationUploder.conversion.generatingSvg": "در حال ساخت تصاویر SVG",
+    "app.presentationUploder.conversion.pageCountExceeded": "تعداد صفحات از حد اکثر صفحات مورد پشتیبانی بیشتر است.",
+    "app.presentationUploder.conversion.timeout": "تبدیل فایل بیش از حد طول کشید.",
+    "app.poll.closeLabel": "بستن",
+    "app.poll.liveResult.usersTitle": "دانش آموزان",
+    "app.polling.pollingTitle": "گزینه های نظرسنجی.",
+    "app.polling.pollAnswerLabel": "پاسخ نظرسنجی {0}",
+    "app.polling.pollAnswerDesc": "این گزینه را برای رای دادن به {0} انتخاب کنید.",
+    "app.failedMessage": "عذر خواهی میکنیم. مشکلی در ارتباط با سرور وجود دارد.",
+    "app.connectingMessage": "در حال اتصال...",
+    "app.waitingMessage": "ارتباط قطع شد. در حال تلاش مجدد در {0} ثانیه",
+    "app.navBar.settingsDropdown.optionsLabel": "گزینه ها",
+    "app.navBar.settingsDropdown.fullscreenLabel": "تمام صفحه",
+    "app.navBar.settingsDropdown.settingsLabel": "تنظیمات",
+    "app.navBar.settingsDropdown.aboutLabel": "درباره",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "خروج",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "بستن حالت تمام صفحه",
+    "app.navBar.settingsDropdown.fullscreenDesc": "منوی تنظیمات را تمام صفحه کن",
+    "app.navBar.settingsDropdown.settingsDesc": "تغییر تنظیمات معمول",
+    "app.navBar.settingsDropdown.aboutDesc": "نمایش اطلاعات دانش آموز",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "ترک جلسه",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "خروج از حالت تمام صفحه",
+    "app.navBar.settingsDropdown.hotkeysLabel": "کلیدهای میانبر",
+    "app.navBar.settingsDropdown.hotkeysDesc": "لیست کلیدهای میانبر",
+    "app.navBar.userListToggleBtnLabel": "نمایش لیست کاربران",
+    "app.navBar.toggleUserList.ariaLabel": "نمایش گفتگوی دانش آموزان و اساتید",
+    "app.navBar.toggleUserList.newMessages": "با اعلان پیام جدید",
+    "app.navBar.recording": "جلسه در حال ضبط شدن است.",
+    "app.navBar.recording.on": "در حال ضبط",
+    "app.navBar.recording.off": "ضبط نمیشود.",
+    "app.leaveConfirmation.confirmLabel": "ترک",
+    "app.leaveConfirmation.confirmDesc": "پیام های شما بیرون از جلسه",
+    "app.endMeeting.yesLabel": "بله",
+    "app.endMeeting.noLabel": "خیر",
+    "app.about.title": "درباره",
+    "app.about.version": "نسخه کاربر",
+    "app.about.copyright": "کپی رایت",
+    "app.about.confirmLabel": "تایید",
+    "app.about.confirmDesc": "تایید",
+    "app.about.dismissLabel": "کنسل",
+    "app.about.dismissDesc": "بستن قسمت درباره کاربر",
+    "app.actionsBar.changeStatusLabel": "تغییر وضعیت دانش آموز",
+    "app.actionsBar.muteLabel": "حالت بی صدا",
+    "app.actionsBar.unmuteLabel": "فعال سازی صدا",
+    "app.actionsBar.camOffLabel": "بستن دوربین",
+    "app.actionsBar.raiseLabel": "اجازه گرفتن از استاد",
+    "app.actionsBar.label": "منوی امکانات",
+    "app.submenu.application.applicationSectionTitle": "نرم افزار",
+    "app.submenu.application.fontSizeControlLabel": "اندازه متن",
+    "app.submenu.application.increaseFontBtnLabel": "افزایش اندازه متن نرم افزار",
+    "app.submenu.application.decreaseFontBtnLabel": "کاهش اندازه متن نرم افزار",
+    "app.submenu.application.languageLabel": "زبان نرم افزار",
+    "app.submenu.application.ariaLanguageLabel": "تغییر زبان نرم افزار",
+    "app.submenu.application.languageOptionLabel": "انتخاب زبان",
+    "app.submenu.application.noLocaleOptionLabel": "هیچ زبان فعالی وجود ندارد",
+    "app.submenu.audio.micSourceLabel": "ورودی صدای میکروفن",
+    "app.submenu.audio.speakerSourceLabel": "صدای خروجی",
+    "app.submenu.audio.streamVolumeLabel": "ولوم صدای میکروفن شما",
+    "app.submenu.video.title": "تصویر کلاس",
+    "app.submenu.video.videoSourceLabel": "منبع تصویر",
+    "app.submenu.video.videoOptionLabel": "انتخاب منبع تصویر",
+    "app.submenu.video.videoQualityLabel": "کیفیت تصویر",
+    "app.submenu.video.qualityOptionLabel": "انتخاب کیفیت تصویر",
+    "app.submenu.video.participantsCamLabel": "مشاهده دوربین کاربران",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "کپشن های بسته شده",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "بدست گرفتن کنترل",
+    "app.submenu.closedCaptions.languageLabel": "زبان",
+    "app.submenu.closedCaptions.localeOptionLabel": "انتخاب زبان",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "هیچ زبان فعالی وجود ندارد.",
+    "app.submenu.closedCaptions.fontFamilyLabel": "فونت",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "انتخاب فونت",
+    "app.submenu.closedCaptions.fontSizeLabel": "اندازه فونت",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "انتخاب اندازه فونت",
+    "app.submenu.closedCaptions.backgroundColorLabel": "رنگ پس زمینه",
+    "app.submenu.closedCaptions.fontColorLabel": "رنگ متن",
+    "app.submenu.participants.muteAllLabel": "غیر فعال سازی صدای کاربران به جز اساتید",
+    "app.submenu.participants.lockAllLabel": "قفل کردن کابران",
+    "app.submenu.participants.lockItemLabel": "شرکت کنندگان{0}",
+    "app.submenu.participants.lockMicDesc": "غیر فعال سازی میکروفن شرکت کنندگان قفل شده",
+    "app.submenu.participants.lockCamDesc": "غیر فعال سازی دوربین کاربران قفل شده.",
+    "app.submenu.participants.lockPublicChatDesc": "غیرفعال سازی گفتگوی عمومی کابران قفل شده",
+    "app.submenu.participants.lockPrivateChatDesc": "غیرفعال سازی گفتگوی خصوصی برای کابران قفل شده.",
+    "app.submenu.participants.lockLayoutDesc": "قفل کردن چینش صفحه کابران قفل شده",
+    "app.submenu.participants.lockMicAriaLabel": "قفل کردن میکروفن",
+    "app.submenu.participants.lockCamAriaLabel": "قفل کردن دوربین",
+    "app.submenu.participants.lockPublicChatAriaLabel": "قفل کردن گفتگوی عمومی",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "قفل کردن گفتگوی خصوصی",
+    "app.submenu.participants.lockLayoutAriaLabel": "قفل کردن چینش تصویر",
+    "app.submenu.participants.lockMicLabel": "میکروفن",
+    "app.submenu.participants.lockCamLabel": "دوربین",
+    "app.submenu.participants.lockPublicChatLabel": "گفتگوی عمومی",
+    "app.submenu.participants.lockPrivateChatLabel": "گفتگوی خصوصی",
+    "app.submenu.participants.lockLayoutLabel": "چینش تصویر",
+    "app.settings.applicationTab.label": "نرم افزار",
+    "app.settings.audioTab.label": "صدا",
+    "app.settings.videoTab.label": "تصویر کلاس",
+    "app.settings.closedcaptionTab.label": "کپشن های بسته شده",
+    "app.settings.usersTab.label": "شرکت کنندگان در کلاس",
+    "app.settings.main.label": "تنظیمات",
+    "app.settings.main.cancel.label": "کنسل",
+    "app.settings.main.cancel.label.description": "حذف تغییرات و بستن منوی تنظیمات",
+    "app.settings.main.save.label": "ذخیره",
+    "app.settings.main.save.label.description": "ذخیره تغییرات و بستن منوی تنظیمات",
+    "app.settings.dataSavingTab.label": "کاهش مصرف اینترنت",
+    "app.settings.dataSavingTab.webcam": "فعال سازی دوربین کلاس",
+    "app.settings.dataSavingTab.screenShare": "فعال سازی اشتراک گذاری تصویر کامپیوتر",
+    "app.settings.dataSavingTab.description": "برای صرفه جویی در مصرف اینترنت آیتم هایی که باید نمایش داده شوند را انتخاب کنید.",
+    "app.switch.onLabel": "روشن",
+    "app.switch.offLabel": "خاموش",
+    "app.actionsBar.actionsDropdown.actionsLabel": "فعالیت ها",
+    "app.actionsBar.actionsDropdown.presentationLabel": "آپلود فایل ارائه",
+    "app.actionsBar.actionsDropdown.initPollLabel": "ایجاد نظرسنجی",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "اشتراک صفحه نمایش شما",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "متوقف کردن اشتراک گذاری دسکتاپ شما",
+    "app.actionsBar.actionsDropdown.presentationDesc": "آپلود فایل ارائه شما",
+    "app.actionsBar.actionsDropdown.initPollDesc": "ایجاد نظرسنجی",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "اشتراک گذاری تصویر کامپیوتر شما با دیگران",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "توقف اشتراک گذاری تصویر کامپیوتر شما با دیگران",
+    "app.actionsBar.emojiMenu.awayLabel": "عدم حضور در کلاس",
+    "app.actionsBar.emojiMenu.awayDesc": "تغییر وضعیت شما به عدم حضور در کلاس",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "اجازه گرفتن از استاد",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "دست خود را بالا ببرید تا از استاد سوال بپرسید",
+    "app.actionsBar.emojiMenu.neutralLabel": "تصمیم گیری نشده",
+    "app.actionsBar.emojiMenu.neutralDesc": "تغییر وضعیت شما به تصمیم گیری نشده",
+    "app.actionsBar.emojiMenu.confusedLabel": "کامل نفهمیدم",
+    "app.actionsBar.emojiMenu.confusedDesc": "تغییر وضعیت شما به وضعیت کامل نفهمیدم",
+    "app.actionsBar.emojiMenu.sadLabel": "ناراحت",
+    "app.actionsBar.emojiMenu.sadDesc": "تغییر حالت شما به ناراحت",
+    "app.actionsBar.emojiMenu.happyLabel": "شاد",
+    "app.actionsBar.emojiMenu.happyDesc": "تغییر وضعیت شما به خوشحال",
+    "app.actionsBar.emojiMenu.noneLabel": "پاک کردن وضعیت",
+    "app.actionsBar.emojiMenu.noneDesc": "پاک کردن وضعیت شما",
+    "app.actionsBar.emojiMenu.applauseLabel": "تحسین کردن.",
+    "app.actionsBar.emojiMenu.applauseDesc": "تغییر وضعیت شما به تحسین کردن",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "عالی",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "تغییر وضعیت شما به عالی",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "نه چندان خوب",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "تغییر وضعیت شما به نه چندان خوب",
+    "app.actionsBar.currentStatusDesc": "وضعیت فعلی شما{0}",
+    "app.audioNotification.audioFailedError1001": "خطای 1001: سوکت شما قطع شد",
+    "app.audioNotification.audioFailedError1002": "خطای 1002: امکان ارتباط با سوکت برای شما فراهم نیست، وضعیت نت خود را بررسی کنید یا آن را تغییر دهید.",
+    "app.audioNotification.audioFailedError1003": "خطای 1003: نسخه مرورگر شما برای کلاس مناسب نیست.",
+    "app.audioNotification.audioFailedError1004": "خطای 1004: خطا در تماس",
+    "app.audioNotification.audioFailedError1005": "خطای 1005: تماس به صورت نامشخصی قطع شد",
+    "app.audioNotification.audioFailedError1006": "خطای 1006: تماس بسیار طولانی شد",
+    "app.audioNotification.audioFailedError1007": "خطای 1007: خطای ارتباط ice",
+    "app.audioNotification.audioFailedError1008": "خطای 1008: انتقال میسر نشد",
+    "app.audioNotification.audioFailedError1009": "خطای 1009: امکان پیدا کردن STUN/TURN وجود ندارد.",
+    "app.audioNotification.audioFailedError1010": "خطای 1010: ICE برقرار نشد اینترنت خود را چک کنید.",
+    "app.audioNotification.audioFailedError1011": "خطای 1011: ICE برقرار نشد",
+    "app.audioNotification.audioFailedMessage": "امکان اتصال صدای شما فراهم نیست.",
+    "app.audioNotification.mediaFailedMessage": "امکان گرفتن صدای میکروفن کاربر وجود ندارد.",
+    "app.audioNotification.closeLabel": "بستن",
+    "app.audioNotificaion.reconnectingAsListenOnly": "صدای میکروفن برای مدیران فقط فعال است، شما فقط شنونده هستید.",
+    "app.breakoutJoinConfirmation.title": "رفتن به اتاق استراحت",
+    "app.breakoutJoinConfirmation.message": "آیا میخواهید وارد شوید",
+    "app.breakoutJoinConfirmation.confirmLabel": "پیوستن",
+    "app.breakoutJoinConfirmation.confirmDesc": "پیوستن به اتاق استراحت",
+    "app.breakoutJoinConfirmation.dismissLabel": "کنسل",
+    "app.breakoutJoinConfirmation.dismissDesc": "بستن و رد کردن پیوستن به اتاق استراحت",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "انتخاب اتاق استراحت برای پیوستن",
+    "app.breakoutTimeRemainingMessage": "زمان باقی مانده از اتاق استراحت: {0}",
+    "app.breakoutWillCloseMessage": "زمان پایان یافت. اتاق استراحت به زودی بسته میشود",
+    "app.calculatingBreakoutTimeRemaining": "محاسبه زمان باقی مانده...",
+    "app.audioModal.microphoneLabel": "گوینده هم باشم.",
+    "app.audioModal.listenOnlyLabel": "فقط شنونده باشم.",
+    "app.audioModal.audioChoiceLabel": "چگونه میخواهید صدا را دریافت کنید.",
+    "app.audioModal.iOSBrowser": "صدا/تصویر پشتیبانی نمیشود.",
+    "app.audioModal.iOSErrorDescription": "در حال حاضر صدا و تصویر در کروم iOS پشتیبانی نمیشود.",
+    "app.audioModal.iOSErrorRecommendation": "پیشنهاد ما استفاده از سافاری است.",
+    "app.audioModal.audioChoiceDesc": "انتخاب کنید چگونه صدا را در این جلسه میخواهید دریافت کنید",
+    "app.audioModal.closeLabel": "بستن",
+    "app.audioModal.yes": "بله",
+    "app.audioModal.no": "خیر",
+    "app.audioModal.yes.arialabel" : "اکو شنیده میشود",
+    "app.audioModal.no.arialabel" : "اکو شنیده نمیشود",
+    "app.audioModal.echoTestTitle": "این یک تست اکو خصوصی است.چند کلمه صحبت کنید.آیا صدایتان را میشنوید؟",
+    "app.audioModal.settingsTitle": "تغییر تنظیمات صدا",
+    "app.audioModal.helpTitle": "یک مشکلی در سخت افزار شما وجود دارد",
+    "app.audioModal.helpText": "آیا به مرورگر خود در قسمت تنظیمات اجازه دسترسی به میکروفن را داده اید؟ اگر اینطور نیست مطابق دستورالعمل مرورگرتان عمل کرده و اجازه دسترسی به میکروفن را فعال کنید.",
+    "app.audioModal.connecting": "در حال اتصال...",
+    "app.audioModal.connectingEchoTest": "اتصال به تست اکو",
+    "app.audioManager.joinedAudio": "شما به جلسه صوتی وارد شده اید",
+    "app.audioManager.joinedEcho": "شما به تست اکو پیوسته اید",
+    "app.audioManager.leftAudio": "شما جلسه صوتی را ترک کرده اید",
+    "app.audioManager.genericError": "خطا: مشکلی پیش آمده است لطفا مجدد سعی کنید.",
+    "app.audioManager.connectionError": "خطا: خطای ارتباط",
+    "app.audioManager.requestTimeout": "خطا: خطای طول کشیدن بیش از اندازه در درخواست.",
+    "app.audioManager.invalidTarget": "خطا: تلاش برای درخواست چیزی غیر صحیح",
+    "app.audioManager.mediaError": "خطا: مشکلی در اتصال سخت افزار شما با کلاس موجود است.",
+    "app.audio.joinAudio": "پیوستن به صدا",
+    "app.audio.leaveAudio": "ترک صدا",
+    "app.audio.enterSessionLabel": "ورود به جلسه",
+    "app.audio.playSoundLabel": "پخش صدا",
+    "app.audio.backLabel": "بازگشت",
+    "app.audio.audioSettings.titleLabel": "انتخاب تنظیمات صدای شما",
+    "app.audio.audioSettings.descriptionLabel": "لطفا توجه کنید، یک پیام در مرورگر شما ظاهر میشود و از شما میخواهد اجازه اشتراک میکروفن خود را بدهید.",
+    "app.audio.audioSettings.microphoneSourceLabel": "منبع ورودی میکروفن",
+    "app.audio.audioSettings.speakerSourceLabel": "منبع خروجی صدا",
+    "app.audio.audioSettings.microphoneStreamLabel": "ولوم صدای میکروفن شما",
+    "app.audio.audioSettings.retryLabel": "تلاش مجدد",
+    "app.audio.listenOnly.backLabel": "بازگشت",
+    "app.audio.listenOnly.closeLabel": "بستن",
+    "app.audio.permissionsOverlay.title": "اجازه دهید کلاس به میکروفن  شما دسترسی داشته باشد.",
+    "app.audio.permissionsOverlay.hint": "برای پیوستن شما به کنفرانس صوتی نیاز به اجازه شما می باشد. :)",
+    "app.error.removed": "شما از کنفرانس کنار گذاشته شده اید.",
+    "app.error.meeting.ended": "شما از کنفرانس خارج شده اید",
+    "app.dropdown.close": "بستن",
+    "app.error.500": "خطای پیش آمده است.",
+    "app.error.404": "پیدا نشد",
+    "app.error.401": "شناسایی نشد",
+    "app.error.403": "ممنوع",
+    "app.error.leaveLabel": "ورود مجدد",
+    "app.guest.waiting": "منتظر تایید جهت پیوستن",
+    "app.toast.breakoutRoomEnded": "اتاق استراحت پایان یافت. لطفا مجدد به کنفرانس صوتی بپیوندید.",
+    "app.toast.chat.public": "پیام جدید در گفتگوی عمومی",
+    "app.toast.chat.private": "پیام جدید در گفتگوی خصوصی",
+    "app.toast.chat.system": "سیستم",
+    "app.notification.recordingStart": "جلسه در حال ضبط شدن است",
+    "app.notification.recordingStop": "جلسه دیگر ضبط نمیشود.",
+    "app.shortcut-help.title": "کلید های میانبر",
+    "app.shortcut-help.accessKeyNotAvailable": "کلیدهای دسترسی موجود نیستند.",
+    "app.shortcut-help.comboLabel": "کمبو",
+    "app.shortcut-help.functionLabel": "تابع",
+    "app.shortcut-help.closeLabel": "بستن",
+    "app.shortcut-help.closeDesc": "بستن صفحه کلیدهای میانبر",
+    "app.shortcut-help.openOptions": "باز کردن گزینه ها",
+    "app.shortcut-help.toggleUserList": "مشاهده لیست دانش آموزان",
+    "app.shortcut-help.toggleMute": "حالت بی صدا/با صدا",
+    "app.shortcut-help.togglePublicChat": "نمایش گفتگوی عمومی(لیتس کاربران باید فعال باشد)",
+    "app.shortcut-help.hidePrivateChat": "پنهان کردن گفتگوی خصوصی",
+    "app.shortcut-help.closePrivateChat": "بستن گفتگوی خصوصی",
+    "app.shortcut-help.openActions": "باز کردن منوی کارها",
+    "app.shortcut-help.openStatus": "باز کردن منوی وضعیت",
+    "app.lock-viewers.webcamLabel": "دوربین",
+    "app.lock-viewers.microphoneLable": "میکروفن",
+    "app.lock-viewers.PublicChatLabel": "گفتگوی عمومی",
+    "app.lock-viewers.PrivateChatLable": "گفتگوی خصوصی",
+    "app.lock-viewers.Layout": "چینش تصویر",
+    "app.videoPreview.cancelLabel": "کنسل",
+    "app.videoPreview.closeLabel": "بستن",
+    "app.video.joinVideo": "اشتراک گذاری دوربین",
+    "app.video.leaveVideo": "بستن دوربین",
+    "app.video.iceCandidateError": "خطا در افزودن ICE",
+    "app.video.permissionError": "خطا در اشتراک گذاری دوربین. لطفا دسترسی ها را چک کنید.",
+    "app.video.sharingError": "خطا در اشتراک دوربین",
+    "app.video.notFoundError": "دوربین یافت نشد. لطفا مطمئن شوید که دوربین متصل است.",
+    "app.video.notAllowed": "اجازه دسترسی مرورگر به دوربین داده نشده است. لطفا دسترسی های مرورگر را چک کنید.",
+    "app.video.notSupportedError": "مطمئن شوید SSL فعال است.",
+    "app.video.notReadableError": "عدم امکان دسترسی به داده های دوربین، مطمئن شوید دوربین شما جای دیگری درگیر نیست.",
+    "app.video.swapCam": "جابجا کردن",
+    "app.video.swapCamDesc": "جابجا کردن موقعیت تصویر دوربین ها",
+    "app.video.videoMenu": "منوی دوربین",
+    "app.video.videoMenuDisabled": "امکان مشاهده دوربین در تنظیمات شما فعال نیست.لطفا به تنظیمات مراجعه کنید.",
+    "app.video.videoMenuDesc": "منوی تنظیمات دوربین",
+    "app.video.chromeExtensionError": "شما باید نصب کنید.",
+    "app.video.chromeExtensionErrorLink": "این افزونه کروم را",
+    "app.video.stats.title": "وضعیت اتصال",
+    "app.video.stats.packetsReceived": "بسته های دریافت شده.",
+    "app.video.stats.packetsSent": "بسته های ارسال شده",
+    "app.video.stats.packetsLost": "بسته های از دست رفته",
+    "app.video.stats.bitrate": "بیت ریت",
+    "app.video.stats.lostPercentage": "درصد از دست رفته",
+    "app.video.stats.lostRecentPercentage": "درصد از دست رفته اخیر",
+    "app.video.stats.dimensions": "ابعاد",
+    "app.video.stats.codec": "کدک",
+    "app.video.stats.decodeDelay": "تاخیر بازگشایی",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "استفاده ENCOD",
+    "app.video.stats.currentDelay": "تاخیر جاری",
+    "app.sfu.mediaServerConnectionError2000": "خطای 2000: عدم امکان ارتباط با سرور",
+    "app.sfu.mediaServerOffline2001": "خطای 2001: سرور مدیا اینترنت ندارد. لطفا بعدا چک کنید.",
+    "app.sfu.mediaServerNoResources2002": "خطای 2002: سرور مدیا منابع قابل دسترسی ندارد.",
+    "app.sfu.mediaServerRequestTimeout2003": "خطای 2003: درخواست های سرور مدیا TIMEOUT میشود",
+    "app.sfu.serverIceGatheringFailed2021": "خطای 2021: سرور مدیا ICE ندارد.",
+    "app.sfu.serverIceGatheringFailed2022": "خطای 2022: سرور مدیا اتصال ICE ندارد.",
+    "app.sfu.invalidSdp2202":"خطای 2202: کاربر SDP اشتباه ایجاد کرده است.",
+    "app.sfu.noAvailableCodec2203": "خطای 2203: سرور کدک متناسب را پیدا نمیکند",
+    "app.meeting.endNotification.ok.label": "باشه",
+    "app.whiteboard.toolbar.tools": "ابزارها",
+    "app.whiteboard.toolbar.tools.pencil": "مداد",
+    "app.whiteboard.toolbar.tools.rectangle": "چهارگوش",
+    "app.whiteboard.toolbar.tools.triangle": "سه گوش",
+    "app.whiteboard.toolbar.tools.ellipse": "بیضی",
+    "app.whiteboard.toolbar.tools.line": "خط",
+    "app.whiteboard.toolbar.tools.text": "متن",
+    "app.whiteboard.toolbar.thickness": "ضخامت خط",
+    "app.whiteboard.toolbar.thicknessDisabled": "ضخامت خط غیر فعال است.",
+    "app.whiteboard.toolbar.color": "رنگ ها",
+    "app.whiteboard.toolbar.colorDisabled": "رنگ ها غیر فعالند",
+    "app.whiteboard.toolbar.color.black": "مشکی",
+    "app.whiteboard.toolbar.color.white": "سفید",
+    "app.whiteboard.toolbar.color.red": "قرمز",
+    "app.whiteboard.toolbar.color.orange": "نارنجی",
+    "app.whiteboard.toolbar.color.eletricLime": "زرد آبی",
+    "app.whiteboard.toolbar.color.lime": "لیمویی",
+    "app.whiteboard.toolbar.color.cyan": "آبی روشن",
+    "app.whiteboard.toolbar.color.dodgerBlue": "آبی تیره",
+    "app.whiteboard.toolbar.color.blue": "آبی",
+    "app.whiteboard.toolbar.color.violet": "بنفش",
+    "app.whiteboard.toolbar.color.magenta": "قرمز",
+    "app.whiteboard.toolbar.color.silver": "نقره ای",
+    "app.whiteboard.toolbar.undo": "دوباره سازی حاشیه نویسی",
+    "app.whiteboard.toolbar.clear": "پاک کردن همه حاشیه نویسی ها",
+    "app.whiteboard.toolbar.multiUserOn": "فعال کردن حالت چند کابره",
+    "app.whiteboard.toolbar.multiUserOff": "خاموش کردن حالت چند کاربره",
+    "app.whiteboard.toolbar.fontSize": "لیست اندازه فونت",
+    "app.feedback.title": "شما از کنفرانس بیرون رفته اید",
+    "app.feedback.subtitle": "بسیار ممنون میشویم نظر خود را در خصوص کلاس بفرمایید(نظر شما)",
+    "app.feedback.textarea": "چگونه میتوان کلاس را بهتر کرد؟",
+    "app.feedback.sendFeedback": "ارسال پیشنهاد و انتقاد",
+    "app.feedback.sendFeedbackDesc": "ارسال پیشنهاد و انتقاد و ترک جلسه",
+    "app.videoDock.webcamFocusLabel": "تمرکز",
+    "app.videoDock.webcamFocusDesc": "تمرکز در دوربین انتخاب شده",
+    "app.videoDock.webcamUnfocusLabel": "خروج از حالت تمرکز",
+    "app.videoDock.webcamUnfocusDesc": "خروج از حالت تمرکز در دوربین انتخاب شده",
+    "app.createBreakoutRoom.joinAudio": "پیوستن به صدا",
+    "app.externalVideo.close": "بستن"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/fr.json b/bigbluebutton-html5/private/locales/fr.json
new file mode 100644
index 0000000000..c5f42a185d
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/fr.json
@@ -0,0 +1,406 @@
+{
+    "app.home.greeting": "Bienvenue {0} ! Votre présentation commence bientôt...",
+    "app.chat.submitLabel": "Envoyer message",
+    "app.chat.errorMinMessageLength": "Le message est {0} caractère(s) trop court",
+    "app.chat.errorMaxMessageLength": "Le message est {0} caractère(s) trop long",
+    "app.chat.inputLabel": "Saisie des messages pour le chat {0}",
+    "app.chat.inputPlaceholder": "Message {0}",
+    "app.chat.titlePublic": "Discussion publique",
+    "app.chat.titlePrivate": "Discussion privée avec {0}",
+    "app.chat.partnerDisconnected": "{0} a quitté la conférence",
+    "app.chat.closeChatLabel": "Fermer {0}",
+    "app.chat.hideChatLabel": "Cacher {0}",
+    "app.chat.moreMessages": "Plus de messages ci-dessous",
+    "app.chat.dropdown.options": "Options de Discussion",
+    "app.chat.dropdown.clear": "Effacer",
+    "app.chat.dropdown.copy": "Copier",
+    "app.chat.dropdown.save": "Sauvegarder",
+    "app.chat.label": "Discussion",
+    "app.chat.emptyLogLabel": "Journal de discussion vide",
+    "app.chat.clearPublicChatMessage": "L'historique des discussions publiques a été effacé par un modérateur",
+    "app.userList.usersTitle": "Utilisateurs",
+    "app.userList.participantsTitle": "Participants",
+    "app.userList.messagesTitle": "Messages",
+    "app.userList.presenter": "Présentateur",
+    "app.userList.you": "Vous",
+    "app.userList.locked": "Verrouillé",
+    "app.userList.label": "Liste d'utilisateurs",
+    "app.userList.toggleCompactView.label": "Basculer le mode d'affichage compact",
+    "app.userList.guest": "Invité",
+    "app.userList.menuTitleContext": "Options disponibles",
+    "app.userList.chatListItem.unreadSingular": "{0} nouveau message",
+    "app.userList.chatListItem.unreadPlural": "{0} nouveaux messages",
+    "app.userList.menu.chat.label": "Discussion",
+    "app.userList.menu.clearStatus.label": "Effacer l'état",
+    "app.userList.menu.makePresenter.label": "Promouvoir comme Présentateur",
+    "app.userList.menu.removeUser.label": "Retirer l'utilisateur",
+    "app.userList.menu.muteUserAudio.label": "Rendre Muet",
+    "app.userList.menu.unmuteUserAudio.label": "Autoriser à parler",
+    "app.userList.userAriaLabel": "{0} {1} {2} État {3}",
+    "app.userList.menu.promoteUser.label": "Promouvoir comme modérateur",
+    "app.userList.menu.demoteUser.label": "Rendre utilisateur normal",
+    "app.media.label": "Média",
+    "app.media.screenshare.start": "Le Partage d'écran à commencé",
+    "app.media.screenshare.end": "Le Partage d'écran s'est terminé",
+    "app.media.screenshare.safariNotSupported": "Le Partage d'écran n'est pour le moment pas supporté par Safari. Veuillez utiliser Firefox ou Google Chrome.",
+    "app.meeting.ended": "Cette session s'est terminée",
+    "app.meeting.endedMessage": "Vous serez redirigé vers l'écran d'accueil",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Diapositive précédente",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Changer la présentation à la diapositive précédente",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Diapositive suivante",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Changer la présentation à la diapositive suivante",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Passer la diapositive",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Changer la présentation à une diapositive spécifique",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Adapté à la largeur",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Afficher toute la largeur de la diapositive",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Ajuster à l'écran",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Afficher toute la diapositive",
+    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
+    "app.presentation.presentationToolbar.zoomDesc": "Changer le niveau de zoom de la présentation",
+    "app.presentation.presentationToolbar.fitToWidth": "Adapté à la largeur",
+    "app.presentation.presentationToolbar.goToSlide": "Diapositive {0}",
+    "app.presentationUploder.title": "Présentation",
+    "app.presentationUploder.message": "En tant que présentateur dans BigBlueButton, vous avez la possibilité de téléverser n'importe quel document bureautique ou fichier PDF. Nous recommandons pour les meilleurs résultats de téléverser un fichier PDF.",
+    "app.presentationUploder.confirmLabel": "Débuter",
+    "app.presentationUploder.confirmDesc": "Sauvegardez vos modifications et lancez la présentation",
+    "app.presentationUploder.dismissLabel": "Annuler",
+    "app.presentationUploder.dismissDesc": "Ferme la fenêtre d'option et supprime vos modifications",
+    "app.presentationUploder.dropzoneLabel": "Faites glisser les fichiers ici pour les charger",
+    "app.presentationUploder.browseFilesLabel": "ou parcourez pour trouver des fichiers",
+    "app.presentationUploder.fileToUpload": "À charger...",
+    "app.presentationUploder.currentBadge": "En cours",
+    "app.presentationUploder.genericError": "Oups, quelque chose s'est mal passé",
+    "app.presentationUploder.upload.progress": "Chargement ({0}%)",
+    "app.presentationUploder.upload.413": "Le fichier est trop volumineux",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Traitement de la page {0} sur {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Conversion du fichier...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Création des vignettes...",
+    "app.presentationUploder.conversion.generatedSlides": "Diapositives générées...",
+    "app.presentationUploder.conversion.generatingSvg": "Création des images SVG...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Oups, le nombre de pages a dépassé la limite",
+    "app.presentationUploder.conversion.timeout": "Oups, la conversion prend trop de temps",
+    "app.poll.closeLabel": "Fermer",
+    "app.poll.liveResult.usersTitle": "Utilisateurs",
+    "app.polling.pollingTitle": "Options du Sondage",
+    "app.polling.pollAnswerLabel": "Réponse de sondage {0}",
+    "app.polling.pollAnswerDesc": "Choisir cette option pour voter pour {0}",
+    "app.failedMessage": "Problème de connexion au serveur, toutes nos excuses.",
+    "app.connectingMessage": "Connexion en cours...",
+    "app.waitingMessage": "Déconnecté. Tentative de reconnexion dans {0} secondes...",
+    "app.navBar.settingsDropdown.optionsLabel": "Options",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Plein écran",
+    "app.navBar.settingsDropdown.settingsLabel": "Ouvrir les paramètres",
+    "app.navBar.settingsDropdown.aboutLabel": "À propos",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Déconnexion",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Quitter le plein écran",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Passer le menu de paramétrage en plein écran",
+    "app.navBar.settingsDropdown.settingsDesc": "Modifier les paramètres généraux",
+    "app.navBar.settingsDropdown.aboutDesc": "Afficher les informations du client",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Quitter la conférence",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Quitter le mode plein écran",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Raccourcis",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Liste des raccourcis disponibles",
+    "app.navBar.settingsDropdown.helpLabel": "Aide",
+    "app.navBar.settingsDropdown.helpDesc": "Liens utilisateur à des didacticiels vidéo",
+    "app.navBar.userListToggleBtnLabel": "Basculer l'affichage de la Liste des Utilisateurs",
+    "app.navBar.toggleUserList.ariaLabel": "Basculer l'affichage de la Liste des Utilisateurs aux messages",
+    "app.navBar.toggleUserList.newMessages": "avec notification des nouveaux messages",
+    "app.navBar.recording": "Cette session est enregistrée",
+    "app.navBar.recording.on": "Enregistrement en cours",
+    "app.navBar.recording.off": "Pas d'enregistrement en cours",
+    "app.leaveConfirmation.confirmLabel": "Quitter",
+    "app.leaveConfirmation.confirmDesc": "Vous déconnecte de la conférence",
+    "app.endMeeting.yesLabel": "Oui",
+    "app.endMeeting.noLabel": "Non",
+    "app.about.title": "À propos",
+    "app.about.version": "Version du client :",
+    "app.about.copyright": "Copyright :",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Annuler",
+    "app.about.dismissDesc": "Fermer l'information client",
+    "app.actionsBar.changeStatusLabel": "Changer le statut",
+    "app.actionsBar.muteLabel": "Rendre silencieux",
+    "app.actionsBar.unmuteLabel": "Autoriser à parler",
+    "app.actionsBar.camOffLabel": "Caméra désactivée",
+    "app.actionsBar.raiseLabel": "Lever la main",
+    "app.actionsBar.label": "Barre d'actions",
+    "app.submenu.application.applicationSectionTitle": "Application",
+    "app.submenu.application.audioAlertLabel": "Alertes audio pour Discussion",
+    "app.submenu.application.pushAlertLabel": "Alertes Popup de Discussion",
+    "app.submenu.application.fontSizeControlLabel": "Taille des caractères",
+    "app.submenu.application.increaseFontBtnLabel": "Augmenter la Taille de la Police",
+    "app.submenu.application.decreaseFontBtnLabel": "Diminuer la Taille de la Police",
+    "app.submenu.application.languageLabel": "Langue de l'application",
+    "app.submenu.application.ariaLanguageLabel": "Changer la langue de l'application",
+    "app.submenu.application.languageOptionLabel": "Choisir la langue",
+    "app.submenu.application.noLocaleOptionLabel": "Pas de lieu actif",
+    "app.submenu.audio.micSourceLabel": "Source du Micro",
+    "app.submenu.audio.speakerSourceLabel": "Source du haut-parleur",
+    "app.submenu.audio.streamVolumeLabel": "Volume de votre flux audio",
+    "app.submenu.video.title": "Vidéo",
+    "app.submenu.video.videoSourceLabel": "Voir la source",
+    "app.submenu.video.videoOptionLabel": "Choisir la source de la vue",
+    "app.submenu.video.videoQualityLabel": "Qualité vidéo",
+    "app.submenu.video.qualityOptionLabel": "Choisissez la qualité vidéo",
+    "app.submenu.video.participantsCamLabel": "Voir les webcams des participants",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Sous-titres codés",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "S'approprier",
+    "app.submenu.closedCaptions.languageLabel": "Langue",
+    "app.submenu.closedCaptions.localeOptionLabel": "Choisir la langue",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Pas de lieux actifs",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Famille de police",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Choisir la famille de Police",
+    "app.submenu.closedCaptions.fontSizeLabel": "Taille des caractères",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Choisissez la taille des caractères",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Couleur du fond",
+    "app.submenu.closedCaptions.fontColorLabel": "Couleur des caractères",
+    "app.submenu.participants.muteAllLabel": "Couper le son, excepté pour le présentateur",
+    "app.submenu.participants.lockAllLabel": "Verrouiller tous les participants",
+    "app.submenu.participants.lockItemLabel": "Participants {0}",
+    "app.submenu.participants.lockMicDesc": "Désactiver le micro de tous les participants verrouillés",
+    "app.submenu.participants.lockCamDesc": "Désactiver la webcam de tous les participants verrouillés",
+    "app.submenu.participants.lockPublicChatDesc": "Désactiver la discussion publique pour tous les participants verrouillés",
+    "app.submenu.participants.lockPrivateChatDesc": "Désactiver la discussion privée pour tous les participants verrouillés",
+    "app.submenu.participants.lockLayoutDesc": "Verrouiller la disposition pour tous les participants verrouillés",
+    "app.submenu.participants.lockMicAriaLabel": "Verrouillage du micro",
+    "app.submenu.participants.lockCamAriaLabel": "Verrouillage de la webcam",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Discussion publique verrouillée",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Discussion privée verrouillée",
+    "app.submenu.participants.lockLayoutAriaLabel": "Disposition verrouillée",
+    "app.submenu.participants.lockMicLabel": "Microphone",
+    "app.submenu.participants.lockCamLabel": "Webcam",
+    "app.submenu.participants.lockPublicChatLabel": "Discussion Publique",
+    "app.submenu.participants.lockPrivateChatLabel": "Discussion Privée",
+    "app.submenu.participants.lockLayoutLabel": "Disposition",
+    "app.settings.applicationTab.label": "Application",
+    "app.settings.audioTab.label": "Audio",
+    "app.settings.videoTab.label": "Vidéo",
+    "app.settings.closedcaptionTab.label": "Sous-titres codés",
+    "app.settings.usersTab.label": "Participants",
+    "app.settings.main.label": "Paramètres",
+    "app.settings.main.cancel.label": "Annuler",
+    "app.settings.main.cancel.label.description": "Annule les changements et ferme le menu des paramètres",
+    "app.settings.main.save.label": "Sauvegarder",
+    "app.settings.main.save.label.description": "Sauvegarde les changements et ferme le menu des paramètres",
+    "app.settings.dataSavingTab.label": "Enregistrement des Données",
+    "app.settings.dataSavingTab.webcam": "Activer les Webcams",
+    "app.settings.dataSavingTab.screenShare": "Activer le Partage de Bureau",
+    "app.settings.dataSavingTab.description": "Pour économiser votre bande passante, ajustez ce qui est actuellement affiché.",
+    "app.switch.onLabel": "ON",
+    "app.switch.offLabel": "OFF",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Actions",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Charger une présentation",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Débuter un sondage",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Partager votre écran",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Cesser le partage d'écran",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Charger votre présentation",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Débuter un sondage",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Partager votre écran avec d'autres",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Cesser de partager votre écran avec",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "Définir le statut",
+    "app.actionsBar.emojiMenu.awayLabel": "Éloigné",
+    "app.actionsBar.emojiMenu.awayDesc": "Passer votre état à éloigné",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Lever la main",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Lever la main pour poser une question",
+    "app.actionsBar.emojiMenu.neutralLabel": "Indécis",
+    "app.actionsBar.emojiMenu.neutralDesc": "Passer votre état à indécis",
+    "app.actionsBar.emojiMenu.confusedLabel": "Désorienté",
+    "app.actionsBar.emojiMenu.confusedDesc": "Passer votre état à désorienté",
+    "app.actionsBar.emojiMenu.sadLabel": "Triste",
+    "app.actionsBar.emojiMenu.sadDesc": "Passer votre état à triste",
+    "app.actionsBar.emojiMenu.happyLabel": "Ravi",
+    "app.actionsBar.emojiMenu.happyDesc": "Passer votre état à ravi",
+    "app.actionsBar.emojiMenu.noneLabel": "Effacer votre état",
+    "app.actionsBar.emojiMenu.noneDesc": "Effacer votre statut",
+    "app.actionsBar.emojiMenu.applauseLabel": "Approuver",
+    "app.actionsBar.emojiMenu.applauseDesc": "Passer votre état à applaudissements",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Favorable",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Passer votre statut à favorable",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Défavorable",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Passer votre statut à défavorable",
+    "app.actionsBar.currentStatusDesc": "statut actuel {0}",
+    "app.audioNotification.audioFailedError1001": "Erreur 1001 : WebSocket déconnecté",
+    "app.audioNotification.audioFailedError1002": "Erreur 1002 : impossible d'établir une connexion WebSocket.",
+    "app.audioNotification.audioFailedError1003": "Erreur 1003 : version de navigateur non supportée",
+    "app.audioNotification.audioFailedError1004": "Erreur 1004 : défaut sur appel",
+    "app.audioNotification.audioFailedError1005": "Erreur 1005 : l'appel s'est terminé inopinément",
+    "app.audioNotification.audioFailedError1006": "Erreur 1006 : délai d'appel dépassé",
+    "app.audioNotification.audioFailedError1007": "Erreur 1007 : la négociation ICE a échoué",
+    "app.audioNotification.audioFailedError1008": "Erreur 1008 : échec du transfert",
+    "app.audioNotification.audioFailedError1009": "Erreur 1009 : impossible de récupérer les informations du serveur STUN/TURN.",
+    "app.audioNotification.audioFailedError1010": "Erreur 1010 :  délai dépassé durant la négociation ICE",
+    "app.audioNotification.audioFailedError1011": "Erreur 1011 : délai d'attente dépassé pour ICE",
+    "app.audioNotification.audioFailedMessage": "Votre connexion audio à échoué",
+    "app.audioNotification.mediaFailedMessage": "Votre connexion micro a échoué",
+    "app.audioNotification.closeLabel": "Fermer",
+    "app.audioNotificaion.reconnectingAsListenOnly": "L'audio a été verrouillé pour les modérateurs uniquement, vous êtes connecté pour écouter seulement",
+    "app.breakoutJoinConfirmation.title": "Rejoindre la salle de groupe",
+    "app.breakoutJoinConfirmation.message": "Voulez-vous rejoindre",
+    "app.breakoutJoinConfirmation.confirmLabel": "Rejoindre",
+    "app.breakoutJoinConfirmation.confirmDesc": "Rejoignez la salle de groupe",
+    "app.breakoutJoinConfirmation.dismissLabel": "Annuler",
+    "app.breakoutJoinConfirmation.dismissDesc": "Fermer et refuser de rejoindre la salle de groupe",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Choisissez une salle de groupe à rejoindre",
+    "app.breakoutTimeRemainingMessage": "Temps restant pour la salle de groupe : {0}",
+    "app.breakoutWillCloseMessage": "Temps écoulé. La salle de groupe fermera bientôt",
+    "app.calculatingBreakoutTimeRemaining": "Calcul du temps restant...",
+    "app.audioModal.microphoneLabel": "Microphone",
+    "app.audioModal.listenOnlyLabel": "Écoute seule",
+    "app.audioModal.audioChoiceLabel": "Voulez-vous rejoindre l'audio ?",
+    "app.audioModal.iOSBrowser": "Audio/Vidéo non supporté",
+    "app.audioModal.iOSErrorDescription": "Actuellement l'audio et la vidéo ne sont pas supportés par Chrome sur iOS.",
+    "app.audioModal.iOSErrorRecommendation": "Nous recommandons d'utiliser Safari iOS.",
+    "app.audioModal.audioChoiceDesc": "Sélectionnez comment rejoindre l'audio de cette conférence",
+    "app.audioModal.closeLabel": "Fermer",
+    "app.audioModal.yes": "Oui",
+    "app.audioModal.no": "Non",
+    "app.audioModal.yes.arialabel" : "Écho activé",
+    "app.audioModal.no.arialabel" : "Écho désactivé",
+    "app.audioModal.echoTestTitle": "Écho test privé. Dites quelques mots. Entendez-vous l'audio ?",
+    "app.audioModal.settingsTitle": "Modifier vos paramètres audio",
+    "app.audioModal.helpTitle": "Il y a un problème avec vos périphériques",
+    "app.audioModal.helpText": "Avez-vous donné à BigBlueButton la permission d'accéder à votre microphone ? Notez qu'une boîte de dialogue devrait apparaître lorsque vous essayez de vous joindre à l'audio, vous demandant les permissions d'accès à vos périphériques multimédia. Veuillez accepter afin de vous joindre à la conférence audio. Si tel n'est pas le cas, essayez de changer les permissions de votre micro dans les paramètres de votre navigateur.",
+    "app.audioModal.connecting": "Connexion en cours",
+    "app.audioModal.connectingEchoTest": "Connexion au test d'écho",
+    "app.audioManager.joinedAudio": "Vous avez rejoint la conférence audio",
+    "app.audioManager.joinedEcho": "Vous avez rejoint le test d'écho",
+    "app.audioManager.leftAudio": "Vous avez quitté la conférence audio",
+    "app.audioManager.genericError": "Erreur : une erreur s'est produite, veuillez réessayez.",
+    "app.audioManager.connectionError": "Erreur : erreur de connexion",
+    "app.audioManager.requestTimeout": "Erreur : un délai est dépassé dans la requête",
+    "app.audioManager.invalidTarget": "Erreur : tentative de requête sur une destination invalide",
+    "app.audioManager.mediaError": "Erreur : il y a un problème pour obtenir vos périphériques multimédias",
+    "app.audio.joinAudio": "Rejoindre l'Audio",
+    "app.audio.leaveAudio": "Quitter l'Audio",
+    "app.audio.enterSessionLabel": "Entrer dans la Session",
+    "app.audio.playSoundLabel": "Jouer un son",
+    "app.audio.backLabel": "Retour",
+    "app.audio.audioSettings.titleLabel": "Choisissez vos paramètres audio",
+    "app.audio.audioSettings.descriptionLabel": "Veuillez noter qu'une boîte de dialogue apparaîtra dans votre navigateur, vous demandant d'accepter le partage de votre micro.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Source du Micro",
+    "app.audio.audioSettings.speakerSourceLabel": "Source du haut-parleur",
+    "app.audio.audioSettings.microphoneStreamLabel": "Le volume de votre flux audio",
+    "app.audio.audioSettings.retryLabel": "Réessayer",
+    "app.audio.listenOnly.backLabel": "Retour",
+    "app.audio.listenOnly.closeLabel": "Fermer",
+    "app.audio.permissionsOverlay.title": "Autoriser BigBlueButton à utiliser vos périphériques multimédias",
+    "app.audio.permissionsOverlay.hint": "Nous avons besoin de vous pour nous permettre d'utiliser vos périphériques Multimédias afin de vous joindre à la conférence vocale :)",
+    "app.error.removed": "Vous avez été retiré de la conférence",
+    "app.error.meeting.ended": "Vous avez été déconnecté de la conférence",
+    "app.dropdown.close": "Fermer",
+    "app.error.500": "Oups, quelque chose s'est mal passé",
+    "app.error.404": "Non trouvé",
+    "app.error.401": "Non autorisé",
+    "app.error.403": "Interdit",
+    "app.error.leaveLabel": "Connectez-vous à nouveau",
+    "app.guest.waiting": "En attente de l'approbation d'adhésion",
+    "app.toast.breakoutRoomEnded": "La salle de groupe s'est terminée. Veuillez vous joindre à l'audio.",
+    "app.toast.chat.public": "Nouveau message de discussion publique",
+    "app.toast.chat.private": "Nouveau message de discussion privée",
+    "app.toast.chat.system": "Système",
+    "app.notification.recordingStart": "Cette session est maintenant enregistrée",
+    "app.notification.recordingStop": "Cette session n'est maintenant plus enregistrée",
+    "app.shortcut-help.title": "Raccourcis",
+    "app.shortcut-help.accessKeyNotAvailable": "Raccourcis non disponible.",
+    "app.shortcut-help.comboLabel": "Combo",
+    "app.shortcut-help.functionLabel": "Fonction",
+    "app.shortcut-help.closeLabel": "Fermer",
+    "app.shortcut-help.closeDesc": "Ferme la fenêtre des raccourcis",
+    "app.shortcut-help.openOptions": "Ouvrir les options",
+    "app.shortcut-help.toggleUserList": "Basculer la liste d'utilisateurs",
+    "app.shortcut-help.toggleMute": "Assourdir / Activer",
+    "app.shortcut-help.togglePublicChat": "Basculer vers la Discussion Publique(La liste utilisateurs doit être ouvert)",
+    "app.shortcut-help.hidePrivateChat": "Cacher la discussion privée",
+    "app.shortcut-help.closePrivateChat": "Fermer la discussion privée",
+    "app.shortcut-help.openActions": "Ouvrir le menu Actions",
+    "app.shortcut-help.openStatus": "Ouvrir le menu Statut",
+    "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.microphoneLable": "Microphone",
+    "app.lock-viewers.PublicChatLabel": "Discussion Publique",
+    "app.lock-viewers.PrivateChatLable": "Discussion Privée",
+    "app.lock-viewers.Layout": "Disposition",
+    "app.videoPreview.cancelLabel": "Annuler",
+    "app.videoPreview.closeLabel": "Fermer",
+    "app.video.joinVideo": "Partager la Webcam",
+    "app.video.leaveVideo": "Ne plus partager la Webcam",
+    "app.video.iceCandidateError": "Erreur lors de l'ajout d'un candidat ICE",
+    "app.video.iceConnectionStateError": "Erreur 1107 : négociation ICE échouée",
+    "app.video.permissionError": "Erreur lors du partage de la webcam. Veuillez vérifier les permissions.",
+    "app.video.sharingError": "Erreur lors du partage de la Webcam",
+    "app.video.notFoundError": "Webcam introuvable. Assurez-vous qu'elle soit bien connectée",
+    "app.video.notAllowed": "Permission manquante pour partager la Webcam. Veuillez vérifier les permissions dans votre navigateur",
+    "app.video.notSupportedError": "La vidéo de la webcam peut uniquement être partagée avec des sources sûres ; assurez-vous que votre certificat SSL est valide",
+    "app.video.notReadableError": "Impossible d'obtenir la vidéo de la webcam. Assurez-vous qu'aucun autre programme n'utilise la webcam",
+    "app.video.swapCam": "Échanger",
+    "app.video.swapCamDesc": "Permuter les Webcams",
+    "app.video.videoMenu": "Menu Vidéo",
+    "app.video.videoMenuDisabled": "Le menu Vidéo de la Webcam est désactivé dans les paramètres",
+    "app.video.videoMenuDesc": "Ouvrir le menu déroulant de la vidéo",
+    "app.video.chromeExtensionError": "Vous devez installer ",
+    "app.video.chromeExtensionErrorLink": "cette Extension Chrome",
+    "app.video.stats.title": "Statistiques de connexion",
+    "app.video.stats.packetsReceived": "Paquets reçus",
+    "app.video.stats.packetsSent": "Paquets envoyés",
+    "app.video.stats.packetsLost": "Paquets perdus",
+    "app.video.stats.bitrate": "Bitrate",
+    "app.video.stats.lostPercentage": "Pourcentage perdu total",
+    "app.video.stats.lostRecentPercentage": "Pourcentage perdu récent",
+    "app.video.stats.dimensions": "Dimensions",
+    "app.video.stats.codec": "Codec",
+    "app.video.stats.decodeDelay": "Délai de décodage",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "Usage de l'encodage",
+    "app.video.stats.currentDelay": "Délai actuel",
+    "app.deskshare.iceConnectionStateError": "Erreur 1108 : connexion ICE échouée lors du partage d'écran",
+    "app.sfu.mediaServerConnectionError2000": "Erreur 2000 : impossible de se connecter au serveur multimédia",
+    "app.sfu.mediaServerOffline2001": "Erreur 2001 : le serveur multimédia est hors ligne. Veuillez réessayer plus tard.",
+    "app.sfu.mediaServerNoResources2002": "Erreur 2002 : le serveur de médias n'a pas de ressources disponibles",
+    "app.sfu.mediaServerRequestTimeout2003": "Erreur 2003 : les demandes du serveur multimédia expirent",
+    "app.sfu.serverIceGatheringFailed2021": "Erreur 2021 : le serveur multimédia ne peut pas rassembler de candidats ICE",
+    "app.sfu.serverIceGatheringFailed2022": "Erreur 2022 : la connexion ICE au serveur de médias a échoué",
+    "app.sfu.invalidSdp2202":"Erreur 2202 : le client a généré un SDP non valide",
+    "app.sfu.noAvailableCodec2203": "Erreur 2203 : le serveur n'a pas trouvé de codec approprié",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.toolbar.tools": "Outils",
+    "app.whiteboard.toolbar.tools.pencil": "Crayon",
+    "app.whiteboard.toolbar.tools.rectangle": "Rectangle",
+    "app.whiteboard.toolbar.tools.triangle": "Triangle",
+    "app.whiteboard.toolbar.tools.ellipse": "Ellipse",
+    "app.whiteboard.toolbar.tools.line": "Ligne",
+    "app.whiteboard.toolbar.tools.text": "Texte",
+    "app.whiteboard.toolbar.thickness": "Épaisseur du trait",
+    "app.whiteboard.toolbar.thicknessDisabled": "L'épaisseur du trait est désactivée",
+    "app.whiteboard.toolbar.color": "Couleurs",
+    "app.whiteboard.toolbar.colorDisabled": "Couleurs désactivées",
+    "app.whiteboard.toolbar.color.black": "Noir",
+    "app.whiteboard.toolbar.color.white": "Blanc",
+    "app.whiteboard.toolbar.color.red": "Rouge",
+    "app.whiteboard.toolbar.color.orange": "Orange",
+    "app.whiteboard.toolbar.color.eletricLime": "Vert électrique",
+    "app.whiteboard.toolbar.color.lime": "Vert",
+    "app.whiteboard.toolbar.color.cyan": "Cyan",
+    "app.whiteboard.toolbar.color.dodgerBlue": "Bleu foncé",
+    "app.whiteboard.toolbar.color.blue": "Bleu",
+    "app.whiteboard.toolbar.color.violet": "Violet",
+    "app.whiteboard.toolbar.color.magenta": "Magenta",
+    "app.whiteboard.toolbar.color.silver": "Argenté",
+    "app.whiteboard.toolbar.undo": "Annuler l'annotation",
+    "app.whiteboard.toolbar.clear": "Effacer toutes les annotations",
+    "app.whiteboard.toolbar.multiUserOn": "Activer le mode multi-utilisateur",
+    "app.whiteboard.toolbar.multiUserOff": "Désactiver le mode multi-utilisateur",
+    "app.whiteboard.toolbar.fontSize": "Liste des Tailles de Police",
+    "app.feedback.title": "Vous avez quitté la conférence",
+    "app.feedback.subtitle": "Nous aimerions connaitre votre expérience avec BigBlueButton (optionnel)",
+    "app.feedback.textarea": "Comment pouvons nous améliorer BigBlueButton ?",
+    "app.feedback.sendFeedback": "Envoyer l'avis",
+    "app.feedback.sendFeedbackDesc": "Envoyer l'avis et quitter la conférence",
+    "app.videoDock.webcamFocusLabel": "Focus",
+    "app.videoDock.webcamFocusDesc": "Focus sur la webcam sélectionnée",
+    "app.videoDock.webcamUnfocusLabel": "Arrêt du focus",
+    "app.videoDock.webcamUnfocusDesc": "Arrêt du focus sur la webcam sélectionnée",
+    "app.createBreakoutRoom.joinAudio": "Rejoindre l'Audio",
+    "app.externalVideo.close": "Fermer"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/id.json b/bigbluebutton-html5/private/locales/id.json
new file mode 100644
index 0000000000..4af90872fc
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/id.json
@@ -0,0 +1,238 @@
+{
+    "app.home.greeting": "Selamat datang {0}! Presentasi anda akan mulai sesaat lagi...",
+    "app.chat.submitLabel": "Kirimkan pesan",
+    "app.chat.errorMinMessageLength": "Pesan ini terdiri dari {0} karakter(s) terlalu pendek",
+    "app.chat.errorMaxMessageLength": "Pesan ini terdiri dari {0} karakter(s) terlalu panjang",
+    "app.chat.inputLabel": "Input pesan untuk chat {0}",
+    "app.chat.inputPlaceholder": "Pesan {0}",
+    "app.chat.titlePublic": "Chat Publik",
+    "app.chat.titlePrivate": "Chat pribadi dengan {0}",
+    "app.chat.partnerDisconnected": "{0} sudah keluar dari meeting",
+    "app.chat.closeChatLabel": "Tutup {0}",
+    "app.chat.hideChatLabel": "Sembunyikan {0}",
+    "app.chat.moreMessages": "Lihat pesan lebih banyak dibawah ini",
+    "app.chat.dropdown.options": "Opsi Chat",
+    "app.chat.dropdown.clear": "Bersihkan",
+    "app.chat.dropdown.copy": "Salin",
+    "app.chat.dropdown.save": "Simpan",
+    "app.chat.label": "Chat",
+    "app.chat.emptyLogLabel": "Log Chatting kosong",
+    "app.userList.usersTitle": "Pengguna",
+    "app.userList.participantsTitle": "Peserta",
+    "app.userList.messagesTitle": "Pesan",
+    "app.userList.presenter": "Pemateri",
+    "app.userList.you": "Anda",
+    "app.userList.locked": "Terkunci",
+    "app.userList.label": "Daftar Pengguna",
+    "app.userList.guest": "Tamu",
+    "app.userList.menuTitleContext": "Opsi yang tersedia",
+    "app.userList.chatListItem.unreadSingular": "{0} Pesan Baru",
+    "app.userList.chatListItem.unreadPlural": "{0} Pesan Baru",
+    "app.userList.menu.chat.label": "Chat",
+    "app.userList.menu.clearStatus.label": "Bersihkan Status",
+    "app.userList.menu.makePresenter.label": "Ubah menjadi Pemateri",
+    "app.userList.menu.removeUser.label": "Hapus pengguna",
+    "app.userList.menu.muteUserAudio.label": "Diamkan pengguna",
+    "app.userList.menu.unmuteUserAudio.label": "Aktifkan pengguna",
+    "app.media.label": "Media",
+    "app.media.screenshare.start": "Berbagi layar sudah mulai",
+    "app.media.screenshare.end": "Berbagi layar sudah berakhir",
+    "app.meeting.ended": "Sesi sudah berakhir",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Slide Sebelumnya",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Pindahkan presentasi ke slide sebelumnya",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Slide selanjutnya",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Pindahkan presentasi ke slide selanjutnya",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Lewati Slide",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Pindahkan presentasi ke slide tertentu",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Sesuaikan dengan lebar layar",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Tampilkan seluruh lebar slide",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Sesuaikan dengan ukuran layar",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Tampilkan seluruh slide",
+    "app.presentation.presentationToolbar.zoomLabel": "Perbesar",
+    "app.presentation.presentationToolbar.zoomDesc": "Ubah level zoom dari presentasi",
+    "app.presentation.presentationToolbar.fitToWidth": "Sesuaikan dengan lebar layar",
+    "app.presentationUploder.title": "Presentasi",
+    "app.presentationUploder.message": "Silakan unggah file presentasi dalam bentuk microsoft office format, file .jpg ataupun file .pdf. Gunakan mode presentasi/landscape untuk mendapatkan hasil terbaik. ",
+    "app.presentationUploder.confirmLabel": "Mulai",
+    "app.presentationUploder.confirmDesc": "Simpan ubahan Anda dan mulai presentasi",
+    "app.presentationUploder.dismissLabel": "Batalkan",
+    "app.presentationUploder.dismissDesc": "Tutup jendela dan batalkan perubahan.",
+    "app.presentationUploder.dropzoneLabel": "Drag file untuk unggah",
+    "app.presentationUploder.browseFilesLabel": "atau telusuri file",
+    "app.presentationUploder.fileToUpload": "untuk diunggah",
+    "app.presentationUploder.genericError": "Ops, terjadi kesalahan",
+    "app.presentationUploder.upload.413": "File terlalu besar",
+    "app.presentationUploder.conversion.genericConversionStatus": "Mengkonversikan file",
+    "app.presentationUploder.conversion.generatingThumbnail": "Membuat thumbnail...",
+    "app.presentationUploder.conversion.generatedSlides": "Slides telah siap",
+    "app.presentationUploder.conversion.generatingSvg": "Membuat gambar SVG ...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Ops, jumlah halaman melebihi batas",
+    "app.poll.closeLabel": "Tutup",
+    "app.poll.liveResult.usersTitle": "Pengguna",
+    "app.polling.pollingTitle": "Pilihan Polling",
+    "app.failedMessage": "Mohon maaf, ada kesulitan terhubung ke server",
+    "app.connectingMessage": "Menghubungkan",
+    "app.waitingMessage": "Terputus. Sedang menghubungkan kembali dalam {0} detik...",
+    "app.navBar.settingsDropdown.optionsLabel": "Pilihan",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Aktifkan layar penuh",
+    "app.navBar.settingsDropdown.settingsLabel": "Buka Pengaturan",
+    "app.navBar.settingsDropdown.aboutLabel": "Tentang",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Keluar",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Keluar dari layar penuh",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Buat menu pengaturan menjadi layar penuh",
+    "app.navBar.settingsDropdown.settingsDesc": "Ubah pengaturan umum",
+    "app.navBar.settingsDropdown.aboutDesc": "Tampilkan informasi tentang klien",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Keluar meeting",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Keluar dari mode layar penuh",
+    "app.navBar.userListToggleBtnLabel": "Alihkan Daftar Pengguna",
+    "app.navBar.toggleUserList.newMessages": "Dengan notifikasi pesan baru",
+    "app.leaveConfirmation.confirmLabel": "Keluar",
+    "app.leaveConfirmation.confirmDesc": "Anda keluar dari meeting",
+    "app.about.title": "Tentang",
+    "app.about.version": "Versi klien:",
+    "app.about.copyright": "Hak Cipta:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Batalkan",
+    "app.about.dismissDesc": "Tutup informasi klien",
+    "app.actionsBar.changeStatusLabel": "Ubah Status",
+    "app.actionsBar.muteLabel": "Diamkan",
+    "app.actionsBar.unmuteLabel": "Aktifkan",
+    "app.actionsBar.camOffLabel": "Kamera Off",
+    "app.actionsBar.raiseLabel": "Naikan",
+    "app.actionsBar.label": "Menu aksi",
+    "app.submenu.application.applicationSectionTitle": "Aplikasi",
+    "app.submenu.application.fontSizeControlLabel": "Ukuran Huruf",
+    "app.submenu.application.increaseFontBtnLabel": "Besarkan Ukuran Huruf Aplikasi",
+    "app.submenu.application.decreaseFontBtnLabel": "Kecilkan Ukuran Huruf Aplikasi",
+    "app.submenu.application.languageLabel": "Bahasa Aplikasi",
+    "app.submenu.application.ariaLanguageLabel": "Ubah Bahasa Aplikasi",
+    "app.submenu.application.languageOptionLabel": "Pilih Bahasa",
+    "app.submenu.application.noLocaleOptionLabel": "Tidak ada lokalisasi yang aktif",
+    "app.submenu.audio.micSourceLabel": "Sumber Mikropon",
+    "app.submenu.audio.speakerSourceLabel": "Sumber Speaker",
+    "app.submenu.audio.streamVolumeLabel": "Volume stream audio Anda",
+    "app.submenu.video.title": "Video",
+    "app.submenu.video.videoSourceLabel": "Lihat Sumber",
+    "app.submenu.video.videoOptionLabel": "Pilih Lihat Sumber",
+    "app.submenu.video.videoQualityLabel": "Kualitas Video",
+    "app.submenu.video.qualityOptionLabel": "Pilih kualitas video",
+    "app.submenu.video.participantsCamLabel": "Melihat Web Kamera Peserta",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Subtitel",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Ambil kepemilikan",
+    "app.submenu.closedCaptions.languageLabel": "Bahasa",
+    "app.submenu.closedCaptions.localeOptionLabel": "Pilih Bahasa",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Tidaki ada lokalisasi yang aktif",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Jenis Huruf",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Pilih jenis Huruf",
+    "app.submenu.closedCaptions.fontSizeLabel": "Ukuran Huruf",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Pilih ukuran Huruf",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Warna latar",
+    "app.submenu.closedCaptions.fontColorLabel": "Warna Huruf",
+    "app.submenu.participants.muteAllLabel": "Diamkan semua kecuali pemateri",
+    "app.submenu.participants.lockAllLabel": "Kunci semua peserta",
+    "app.submenu.participants.lockItemLabel": "Peserta {0}",
+    "app.submenu.participants.lockMicDesc": "Nonaktifkan mikropon untuk semua peserta yang terkunci",
+    "app.submenu.participants.lockCamDesc": "Nonaktifkan web kamera untuk semua peserta yang terkunci",
+    "app.submenu.participants.lockPublicChatDesc": "Nonaktifkan Chat publik untuk semua peserta yang terkunci",
+    "app.submenu.participants.lockPrivateChatDesc": "Nonaktifkan Chat privat untuk semua peserta yang terkunci",
+    "app.submenu.participants.lockLayoutDesc": "Kunci Layout untuk semua peserta yang terkunci",
+    "app.submenu.participants.lockMicAriaLabel": "Kunci Mikropon",
+    "app.submenu.participants.lockCamAriaLabel": "Kunci Web Kamera.",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Chat publik terkunci",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Chat privat terkunci",
+    "app.submenu.participants.lockLayoutAriaLabel": "Layout terkunci",
+    "app.submenu.participants.lockMicLabel": "Mikropon",
+    "app.submenu.participants.lockCamLabel": "Web Kamera",
+    "app.submenu.participants.lockPublicChatLabel": "Chat Publik",
+    "app.submenu.participants.lockPrivateChatLabel": "Chat Privat",
+    "app.submenu.participants.lockLayoutLabel": "Layout",
+    "app.settings.applicationTab.label": "Aplikasi",
+    "app.settings.audioTab.label": "Audio",
+    "app.settings.videoTab.label": "Video",
+    "app.settings.closedcaptionTab.label": "Subtitel",
+    "app.settings.usersTab.label": "Partisipan",
+    "app.settings.main.label": "Pengaturan",
+    "app.settings.main.cancel.label": "Batalkan",
+    "app.settings.main.cancel.label.description": "Batalkan perubahan dan tutup menu pengaturan.",
+    "app.settings.main.save.label": "Simpan",
+    "app.settings.main.save.label.description": "Simpan perubahan dan tutup menu pengaturan",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Aksi",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Unggah presentasi",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Mulai polling",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Bagikan Layar",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Unggah presentasi",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Mulai polling",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Bagikan layar anda dengan orang lain",
+    "app.actionsBar.emojiMenu.awayLabel": "Tidak Fokus",
+    "app.actionsBar.emojiMenu.awayDesc": "Ubah status menjadi Tidak Fokus",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Naikan",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Angkat tangan untuk bertanya",
+    "app.actionsBar.emojiMenu.neutralLabel": "Tidak memutuskan",
+    "app.actionsBar.emojiMenu.neutralDesc": "Ubah status anda menjadi Tidak Memutuskan",
+    "app.actionsBar.emojiMenu.confusedLabel": "Bingung",
+    "app.actionsBar.emojiMenu.confusedDesc": "Ubah status anda menjadi Bingung",
+    "app.actionsBar.emojiMenu.sadLabel": "Sedih",
+    "app.actionsBar.emojiMenu.sadDesc": "Ubah status anda menjadi Sedih",
+    "app.actionsBar.emojiMenu.happyLabel": "Bahagia",
+    "app.actionsBar.emojiMenu.happyDesc": "Ubah status anda menjadi Bahagia",
+    "app.actionsBar.emojiMenu.noneLabel": "Bersihkan Status",
+    "app.actionsBar.emojiMenu.noneDesc": "Normalkan status anda",
+    "app.actionsBar.emojiMenu.applauseLabel": "Tepuk tangan",
+    "app.actionsBar.emojiMenu.applauseDesc": "Ubah status anda menjadi Tepuk Tangan",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Jempol Atas",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Ubah status Anda menjadi Jempol Atas",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Jempol Bawah",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Ubah status Anda menjadi Jempol Bawah",
+    "app.actionsBar.currentStatusDesc": "status saat ini {0}",
+    "app.audioNotification.audioFailedMessage": "Koneksi audio anda gagal terhubung",
+    "app.audioNotification.mediaFailedMessage": "Aktivasi Mikropon  gagal, hanya sumber yang aman yang diizinkan ",
+    "app.audioNotification.closeLabel": "Tutup",
+    "app.breakoutJoinConfirmation.title": "Terhubung Ruang Diskusi Kelompok",
+    "app.breakoutJoinConfirmation.message": "Anda ingin bergabung ?",
+    "app.breakoutJoinConfirmation.confirmLabel": "Bergabung",
+    "app.breakoutJoinConfirmation.confirmDesc": "Sedang menghubungkan ke Ruang Diskusi Kelompok",
+    "app.breakoutJoinConfirmation.dismissLabel": "Batalkan",
+    "app.breakoutJoinConfirmation.dismissDesc": "Tutup dan tolak bergabung dengan Ruang diskusi kelompok",
+    "app.breakoutTimeRemainingMessage": "Waktu tersisa untuk Ruang Diskusi Kelompok: {0}",
+    "app.breakoutWillCloseMessage": "Waktu sudah habis. Ruang Diskusi Kelompok akan segera ditutup.",
+    "app.calculatingBreakoutTimeRemaining": "Menghitung sisa waktu...",
+    "app.audioModal.microphoneLabel": "MIkropon",
+    "app.audioModal.listenOnlyLabel": "Hanya Mendengar",
+    "app.audioModal.audioChoiceLabel": "Bagaimana anda akan terhubung dengan audio?",
+    "app.audioModal.audioChoiceDesc": "Pilih cara terhubung dengan audio di meeting ini",
+    "app.audioModal.closeLabel": "Tutup",
+    "app.audio.joinAudio": "Terhubung audio",
+    "app.audio.leaveAudio": "Tinggalkan audio",
+    "app.audio.enterSessionLabel": "Masuk sesi",
+    "app.audio.playSoundLabel": "Mainkan audio",
+    "app.audio.backLabel": "Kembali",
+    "app.audio.audioSettings.titleLabel": "Pilih pengaturan audio anda",
+    "app.audio.audioSettings.descriptionLabel": "Mohon diperhatikan, dialog akan muncul pada browser anda, Silakan untuk menekan tombol  menerima berbagi mikropon jika diminta.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Sumber Mikropon",
+    "app.audio.audioSettings.speakerSourceLabel": "Sumber Speaker",
+    "app.audio.audioSettings.microphoneStreamLabel": "Volume stream audio anda",
+    "app.audio.listenOnly.backLabel": "Kembali",
+    "app.audio.listenOnly.closeLabel": "Tutup",
+    "app.error.meeting.ended": "Anda telah keluar dari konferensi",
+    "app.dropdown.close": "Tutup",
+    "app.error.500": "Ops, sepertinya ada kesalahan",
+    "app.error.404": "Tidak ditemukan",
+    "app.error.401": "Tidak memiliki izin",
+    "app.error.403": "Dilarang",
+    "app.error.leaveLabel": "Log in Kembali",
+    "app.shortcut-help.closeLabel": "Tutup",
+    "app.lock-viewers.webcamLabel": "Web Kamera",
+    "app.lock-viewers.microphoneLable": "Mikropon",
+    "app.lock-viewers.PublicChatLabel": "Chat Publik",
+    "app.lock-viewers.PrivateChatLable": "Chat Privat",
+    "app.lock-viewers.Layout": "Layout",
+    "app.videoPreview.cancelLabel": "Batalkan",
+    "app.videoPreview.closeLabel": "Tutup",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.feedback.title": "Anda telah keluar dari konferensi",
+    "app.createBreakoutRoom.joinAudio": "Terhubung audio",
+    "app.externalVideo.close": "Tutup"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/it_IT.json b/bigbluebutton-html5/private/locales/it_IT.json
new file mode 100644
index 0000000000..6863ff0051
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/it_IT.json
@@ -0,0 +1,9 @@
+{
+    "app.home.greeting": "Benvenuto {0}! La tua presentazione comincerà a breve...",
+    "app.chat.submitLabel": "Invia Messaggio",
+    "app.chat.errorMinMessageLength": "Il messaggio di {0} carattere(i) è troppo breve",
+    "app.chat.errorMaxMessageLength": "Il messaggio di {0} carattere(i) è troppo lungo",
+    "app.chat.inputLabel": "Messaggio di input per la chat  {0}"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
new file mode 100644
index 0000000000..ebb33131fa
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/ja.json
@@ -0,0 +1,382 @@
+{
+    "app.home.greeting": "ようこそ {0} さん！ プレゼンテーションは間もなく始まります…",
+    "app.chat.submitLabel": "メッセージを送信",
+    "app.chat.errorMinMessageLength": "このメッセージは文字数が{0}文字足りません",
+    "app.chat.errorMaxMessageLength": "このメッセージは文字数制限を{0}文字超えています",
+    "app.chat.inputLabel": "チャット {0} へメッセージ入力",
+    "app.chat.inputPlaceholder": "メッセージ {0}",
+    "app.chat.titlePublic": "公開チャット",
+    "app.chat.titlePrivate": "{0} との非公開チャット",
+    "app.chat.partnerDisconnected": "{0} は会議から退出しました",
+    "app.chat.closeChatLabel": "{0} を閉じる",
+    "app.chat.hideChatLabel": "{0} を隠す",
+    "app.chat.moreMessages": "下にまだメッセージがあります",
+    "app.chat.dropdown.options": "チャット設定",
+    "app.chat.dropdown.clear": "クリア",
+    "app.chat.dropdown.copy": "コピー",
+    "app.chat.dropdown.save": "セーブ",
+    "app.chat.label": "チャット",
+    "app.chat.emptyLogLabel": "チャットログは空です",
+    "app.chat.clearPublicChatMessage": "チャット履歴はモデレーターにクリアされました",
+    "app.userList.usersTitle": "ユーザー",
+    "app.userList.participantsTitle": "参加者",
+    "app.userList.messagesTitle": "メッセージ",
+    "app.userList.presenter": "プレゼンター",
+    "app.userList.you": "自分",
+    "app.userList.locked": "ロック",
+    "app.userList.label": "ユーザーリスト",
+    "app.userList.toggleCompactView.label": "コンパクトモード",
+    "app.userList.guest": "ゲスト",
+    "app.userList.menuTitleContext": "変更できる設定",
+    "app.userList.chatListItem.unreadSingular": "未読メッセージ：{0}",
+    "app.userList.chatListItem.unreadPlural": "未読メッセージ{0}",
+    "app.userList.menu.chat.label": "チャット",
+    "app.userList.menu.clearStatus.label": "ステータスをクリア",
+    "app.userList.menu.makePresenter.label": "プレゼンターにする",
+    "app.userList.menu.removeUser.label": "ユーザーを取り除く",
+    "app.userList.menu.muteUserAudio.label": "ユーザーをミュートする",
+    "app.userList.menu.unmuteUserAudio.label": "ユーザーのミュートを外す",
+    "app.userList.userAriaLabel": "{0} {1} {2} ステータス {3}",
+    "app.media.label": "メディア",
+    "app.media.screenshare.start": "スクリーンシェアが開始しました",
+    "app.media.screenshare.end": "スクリーンシェアが終了しました",
+    "app.media.screenshare.safariNotSupported": "Safariは画面共有をサポートしていません。FirefoxまたはGoogle Chromeをお使いください。",
+    "app.meeting.ended": "このセッションは終了しました",
+    "app.meeting.endedMessage": "ホームスクリーンに戻ります",
+    "app.presentation.presentationToolbar.prevSlideLabel": "前のスライド",
+    "app.presentation.presentationToolbar.prevSlideDesc": "前のスライド",
+    "app.presentation.presentationToolbar.nextSlideLabel": "次のスライド",
+    "app.presentation.presentationToolbar.nextSlideDesc": "次のスライド",
+    "app.presentation.presentationToolbar.skipSlideLabel": "スライドをスキップ",
+    "app.presentation.presentationToolbar.skipSlideDesc": "表示したいスライドに移動",
+    "app.presentation.presentationToolbar.fitWidthLabel": "幅に合わせる",
+    "app.presentation.presentationToolbar.fitWidthDesc": "幅に合わせる",
+    "app.presentation.presentationToolbar.fitScreenLabel": "画面に合わせる",
+    "app.presentation.presentationToolbar.fitScreenDesc": "画面に合わせる",
+    "app.presentation.presentationToolbar.zoomLabel": "ズーム",
+    "app.presentation.presentationToolbar.zoomDesc": "プレゼンテーションのズームを変更する",
+    "app.presentation.presentationToolbar.fitToWidth": "幅に合わせる",
+    "app.presentation.presentationToolbar.goToSlide": "スライド {0}",
+    "app.presentationUploder.title": "プレゼンテーション",
+    "app.presentationUploder.message": "プレゼンターはドキュメントをアップロードすることができます。お勧めのファイル形式はPDFです。",
+    "app.presentationUploder.confirmLabel": "スタート",
+    "app.presentationUploder.confirmDesc": "編集を保存してプレゼンテーションを開始する",
+    "app.presentationUploder.dismissLabel": "キャンセル",
+    "app.presentationUploder.dismissDesc": "編集を保存せずウィンドウを閉じる",
+    "app.presentationUploder.dropzoneLabel": "ファイルをここにドラッグしてアップロードする",
+    "app.presentationUploder.browseFilesLabel": "またはファイルを探す",
+    "app.presentationUploder.fileToUpload": "アップロード待ち...",
+    "app.presentationUploder.currentBadge": "現在",
+    "app.presentationUploder.genericError": "エラーが発生しました",
+    "app.presentationUploder.upload.413": "ファイルが大きすぎます",
+    "app.presentationUploder.conversion.genericConversionStatus": "ファイル変換中...",
+    "app.presentationUploder.conversion.generatingThumbnail": "サムネール作成中...",
+    "app.presentationUploder.conversion.generatedSlides": "スライド作成...",
+    "app.presentationUploder.conversion.generatingSvg": "SVG画像作成中...",
+    "app.presentationUploder.conversion.pageCountExceeded": "エラー：ページ数が多すぎました",
+    "app.presentationUploder.conversion.timeout": "エラー：処理に時間がかかりすぎました",
+    "app.poll.closeLabel": "閉じる",
+    "app.poll.liveResult.usersTitle": "ユーザー",
+    "app.polling.pollingTitle": "投票オプション",
+    "app.polling.pollAnswerLabel": "投票結果{0}",
+    "app.polling.pollAnswerDesc": "この選択肢で「{0}」に投票する",
+    "app.failedMessage": "サーバー接続障害",
+    "app.connectingMessage": "接続中…",
+    "app.waitingMessage": "切断されました。 {0} 秒後に再接続します…",
+    "app.navBar.settingsDropdown.optionsLabel": "オプション",
+    "app.navBar.settingsDropdown.fullscreenLabel": "全画面表示に切替",
+    "app.navBar.settingsDropdown.settingsLabel": "設定を開く",
+    "app.navBar.settingsDropdown.aboutLabel": "アバウト",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "ログアウト",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "全画面表示解除",
+    "app.navBar.settingsDropdown.fullscreenDesc": "設定メニューを全画面表示",
+    "app.navBar.settingsDropdown.settingsDesc": "一般の設定を変更",
+    "app.navBar.settingsDropdown.aboutDesc": "クライアントに関する情報を表示",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "会議から退室",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "全画面表示解除",
+    "app.navBar.settingsDropdown.hotkeysLabel": "ショートカット",
+    "app.navBar.settingsDropdown.hotkeysDesc": "ショートカットを押してください",
+    "app.navBar.userListToggleBtnLabel": "ユーザーリストのトグル",
+    "app.navBar.toggleUserList.ariaLabel": "ユーザーリストのトグル",
+    "app.navBar.toggleUserList.newMessages": "メッセージを通知する",
+    "app.navBar.recording": "このセッションは録画されています",
+    "app.navBar.recording.on": "録画中",
+    "app.navBar.recording.off": "録画されていません",
+    "app.leaveConfirmation.confirmLabel": "退室",
+    "app.leaveConfirmation.confirmDesc": "自分を会議からログアウトさせる",
+    "app.endMeeting.yesLabel": "はい",
+    "app.endMeeting.noLabel": "いいえ",
+    "app.about.title": "アバウト",
+    "app.about.version": "Client Build:",
+    "app.about.copyright": "Copyright:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "キャンセル",
+    "app.about.dismissDesc": "クライアント情報を閉じる",
+    "app.actionsBar.changeStatusLabel": "ステータス変更",
+    "app.actionsBar.muteLabel": "ミュート",
+    "app.actionsBar.unmuteLabel": "ミュート解除",
+    "app.actionsBar.camOffLabel": "カメラオフ",
+    "app.actionsBar.raiseLabel": "手をあげる",
+    "app.actionsBar.label": "アクションメニュー",
+    "app.submenu.application.applicationSectionTitle": "アプリケーション",
+    "app.submenu.application.fontSizeControlLabel": "フォントサイズ",
+    "app.submenu.application.increaseFontBtnLabel": "アプリケーションのフォントサイズを大きくする",
+    "app.submenu.application.decreaseFontBtnLabel": "アプリケーションのフォントサイズを小さくする",
+    "app.submenu.application.languageLabel": "アプリケーション言語",
+    "app.submenu.application.ariaLanguageLabel": "アプリケーション言語を変更",
+    "app.submenu.application.languageOptionLabel": "言語を選択",
+    "app.submenu.application.noLocaleOptionLabel": "アクティブなロケールがありません",
+    "app.submenu.audio.micSourceLabel": "マイクのソース",
+    "app.submenu.audio.speakerSourceLabel": "スピーカーのソース",
+    "app.submenu.audio.streamVolumeLabel": "音声ストリームの音量",
+    "app.submenu.video.title": "ビデオ",
+    "app.submenu.video.videoSourceLabel": "ソースを表示",
+    "app.submenu.video.videoOptionLabel": "ソース表示を選択",
+    "app.submenu.video.videoQualityLabel": "ビデオ品質",
+    "app.submenu.video.qualityOptionLabel": "ビデオ品質を選択",
+    "app.submenu.video.participantsCamLabel": "参加者のウェブカメラを見ています",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "クローズドキャプション",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "所有権をとる",
+    "app.submenu.closedCaptions.languageLabel": "言語",
+    "app.submenu.closedCaptions.localeOptionLabel": "言語を選択",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "アクティブなロケールがありません",
+    "app.submenu.closedCaptions.fontFamilyLabel": "フォントファミリー",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "フォントファミリーを選択",
+    "app.submenu.closedCaptions.fontSizeLabel": "フォントサイズ",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "フォントサイズを選択",
+    "app.submenu.closedCaptions.backgroundColorLabel": "背景色",
+    "app.submenu.closedCaptions.fontColorLabel": "フォント色",
+    "app.submenu.participants.muteAllLabel": "プレゼンター以外の全員をミュート",
+    "app.submenu.participants.lockAllLabel": "すべての参加者をロック",
+    "app.submenu.participants.lockItemLabel": "参加者 {0}",
+    "app.submenu.participants.lockMicDesc": "ロック中のすべての参加者のマイクを無効化",
+    "app.submenu.participants.lockCamDesc": "ロック中のすべての参加者のウェブカメラを無効化",
+    "app.submenu.participants.lockPublicChatDesc": "ロック中のすべての参加者の公開チャットを無効化",
+    "app.submenu.participants.lockPrivateChatDesc": "ロック中のすべての参加者の非公開チャットを無効化",
+    "app.submenu.participants.lockLayoutDesc": "ロック中のすべての参加者のレイアウトを固定",
+    "app.submenu.participants.lockMicAriaLabel": "マイクのロック",
+    "app.submenu.participants.lockCamAriaLabel": "ウェブカメラのロック",
+    "app.submenu.participants.lockPublicChatAriaLabel": "公開チャットのロック",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "非公開チャットのロック",
+    "app.submenu.participants.lockLayoutAriaLabel": "レイアウトのロック",
+    "app.submenu.participants.lockMicLabel": "マイク",
+    "app.submenu.participants.lockCamLabel": "ウェブカメラ",
+    "app.submenu.participants.lockPublicChatLabel": "公開チャット",
+    "app.submenu.participants.lockPrivateChatLabel": "非公開チャット",
+    "app.submenu.participants.lockLayoutLabel": "レイアウト",
+    "app.settings.applicationTab.label": "アプリケーション",
+    "app.settings.audioTab.label": "音声",
+    "app.settings.videoTab.label": "ビデオ",
+    "app.settings.closedcaptionTab.label": "クローズドキャプション",
+    "app.settings.usersTab.label": "参加者",
+    "app.settings.main.label": "設定",
+    "app.settings.main.cancel.label": "キャンセル",
+    "app.settings.main.cancel.label.description": "変更を破棄し設定メニューを閉じる",
+    "app.settings.main.save.label": "保存",
+    "app.settings.main.save.label.description": "変更を保存し設定メニューを閉じる",
+    "app.settings.dataSavingTab.label": "データ量調整",
+    "app.settings.dataSavingTab.webcam": "カメラを許可する",
+    "app.settings.dataSavingTab.screenShare": "画面共有を許可する",
+    "app.settings.dataSavingTab.description": "データ量を下げるには設定を変更してください",
+    "app.switch.onLabel": "オン",
+    "app.switch.offLabel": "オフ",
+    "app.actionsBar.actionsDropdown.actionsLabel": "アクション",
+    "app.actionsBar.actionsDropdown.presentationLabel": "プレゼンテーションをアップロード",
+    "app.actionsBar.actionsDropdown.initPollLabel": "投票を初期化",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "画面を共有する",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有を止める",
+    "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
+    "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "との画面共有を止める",
+    "app.actionsBar.emojiMenu.awayLabel": "不在",
+    "app.actionsBar.emojiMenu.awayDesc": "スタータスを「不在」にする",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "挙手",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "質問がありましたら挙手してください",
+    "app.actionsBar.emojiMenu.neutralLabel": "普通",
+    "app.actionsBar.emojiMenu.neutralDesc": "ステータスを「普通」にする",
+    "app.actionsBar.emojiMenu.confusedLabel": "わけがわからない",
+    "app.actionsBar.emojiMenu.confusedDesc": "ステータスを「わけがわからない」にする",
+    "app.actionsBar.emojiMenu.sadLabel": "悲しい",
+    "app.actionsBar.emojiMenu.sadDesc": "ステータスを「悲しい」にする",
+    "app.actionsBar.emojiMenu.happyLabel": "ハッピー",
+    "app.actionsBar.emojiMenu.happyDesc": "ステータスを「ハッピー」にする",
+    "app.actionsBar.emojiMenu.noneLabel": "ステータスをクリアする",
+    "app.actionsBar.emojiMenu.noneDesc": "ステータスをクリアする",
+    "app.actionsBar.emojiMenu.applauseLabel": "拍手",
+    "app.actionsBar.emojiMenu.applauseDesc": "ステータスを「拍手」にする",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "いいね",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "ステータスを「いいね」にする",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "ダメ",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "ステータスを「ダメ」にする",
+    "app.actionsBar.currentStatusDesc": "現在のステータス {0}",
+    "app.audioNotification.audioFailedError1001": "エラー1001：WebSocketの接続が切れました",
+    "app.audioNotification.audioFailedError1002": "エラー1002：WebSocketに接続できませんでした",
+    "app.audioNotification.audioFailedError1003": "エラー1003：ブラウザのバージョンはサポートされていません",
+    "app.audioNotification.audioFailedError1004": "エラー1004：通話失敗",
+    "app.audioNotification.audioFailedError1005": "エラー1005：問題が発生し通話が終了しました",
+    "app.audioNotification.audioFailedError1006": "エラー1006：通話がタイムアウトしました",
+    "app.audioNotification.audioFailedError1007": "エラー1007：ICE接続失敗",
+    "app.audioNotification.audioFailedError1008": "エラー1008：トランスファー失敗",
+    "app.audioNotification.audioFailedError1009": "エラー1009：STUN/TURNサーバー情報にアクセスできませんでした",
+    "app.audioNotification.audioFailedError1010": "エラー1010：ICE接続がタイムアウトしました",
+    "app.audioNotification.audioFailedError1011": "エラー1011：ICEギャザリングがタイムアウトしました",
+    "app.audioNotification.audioFailedMessage": "音声接続に失敗しました",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia に失敗。安全な接続だけが許可されます",
+    "app.audioNotification.closeLabel": "閉じる",
+    "app.breakoutJoinConfirmation.title": "小会議室に参加",
+    "app.breakoutJoinConfirmation.message": "参加しますか",
+    "app.breakoutJoinConfirmation.confirmLabel": "参加",
+    "app.breakoutJoinConfirmation.confirmDesc": "自分を小会議室に参加させる",
+    "app.breakoutJoinConfirmation.dismissLabel": "キャンセル",
+    "app.breakoutJoinConfirmation.dismissDesc": "小会議室の参加を拒否し閉じる",
+    "app.breakoutTimeRemainingMessage": "小会議室残り時間： {0}",
+    "app.breakoutWillCloseMessage": "終了時間。間もなく小会議室を閉じます",
+    "app.calculatingBreakoutTimeRemaining": "残り時間計算中…",
+    "app.audioModal.microphoneLabel": "マイク",
+    "app.audioModal.listenOnlyLabel": "聴講のみ",
+    "app.audioModal.audioChoiceLabel": "音声はどうしますか？",
+    "app.audioModal.iOSBrowser": "音声、ビデオがサポートされていません",
+    "app.audioModal.iOSErrorDescription": "iOSのChromeでは、音声、  ビデオは現在サポートされていません",
+    "app.audioModal.iOSErrorRecommendation": "Safari iOSをお使いください",
+    "app.audioModal.audioChoiceDesc": "音声はどうしますか？",
+    "app.audioModal.closeLabel": "閉じる",
+    "app.audioModal.yes": "はい",
+    "app.audioModal.no": "いいえ",
+    "app.audioModal.yes.arialabel" : "エコーが聞こえます",
+    "app.audioModal.no.arialabel" : "エコーが聞こえません",
+    "app.audioModal.echoTestTitle": "これはエコーテストです。マイクに話すとエコーが聞こえますか？",
+    "app.audioModal.settingsTitle": "オーディオ設定を変更する",
+    "app.audioModal.helpTitle": "デバイスとの接続ができませんでした",
+    "app.audioModal.helpText": "このサイトにマイクのアクセスを許可しましたか？ページを開く際にポップアップが出てくるはずです。アクセスを許可してください。それでも問題が続きましたら、ブラウザの設定を確認してみてください。",
+    "app.audioModal.connecting": "接続中",
+    "app.audioModal.connectingEchoTest": "エコーテストに接続中",
+    "app.audioManager.joinedAudio": "セッションに参加しました",
+    "app.audioManager.joinedEcho": "エコーテストに入りました",
+    "app.audioManager.leftAudio": "セッションから退席しました",
+    "app.audioManager.genericError": "エラー：もう一度やり直してください",
+    "app.audioManager.connectionError": "エラー：接続エラー",
+    "app.audioManager.requestTimeout": "エラー：リクエストに時間がかかりすぎました",
+    "app.audioManager.invalidTarget": "エラー：リクエスト先がいませんでした",
+    "app.audioManager.mediaError": "エラー：デバイスが見つかりませんでした",
+    "app.audio.joinAudio": "音声で参加",
+    "app.audio.leaveAudio": "音声をやめる",
+    "app.audio.enterSessionLabel": "セッションに入る",
+    "app.audio.playSoundLabel": "音を出す",
+    "app.audio.backLabel": "戻る",
+    "app.audio.audioSettings.titleLabel": "音声設定を選択",
+    "app.audio.audioSettings.descriptionLabel": "マイク共有の許可を求めるダイアログがブラウザ内に現われますのでご了承ください。",
+    "app.audio.audioSettings.microphoneSourceLabel": "マイクのソース",
+    "app.audio.audioSettings.speakerSourceLabel": "スピーカーのソース",
+    "app.audio.audioSettings.microphoneStreamLabel": "音声ストリームの音量",
+    "app.audio.audioSettings.retryLabel": "再試行",
+    "app.audio.listenOnly.backLabel": "戻る",
+    "app.audio.listenOnly.closeLabel": "閉じる",
+    "app.audio.permissionsOverlay.title": "デバイスのアクセスを許可する",
+    "app.audio.permissionsOverlay.hint": "セッションに参加するには、デバイスのアクセスが必要になります",
+    "app.error.removed": "セッションから退室しました",
+    "app.error.meeting.ended": "会議からログアウトしました",
+    "app.dropdown.close": "閉じる",
+    "app.error.500": "問題が起こりました",
+    "app.error.404": "見つかりません",
+    "app.error.401": "権限がありません",
+    "app.error.403": "禁止されています",
+    "app.error.leaveLabel": "再ログイン",
+    "app.guest.waiting": "主催者の承認待ち",
+    "app.toast.breakoutRoomEnded": "The breakout room ended. オーディオで参加してください",
+    "app.notification.recordingStart": "録画が開始しました",
+    "app.notification.recordingStop": "録画が終了しました",
+    "app.shortcut-help.title": "ショートカット",
+    "app.shortcut-help.accessKeyNotAvailable": "アクセスキーがありません",
+    "app.shortcut-help.comboLabel": "コンボ",
+    "app.shortcut-help.functionLabel": "機能",
+    "app.shortcut-help.closeLabel": "閉じる",
+    "app.shortcut-help.closeDesc": "ショートカットボックスを閉じる",
+    "app.shortcut-help.openOptions": "設定を開く",
+    "app.shortcut-help.toggleUserList": "ユーザーリストトグル",
+    "app.shortcut-help.toggleMute": "ミュート/ミュート解除",
+    "app.shortcut-help.togglePublicChat": "公開チャットトグル(ユーザーリストが開いている場合のみ)",
+    "app.shortcut-help.hidePrivateChat": "個人チャットを隠す",
+    "app.shortcut-help.closePrivateChat": "個人チャットを閉じる",
+    "app.shortcut-help.openActions": "アクションメニューを開く",
+    "app.shortcut-help.openStatus": "ステータスメニューを開く",
+    "app.lock-viewers.webcamLabel": "ウェブカメラ",
+    "app.lock-viewers.microphoneLable": "マイク",
+    "app.lock-viewers.PublicChatLabel": "公開チャット",
+    "app.lock-viewers.PrivateChatLable": "非公開チャット",
+    "app.lock-viewers.Layout": "レイアウト",
+    "app.videoPreview.cancelLabel": "キャンセル",
+    "app.videoPreview.closeLabel": "閉じる",
+    "app.video.joinVideo": "カメラ共有",
+    "app.video.leaveVideo": "カメラ共有解除",
+    "app.video.iceCandidateError": "アイス候補者追加エラー",
+    "app.video.permissionError": "カメラ共有エラー。設定を確認してください",
+    "app.video.sharingError": "カメラ共有エラー",
+    "app.video.notFoundError": "カメラが見つかりませんでした。接続を確認してください",
+    "app.video.notAllowed": "カメラを共有する権限がありませんでした。ブラウザの設定を確認してください",
+    "app.video.notSupportedError": "カメラは安全なページでしか共有できません。SSL証明書が有効か確かめてください",
+    "app.video.notReadableError": "カメラの映像を受け取れませんでした。他のプログラムが使ってないことを確認してください",
+    "app.video.swapCam": "スワップ",
+    "app.video.swapCamDesc": "カメラの向きを反転する",
+    "app.video.videoMenu": "ビデオメニュー",
+    "app.video.videoMenuDisabled": "設定でビデオメニューがブロックされています",
+    "app.video.videoMenuDesc": "設定でビデオメニューがブロックされています",
+    "app.video.chromeExtensionError": "インストールしてください",
+    "app.video.chromeExtensionErrorLink": "このChrome拡張機能",
+    "app.video.stats.title": "接続情報",
+    "app.video.stats.packetsReceived": "パケット受信",
+    "app.video.stats.packetsSent": "パケット送信",
+    "app.video.stats.packetsLost": "エラーパケット",
+    "app.video.stats.bitrate": "ビットレート",
+    "app.video.stats.lostPercentage": "トータルパーセンテージ（エラー）",
+    "app.video.stats.lostRecentPercentage": "最新のパーセンテージ（エラー）",
+    "app.video.stats.dimensions": "解像度",
+    "app.video.stats.codec": "コーデック",
+    "app.video.stats.decodeDelay": "遅延（ディコード）",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "エンコードの使用状況",
+    "app.video.stats.currentDelay": "遅延（最新）",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.toolbar.tools": "ツール",
+    "app.whiteboard.toolbar.tools.pencil": "ペン",
+    "app.whiteboard.toolbar.tools.rectangle": "長方形",
+    "app.whiteboard.toolbar.tools.triangle": "三角形",
+    "app.whiteboard.toolbar.tools.ellipse": "楕円",
+    "app.whiteboard.toolbar.tools.line": "線",
+    "app.whiteboard.toolbar.tools.text": "テキスト",
+    "app.whiteboard.toolbar.thickness": "線の太さ",
+    "app.whiteboard.toolbar.thicknessDisabled": "線の太さは変えられません",
+    "app.whiteboard.toolbar.color": "色",
+    "app.whiteboard.toolbar.colorDisabled": "色は変えられません",
+    "app.whiteboard.toolbar.color.black": "黒",
+    "app.whiteboard.toolbar.color.white": "白",
+    "app.whiteboard.toolbar.color.red": "赤",
+    "app.whiteboard.toolbar.color.orange": "オレンジ",
+    "app.whiteboard.toolbar.color.eletricLime": "黄緑",
+    "app.whiteboard.toolbar.color.lime": "ライム",
+    "app.whiteboard.toolbar.color.cyan": "シアン",
+    "app.whiteboard.toolbar.color.dodgerBlue": "ドジャーブルー",
+    "app.whiteboard.toolbar.color.blue": "青",
+    "app.whiteboard.toolbar.color.violet": "紫",
+    "app.whiteboard.toolbar.color.magenta": "マゼンタ",
+    "app.whiteboard.toolbar.color.silver": "シルバー",
+    "app.whiteboard.toolbar.undo": "取り消す",
+    "app.whiteboard.toolbar.clear": "全て取り消す",
+    "app.whiteboard.toolbar.multiUserOn": "マルチユーザーモードにする",
+    "app.whiteboard.toolbar.multiUserOff": "マルチユーザーモードを外す",
+    "app.whiteboard.toolbar.fontSize": "フォントサイズ",
+    "app.feedback.title": "セッションからログアウトしました",
+    "app.feedback.subtitle": "BigBlueButtonの感想は？ (任意)",
+    "app.feedback.textarea": "BigBlueButtonに何が欲しいですか?",
+    "app.feedback.sendFeedback": "フィードバックを送る",
+    "app.feedback.sendFeedbackDesc": "フィードバックを送ってセッションから退席する",
+    "app.videoDock.webcamFocusLabel": "フォーカス",
+    "app.videoDock.webcamFocusDesc": "選択したカメラにフォーカスする",
+    "app.videoDock.webcamUnfocusLabel": "フォーカスを外す",
+    "app.videoDock.webcamUnfocusDesc": "選択したカメラのフォーカスを外す",
+    "app.createBreakoutRoom.joinAudio": "音声で参加",
+    "app.externalVideo.close": "閉じる"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/ja_JP.json b/bigbluebutton-html5/private/locales/ja_JP.json
new file mode 100644
index 0000000000..ebb33131fa
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/ja_JP.json
@@ -0,0 +1,382 @@
+{
+    "app.home.greeting": "ようこそ {0} さん！ プレゼンテーションは間もなく始まります…",
+    "app.chat.submitLabel": "メッセージを送信",
+    "app.chat.errorMinMessageLength": "このメッセージは文字数が{0}文字足りません",
+    "app.chat.errorMaxMessageLength": "このメッセージは文字数制限を{0}文字超えています",
+    "app.chat.inputLabel": "チャット {0} へメッセージ入力",
+    "app.chat.inputPlaceholder": "メッセージ {0}",
+    "app.chat.titlePublic": "公開チャット",
+    "app.chat.titlePrivate": "{0} との非公開チャット",
+    "app.chat.partnerDisconnected": "{0} は会議から退出しました",
+    "app.chat.closeChatLabel": "{0} を閉じる",
+    "app.chat.hideChatLabel": "{0} を隠す",
+    "app.chat.moreMessages": "下にまだメッセージがあります",
+    "app.chat.dropdown.options": "チャット設定",
+    "app.chat.dropdown.clear": "クリア",
+    "app.chat.dropdown.copy": "コピー",
+    "app.chat.dropdown.save": "セーブ",
+    "app.chat.label": "チャット",
+    "app.chat.emptyLogLabel": "チャットログは空です",
+    "app.chat.clearPublicChatMessage": "チャット履歴はモデレーターにクリアされました",
+    "app.userList.usersTitle": "ユーザー",
+    "app.userList.participantsTitle": "参加者",
+    "app.userList.messagesTitle": "メッセージ",
+    "app.userList.presenter": "プレゼンター",
+    "app.userList.you": "自分",
+    "app.userList.locked": "ロック",
+    "app.userList.label": "ユーザーリスト",
+    "app.userList.toggleCompactView.label": "コンパクトモード",
+    "app.userList.guest": "ゲスト",
+    "app.userList.menuTitleContext": "変更できる設定",
+    "app.userList.chatListItem.unreadSingular": "未読メッセージ：{0}",
+    "app.userList.chatListItem.unreadPlural": "未読メッセージ{0}",
+    "app.userList.menu.chat.label": "チャット",
+    "app.userList.menu.clearStatus.label": "ステータスをクリア",
+    "app.userList.menu.makePresenter.label": "プレゼンターにする",
+    "app.userList.menu.removeUser.label": "ユーザーを取り除く",
+    "app.userList.menu.muteUserAudio.label": "ユーザーをミュートする",
+    "app.userList.menu.unmuteUserAudio.label": "ユーザーのミュートを外す",
+    "app.userList.userAriaLabel": "{0} {1} {2} ステータス {3}",
+    "app.media.label": "メディア",
+    "app.media.screenshare.start": "スクリーンシェアが開始しました",
+    "app.media.screenshare.end": "スクリーンシェアが終了しました",
+    "app.media.screenshare.safariNotSupported": "Safariは画面共有をサポートしていません。FirefoxまたはGoogle Chromeをお使いください。",
+    "app.meeting.ended": "このセッションは終了しました",
+    "app.meeting.endedMessage": "ホームスクリーンに戻ります",
+    "app.presentation.presentationToolbar.prevSlideLabel": "前のスライド",
+    "app.presentation.presentationToolbar.prevSlideDesc": "前のスライド",
+    "app.presentation.presentationToolbar.nextSlideLabel": "次のスライド",
+    "app.presentation.presentationToolbar.nextSlideDesc": "次のスライド",
+    "app.presentation.presentationToolbar.skipSlideLabel": "スライドをスキップ",
+    "app.presentation.presentationToolbar.skipSlideDesc": "表示したいスライドに移動",
+    "app.presentation.presentationToolbar.fitWidthLabel": "幅に合わせる",
+    "app.presentation.presentationToolbar.fitWidthDesc": "幅に合わせる",
+    "app.presentation.presentationToolbar.fitScreenLabel": "画面に合わせる",
+    "app.presentation.presentationToolbar.fitScreenDesc": "画面に合わせる",
+    "app.presentation.presentationToolbar.zoomLabel": "ズーム",
+    "app.presentation.presentationToolbar.zoomDesc": "プレゼンテーションのズームを変更する",
+    "app.presentation.presentationToolbar.fitToWidth": "幅に合わせる",
+    "app.presentation.presentationToolbar.goToSlide": "スライド {0}",
+    "app.presentationUploder.title": "プレゼンテーション",
+    "app.presentationUploder.message": "プレゼンターはドキュメントをアップロードすることができます。お勧めのファイル形式はPDFです。",
+    "app.presentationUploder.confirmLabel": "スタート",
+    "app.presentationUploder.confirmDesc": "編集を保存してプレゼンテーションを開始する",
+    "app.presentationUploder.dismissLabel": "キャンセル",
+    "app.presentationUploder.dismissDesc": "編集を保存せずウィンドウを閉じる",
+    "app.presentationUploder.dropzoneLabel": "ファイルをここにドラッグしてアップロードする",
+    "app.presentationUploder.browseFilesLabel": "またはファイルを探す",
+    "app.presentationUploder.fileToUpload": "アップロード待ち...",
+    "app.presentationUploder.currentBadge": "現在",
+    "app.presentationUploder.genericError": "エラーが発生しました",
+    "app.presentationUploder.upload.413": "ファイルが大きすぎます",
+    "app.presentationUploder.conversion.genericConversionStatus": "ファイル変換中...",
+    "app.presentationUploder.conversion.generatingThumbnail": "サムネール作成中...",
+    "app.presentationUploder.conversion.generatedSlides": "スライド作成...",
+    "app.presentationUploder.conversion.generatingSvg": "SVG画像作成中...",
+    "app.presentationUploder.conversion.pageCountExceeded": "エラー：ページ数が多すぎました",
+    "app.presentationUploder.conversion.timeout": "エラー：処理に時間がかかりすぎました",
+    "app.poll.closeLabel": "閉じる",
+    "app.poll.liveResult.usersTitle": "ユーザー",
+    "app.polling.pollingTitle": "投票オプション",
+    "app.polling.pollAnswerLabel": "投票結果{0}",
+    "app.polling.pollAnswerDesc": "この選択肢で「{0}」に投票する",
+    "app.failedMessage": "サーバー接続障害",
+    "app.connectingMessage": "接続中…",
+    "app.waitingMessage": "切断されました。 {0} 秒後に再接続します…",
+    "app.navBar.settingsDropdown.optionsLabel": "オプション",
+    "app.navBar.settingsDropdown.fullscreenLabel": "全画面表示に切替",
+    "app.navBar.settingsDropdown.settingsLabel": "設定を開く",
+    "app.navBar.settingsDropdown.aboutLabel": "アバウト",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "ログアウト",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "全画面表示解除",
+    "app.navBar.settingsDropdown.fullscreenDesc": "設定メニューを全画面表示",
+    "app.navBar.settingsDropdown.settingsDesc": "一般の設定を変更",
+    "app.navBar.settingsDropdown.aboutDesc": "クライアントに関する情報を表示",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "会議から退室",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "全画面表示解除",
+    "app.navBar.settingsDropdown.hotkeysLabel": "ショートカット",
+    "app.navBar.settingsDropdown.hotkeysDesc": "ショートカットを押してください",
+    "app.navBar.userListToggleBtnLabel": "ユーザーリストのトグル",
+    "app.navBar.toggleUserList.ariaLabel": "ユーザーリストのトグル",
+    "app.navBar.toggleUserList.newMessages": "メッセージを通知する",
+    "app.navBar.recording": "このセッションは録画されています",
+    "app.navBar.recording.on": "録画中",
+    "app.navBar.recording.off": "録画されていません",
+    "app.leaveConfirmation.confirmLabel": "退室",
+    "app.leaveConfirmation.confirmDesc": "自分を会議からログアウトさせる",
+    "app.endMeeting.yesLabel": "はい",
+    "app.endMeeting.noLabel": "いいえ",
+    "app.about.title": "アバウト",
+    "app.about.version": "Client Build:",
+    "app.about.copyright": "Copyright:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "キャンセル",
+    "app.about.dismissDesc": "クライアント情報を閉じる",
+    "app.actionsBar.changeStatusLabel": "ステータス変更",
+    "app.actionsBar.muteLabel": "ミュート",
+    "app.actionsBar.unmuteLabel": "ミュート解除",
+    "app.actionsBar.camOffLabel": "カメラオフ",
+    "app.actionsBar.raiseLabel": "手をあげる",
+    "app.actionsBar.label": "アクションメニュー",
+    "app.submenu.application.applicationSectionTitle": "アプリケーション",
+    "app.submenu.application.fontSizeControlLabel": "フォントサイズ",
+    "app.submenu.application.increaseFontBtnLabel": "アプリケーションのフォントサイズを大きくする",
+    "app.submenu.application.decreaseFontBtnLabel": "アプリケーションのフォントサイズを小さくする",
+    "app.submenu.application.languageLabel": "アプリケーション言語",
+    "app.submenu.application.ariaLanguageLabel": "アプリケーション言語を変更",
+    "app.submenu.application.languageOptionLabel": "言語を選択",
+    "app.submenu.application.noLocaleOptionLabel": "アクティブなロケールがありません",
+    "app.submenu.audio.micSourceLabel": "マイクのソース",
+    "app.submenu.audio.speakerSourceLabel": "スピーカーのソース",
+    "app.submenu.audio.streamVolumeLabel": "音声ストリームの音量",
+    "app.submenu.video.title": "ビデオ",
+    "app.submenu.video.videoSourceLabel": "ソースを表示",
+    "app.submenu.video.videoOptionLabel": "ソース表示を選択",
+    "app.submenu.video.videoQualityLabel": "ビデオ品質",
+    "app.submenu.video.qualityOptionLabel": "ビデオ品質を選択",
+    "app.submenu.video.participantsCamLabel": "参加者のウェブカメラを見ています",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "クローズドキャプション",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "所有権をとる",
+    "app.submenu.closedCaptions.languageLabel": "言語",
+    "app.submenu.closedCaptions.localeOptionLabel": "言語を選択",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "アクティブなロケールがありません",
+    "app.submenu.closedCaptions.fontFamilyLabel": "フォントファミリー",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "フォントファミリーを選択",
+    "app.submenu.closedCaptions.fontSizeLabel": "フォントサイズ",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "フォントサイズを選択",
+    "app.submenu.closedCaptions.backgroundColorLabel": "背景色",
+    "app.submenu.closedCaptions.fontColorLabel": "フォント色",
+    "app.submenu.participants.muteAllLabel": "プレゼンター以外の全員をミュート",
+    "app.submenu.participants.lockAllLabel": "すべての参加者をロック",
+    "app.submenu.participants.lockItemLabel": "参加者 {0}",
+    "app.submenu.participants.lockMicDesc": "ロック中のすべての参加者のマイクを無効化",
+    "app.submenu.participants.lockCamDesc": "ロック中のすべての参加者のウェブカメラを無効化",
+    "app.submenu.participants.lockPublicChatDesc": "ロック中のすべての参加者の公開チャットを無効化",
+    "app.submenu.participants.lockPrivateChatDesc": "ロック中のすべての参加者の非公開チャットを無効化",
+    "app.submenu.participants.lockLayoutDesc": "ロック中のすべての参加者のレイアウトを固定",
+    "app.submenu.participants.lockMicAriaLabel": "マイクのロック",
+    "app.submenu.participants.lockCamAriaLabel": "ウェブカメラのロック",
+    "app.submenu.participants.lockPublicChatAriaLabel": "公開チャットのロック",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "非公開チャットのロック",
+    "app.submenu.participants.lockLayoutAriaLabel": "レイアウトのロック",
+    "app.submenu.participants.lockMicLabel": "マイク",
+    "app.submenu.participants.lockCamLabel": "ウェブカメラ",
+    "app.submenu.participants.lockPublicChatLabel": "公開チャット",
+    "app.submenu.participants.lockPrivateChatLabel": "非公開チャット",
+    "app.submenu.participants.lockLayoutLabel": "レイアウト",
+    "app.settings.applicationTab.label": "アプリケーション",
+    "app.settings.audioTab.label": "音声",
+    "app.settings.videoTab.label": "ビデオ",
+    "app.settings.closedcaptionTab.label": "クローズドキャプション",
+    "app.settings.usersTab.label": "参加者",
+    "app.settings.main.label": "設定",
+    "app.settings.main.cancel.label": "キャンセル",
+    "app.settings.main.cancel.label.description": "変更を破棄し設定メニューを閉じる",
+    "app.settings.main.save.label": "保存",
+    "app.settings.main.save.label.description": "変更を保存し設定メニューを閉じる",
+    "app.settings.dataSavingTab.label": "データ量調整",
+    "app.settings.dataSavingTab.webcam": "カメラを許可する",
+    "app.settings.dataSavingTab.screenShare": "画面共有を許可する",
+    "app.settings.dataSavingTab.description": "データ量を下げるには設定を変更してください",
+    "app.switch.onLabel": "オン",
+    "app.switch.offLabel": "オフ",
+    "app.actionsBar.actionsDropdown.actionsLabel": "アクション",
+    "app.actionsBar.actionsDropdown.presentationLabel": "プレゼンテーションをアップロード",
+    "app.actionsBar.actionsDropdown.initPollLabel": "投票を初期化",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "画面を共有する",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有を止める",
+    "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
+    "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "との画面共有を止める",
+    "app.actionsBar.emojiMenu.awayLabel": "不在",
+    "app.actionsBar.emojiMenu.awayDesc": "スタータスを「不在」にする",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "挙手",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "質問がありましたら挙手してください",
+    "app.actionsBar.emojiMenu.neutralLabel": "普通",
+    "app.actionsBar.emojiMenu.neutralDesc": "ステータスを「普通」にする",
+    "app.actionsBar.emojiMenu.confusedLabel": "わけがわからない",
+    "app.actionsBar.emojiMenu.confusedDesc": "ステータスを「わけがわからない」にする",
+    "app.actionsBar.emojiMenu.sadLabel": "悲しい",
+    "app.actionsBar.emojiMenu.sadDesc": "ステータスを「悲しい」にする",
+    "app.actionsBar.emojiMenu.happyLabel": "ハッピー",
+    "app.actionsBar.emojiMenu.happyDesc": "ステータスを「ハッピー」にする",
+    "app.actionsBar.emojiMenu.noneLabel": "ステータスをクリアする",
+    "app.actionsBar.emojiMenu.noneDesc": "ステータスをクリアする",
+    "app.actionsBar.emojiMenu.applauseLabel": "拍手",
+    "app.actionsBar.emojiMenu.applauseDesc": "ステータスを「拍手」にする",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "いいね",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "ステータスを「いいね」にする",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "ダメ",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "ステータスを「ダメ」にする",
+    "app.actionsBar.currentStatusDesc": "現在のステータス {0}",
+    "app.audioNotification.audioFailedError1001": "エラー1001：WebSocketの接続が切れました",
+    "app.audioNotification.audioFailedError1002": "エラー1002：WebSocketに接続できませんでした",
+    "app.audioNotification.audioFailedError1003": "エラー1003：ブラウザのバージョンはサポートされていません",
+    "app.audioNotification.audioFailedError1004": "エラー1004：通話失敗",
+    "app.audioNotification.audioFailedError1005": "エラー1005：問題が発生し通話が終了しました",
+    "app.audioNotification.audioFailedError1006": "エラー1006：通話がタイムアウトしました",
+    "app.audioNotification.audioFailedError1007": "エラー1007：ICE接続失敗",
+    "app.audioNotification.audioFailedError1008": "エラー1008：トランスファー失敗",
+    "app.audioNotification.audioFailedError1009": "エラー1009：STUN/TURNサーバー情報にアクセスできませんでした",
+    "app.audioNotification.audioFailedError1010": "エラー1010：ICE接続がタイムアウトしました",
+    "app.audioNotification.audioFailedError1011": "エラー1011：ICEギャザリングがタイムアウトしました",
+    "app.audioNotification.audioFailedMessage": "音声接続に失敗しました",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia に失敗。安全な接続だけが許可されます",
+    "app.audioNotification.closeLabel": "閉じる",
+    "app.breakoutJoinConfirmation.title": "小会議室に参加",
+    "app.breakoutJoinConfirmation.message": "参加しますか",
+    "app.breakoutJoinConfirmation.confirmLabel": "参加",
+    "app.breakoutJoinConfirmation.confirmDesc": "自分を小会議室に参加させる",
+    "app.breakoutJoinConfirmation.dismissLabel": "キャンセル",
+    "app.breakoutJoinConfirmation.dismissDesc": "小会議室の参加を拒否し閉じる",
+    "app.breakoutTimeRemainingMessage": "小会議室残り時間： {0}",
+    "app.breakoutWillCloseMessage": "終了時間。間もなく小会議室を閉じます",
+    "app.calculatingBreakoutTimeRemaining": "残り時間計算中…",
+    "app.audioModal.microphoneLabel": "マイク",
+    "app.audioModal.listenOnlyLabel": "聴講のみ",
+    "app.audioModal.audioChoiceLabel": "音声はどうしますか？",
+    "app.audioModal.iOSBrowser": "音声、ビデオがサポートされていません",
+    "app.audioModal.iOSErrorDescription": "iOSのChromeでは、音声、  ビデオは現在サポートされていません",
+    "app.audioModal.iOSErrorRecommendation": "Safari iOSをお使いください",
+    "app.audioModal.audioChoiceDesc": "音声はどうしますか？",
+    "app.audioModal.closeLabel": "閉じる",
+    "app.audioModal.yes": "はい",
+    "app.audioModal.no": "いいえ",
+    "app.audioModal.yes.arialabel" : "エコーが聞こえます",
+    "app.audioModal.no.arialabel" : "エコーが聞こえません",
+    "app.audioModal.echoTestTitle": "これはエコーテストです。マイクに話すとエコーが聞こえますか？",
+    "app.audioModal.settingsTitle": "オーディオ設定を変更する",
+    "app.audioModal.helpTitle": "デバイスとの接続ができませんでした",
+    "app.audioModal.helpText": "このサイトにマイクのアクセスを許可しましたか？ページを開く際にポップアップが出てくるはずです。アクセスを許可してください。それでも問題が続きましたら、ブラウザの設定を確認してみてください。",
+    "app.audioModal.connecting": "接続中",
+    "app.audioModal.connectingEchoTest": "エコーテストに接続中",
+    "app.audioManager.joinedAudio": "セッションに参加しました",
+    "app.audioManager.joinedEcho": "エコーテストに入りました",
+    "app.audioManager.leftAudio": "セッションから退席しました",
+    "app.audioManager.genericError": "エラー：もう一度やり直してください",
+    "app.audioManager.connectionError": "エラー：接続エラー",
+    "app.audioManager.requestTimeout": "エラー：リクエストに時間がかかりすぎました",
+    "app.audioManager.invalidTarget": "エラー：リクエスト先がいませんでした",
+    "app.audioManager.mediaError": "エラー：デバイスが見つかりませんでした",
+    "app.audio.joinAudio": "音声で参加",
+    "app.audio.leaveAudio": "音声をやめる",
+    "app.audio.enterSessionLabel": "セッションに入る",
+    "app.audio.playSoundLabel": "音を出す",
+    "app.audio.backLabel": "戻る",
+    "app.audio.audioSettings.titleLabel": "音声設定を選択",
+    "app.audio.audioSettings.descriptionLabel": "マイク共有の許可を求めるダイアログがブラウザ内に現われますのでご了承ください。",
+    "app.audio.audioSettings.microphoneSourceLabel": "マイクのソース",
+    "app.audio.audioSettings.speakerSourceLabel": "スピーカーのソース",
+    "app.audio.audioSettings.microphoneStreamLabel": "音声ストリームの音量",
+    "app.audio.audioSettings.retryLabel": "再試行",
+    "app.audio.listenOnly.backLabel": "戻る",
+    "app.audio.listenOnly.closeLabel": "閉じる",
+    "app.audio.permissionsOverlay.title": "デバイスのアクセスを許可する",
+    "app.audio.permissionsOverlay.hint": "セッションに参加するには、デバイスのアクセスが必要になります",
+    "app.error.removed": "セッションから退室しました",
+    "app.error.meeting.ended": "会議からログアウトしました",
+    "app.dropdown.close": "閉じる",
+    "app.error.500": "問題が起こりました",
+    "app.error.404": "見つかりません",
+    "app.error.401": "権限がありません",
+    "app.error.403": "禁止されています",
+    "app.error.leaveLabel": "再ログイン",
+    "app.guest.waiting": "主催者の承認待ち",
+    "app.toast.breakoutRoomEnded": "The breakout room ended. オーディオで参加してください",
+    "app.notification.recordingStart": "録画が開始しました",
+    "app.notification.recordingStop": "録画が終了しました",
+    "app.shortcut-help.title": "ショートカット",
+    "app.shortcut-help.accessKeyNotAvailable": "アクセスキーがありません",
+    "app.shortcut-help.comboLabel": "コンボ",
+    "app.shortcut-help.functionLabel": "機能",
+    "app.shortcut-help.closeLabel": "閉じる",
+    "app.shortcut-help.closeDesc": "ショートカットボックスを閉じる",
+    "app.shortcut-help.openOptions": "設定を開く",
+    "app.shortcut-help.toggleUserList": "ユーザーリストトグル",
+    "app.shortcut-help.toggleMute": "ミュート/ミュート解除",
+    "app.shortcut-help.togglePublicChat": "公開チャットトグル(ユーザーリストが開いている場合のみ)",
+    "app.shortcut-help.hidePrivateChat": "個人チャットを隠す",
+    "app.shortcut-help.closePrivateChat": "個人チャットを閉じる",
+    "app.shortcut-help.openActions": "アクションメニューを開く",
+    "app.shortcut-help.openStatus": "ステータスメニューを開く",
+    "app.lock-viewers.webcamLabel": "ウェブカメラ",
+    "app.lock-viewers.microphoneLable": "マイク",
+    "app.lock-viewers.PublicChatLabel": "公開チャット",
+    "app.lock-viewers.PrivateChatLable": "非公開チャット",
+    "app.lock-viewers.Layout": "レイアウト",
+    "app.videoPreview.cancelLabel": "キャンセル",
+    "app.videoPreview.closeLabel": "閉じる",
+    "app.video.joinVideo": "カメラ共有",
+    "app.video.leaveVideo": "カメラ共有解除",
+    "app.video.iceCandidateError": "アイス候補者追加エラー",
+    "app.video.permissionError": "カメラ共有エラー。設定を確認してください",
+    "app.video.sharingError": "カメラ共有エラー",
+    "app.video.notFoundError": "カメラが見つかりませんでした。接続を確認してください",
+    "app.video.notAllowed": "カメラを共有する権限がありませんでした。ブラウザの設定を確認してください",
+    "app.video.notSupportedError": "カメラは安全なページでしか共有できません。SSL証明書が有効か確かめてください",
+    "app.video.notReadableError": "カメラの映像を受け取れませんでした。他のプログラムが使ってないことを確認してください",
+    "app.video.swapCam": "スワップ",
+    "app.video.swapCamDesc": "カメラの向きを反転する",
+    "app.video.videoMenu": "ビデオメニュー",
+    "app.video.videoMenuDisabled": "設定でビデオメニューがブロックされています",
+    "app.video.videoMenuDesc": "設定でビデオメニューがブロックされています",
+    "app.video.chromeExtensionError": "インストールしてください",
+    "app.video.chromeExtensionErrorLink": "このChrome拡張機能",
+    "app.video.stats.title": "接続情報",
+    "app.video.stats.packetsReceived": "パケット受信",
+    "app.video.stats.packetsSent": "パケット送信",
+    "app.video.stats.packetsLost": "エラーパケット",
+    "app.video.stats.bitrate": "ビットレート",
+    "app.video.stats.lostPercentage": "トータルパーセンテージ（エラー）",
+    "app.video.stats.lostRecentPercentage": "最新のパーセンテージ（エラー）",
+    "app.video.stats.dimensions": "解像度",
+    "app.video.stats.codec": "コーデック",
+    "app.video.stats.decodeDelay": "遅延（ディコード）",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "エンコードの使用状況",
+    "app.video.stats.currentDelay": "遅延（最新）",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.toolbar.tools": "ツール",
+    "app.whiteboard.toolbar.tools.pencil": "ペン",
+    "app.whiteboard.toolbar.tools.rectangle": "長方形",
+    "app.whiteboard.toolbar.tools.triangle": "三角形",
+    "app.whiteboard.toolbar.tools.ellipse": "楕円",
+    "app.whiteboard.toolbar.tools.line": "線",
+    "app.whiteboard.toolbar.tools.text": "テキスト",
+    "app.whiteboard.toolbar.thickness": "線の太さ",
+    "app.whiteboard.toolbar.thicknessDisabled": "線の太さは変えられません",
+    "app.whiteboard.toolbar.color": "色",
+    "app.whiteboard.toolbar.colorDisabled": "色は変えられません",
+    "app.whiteboard.toolbar.color.black": "黒",
+    "app.whiteboard.toolbar.color.white": "白",
+    "app.whiteboard.toolbar.color.red": "赤",
+    "app.whiteboard.toolbar.color.orange": "オレンジ",
+    "app.whiteboard.toolbar.color.eletricLime": "黄緑",
+    "app.whiteboard.toolbar.color.lime": "ライム",
+    "app.whiteboard.toolbar.color.cyan": "シアン",
+    "app.whiteboard.toolbar.color.dodgerBlue": "ドジャーブルー",
+    "app.whiteboard.toolbar.color.blue": "青",
+    "app.whiteboard.toolbar.color.violet": "紫",
+    "app.whiteboard.toolbar.color.magenta": "マゼンタ",
+    "app.whiteboard.toolbar.color.silver": "シルバー",
+    "app.whiteboard.toolbar.undo": "取り消す",
+    "app.whiteboard.toolbar.clear": "全て取り消す",
+    "app.whiteboard.toolbar.multiUserOn": "マルチユーザーモードにする",
+    "app.whiteboard.toolbar.multiUserOff": "マルチユーザーモードを外す",
+    "app.whiteboard.toolbar.fontSize": "フォントサイズ",
+    "app.feedback.title": "セッションからログアウトしました",
+    "app.feedback.subtitle": "BigBlueButtonの感想は？ (任意)",
+    "app.feedback.textarea": "BigBlueButtonに何が欲しいですか?",
+    "app.feedback.sendFeedback": "フィードバックを送る",
+    "app.feedback.sendFeedbackDesc": "フィードバックを送ってセッションから退席する",
+    "app.videoDock.webcamFocusLabel": "フォーカス",
+    "app.videoDock.webcamFocusDesc": "選択したカメラにフォーカスする",
+    "app.videoDock.webcamUnfocusLabel": "フォーカスを外す",
+    "app.videoDock.webcamUnfocusDesc": "選択したカメラのフォーカスを外す",
+    "app.createBreakoutRoom.joinAudio": "音声で参加",
+    "app.externalVideo.close": "閉じる"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/km.json b/bigbluebutton-html5/private/locales/km.json
index 3239abcaa1..ec903b2d63 100644
--- a/bigbluebutton-html5/private/locales/km.json
+++ b/bigbluebutton-html5/private/locales/km.json
@@ -47,6 +47,11 @@
     "app.presentation.presentationToolbar.fitScreenDesc": "បង្ហាញ​ស្លាយ​ទាំង​មូល",
     "app.presentation.presentationToolbar.zoomLabel": "ពង្រីក/បង្រួម",
     "app.presentation.presentationToolbar.zoomDesc": "ប្តូរ​កម្រិត​ពង្រីក​របស់​បទ​បង្ហាញ",
+    "app.presentation.presentationToolbar.fitToWidth": "ទំហំ​សម​នឹង​ប្រវែង​ទទឹង",
+    "app.presentationUploder.dismissLabel": "បោះបង់",
+    "app.presentationUploder.genericError": "អុញ! មាន​បញ្ហា​អ្វី​មួយ​ហើយ",
+    "app.poll.closeLabel": "បិទ",
+    "app.poll.liveResult.usersTitle": "អ្នកប្រើប្រាស់",
     "app.polling.pollingTitle": "ជម្រើសសម្រាប់ការ​ស្ទង់​មតិ",
     "app.failedMessage": "សូមទោស! មាន​បញ្ហា​ក្នុង​ការ​ភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ",
     "app.connectingMessage": "កំពុង​ភ្ជាប់...",
@@ -64,14 +69,10 @@
     "app.navBar.settingsDropdown.exitFullscreenDesc": "ចាកចេញ​ពី​អេក្រង់​ពេញ",
     "app.navBar.userListToggleBtnLabel": "បិទ​បើក​បញ្ជី​អ្នកប្រើប្រាស់",
     "app.navBar.toggleUserList.newMessages": "ជាមួយ​ការ​ជូន​ដំណឹង​ពី​សារ​ថ្មី",
-    "app.leaveConfirmation.title": "ចាកចេញ​ពី​វគ្គ​នេះ",
-    "app.leaveConfirmation.message": "តើ​អ្នក​ពិត​ជា​ចង់​ចាកចេញ​ពី​ការប្រជុំ​នេះ​មែន​ទេ?",
     "app.leaveConfirmation.confirmLabel": "ចាកចេញ",
     "app.leaveConfirmation.confirmDesc": "ដក​អ្នក​ចេញ​ពី​ការ​ប្រជុំ",
-    "app.leaveConfirmation.dismissLabel": "បោះបង់",
-    "app.leaveConfirmation.dismissDesc": "បិទ​និង​បដិសេធ​ការ​បញ្ជាក់​ពី​ការ​ចាកចេញ",
-    "app.leaveConfirmation.endMeetingLabel": "យល់ព្រម និងបិទវគ្គនេះ",
-    "app.leaveConfirmation.endMeetingDesc": "បិទ​និង​បញ្ចប់ការ​បញ្ជាក់​ពី​ការ​ប្រជំុ",
+    "app.endMeeting.yesLabel": "បាទ/ចាស",
+    "app.endMeeting.noLabel": "ទេ",
     "app.about.title": "អំពី",
     "app.about.version": "ជំនាន់​កសាង​របស់​ម៉ាស៊ីន​ភ្ញៀវ ៖",
     "app.about.copyright": "សិទ្ធិ​អ្នកនិពន្ធ ៖",
@@ -149,15 +150,21 @@
     "app.actionsBar.actionsDropdown.initPollDesc": "ចាប់​ផ្តើម​ការ​ស្ទង់មតិ",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "ចែក​រំលែក​អេក្រង់​របស់​អ្នក​ជាមួយ​អ្នក​ដទៃ",
     "app.actionsBar.emojiMenu.awayLabel": "នៅ​ឆ្ងាយ",
-    "app.actionsBar.emojiMenu.awayDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"នៅឆ្ងាយ\"",
+    "app.actionsBar.emojiMenu.awayDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "នៅឆ្ងាយ"",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "លើកដៃ",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "លើកដៃ​របស់​អ្នក​ដើម្បី​សួរ​សំនួរ",
+    "app.actionsBar.emojiMenu.neutralLabel": "មិន​សម្រេច​ចិត្ត",
+    "app.actionsBar.emojiMenu.neutralDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "មិន​សម្រេច​ចិត្ត"",
     "app.actionsBar.emojiMenu.confusedLabel": "ច្រឡំ",
-    "app.actionsBar.emojiMenu.confusedDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"ច្រឡំ\"",
+    "app.actionsBar.emojiMenu.confusedDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "ច្រឡំ"",
     "app.actionsBar.emojiMenu.sadLabel": "មិន​សប្បាយ​ចិត្ត",
-    "app.actionsBar.emojiMenu.sadDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ \"មិន​សប្បាយ​ចិត្ត\"",
+    "app.actionsBar.emojiMenu.sadDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ "មិន​សប្បាយ​ចិត្ត"",
     "app.actionsBar.emojiMenu.happyLabel": "សប្បាយចិត្ត",
-    "app.actionsBar.emojiMenu.happyDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ \"សប្បាយចិត្ត\"",
+    "app.actionsBar.emojiMenu.happyDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ "សប្បាយចិត្ត"",
+    "app.actionsBar.emojiMenu.noneLabel": "លុប​ស្ថានភាព",
+    "app.actionsBar.emojiMenu.noneDesc": "លុប​ស្ថានភាព​របស់​អ្នក",
     "app.actionsBar.emojiMenu.applauseLabel": "ទះដៃ",
-    "app.actionsBar.emojiMenu.applauseDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"ទះដៃ\"",
+    "app.actionsBar.emojiMenu.applauseDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "ទះដៃ"",
     "app.actionsBar.emojiMenu.thumbsUpLabel": "មេដៃ​ឡើង",
     "app.actionsBar.emojiMenu.thumbsUpDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"មេដៃ​ឡើង\"",
     "app.actionsBar.emojiMenu.thumbsDownLabel": "មេ​ដៃ​ចុះ",
@@ -226,7 +233,19 @@
     "app.error.leaveLabel": "ចូល​ម្តង​ទៀត",
     "app.guest.waiting": "កំពុងរង់ចាំការយល់ព្រមដើម្បីចូលរួម",
     "app.notification.recordingStart": "វគ្គនេះកំពុងត្រូវបានថតទុក",
-    "app.notification.recordingStop": "វគ្គនេះមិនកំពុងត្រូវបានថតទុកទៀតទេ"
+    "app.notification.recordingStop": "វគ្គនេះមិនកំពុងត្រូវបានថតទុកទៀតទេ",
+    "app.shortcut-help.closeLabel": "បិទ",
+    "app.lock-viewers.webcamLabel": "វេបខេម",
+    "app.lock-viewers.microphoneLable": "មីក្រូហ្វូន",
+    "app.lock-viewers.PublicChatLabel": "ជជែក​សាធារណៈ",
+    "app.lock-viewers.PrivateChatLable": "ជជែក​ឯកជន",
+    "app.lock-viewers.Layout": "ទម្រង់",
+    "app.videoPreview.cancelLabel": "បោះបង់",
+    "app.videoPreview.closeLabel": "បិទ",
+    "app.meeting.endNotification.ok.label": "យល់ព្រម",
+    "app.feedback.title": "អ្នកបានចាកចេញពីសន្និសិត",
+    "app.createBreakoutRoom.joinAudio": "ប្រើ​សម្លេង",
+    "app.externalVideo.close": "បិទ"
 
 }
 
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
new file mode 100644
index 0000000000..2d2b7ed93f
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -0,0 +1,406 @@
+{
+    "app.home.greeting": "Bem-vindo {0}! Sua apresentação começará em breve...",
+    "app.chat.submitLabel": "Enviar Mensagem",
+    "app.chat.errorMinMessageLength": "Mensagem menor do que {0} caractere(s)",
+    "app.chat.errorMaxMessageLength": "Mensagem maior do que {0} caractere(s)",
+    "app.chat.inputLabel": "Entrada de mensagem para o bate-papo {0}",
+    "app.chat.inputPlaceholder": "Mensagem {0}",
+    "app.chat.titlePublic": "Bate-papo Público",
+    "app.chat.titlePrivate": "Bate-papo Privado com {0}",
+    "app.chat.partnerDisconnected": "{0} saiu da reunião",
+    "app.chat.closeChatLabel": "Fechar {0}",
+    "app.chat.hideChatLabel": "Ocultar {0}",
+    "app.chat.moreMessages": "Mais mensagens abaixo",
+    "app.chat.dropdown.options": "Opções do Bate-papo",
+    "app.chat.dropdown.clear": "Limpar",
+    "app.chat.dropdown.copy": "Copiar",
+    "app.chat.dropdown.save": "Salvar",
+    "app.chat.label": "Bate-papo",
+    "app.chat.emptyLogLabel": "Registro do bate-papo vazio",
+    "app.chat.clearPublicChatMessage": "O histórico de bate-papo público foi apagado por um moderador",
+    "app.userList.usersTitle": "Usuários",
+    "app.userList.participantsTitle": "Participantes",
+    "app.userList.messagesTitle": "Mensagens",
+    "app.userList.presenter": "Apresentador",
+    "app.userList.you": "Você",
+    "app.userList.locked": "Bloqueado",
+    "app.userList.label": "Lista de usuários",
+    "app.userList.toggleCompactView.label": "Alternar para o modo de exibição compacta",
+    "app.userList.guest": "Convidado",
+    "app.userList.menuTitleContext": "Opções disponíveis",
+    "app.userList.chatListItem.unreadSingular": "{0} Nova mensagem",
+    "app.userList.chatListItem.unreadPlural": "{0} Novas mensagens",
+    "app.userList.menu.chat.label": "Bate-papo",
+    "app.userList.menu.clearStatus.label": "Limpar status",
+    "app.userList.menu.makePresenter.label": "Torná-lo apresentador",
+    "app.userList.menu.removeUser.label": "Remover usuário",
+    "app.userList.menu.muteUserAudio.label": "Silenciar usuário",
+    "app.userList.menu.unmuteUserAudio.label": "Desbloquear microfone do usuário",
+    "app.userList.userAriaLabel": "{0} {1} {2}  Status {3}",
+    "app.userList.menu.promoteUser.label": "Promover para moderador",
+    "app.userList.menu.demoteUser.label": "Rebaixar para espectador",
+    "app.media.label": "Mídia",
+    "app.media.screenshare.start": "O compartilhamento de tela foi iniciado",
+    "app.media.screenshare.end": "O compartilhamento de tela foi encerrado",
+    "app.media.screenshare.safariNotSupported": "Atualmente, o compartilhamento de tela não é suportado pelo Safari. Por favor, use o Firefox ou o Google Chrome.",
+    "app.meeting.ended": "Esta reunião terminou",
+    "app.meeting.endedMessage": "Você será redirecionado para a tela inicial",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Slide anterior",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Mudar a apresentação para o slide anterior",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Próximo slide",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Mudar a apresentação para o próximo slide",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Pular slide",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Mudar a apresentação para um slide específico",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Ajustar a largura",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Exibir toda a largura do slide",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Ajustar a tela",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Exibir todo o slide",
+    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
+    "app.presentation.presentationToolbar.zoomDesc": "Alterar o nível de zoom da apresentação",
+    "app.presentation.presentationToolbar.fitToWidth": "Ajustar a largura",
+    "app.presentation.presentationToolbar.goToSlide": "Slide {0}",
+    "app.presentationUploder.title": "Apresentação",
+    "app.presentationUploder.message": "Como apresentador, você tem a capacidade de carregar qualquer documento do Office ou arquivo PDF. Para melhores resultados, recomendamos que se carregue arquivos em PDF.",
+    "app.presentationUploder.confirmLabel": "Iniciar",
+    "app.presentationUploder.confirmDesc": "Salve as alterações e inicie a apresentação",
+    "app.presentationUploder.dismissLabel": "Cancelar",
+    "app.presentationUploder.dismissDesc": "Feche a janela e descarte as alterações",
+    "app.presentationUploder.dropzoneLabel": "Arraste arquivos aqui para carregar",
+    "app.presentationUploder.browseFilesLabel": "ou procure arquivos",
+    "app.presentationUploder.fileToUpload": "Carregar arquivo...",
+    "app.presentationUploder.currentBadge": "Atual",
+    "app.presentationUploder.genericError": "Ops, algo deu errado",
+    "app.presentationUploder.upload.progress": "Carregando ({0}%)",
+    "app.presentationUploder.upload.413": "O arquivo é muito grande",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Página de processamento {0} de {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Convertendo arquivo...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Gerando miniaturas...",
+    "app.presentationUploder.conversion.generatedSlides": "Slides gerados...",
+    "app.presentationUploder.conversion.generatingSvg": "Gerando imagens SVG...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Ops, a contagem de páginas excedeu o limite",
+    "app.presentationUploder.conversion.timeout": "Ops, a conversão está demorando muito",
+    "app.poll.closeLabel": "Fechar",
+    "app.poll.liveResult.usersTitle": "Usuários",
+    "app.polling.pollingTitle": "Opções da enquete",
+    "app.polling.pollAnswerLabel": "Resposta da enquete {0}",
+    "app.polling.pollAnswerDesc": "Selecione esta opção para votar em {0}",
+    "app.failedMessage": "Desculpe-nos, estamos com problemas na conexão com o servidor",
+    "app.connectingMessage": "Conectando...",
+    "app.waitingMessage": "Desconectado. Tentando reconectar em {0} segundos...",
+    "app.navBar.settingsDropdown.optionsLabel": "Opções",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Alternar para tela cheia",
+    "app.navBar.settingsDropdown.settingsLabel": "Abrir configurações",
+    "app.navBar.settingsDropdown.aboutLabel": "Sobre",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Sair",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Sair da tela cheia",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Alternar o menu de configurações para tela cheia",
+    "app.navBar.settingsDropdown.settingsDesc": "Alterar as configurações gerais",
+    "app.navBar.settingsDropdown.aboutDesc": "Mostrar informações sobre o cliente",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Deixar a reunião",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Sair do modo de tela cheia",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Atalhos de teclado",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Lista de atalhos disponíveis",
+    "app.navBar.settingsDropdown.helpLabel": "Ajuda",
+    "app.navBar.settingsDropdown.helpDesc": "Vídeo tutoriais",
+    "app.navBar.userListToggleBtnLabel": "Alternar lista de usuários",
+    "app.navBar.toggleUserList.ariaLabel": "Alternar Usuários e Mensagens",
+    "app.navBar.toggleUserList.newMessages": "com notificação para novas mensagens",
+    "app.navBar.recording": "Esta conferência está sendo gravada",
+    "app.navBar.recording.on": "A gravação está em andamento",
+    "app.navBar.recording.off": "Sem gravação",
+    "app.leaveConfirmation.confirmLabel": "Sair",
+    "app.leaveConfirmation.confirmDesc": "Desconecta da reunião",
+    "app.endMeeting.yesLabel": "Sim",
+    "app.endMeeting.noLabel": "Não",
+    "app.about.title": "Sobre",
+    "app.about.version": "Client Build:",
+    "app.about.copyright": "Copyright:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Cancelar",
+    "app.about.dismissDesc": "Fechar informações sobre o cliente",
+    "app.actionsBar.changeStatusLabel": "Alterar status",
+    "app.actionsBar.muteLabel": "Silenciar",
+    "app.actionsBar.unmuteLabel": "Falar",
+    "app.actionsBar.camOffLabel": "Câmera desligada",
+    "app.actionsBar.raiseLabel": "Levantar a mão",
+    "app.actionsBar.label": "Barra de ações",
+    "app.submenu.application.applicationSectionTitle": "Aplicação",
+    "app.submenu.application.audioAlertLabel": "Alertas de áudio para Bate-papo",
+    "app.submenu.application.pushAlertLabel": "Alertas de pop-up para Bate-papo",
+    "app.submenu.application.fontSizeControlLabel": "Tamanho da fonte",
+    "app.submenu.application.increaseFontBtnLabel": "Aumentar o tamanho da fonte da aplicação",
+    "app.submenu.application.decreaseFontBtnLabel": "Diminuir o tamanho da fonte da aplicação",
+    "app.submenu.application.languageLabel": "Idioma da aplicação",
+    "app.submenu.application.ariaLanguageLabel": "Alterar idioma da aplicação",
+    "app.submenu.application.languageOptionLabel": "Escolha o idioma",
+    "app.submenu.application.noLocaleOptionLabel": "Não existem esquemas de idiomas disponíveis",
+    "app.submenu.audio.micSourceLabel": "Seleção do microfone",
+    "app.submenu.audio.speakerSourceLabel": "Seleção do alto-falante",
+    "app.submenu.audio.streamVolumeLabel": "Seu volume de áudio",
+    "app.submenu.video.title": "Vídeo",
+    "app.submenu.video.videoSourceLabel": "Seleção do vídeo",
+    "app.submenu.video.videoOptionLabel": "Selecione a entrada de vídeo",
+    "app.submenu.video.videoQualityLabel": "Qualidade do vídeo",
+    "app.submenu.video.qualityOptionLabel": "Escolha a qualidade do vídeo",
+    "app.submenu.video.participantsCamLabel": "Visualizando webcams dos participantes",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Legendas",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Assumir o controle",
+    "app.submenu.closedCaptions.languageLabel": "Idioma",
+    "app.submenu.closedCaptions.localeOptionLabel": "Escolha o idioma",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Nenhum esquema de idioma ativo",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Família da fonte",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Selecionar família da fonte",
+    "app.submenu.closedCaptions.fontSizeLabel": "Tamanho da fonte",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Escolha o tamanho da fonte",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Cor de fundo",
+    "app.submenu.closedCaptions.fontColorLabel": "Cor da fonte",
+    "app.submenu.participants.muteAllLabel": "Silenciar todos exceto o apresentador",
+    "app.submenu.participants.lockAllLabel": "Restringir todos os participantes",
+    "app.submenu.participants.lockItemLabel": "Participantes {0}",
+    "app.submenu.participants.lockMicDesc": "Desativa o microfone para todos os participantes bloqueados",
+    "app.submenu.participants.lockCamDesc": "Desativa a webcam para todos os participantes bloqueados",
+    "app.submenu.participants.lockPublicChatDesc": "Desativa o bate-papo público para todos os participantes bloqueados",
+    "app.submenu.participants.lockPrivateChatDesc": "Desativa o bate-papo privado para todos os participantes bloqueados",
+    "app.submenu.participants.lockLayoutDesc": "Bloqueia o layout para todos os participantes bloqueados",
+    "app.submenu.participants.lockMicAriaLabel": "Bloqueia o microfone",
+    "app.submenu.participants.lockCamAriaLabel": "Bloqueia a webcam",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Bloqueia o bate-papo público",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Bloqueia o bate-papo privado",
+    "app.submenu.participants.lockLayoutAriaLabel": "Bloqueia o layout",
+    "app.submenu.participants.lockMicLabel": "Microfone",
+    "app.submenu.participants.lockCamLabel": "Webcam",
+    "app.submenu.participants.lockPublicChatLabel": "Bate-papo Público",
+    "app.submenu.participants.lockPrivateChatLabel": "Bate-papo Privado",
+    "app.submenu.participants.lockLayoutLabel": "Layout",
+    "app.settings.applicationTab.label": "Aplicação",
+    "app.settings.audioTab.label": "Áudio",
+    "app.settings.videoTab.label": "Vídeo",
+    "app.settings.closedcaptionTab.label": "Legendas",
+    "app.settings.usersTab.label": "Participantes",
+    "app.settings.main.label": "Configurações",
+    "app.settings.main.cancel.label": "Cancelar",
+    "app.settings.main.cancel.label.description": "Descartar as alterações e fechar o menu de configurações",
+    "app.settings.main.save.label": "Salvar",
+    "app.settings.main.save.label.description": "Salvar as alterações e fechar o menu de configurações",
+    "app.settings.dataSavingTab.label": "Economia de dados",
+    "app.settings.dataSavingTab.webcam": "Ativar Webcams",
+    "app.settings.dataSavingTab.screenShare": "Ativar o compartilhamento de tela",
+    "app.settings.dataSavingTab.description": "Para economizar o volume de transferência de dados, ajuste o que está sendo exibido no momento.",
+    "app.switch.onLabel": "Ligar",
+    "app.switch.offLabel": "Desligar",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Ações",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Carregar uma apresentação",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar uma enquete",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartilhar sua tela",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Parar compartilhamento de tela",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Carregar sua apresentação",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar uma enquete",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Compartilhar sua tela com os outros",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Pare o compartilhamento de tela com",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "Definir Status",
+    "app.actionsBar.emojiMenu.awayLabel": "Ausente",
+    "app.actionsBar.emojiMenu.awayDesc": "Mudar seu status para ausente",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Levantar a mão",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Levante a mão para fazer uma pergunta",
+    "app.actionsBar.emojiMenu.neutralLabel": "Indeciso",
+    "app.actionsBar.emojiMenu.neutralDesc": "Mudar seu status para indeciso",
+    "app.actionsBar.emojiMenu.confusedLabel": "Confuso",
+    "app.actionsBar.emojiMenu.confusedDesc": "Mudar seu status para confuso",
+    "app.actionsBar.emojiMenu.sadLabel": "Triste",
+    "app.actionsBar.emojiMenu.sadDesc": "Mudar seu status para triste",
+    "app.actionsBar.emojiMenu.happyLabel": "Feliz",
+    "app.actionsBar.emojiMenu.happyDesc": "Mudar seu status para feliz",
+    "app.actionsBar.emojiMenu.noneLabel": "Limpar Status",
+    "app.actionsBar.emojiMenu.noneDesc": "Limpar seu status",
+    "app.actionsBar.emojiMenu.applauseLabel": "Aplauso",
+    "app.actionsBar.emojiMenu.applauseDesc": "Mudar seu status para aplauso",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Positivo",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Mudar seu status para positivo",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Negativo",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Mudar seu status para negativo",
+    "app.actionsBar.currentStatusDesc": "status atual {0}",
+    "app.audioNotification.audioFailedError1001": "Erro 1001: WebSocket desconectou",
+    "app.audioNotification.audioFailedError1002": "Erro 1002: Não foi possível estabelecer a conexão WebSocket",
+    "app.audioNotification.audioFailedError1003": "Erro 1003: Versão do navegador não suportada",
+    "app.audioNotification.audioFailedError1004": "Erro 1004: Falha na chamada",
+    "app.audioNotification.audioFailedError1005": "Erro 1005: Chamada encerrada inesperadamente",
+    "app.audioNotification.audioFailedError1006": "Erro 1006: Tempo de espera da chamada expirou",
+    "app.audioNotification.audioFailedError1007": "Erro 1007: Negociação ICE falhou",
+    "app.audioNotification.audioFailedError1008": "Erro 1008: Falha na transferência",
+    "app.audioNotification.audioFailedError1009": "Erro 1009: Não foi possível recuperar as informações do servidor STUN/TURN",
+    "app.audioNotification.audioFailedError1010": "Erro 1010: Negociação ICE expirou",
+    "app.audioNotification.audioFailedError1011": "Erro 1011: Coleta de candidatos ICE expirou",
+    "app.audioNotification.audioFailedMessage": "Conexão de áudio não pôde ser estabelecida",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia falhou. Somente fontes seguras são permitidas",
+    "app.audioNotification.closeLabel": "Fechar",
+    "app.audioNotificaion.reconnectingAsListenOnly": "O áudio foi bloqueado apenas para moderadores, você está sendo conectado apenas como ouvinte",
+    "app.breakoutJoinConfirmation.title": "Entrar na sala de apoio",
+    "app.breakoutJoinConfirmation.message": "Gostaria de participar",
+    "app.breakoutJoinConfirmation.confirmLabel": "Entrar",
+    "app.breakoutJoinConfirmation.confirmDesc": "Entrar na sala de apoio",
+    "app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
+    "app.breakoutJoinConfirmation.dismissDesc": "Fechar e rejeitar o convite a sala de apoio",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Escolha uma sala de apoio para entrar",
+    "app.breakoutTimeRemainingMessage": "Tempo restante na sala de apoio: {0}",
+    "app.breakoutWillCloseMessage": "Tempo expirado. A sala de discussão será fechada em breve",
+    "app.calculatingBreakoutTimeRemaining": "Calculando o tempo restante...",
+    "app.audioModal.microphoneLabel": "Microfone",
+    "app.audioModal.listenOnlyLabel": "Somente ouvir",
+    "app.audioModal.audioChoiceLabel": "Como você gostaria de se juntar ao áudio?",
+    "app.audioModal.iOSBrowser": "Áudio/Vídeo não é suportado",
+    "app.audioModal.iOSErrorDescription": "No momento, o Chrome não suporta áudio e vídeo para iOS.",
+    "app.audioModal.iOSErrorRecommendation": "Recomendamos o Safari para usar o iOS.",
+    "app.audioModal.audioChoiceDesc": "Selecione como se juntar ao áudio nesta reunião",
+    "app.audioModal.closeLabel": "Fechar",
+    "app.audioModal.yes": "Sim",
+    "app.audioModal.no": "Não",
+    "app.audioModal.yes.arialabel" : "Som é audível",
+    "app.audioModal.no.arialabel" : "Som não é audível",
+    "app.audioModal.echoTestTitle": "Este é um teste privado de áudio. Fale algumas palavras. Você consegue ouvir sua voz?",
+    "app.audioModal.settingsTitle": "Alterar as configurações de áudio",
+    "app.audioModal.helpTitle": "Houve um problema com seus dispositivos de mídia",
+    "app.audioModal.helpText": "Você autorizou o acesso ao seu microfone? Observe que uma caixa de diálogo deve abrir assim que você tentar participar da conferência de áudio, pedindo as permissões de acesso aos dispositivos de mídia, por favor conceda essa permissão de acesso para participar da conferência. Se isso não funcionar, tente alterar a permissão do microfone nas configurações do seu navegador.",
+    "app.audioModal.connecting": "Conectando",
+    "app.audioModal.connectingEchoTest": "Conectando ao teste de áudio",
+    "app.audioManager.joinedAudio": "Você se juntou à conferência de áudio",
+    "app.audioManager.joinedEcho": "O teste de áudio foi iniciado",
+    "app.audioManager.leftAudio": "Você deixou a conferência de áudio",
+    "app.audioManager.genericError": "Erro: Ocorreu um erro, tente novamente",
+    "app.audioManager.connectionError": "Erro: Erro de conexão",
+    "app.audioManager.requestTimeout": "Erro: Tempo limite de chamada",
+    "app.audioManager.invalidTarget": "Erro: Um alvo inválido foi especificado na chamada",
+    "app.audioManager.mediaError": "Erro: Houve um problema ao consultar seus dispositivos de mídia",
+    "app.audio.joinAudio": "Ativar áudio",
+    "app.audio.leaveAudio": "Desativar áudio",
+    "app.audio.enterSessionLabel": "Entrar na reunião",
+    "app.audio.playSoundLabel": "Tocar som de teste",
+    "app.audio.backLabel": "Voltar",
+    "app.audio.audioSettings.titleLabel": "Configurações de áudio",
+    "app.audio.audioSettings.descriptionLabel": "Uma caixa de diálogo aparecerá em seu navegador, onde você deve concordar em compartilhar o seu microfone.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Seleção do microfone",
+    "app.audio.audioSettings.speakerSourceLabel": "Seleção do alto-falante",
+    "app.audio.audioSettings.microphoneStreamLabel": "Seu volume da transmissão de áudio",
+    "app.audio.audioSettings.retryLabel": "Tente novamente",
+    "app.audio.listenOnly.backLabel": "Voltar",
+    "app.audio.listenOnly.closeLabel": "Fechar",
+    "app.audio.permissionsOverlay.title": "Permitir que o BigBlueButton acesse seus dispositivos de mídia",
+    "app.audio.permissionsOverlay.hint": "Precisamos que você nos permita acessar seus dispositivos de mídia para participar da conferência por voz :)",
+    "app.error.removed": "Você foi removido da conferência",
+    "app.error.meeting.ended": "Você saiu da conferência",
+    "app.dropdown.close": "Fechar",
+    "app.error.500": "Ops, algo deu errado",
+    "app.error.404": "Não encontrado",
+    "app.error.401": "Não autorizado",
+    "app.error.403": "Proibido",
+    "app.error.leaveLabel": "Faça o login novamente",
+    "app.guest.waiting": "Esperando aprovação para participar",
+    "app.toast.breakoutRoomEnded": "A sala de apoio terminou. Clique no ícone do microfone para reingressar a conferência de áudio na sala principal",
+    "app.toast.chat.public": "Nova mensagem de Bate-papo público",
+    "app.toast.chat.private": "Nova mensagem de Bate-papo privado",
+    "app.toast.chat.system": "Sistema",
+    "app.notification.recordingStart": "Esta reunião está sendo gravada",
+    "app.notification.recordingStop": "Esta reunião não está mais sendo gravada",
+    "app.shortcut-help.title": "Atalhos de teclado",
+    "app.shortcut-help.accessKeyNotAvailable": "Atalho de teclado não disponível",
+    "app.shortcut-help.comboLabel": "Combo",
+    "app.shortcut-help.functionLabel": "Função",
+    "app.shortcut-help.closeLabel": "Fechar",
+    "app.shortcut-help.closeDesc": "Fecha a caixa de diálogo de atalhos do teclado",
+    "app.shortcut-help.openOptions": "Abrir Configurações",
+    "app.shortcut-help.toggleUserList": "Abrir / fechar a lista de usuários",
+    "app.shortcut-help.toggleMute": "Mudo / Falar",
+    "app.shortcut-help.togglePublicChat": "Abrir / fechar Bate-papo Público (lista de usuários deve estar aberta)",
+    "app.shortcut-help.hidePrivateChat": "Ocultar Bate-papo Privado",
+    "app.shortcut-help.closePrivateChat": "Fechar Bate-papo Privado",
+    "app.shortcut-help.openActions": "Abrir o Menu de Ações",
+    "app.shortcut-help.openStatus": "Abrir o Menu de Status",
+    "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.microphoneLable": "Microfone",
+    "app.lock-viewers.PublicChatLabel": "Bate-papo Público",
+    "app.lock-viewers.PrivateChatLable": "Bate-papo Privado",
+    "app.lock-viewers.Layout": "Layout",
+    "app.videoPreview.cancelLabel": "Cancelar",
+    "app.videoPreview.closeLabel": "Fechar",
+    "app.video.joinVideo": "Ativar Webcam",
+    "app.video.leaveVideo": "Pare a Webcam",
+    "app.video.iceCandidateError": "Erro ao adicionar o candidato ICE",
+    "app.video.iceConnectionStateError": "Erro 1107: Negociação ICE falhou",
+    "app.video.permissionError": "Erro ao compartilhar a webcam. Verifique as permissões",
+    "app.video.sharingError": "Erro ao compartilhar a webcam",
+    "app.video.notFoundError": "Não foi possível encontrar uma webcam. Por favor, verifique se ela está conectada",
+    "app.video.notAllowed": "Autorização não concedida para o compartilhamento da webcam, verifique as permissões do seu navegador",
+    "app.video.notSupportedError": "A webcam só pode ser compartilhada via conexão segura, verifique se o certificado SSL é válido",
+    "app.video.notReadableError": "Não foi possível acessar a webcam. Por favor, certifique-se de que nenhum outro programa esteja acessando a webcam",
+    "app.video.swapCam": "Alterar",
+    "app.video.swapCamDesc": "Alterar a orientação das webcams",
+    "app.video.videoMenu": "Menu de vídeo",
+    "app.video.videoMenuDisabled": "Webcam desativada nas configurações",
+    "app.video.videoMenuDesc": "Abra o menu de vídeo",
+    "app.video.chromeExtensionError": "Você deve instalar o seguinte:",
+    "app.video.chromeExtensionErrorLink": "esta extensão do Chrome",
+    "app.video.stats.title": "Estatísticas de conexão",
+    "app.video.stats.packetsReceived": "Pacotes recebidos",
+    "app.video.stats.packetsSent": "Pacotes enviados",
+    "app.video.stats.packetsLost": "Pacotes perdidos",
+    "app.video.stats.bitrate": "Taxa de bits",
+    "app.video.stats.lostPercentage": "Percentuais de perda total",
+    "app.video.stats.lostRecentPercentage": "Percentuais de perda recentemente",
+    "app.video.stats.dimensions": "Dimensões",
+    "app.video.stats.codec": "Codec",
+    "app.video.stats.decodeDelay": "Atraso de decodificação",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "Uso de codificação",
+    "app.video.stats.currentDelay": "Atraso atual",
+    "app.deskshare.iceConnectionStateError": "Erro 1108: Falha na conexão ICE ao compartilhar a tela",
+    "app.sfu.mediaServerConnectionError2000": "Erro 2000: Não foi possível conectar ao servidor de mídia",
+    "app.sfu.mediaServerOffline2001": "Erro 2001: Servidor de mídia está offline. Por favor, tente novamente mais tarde.",
+    "app.sfu.mediaServerNoResources2002": "Erro 2002: Servidor de mídia não possui recursos disponíveis",
+    "app.sfu.mediaServerRequestTimeout2003": "Erro 2003: Tempo limite para solicitações ao servidor de mídia",
+    "app.sfu.serverIceGatheringFailed2021": "Erro 2021: O servidor de mídia não pode capturar candidatos ICE",
+    "app.sfu.serverIceGatheringFailed2022": "Erro 2022: Falha na conexão ICE do servidor de mídia",
+    "app.sfu.invalidSdp2202":"Erro 2202: Cliente gerou um SDP inválido",
+    "app.sfu.noAvailableCodec2203": "Erro 2203: O servidor não encontrou um codec apropriado",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.toolbar.tools": "Ferramentas",
+    "app.whiteboard.toolbar.tools.pencil": "Lápis",
+    "app.whiteboard.toolbar.tools.rectangle": "Retângulo",
+    "app.whiteboard.toolbar.tools.triangle": "Triângulo",
+    "app.whiteboard.toolbar.tools.ellipse": "Elipse",
+    "app.whiteboard.toolbar.tools.line": "Linha",
+    "app.whiteboard.toolbar.tools.text": "Texto",
+    "app.whiteboard.toolbar.thickness": "Espessura da Linha",
+    "app.whiteboard.toolbar.thicknessDisabled": "A espessura da Linha está Desativada",
+    "app.whiteboard.toolbar.color": "Cores",
+    "app.whiteboard.toolbar.colorDisabled": "As Cores estão Desativadas",
+    "app.whiteboard.toolbar.color.black": "Preto",
+    "app.whiteboard.toolbar.color.white": "Branco",
+    "app.whiteboard.toolbar.color.red": "Vermelho",
+    "app.whiteboard.toolbar.color.orange": "Laranja",
+    "app.whiteboard.toolbar.color.eletricLime": "Verde limão",
+    "app.whiteboard.toolbar.color.lime": "Verde",
+    "app.whiteboard.toolbar.color.cyan": "Ciano",
+    "app.whiteboard.toolbar.color.dodgerBlue": "Azul Dodger",
+    "app.whiteboard.toolbar.color.blue": "Azul",
+    "app.whiteboard.toolbar.color.violet": "Violeta",
+    "app.whiteboard.toolbar.color.magenta": "Magenta",
+    "app.whiteboard.toolbar.color.silver": "Prata",
+    "app.whiteboard.toolbar.undo": "Desfazer Anotação",
+    "app.whiteboard.toolbar.clear": "Limpar todas as anotações",
+    "app.whiteboard.toolbar.multiUserOn": "Iniciar o modo multiusuário",
+    "app.whiteboard.toolbar.multiUserOff": "Sair do modo multiusuário",
+    "app.whiteboard.toolbar.fontSize": "Lista de tamanhos de fonte",
+    "app.feedback.title": "Você saiu da conferência",
+    "app.feedback.subtitle": "Adoraríamos ouvir sobre sua experiência com o BigBlueButton (opcional)",
+    "app.feedback.textarea": "Como podemos melhorar o BigBlueButton?",
+    "app.feedback.sendFeedback": "Enviar feedback",
+    "app.feedback.sendFeedbackDesc": "Enviar um Feedback e deixar a reunião",
+    "app.videoDock.webcamFocusLabel": "Focar",
+    "app.videoDock.webcamFocusDesc": "Focar a webcam selecionada",
+    "app.videoDock.webcamUnfocusLabel": "Desfocar",
+    "app.videoDock.webcamUnfocusDesc": "Desfocar a webcam selecionada",
+    "app.createBreakoutRoom.joinAudio": "Ativar áudio",
+    "app.externalVideo.close": "Fechar"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/ru_RU.json b/bigbluebutton-html5/private/locales/ru_RU.json
new file mode 100644
index 0000000000..9663d8e1dd
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/ru_RU.json
@@ -0,0 +1,406 @@
+{
+    "app.home.greeting": "Добро пожаловать {0}! Ваша презентация начнётся в ближайшее время... ",
+    "app.chat.submitLabel": "Отправить сообщение",
+    "app.chat.errorMinMessageLength": "Сообщение из {0} символа(-ов) слишком короткое",
+    "app.chat.errorMaxMessageLength": "Сообщение из {0} символа(-ов) слишком длинное",
+    "app.chat.inputLabel": "Ввод сообщений для чата {0}",
+    "app.chat.inputPlaceholder": "Сообщение {0}",
+    "app.chat.titlePublic": "Общий чат",
+    "app.chat.titlePrivate": "Приватный чат с {0}",
+    "app.chat.partnerDisconnected": "{0} покинул конференцию",
+    "app.chat.closeChatLabel": "Закрыть {0}",
+    "app.chat.hideChatLabel": "Спрятать {0}",
+    "app.chat.moreMessages": "Больше сообщений ниже",
+    "app.chat.dropdown.options": "Настройки чата",
+    "app.chat.dropdown.clear": "Очистить",
+    "app.chat.dropdown.copy": "Копировать",
+    "app.chat.dropdown.save": "Сохранить",
+    "app.chat.label": "Чат",
+    "app.chat.emptyLogLabel": "Журнал чата пуст",
+    "app.chat.clearPublicChatMessage": "Журнал общего чата был очищен модератором",
+    "app.userList.usersTitle": "Пользователи",
+    "app.userList.participantsTitle": "Участники",
+    "app.userList.messagesTitle": "Сообщения",
+    "app.userList.presenter": "Ведущий",
+    "app.userList.you": "Вы",
+    "app.userList.locked": "Заблокировано",
+    "app.userList.label": "Список пользователей",
+    "app.userList.toggleCompactView.label": "Включить/выключить компактный вид",
+    "app.userList.guest": "Гость",
+    "app.userList.menuTitleContext": "Доступные опции",
+    "app.userList.chatListItem.unreadSingular": "{0} новое сообщение",
+    "app.userList.chatListItem.unreadPlural": "{0} новых сообщений",
+    "app.userList.menu.chat.label": "Чат",
+    "app.userList.menu.clearStatus.label": "Очистить статус",
+    "app.userList.menu.makePresenter.label": "Сделать ведущим",
+    "app.userList.menu.removeUser.label": "Исключить пользователя",
+    "app.userList.menu.muteUserAudio.label": "Выключить микрофон пользователя",
+    "app.userList.menu.unmuteUserAudio.label": "Включить микрофон пользователя",
+    "app.userList.userAriaLabel": "{0} {1} {2}  Статус {3}",
+    "app.userList.menu.promoteUser.label": "Повысить до модератора",
+    "app.userList.menu.demoteUser.label": "Понизить до зрителя",
+    "app.media.label": "Медиа",
+    "app.media.screenshare.start": "Демонстрация экрана началась",
+    "app.media.screenshare.end": "Демонстрация экрана закончилась",
+    "app.media.screenshare.safariNotSupported": "Демонстрация экрана на данный момент не поддерживается Safari. Пожалуйста, используйте Firefox или Google Chrome.",
+    "app.meeting.ended": "Сеанс окончен",
+    "app.meeting.endedMessage": "Вы будете перенаправлены назад на главный экран",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Предыдущий слайд",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Переключить презентацию на предыдущий слайд",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Следующий слайд",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Переключить презентацию на следующий слайд",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Пропустить слайд",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Переключить презентацию на указанный слайд",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Подогнать по ширине",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Уместить по ширине слайда",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Подогнать к экрану",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Уместить слайд целиком",
+    "app.presentation.presentationToolbar.zoomLabel": "Масштаб",
+    "app.presentation.presentationToolbar.zoomDesc": "Изменить масштаб презетации",
+    "app.presentation.presentationToolbar.fitToWidth": "Подогнать по ширине",
+    "app.presentation.presentationToolbar.goToSlide": "Слайд {0}",
+    "app.presentationUploder.title": "Презентация",
+    "app.presentationUploder.message": "Как ведущий, вы можете загрузить любой офисный документ или файл PDF. Для лучшего результата, мы рекомендуем загружать PDF.",
+    "app.presentationUploder.confirmLabel": "Начать",
+    "app.presentationUploder.confirmDesc": "Сохранить изменения и начать презентацию",
+    "app.presentationUploder.dismissLabel": "Отменить",
+    "app.presentationUploder.dismissDesc": "Закрыть окно изображения и отменить изменения",
+    "app.presentationUploder.dropzoneLabel": "Перетащите сюда файлы, чтобы загрузить их",
+    "app.presentationUploder.browseFilesLabel": "или выберите файл",
+    "app.presentationUploder.fileToUpload": "Чтобы загрузить...",
+    "app.presentationUploder.currentBadge": "Текущий",
+    "app.presentationUploder.genericError": "Ой, что-то пошло не так",
+    "app.presentationUploder.upload.progress": "Загрузка ({0}%)",
+    "app.presentationUploder.upload.413": "Файл слишком большой",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Обработка страницы {0} из {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Файл конвертируется...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Генерируются миниатюры...",
+    "app.presentationUploder.conversion.generatedSlides": "Слайды генерируются...",
+    "app.presentationUploder.conversion.generatingSvg": "Генерация изображений SVG...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Ой, достигнут предел количества страниц",
+    "app.presentationUploder.conversion.timeout": "Ой, конвертация занимает слишком много времени",
+    "app.poll.closeLabel": "Закрыть",
+    "app.poll.liveResult.usersTitle": "Пользователи",
+    "app.polling.pollingTitle": "Варианты голосования",
+    "app.polling.pollAnswerLabel": "Результат опроса {0}",
+    "app.polling.pollAnswerDesc": "Выберите этот вариант, чтобы проголосовать за {0}",
+    "app.failedMessage": "Извините, проблемы с подключением к серверу.",
+    "app.connectingMessage": "Подключение...",
+    "app.waitingMessage": "Соединение потеряно. Попытка переподключения через {0} секунд...",
+    "app.navBar.settingsDropdown.optionsLabel": "Опции",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Перейти в полноэкранный режим",
+    "app.navBar.settingsDropdown.settingsLabel": "Открыть настройки",
+    "app.navBar.settingsDropdown.aboutLabel": "О программе",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Выход",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Выйти из полноэкранного режима",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Сделать меню настроек на весь экран",
+    "app.navBar.settingsDropdown.settingsDesc": "Изменить главные настройки",
+    "app.navBar.settingsDropdown.aboutDesc": "Показать информацию о клиенте",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Покинуть конференцию",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Выйти из полноэкранного режима",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Быстрые клавиши",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Список доступных быстрых клавиш",
+    "app.navBar.settingsDropdown.helpLabel": "Помощь",
+    "app.navBar.settingsDropdown.helpDesc": "Ссылает пользователей на видеоуроки",
+    "app.navBar.userListToggleBtnLabel": "Включить/выключить список пользователей",
+    "app.navBar.toggleUserList.ariaLabel": "Включить/выключить Пользователей и Сообщения",
+    "app.navBar.toggleUserList.newMessages": "с уведомлением о новых сообщениях",
+    "app.navBar.recording": "Этот сеанс записывается",
+    "app.navBar.recording.on": "Записывается",
+    "app.navBar.recording.off": "Не записывается",
+    "app.leaveConfirmation.confirmLabel": "Выйти",
+    "app.leaveConfirmation.confirmDesc": "Выйти из конференции",
+    "app.endMeeting.yesLabel": "Да",
+    "app.endMeeting.noLabel": "Нет",
+    "app.about.title": "О программе",
+    "app.about.version": "Сборка клиента:",
+    "app.about.copyright": "Авторские права:",
+    "app.about.confirmLabel": "ОК",
+    "app.about.confirmDesc": "ОК",
+    "app.about.dismissLabel": "Отмена",
+    "app.about.dismissDesc": "Закрыть информацию о клиента",
+    "app.actionsBar.changeStatusLabel": "Изменить статус",
+    "app.actionsBar.muteLabel": "Выключить микрофон",
+    "app.actionsBar.unmuteLabel": "Включить микрофон",
+    "app.actionsBar.camOffLabel": "Выключить камеру",
+    "app.actionsBar.raiseLabel": "Поднять",
+    "app.actionsBar.label": "Панель действий",
+    "app.submenu.application.applicationSectionTitle": "Приложение",
+    "app.submenu.application.audioAlertLabel": "Звуковые оповещения для чата",
+    "app.submenu.application.pushAlertLabel": "Всплывающие оповещения для чата",
+    "app.submenu.application.fontSizeControlLabel": "Размер шрифта",
+    "app.submenu.application.increaseFontBtnLabel": "Увеличить шрифт приложения",
+    "app.submenu.application.decreaseFontBtnLabel": "Уменьшить шрифт приложения",
+    "app.submenu.application.languageLabel": "Язык приложения",
+    "app.submenu.application.ariaLanguageLabel": "Изменить язык приложения",
+    "app.submenu.application.languageOptionLabel": "Выберите язык",
+    "app.submenu.application.noLocaleOptionLabel": "Нет доступных переводов",
+    "app.submenu.audio.micSourceLabel": "Источник микрофона",
+    "app.submenu.audio.speakerSourceLabel": "Источник динамиков",
+    "app.submenu.audio.streamVolumeLabel": "Громкость аудио-потока",
+    "app.submenu.video.title": "Видео",
+    "app.submenu.video.videoSourceLabel": "Видео-источник",
+    "app.submenu.video.videoOptionLabel": "Выбрать видео-источник",
+    "app.submenu.video.videoQualityLabel": "Качество видео",
+    "app.submenu.video.qualityOptionLabel": "Выберите качество видео",
+    "app.submenu.video.participantsCamLabel": "Просмотр веб-камер участников",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Субтитры",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Перехватить",
+    "app.submenu.closedCaptions.languageLabel": "Язык",
+    "app.submenu.closedCaptions.localeOptionLabel": "Выберите язык",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Нет доступных переводов",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Шрифт",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Выберите шрифт",
+    "app.submenu.closedCaptions.fontSizeLabel": "Размер шрифта",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Выберите размер шрифта",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Цвет фона",
+    "app.submenu.closedCaptions.fontColorLabel": "Цвет шрифта",
+    "app.submenu.participants.muteAllLabel": "Выключить микрофоны у всех кроме ведущего",
+    "app.submenu.participants.lockAllLabel": "Блокировать всех участников",
+    "app.submenu.participants.lockItemLabel": "Participants {0}",
+    "app.submenu.participants.lockMicDesc": "Отключает микрофон у всех блокированных участников",
+    "app.submenu.participants.lockCamDesc": "Отключает веб-камеру у всех блокированных участников",
+    "app.submenu.participants.lockPublicChatDesc": "Отключает общий чат для всех блокированных участников",
+    "app.submenu.participants.lockPrivateChatDesc": "Отключает приватный чат для всех блокированных участников",
+    "app.submenu.participants.lockLayoutDesc": "Заблокировать расположение окон для всех заблокированных участников",
+    "app.submenu.participants.lockMicAriaLabel": "Заблокировать микрофон",
+    "app.submenu.participants.lockCamAriaLabel": "Заблокировать веб-камеру",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Заблокировать общий чат",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Заблокировать приватный чат",
+    "app.submenu.participants.lockLayoutAriaLabel": "Заблокировать расположение окон",
+    "app.submenu.participants.lockMicLabel": "Микрофон",
+    "app.submenu.participants.lockCamLabel": "Веб-камера",
+    "app.submenu.participants.lockPublicChatLabel": "Общий чат",
+    "app.submenu.participants.lockPrivateChatLabel": "Приватный чат",
+    "app.submenu.participants.lockLayoutLabel": "Расположение окон",
+    "app.settings.applicationTab.label": "Приложение",
+    "app.settings.audioTab.label": "Аудио",
+    "app.settings.videoTab.label": "Видео",
+    "app.settings.closedcaptionTab.label": "Субтитры",
+    "app.settings.usersTab.label": "Участники",
+    "app.settings.main.label": "Настройки",
+    "app.settings.main.cancel.label": "Отмена",
+    "app.settings.main.cancel.label.description": "Сбрасывает изменения и закрывает меню настроек",
+    "app.settings.main.save.label": "Сохранить",
+    "app.settings.main.save.label.description": "Сохраняет изменения и закрывает меню настроек",
+    "app.settings.dataSavingTab.label": "Сохранение данных",
+    "app.settings.dataSavingTab.webcam": "Включить веб камеры",
+    "app.settings.dataSavingTab.screenShare": "Включить демонстрацию рабочего стола",
+    "app.settings.dataSavingTab.description": "Чтобы сохранить устойчивую скорость соединения, выберите, что будет отображаться",
+    "app.switch.onLabel": "ВКЛ",
+    "app.switch.offLabel": "ВЫКЛ",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Действия",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Загрузить презентацию",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Начать опрос",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Демонстировать ваш экран",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Остановить демонстрацию экрана",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Загрузите вашу презентацию",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Начать опрос",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Демонстрировать ваш экран другим участникам",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Остановить демонстрацию экрана ",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "Установить статус",
+    "app.actionsBar.emojiMenu.awayLabel": "Отошел",
+    "app.actionsBar.emojiMenu.awayDesc": "Изменяет ваш статус на "Отошел"",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Поднять руку",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Поднять руку, чтобы задать вопрос",
+    "app.actionsBar.emojiMenu.neutralLabel": "Нерешительный",
+    "app.actionsBar.emojiMenu.neutralDesc": "Изменяет ваш статус на "Нерешительный"",
+    "app.actionsBar.emojiMenu.confusedLabel": "Смущен",
+    "app.actionsBar.emojiMenu.confusedDesc": "Изменяет ваш статус на "Смущен"",
+    "app.actionsBar.emojiMenu.sadLabel": "Грустный",
+    "app.actionsBar.emojiMenu.sadDesc": "Изменяет ваш статус на "Грустный"",
+    "app.actionsBar.emojiMenu.happyLabel": "Счастливый",
+    "app.actionsBar.emojiMenu.happyDesc": "Изменяет ваш статус на "Счастливый"",
+    "app.actionsBar.emojiMenu.noneLabel": "Очистить статус",
+    "app.actionsBar.emojiMenu.noneDesc": "Очищает ваш статус",
+    "app.actionsBar.emojiMenu.applauseLabel": "Апплодисменты",
+    "app.actionsBar.emojiMenu.applauseDesc": "Изменяет ваш статус на "Аплодисменты"",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Нравится",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Изменяет ваш статус на "Нравится"",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Не нравится",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Изменяет ваш статус на "Не нравится"",
+    "app.actionsBar.currentStatusDesc": "текущий статус {0}",
+    "app.audioNotification.audioFailedError1001": "Ошибка 1001: WebSocket отключен",
+    "app.audioNotification.audioFailedError1002": "Ошибка 1002: Не удалось установить соединение WebSocket",
+    "app.audioNotification.audioFailedError1003": "Ошибка 1003: Версия браузера не поддерживается",
+    "app.audioNotification.audioFailedError1004": "Ошибка 1004: Сбой вызова",
+    "app.audioNotification.audioFailedError1005": "Ошибка 1005: Вызов внезапно прервался",
+    "app.audioNotification.audioFailedError1006": "Ошибка 1006: Время вызова истекло",
+    "app.audioNotification.audioFailedError1007": "Ошибка 1007: Согласование ICE не состоялось",
+    "app.audioNotification.audioFailedError1008": "Ошибка 1008: Сбой передачи",
+    "app.audioNotification.audioFailedError1009": "Ошибка 1009: не удалось получить информацию STUN/TURN сервера",
+    "app.audioNotification.audioFailedError1010": "Ошибка 1010: Время согласования ICE истекло ",
+    "app.audioNotification.audioFailedError1011": "Ошибка 1011: Превышено время сбора ICE",
+    "app.audioNotification.audioFailedMessage": "Не удалось установить аудио-соединение",
+    "app.audioNotification.mediaFailedMessage": "Ошибка getUserMicMedia, разрешены только безопасные источники",
+    "app.audioNotification.closeLabel": "Закрыть",
+    "app.audioNotificaion.reconnectingAsListenOnly": "Аудио было заблокировано модератором, вы присоединились в режиме прослушивания",
+    "app.breakoutJoinConfirmation.title": "Присоединиться к комнате групповой работы",
+    "app.breakoutJoinConfirmation.message": "Вы хотите присоединиться к ",
+    "app.breakoutJoinConfirmation.confirmLabel": "Присоединиться",
+    "app.breakoutJoinConfirmation.confirmDesc": "Присоединяет вас к конференции",
+    "app.breakoutJoinConfirmation.dismissLabel": "Отмена",
+    "app.breakoutJoinConfirmation.dismissDesc": "Закрывает и отклоняет присоединение к конференции",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Выберите конференцию, к которой хотите подключиться",
+    "app.breakoutTimeRemainingMessage": "Оставшееся время конференции: {0}",
+    "app.breakoutWillCloseMessage": "Время вышло. Комната групповой работы скоро закроется.",
+    "app.calculatingBreakoutTimeRemaining": "Подсчёт оставшегося времени...",
+    "app.audioModal.microphoneLabel": "Микрофон",
+    "app.audioModal.listenOnlyLabel": "Только слушать",
+    "app.audioModal.audioChoiceLabel": "Как вы хотите войти в аудио-конференцию?",
+    "app.audioModal.iOSBrowser": "Аудио/Видео не поддерживается",
+    "app.audioModal.iOSErrorDescription": "В настоящее время аудио и видео не поддерживаются в Chrome для iOS.",
+    "app.audioModal.iOSErrorRecommendation": "Мы рекомендуем использовать Safari для iOS.",
+    "app.audioModal.audioChoiceDesc": "Выберите, как участвовать в аудио-конференции",
+    "app.audioModal.closeLabel": "Закрыть",
+    "app.audioModal.yes": "Да",
+    "app.audioModal.no": "Нет",
+    "app.audioModal.yes.arialabel" : "Звучит эхо",
+    "app.audioModal.no.arialabel" : "Эхо не звучит",
+    "app.audioModal.echoTestTitle": "Это тестирование звука, его слышите только вы. Скажите несколько слов в микрофон. Слышите ли вы себя в динамиках?",
+    "app.audioModal.settingsTitle": "Изменить настройки звука",
+    "app.audioModal.helpTitle": "Возникли проблемы с вашими аудио-устройствами",
+    "app.audioModal.helpText": "Дали ли вы BigBlueButton разрешение на использование вашего микрофона? Когда вы подключаете аудио, вы должны увидеть диалог запроса доступа к аудио-устройствам - вы должны предоставить доступ, чтобы учавствовать в аудио-конференции. Если этого не произошло, попробуйте изменить настройки доступа к микрофону в настройках вашего браузера.",
+    "app.audioModal.connecting": "Покдлючение",
+    "app.audioModal.connectingEchoTest": "Подключение к тесту звука",
+    "app.audioManager.joinedAudio": "Вы подключились к аудио-конференции",
+    "app.audioManager.joinedEcho": "Вы подключились к тесту звука",
+    "app.audioManager.leftAudio": "Вы отключились от аудио-конференции",
+    "app.audioManager.genericError": "Ошибка: что-то пошло не так, пожалуйста, попробуйте еще раз",
+    "app.audioManager.connectionError": "Ошибка: подключение не удалось",
+    "app.audioManager.requestTimeout": "Ошибка: время ожидания подключения истекло",
+    "app.audioManager.invalidTarget": "Ошибка: Попытка запросить что-то от неверной цели",
+    "app.audioManager.mediaError": "Ошибка: возникла проблема с вашими аудио-устройствами",
+    "app.audio.joinAudio": "Присоединиться к аудио-конференции",
+    "app.audio.leaveAudio": "Покинуть аудио-конференцию",
+    "app.audio.enterSessionLabel": "Подключиться к сеансу",
+    "app.audio.playSoundLabel": "Проиграть звук",
+    "app.audio.backLabel": "Назад",
+    "app.audio.audioSettings.titleLabel": "Выберите аудио-настройки",
+    "app.audio.audioSettings.descriptionLabel": "Вам будет показан запрос на разрешение использование вашего микрофона",
+    "app.audio.audioSettings.microphoneSourceLabel": "Микрофон",
+    "app.audio.audioSettings.speakerSourceLabel": "Динамики",
+    "app.audio.audioSettings.microphoneStreamLabel": "Громкость вашего аудио-потока",
+    "app.audio.audioSettings.retryLabel": "Повторить",
+    "app.audio.listenOnly.backLabel": "Назад",
+    "app.audio.listenOnly.closeLabel": "Закрыть",
+    "app.audio.permissionsOverlay.title": "Разрешите BigBlueButton использовать ваши медиа-устройства",
+    "app.audio.permissionsOverlay.hint": "Вы должны разрешить нам использовать ваши медиа-устройства, чтобы учавствовать в аудио-конференции :)",
+    "app.error.removed": "Вас удалили из конференции",
+    "app.error.meeting.ended": "Вы вышли из конференции",
+    "app.dropdown.close": "Закрыть",
+    "app.error.500": "Упс, что-то пошло не так",
+    "app.error.404": "Не найдено",
+    "app.error.401": "Не авторизирован",
+    "app.error.403": "Доступ запрещен",
+    "app.error.leaveLabel": "Зайдите снова",
+    "app.guest.waiting": "Ожидание одобрения входа",
+    "app.toast.breakoutRoomEnded": "Конференция закончилась. Пожалуйста, присоединитесь снова к аудио конференции.",
+    "app.toast.chat.public": "Новое сообщение в публичном чате",
+    "app.toast.chat.private": "Новое сообщение в приватном чате",
+    "app.toast.chat.system": "Система",
+    "app.notification.recordingStart": "Этот сеанс записывается",
+    "app.notification.recordingStop": "Этот сеанс больше не будет записан",
+    "app.shortcut-help.title": "Клавиши быстрого доступа",
+    "app.shortcut-help.accessKeyNotAvailable": "Доступ к ключам недоступен.",
+    "app.shortcut-help.comboLabel": "Комбо",
+    "app.shortcut-help.functionLabel": "Функция",
+    "app.shortcut-help.closeLabel": "Закрыть",
+    "app.shortcut-help.closeDesc": "Закрывает модальные клавиши быстрого доступа",
+    "app.shortcut-help.openOptions": "Открывает параметры",
+    "app.shortcut-help.toggleUserList": "Включает список пользователей",
+    "app.shortcut-help.toggleMute": "Включает / Выключает микрофон",
+    "app.shortcut-help.togglePublicChat": "Включает публичный чат (Список пользователей должен быть открыт)",
+    "app.shortcut-help.hidePrivateChat": "Прячет приватный чат",
+    "app.shortcut-help.closePrivateChat": "Закрывает приватный чат",
+    "app.shortcut-help.openActions": "Открывает меню действий",
+    "app.shortcut-help.openStatus": "Открывает меню статуса",
+    "app.lock-viewers.webcamLabel": "Веб-камера",
+    "app.lock-viewers.microphoneLable": "Микрофон",
+    "app.lock-viewers.PublicChatLabel": "Общий чат",
+    "app.lock-viewers.PrivateChatLable": "Приватный чат",
+    "app.lock-viewers.Layout": "Расположение окон",
+    "app.videoPreview.cancelLabel": "Отмена",
+    "app.videoPreview.closeLabel": "Закрыть",
+    "app.video.joinVideo": "Транслировать веб-камеру",
+    "app.video.leaveVideo": "Не транслировать веб-камеру",
+    "app.video.iceCandidateError": "Щшибка добавления ice кандидата",
+    "app.video.iceConnectionStateError": "Ошибка 1107: согласование ICE провалилось",
+    "app.video.permissionError": "Ошибка. Проверьте разрешение на доступ к веб-камере.",
+    "app.video.sharingError": "Ошибка трансляции веб-камеры",
+    "app.video.notFoundError": "Невозможно найти веб-камеру. Пожалуйста, проверте присоединена ли она",
+    "app.video.notAllowed": "Отсутствует разрешение на трансляцию веб-камеры, пожалуйста, убедитесь, что ваш браузер имеет необходиміе разрешения",
+    "app.video.notSupportedError": "Можна транслировать видео с веб-камеры только с безопасных источников, убедитесь, что ваш сертификат SSL действителен",
+    "app.video.notReadableError": "Не удалось получить видео с веб-камеры. Убедитесь, что другая программа не использует веб-камеру",
+    "app.video.swapCam": "Заменить",
+    "app.video.swapCamDesc": "поменять направление веб-камер",
+    "app.video.videoMenu": "Меню видео",
+    "app.video.videoMenuDisabled": "Меню видео веб-камеры отключено в настройках",
+    "app.video.videoMenuDesc": "Открыть выпадающее меню видео",
+    "app.video.chromeExtensionError": "Вы должны установить",
+    "app.video.chromeExtensionErrorLink": "это расширение Chrome",
+    "app.video.stats.title": "Статистика подключений",
+    "app.video.stats.packetsReceived": "Полученные пакеты",
+    "app.video.stats.packetsSent": "Пакеты отправлены",
+    "app.video.stats.packetsLost": "Пакеты потеряны",
+    "app.video.stats.bitrate": "Битрейт",
+    "app.video.stats.lostPercentage": "Общий процент потерянных",
+    "app.video.stats.lostRecentPercentage": "Нынешний процент потерянных",
+    "app.video.stats.dimensions": "Размеры",
+    "app.video.stats.codec": "Кодек",
+    "app.video.stats.decodeDelay": "Задержка декодирования",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "Использование кодировкой",
+    "app.video.stats.currentDelay": "Текущая задержка",
+    "app.deskshare.iceConnectionStateError": "Ошибка 1108: соединение с ICE не удалось при совместном использовании экрана",
+    "app.sfu.mediaServerConnectionError2000": "Ошибка 2000: невозможно подключиться к медиа-серверу",
+    "app.sfu.mediaServerOffline2001": "Ошибка 2001: Медиа-сервер отключен. Пожалуйста, повторите попытку позже.",
+    "app.sfu.mediaServerNoResources2002": "Ошибка 2002: у медиасервера нет доступных ресурсов",
+    "app.sfu.mediaServerRequestTimeout2003": "Ошибка 2003: время запроса на медиа сервер вышло",
+    "app.sfu.serverIceGatheringFailed2021": "Ошибка 2021: Медиа-сервер не может собирать кандидатов ICE",
+    "app.sfu.serverIceGatheringFailed2022": "Ошибка 2022: Медиа серверу не удалось подключиться к ICE",
+    "app.sfu.invalidSdp2202":"Ошибка 2202: клиент создал недопустимый SDP",
+    "app.sfu.noAvailableCodec2203": "Ошибка 2203: сервер не смог найти соответствующий кодек",
+    "app.meeting.endNotification.ok.label": "ОК",
+    "app.whiteboard.toolbar.tools": "Инструменты",
+    "app.whiteboard.toolbar.tools.pencil": "Карандаш",
+    "app.whiteboard.toolbar.tools.rectangle": "Четырехугольник",
+    "app.whiteboard.toolbar.tools.triangle": "Треугольник",
+    "app.whiteboard.toolbar.tools.ellipse": "Окружность",
+    "app.whiteboard.toolbar.tools.line": "Линия",
+    "app.whiteboard.toolbar.tools.text": "Текст",
+    "app.whiteboard.toolbar.thickness": "Толщина рисования",
+    "app.whiteboard.toolbar.thicknessDisabled": "Толщина рисования отключена",
+    "app.whiteboard.toolbar.color": "Цвета",
+    "app.whiteboard.toolbar.colorDisabled": "Цвета отключены",
+    "app.whiteboard.toolbar.color.black": "Черный",
+    "app.whiteboard.toolbar.color.white": "Белый",
+    "app.whiteboard.toolbar.color.red": "Красный",
+    "app.whiteboard.toolbar.color.orange": "Оранжевый",
+    "app.whiteboard.toolbar.color.eletricLime": "Салатовый",
+    "app.whiteboard.toolbar.color.lime": "Зеленый",
+    "app.whiteboard.toolbar.color.cyan": "Бирюзовый",
+    "app.whiteboard.toolbar.color.dodgerBlue": "Голубой",
+    "app.whiteboard.toolbar.color.blue": "Синий",
+    "app.whiteboard.toolbar.color.violet": "Фиолетовый",
+    "app.whiteboard.toolbar.color.magenta": "Пурпурный",
+    "app.whiteboard.toolbar.color.silver": "Серый",
+    "app.whiteboard.toolbar.undo": "Отменить пометку",
+    "app.whiteboard.toolbar.clear": "Очистить все пометки",
+    "app.whiteboard.toolbar.multiUserOn": "Включить многопользовательский режим",
+    "app.whiteboard.toolbar.multiUserOff": "Выключить многопользовательский режим",
+    "app.whiteboard.toolbar.fontSize": "Выбор размера шрифта",
+    "app.feedback.title": "Вы вышли из конференции",
+    "app.feedback.subtitle": "Мы бы хотели услышать о вашем опыте работы с BigBlueButton (необязательно)",
+    "app.feedback.textarea": "Как мы можем сделать BigBlueButton лучше?",
+    "app.feedback.sendFeedback": "Отправить отзыв",
+    "app.feedback.sendFeedbackDesc": "Отправить отзыв и покинуть встречу",
+    "app.videoDock.webcamFocusLabel": "Фокус",
+    "app.videoDock.webcamFocusDesc": "Сфокусировать выбранную веб-камеру",
+    "app.videoDock.webcamUnfocusLabel": "Расфокусировать",
+    "app.videoDock.webcamUnfocusDesc": "Расфокусировать выбранную веб-камеру",
+    "app.createBreakoutRoom.joinAudio": "Присоединиться к аудио-конференции",
+    "app.externalVideo.close": "Закрыть"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/tr_TR.json b/bigbluebutton-html5/private/locales/tr_TR.json
new file mode 100644
index 0000000000..e092951b46
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/tr_TR.json
@@ -0,0 +1,383 @@
+{
+    "app.home.greeting": "Hoş geldin {0}! Sunumunuz birazdan başlayacak...",
+    "app.chat.submitLabel": "Mesaj Gönder",
+    "app.chat.errorMinMessageLength": "Mesaj {0} karakter daha kısa",
+    "app.chat.errorMaxMessageLength": "Mesaj {0} karakter daha uzun",
+    "app.chat.inputLabel": "{0} sohbeti için mesaj verisi",
+    "app.chat.inputPlaceholder": "Mesaj {0}",
+    "app.chat.titlePublic": "Genel Sohbet",
+    "app.chat.titlePrivate": "{0} ile Özel Sohbet",
+    "app.chat.partnerDisconnected": "{0} görüşmeden ayrıldı",
+    "app.chat.closeChatLabel": "Kapat {0}",
+    "app.chat.hideChatLabel": "Gizle {0}",
+    "app.chat.moreMessages": "Mesajların devamı aşağıda",
+    "app.chat.dropdown.options": "Sohbet Seçenekleri",
+    "app.chat.dropdown.clear": "Temizle",
+    "app.chat.dropdown.copy": "Kopyala",
+    "app.chat.dropdown.save": "Kaydet",
+    "app.chat.label": "Sohbet",
+    "app.chat.emptyLogLabel": "Sohbet sistem kayıtları boş",
+    "app.chat.clearPublicChatMessage": "Genel sohbet geçmişi moderatör tarafından temizlendi",
+    "app.userList.usersTitle": "Kullanıcılar",
+    "app.userList.participantsTitle": "Katılımcılar",
+    "app.userList.messagesTitle": "Mesajlar",
+    "app.userList.presenter": "Sunucu",
+    "app.userList.you": "Siz",
+    "app.userList.locked": "Kilitli",
+    "app.userList.label": "Kullanıcı Listesi",
+    "app.userList.toggleCompactView.label": "Sıkıştırılmış görünüm moduna geç",
+    "app.userList.guest": "Misafir",
+    "app.userList.menuTitleContext": "Kullanılabilir Seçenekler",
+    "app.userList.chatListItem.unreadSingular": "{0} Yeni Mesaj",
+    "app.userList.chatListItem.unreadPlural": "{0} Yeni Mesaj",
+    "app.userList.menu.chat.label": "Sohbet",
+    "app.userList.menu.clearStatus.label": "Durum Temizle",
+    "app.userList.menu.makePresenter.label": "Sunucu Yap",
+    "app.userList.menu.removeUser.label": "Kullanıcı uzaklaştır",
+    "app.userList.menu.muteUserAudio.label": "Kullanıcıyı sustur",
+    "app.userList.menu.unmuteUserAudio.label": "Kullanıcıyı konuştur",
+    "app.userList.userAriaLabel": "{0} {1} {2}  Durum {3}",
+    "app.userList.menu.promoteUser.label": "Moderatör yap",
+    "app.userList.menu.demoteUser.label": "İzleyici yap",
+    "app.media.label": "Medya",
+    "app.media.screenshare.start": "Ekran paylaşımı başladı",
+    "app.media.screenshare.end": "Ekran paylaşımı sonlandı",
+    "app.meeting.ended": "Oturum sonlandı",
+    "app.meeting.endedMessage": "Ana ekrana geri yönlendirileceksiniz",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Önceki slayt",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Sunumu önceki slayda değiştir",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Sonraki slayt",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Sunumu sonraki slayda değiştir",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Slayt atla",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Sunumu belirli slayda değiştir",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Genişliğe sığdır",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Slayt genişliğinde göster",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Ekrana sığdır",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Tüm slaydı göster",
+    "app.presentation.presentationToolbar.zoomLabel": "Odak",
+    "app.presentation.presentationToolbar.zoomDesc": "Sunumun odak seviyesini değiştir",
+    "app.presentation.presentationToolbar.fitToWidth": "Genişliğe sığdır",
+    "app.presentation.presentationToolbar.goToSlide": "Slayt {0}",
+    "app.presentationUploder.title": "Sunum",
+    "app.presentationUploder.message": "BigBlueButton'da sunucu olarak herhangi bir ofis belgesini ya da PDF dosyasını yükleyebilirsiniz. En iyi sonuç için PDF dosyası yüklemenizi tavsiye ederiz.",
+    "app.presentationUploder.confirmLabel": "Başlat",
+    "app.presentationUploder.confirmDesc": "Değişiklikleri kaydet ve sunumu başlat",
+    "app.presentationUploder.dismissLabel": "Vazgeç",
+    "app.presentationUploder.dismissDesc": "Model penceresini kapatın ve değişiklikleri geri alın",
+    "app.presentationUploder.dropzoneLabel": "Yüklenecek dosyaları buraya sürükleyin",
+    "app.presentationUploder.browseFilesLabel": "ya da dosyalara göz at",
+    "app.presentationUploder.fileToUpload": "Yüklenecek...",
+    "app.presentationUploder.currentBadge": "Şimdiki",
+    "app.presentationUploder.genericError": "Hops, birşeyler ters gitti",
+    "app.presentationUploder.upload.progress": "Yükleniyor ({0}%)",
+    "app.presentationUploder.upload.413": "Dosya çok büyük",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Sayfalar işleniyor: {0} / {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Dosyayı dönüştürüyor...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Küçük resimler oluşturuluyor...",
+    "app.presentationUploder.conversion.generatedSlides": "Slaytlar oluşturuldu...",
+    "app.presentationUploder.conversion.generatingSvg": "SVG resimler oluşturuluyor...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Hops, sayfa sayısı limiti aştı",
+    "app.presentationUploder.conversion.timeout": "Hops, dönüştürme uzun zaman alıyor",
+    "app.poll.closeLabel": "Kapat",
+    "app.poll.liveResult.usersTitle": "Kullanıcılar",
+    "app.polling.pollingTitle": "Oylama Seçenekleri",
+    "app.polling.pollAnswerLabel": "{0} Oylamasını cevapla",
+    "app.polling.pollAnswerDesc": "{0} Oylaması için bu seçeneği seç",
+    "app.failedMessage": "Özür dileriz, sunucuya bağlanma sorunu var.",
+    "app.connectingMessage": "Bağlanıyor...",
+    "app.waitingMessage": "Bağlantı koptu. {0} saniye sonra tekrar bağlanmayı deneyecek...",
+    "app.navBar.settingsDropdown.optionsLabel": "Seçenekler",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Tam ekran yap",
+    "app.navBar.settingsDropdown.settingsLabel": "Ayarları aç",
+    "app.navBar.settingsDropdown.aboutLabel": "Hakkında",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Çıkış",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Tam ekrandan çık",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Ayarlar menüsünü tam ekran yap",
+    "app.navBar.settingsDropdown.settingsDesc": "Genel ayarları değiştir",
+    "app.navBar.settingsDropdown.aboutDesc": "Kullanıcı bilgilerini göster",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Görüşmeden ayrıl",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Tam ekran modundan çık",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Kısayol Tuşları",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Hazır kısayol tuşları listesi",
+    "app.navBar.settingsDropdown.helpLabel": "Yardım",
+    "app.navBar.userListToggleBtnLabel": "Kullanıcı Listesine Geç",
+    "app.navBar.toggleUserList.ariaLabel": "Kullanıcılar ve Mesajlara Geç",
+    "app.navBar.toggleUserList.newMessages": "yeni mesaj bildirimiyle",
+    "app.navBar.recording": "Bu oturum kaydediliyor",
+    "app.navBar.recording.on": "Kaydediyor",
+    "app.navBar.recording.off": "Kaydetmiyor",
+    "app.leaveConfirmation.confirmLabel": "Ayrıl",
+    "app.leaveConfirmation.confirmDesc": "Sizi görüşmeden çıkarır",
+    "app.endMeeting.yesLabel": "Evet",
+    "app.endMeeting.noLabel": "Hayır",
+    "app.about.title": "Hakkında",
+    "app.about.version": "İstemci Sürümü:",
+    "app.about.copyright": "Telif Hakkı:",
+    "app.about.confirmLabel": "TAMAM",
+    "app.about.confirmDesc": "TAMAM",
+    "app.about.dismissLabel": "Vazgeç",
+    "app.about.dismissDesc": "Kullanıcı bilgilerini kapat",
+    "app.actionsBar.changeStatusLabel": "Durum Değiştir",
+    "app.actionsBar.muteLabel": "Sustur",
+    "app.actionsBar.unmuteLabel": "Konuştur",
+    "app.actionsBar.camOffLabel": "Kamera Devre Dışı",
+    "app.actionsBar.raiseLabel": "El Kaldır",
+    "app.actionsBar.label": "Eylem Çubuğu",
+    "app.submenu.application.applicationSectionTitle": "Uygulama",
+    "app.submenu.application.audioAlertLabel": "Sohbet Sesli Uyarıları",
+    "app.submenu.application.pushAlertLabel": "Sohbet Açılır Pencere Uyarıları",
+    "app.submenu.application.fontSizeControlLabel": "Yazı büyüklüğü",
+    "app.submenu.application.increaseFontBtnLabel": "Uygulama Yazı Büyüklüğünü Artır",
+    "app.submenu.application.decreaseFontBtnLabel": "Uygulama Yazı Büyüklüğünü Azalt",
+    "app.submenu.application.languageLabel": "Uygulama Dili",
+    "app.submenu.application.ariaLanguageLabel": "Uygulama Dilini Değiştir",
+    "app.submenu.application.languageOptionLabel": "Dil seçin",
+    "app.submenu.application.noLocaleOptionLabel": "Aktif yerel ayar bulunamadı",
+    "app.submenu.audio.micSourceLabel": "Mikrofon kaynağı",
+    "app.submenu.audio.speakerSourceLabel": "Hoparlör kaynağı",
+    "app.submenu.audio.streamVolumeLabel": "Sesinizin seviyesi",
+    "app.submenu.video.title": "Video",
+    "app.submenu.video.videoSourceLabel": "Görüntü kaynağı",
+    "app.submenu.video.videoOptionLabel": "Görüntü kaynağını seç",
+    "app.submenu.video.videoQualityLabel": "Video Kalitesi",
+    "app.submenu.video.qualityOptionLabel": "Video kalitesini seç",
+    "app.submenu.video.participantsCamLabel": "Katılımcıların web kameraları görüntüleniyor",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Altyazı",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Sahiplik al",
+    "app.submenu.closedCaptions.languageLabel": "Dil",
+    "app.submenu.closedCaptions.localeOptionLabel": "Dil seçin",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Aktif yerel ayar bulunamadı",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Yazı tipi",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Yazı tipini Seç",
+    "app.submenu.closedCaptions.fontSizeLabel": "Yazı büyüklüğü",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Yazı büyüklüğünü Seç",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Arkalan rengi",
+    "app.submenu.closedCaptions.fontColorLabel": "Yazı rengi",
+    "app.submenu.participants.muteAllLabel": "Sunucu hariç tümünü sustur",
+    "app.submenu.participants.lockAllLabel": "Tüm katılımcıları kilitle",
+    "app.submenu.participants.lockItemLabel": "Katılımcılar {0}",
+    "app.submenu.participants.lockMicDesc": "Tüm kilitli katılımcıların mikrofonunu devre dışı bırakır",
+    "app.submenu.participants.lockCamDesc": "Tüm kilitli katılımcıların web kamerasını devre dışı bırakır",
+    "app.submenu.participants.lockPublicChatDesc": "Tüm kilitli katılımcılar için genel sohbeti devre dışı bırakır",
+    "app.submenu.participants.lockPrivateChatDesc": "Tüm kilitli katılımcılar için özel sohbeti devre dışı bırakır",
+    "app.submenu.participants.lockLayoutDesc": "Tüm kilitli katılımcıların ekran görünümünü kilitler",
+    "app.submenu.participants.lockMicAriaLabel": "Mikrofon kilidi",
+    "app.submenu.participants.lockCamAriaLabel": "Web kamera kilidi",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Genel sohbet kilidi",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Özel sohbet kilidi",
+    "app.submenu.participants.lockLayoutAriaLabel": "Görünüm kilidi",
+    "app.submenu.participants.lockMicLabel": "Mikrofon",
+    "app.submenu.participants.lockCamLabel": "Web Kamerası",
+    "app.submenu.participants.lockPublicChatLabel": "Genel Sohbet",
+    "app.submenu.participants.lockPrivateChatLabel": "Özel Sohbet",
+    "app.submenu.participants.lockLayoutLabel": "Görünüm",
+    "app.settings.applicationTab.label": "Uygulama ",
+    "app.settings.audioTab.label": "Ses",
+    "app.settings.videoTab.label": "Video",
+    "app.settings.closedcaptionTab.label": "Altyazı",
+    "app.settings.usersTab.label": "Katılımcılar",
+    "app.settings.main.label": "Ayarlar",
+    "app.settings.main.cancel.label": "Vazgeç",
+    "app.settings.main.cancel.label.description": "Değişiklikleri geri alır ve ayarlar menüsünü kapatır",
+    "app.settings.main.save.label": "Kaydet",
+    "app.settings.main.save.label.description": "Değişiklikleri kaydeder ve ayarlar menüsünü kapatır",
+    "app.settings.dataSavingTab.label": "Veri Kazancı",
+    "app.settings.dataSavingTab.webcam": "Kameraları Etkinleştir",
+    "app.settings.dataSavingTab.screenShare": "Masaüstü Paylaşımını Etkinleştir",
+    "app.settings.dataSavingTab.description": "Bant genişliğinden tasarruf etmek için mevcut gösterimi ayarlayın.",
+    "app.switch.onLabel": "AÇIK",
+    "app.switch.offLabel": "KAPALI",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Eylemler",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Bir sunum yükle",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Oylama başlat",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Ekranını paylaş",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Ekran paylaşımını sonlandır",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Sunumunuzu yükleyin",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Oylama başlat",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Ekranını diğerleriyle paylaş",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Ekran genişliği paylaşımını sonlandır",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "Durum Belirle",
+    "app.actionsBar.emojiMenu.awayLabel": "Dışarıda",
+    "app.actionsBar.emojiMenu.awayDesc": "Durumunu dışarıda yap",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "El Kaldır",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Soru sormak için el kaldırın",
+    "app.actionsBar.emojiMenu.neutralLabel": "Kararsız",
+    "app.actionsBar.emojiMenu.neutralDesc": "Durumunu kararsız yap",
+    "app.actionsBar.emojiMenu.confusedLabel": "Şaşırmış",
+    "app.actionsBar.emojiMenu.confusedDesc": "Durumunu şaşırmış yap",
+    "app.actionsBar.emojiMenu.sadLabel": "Üzgün",
+    "app.actionsBar.emojiMenu.sadDesc": "Durumunu üzgün yap",
+    "app.actionsBar.emojiMenu.happyLabel": "Mutlu",
+    "app.actionsBar.emojiMenu.happyDesc": "Durumunu mutlu yap",
+    "app.actionsBar.emojiMenu.noneLabel": "Durum Temizle",
+    "app.actionsBar.emojiMenu.noneDesc": "Durumunu temizle",
+    "app.actionsBar.emojiMenu.applauseLabel": "Alkış",
+    "app.actionsBar.emojiMenu.applauseDesc": "Durumunu alkış yap",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Beğendim",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Durumunu beğendi yap",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Beğenmedim",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Durumunu beğenmedi yap",
+    "app.actionsBar.currentStatusDesc": "şimdiki durum {0}",
+    "app.audioNotification.audioFailedError1001": "Hata 1001: WebSocket bağlantısı koptu",
+    "app.audioNotification.audioFailedError1002": "Hata 1002: WebSocket bağlantısı oluşturulamadı",
+    "app.audioNotification.audioFailedError1003": "Hata 1003: Web tarayıcının sürümü desteklenmiyor",
+    "app.audioNotification.audioFailedError1004": "Hata 1004: Arama hatası",
+    "app.audioNotification.audioFailedError1005": "Hata 1005: Arama beklenmedik şekilde sonlandı",
+    "app.audioNotification.audioFailedError1006": "Hata 1006: Arama zaman aşımına uğradı",
+    "app.audioNotification.audioFailedError1007": "Hata 1007: ICE Bilgi ve İçerik iletişimi başarısız oldu",
+    "app.audioNotification.audioFailedError1008": "Hata 1008: Aktarım başarısız oldu",
+    "app.audioNotification.audioFailedError1009": "Hata 1009: STUN/TURN sunucu bilgisi algılamadı",
+    "app.audioNotification.audioFailedError1010": "Hata 1010: ICE Bilgi ve İçerik iletişimi zaman aşımına uğradı",
+    "app.audioNotification.audioFailedError1011": "Hata 1011: ICE Bilgi ve İçerik toplanması zaman aşımına uğradı",
+    "app.audioNotification.audioFailedMessage": "Ses bağlantınız sağlanamadı",
+    "app.audioNotification.mediaFailedMessage": "Kullanıcının mikrofonuna erişim başarısız oldu. Yalnızca güvenli kaynaklara izin veriliyor.",
+    "app.audioNotification.closeLabel": "Kapat",
+    "app.breakoutJoinConfirmation.title": "Özel Odaya Katıl",
+    "app.breakoutJoinConfirmation.message": "Katılmak istiyor musunuz?",
+    "app.breakoutJoinConfirmation.confirmLabel": "Katıl",
+    "app.breakoutJoinConfirmation.confirmDesc": "Özel Odaya katılın",
+    "app.breakoutJoinConfirmation.dismissLabel": "Vazgeç",
+    "app.breakoutJoinConfirmation.dismissDesc": "Özel Odaya Katılımı reddeder ve kapatır",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Katılacağınız Özel Odayı seçin",
+    "app.breakoutTimeRemainingMessage": "Özel Oda kalan süre: {0}",
+    "app.breakoutWillCloseMessage": "Süre bitti. Özel Oda birazdan kapanacak",
+    "app.calculatingBreakoutTimeRemaining": "Kalan süre hesaplanıyor...",
+    "app.audioModal.microphoneLabel": "Mikrofon",
+    "app.audioModal.listenOnlyLabel": "Yalnızca Dinle",
+    "app.audioModal.audioChoiceLabel": "Sesli katılımınızı nasıl yapmak istersiniz?",
+    "app.audioModal.iOSErrorRecommendation": "Safari iOS kullanmanızı tavsiye ederiz.",
+    "app.audioModal.audioChoiceDesc": "Bu görüşmede sesli katılımınızı nasıl yapmak istediğinizi seçin",
+    "app.audioModal.closeLabel": "Kapat",
+    "app.audioModal.yes": "Evet",
+    "app.audioModal.no": "Hayır",
+    "app.audioModal.yes.arialabel" : "Yankı duyulur",
+    "app.audioModal.no.arialabel" : "Yankı duyulmaz",
+    "app.audioModal.echoTestTitle": "Bu bir özel ses testidir. Birkaç kelime konuşun. Sesinizi duydunuz mu?",
+    "app.audioModal.settingsTitle": "Ses ayarlarınızı değiştirin",
+    "app.audioModal.helpTitle": "Medya cihazlarınızla ilgili bir problemi oluştu",
+    "app.audioModal.helpText": "BigBlueButton'ın mikrofonunuza erişim talebini onayladınız mı? Sesli görüşmeye katılmak istediğinizde, medya cihazlarınıza erişim izniyle ilgili bir iletişim kutusu görünecektir, sesli görüşmeye katılabilmek için onay vermeniz gerekir. Eğer onay iletişim kutusu görünmediyse, web tarayıcınızın ayarlarındaki mikrofon izinlerini değiştirmeyi deneyin.",
+    "app.audioModal.connecting": "Bağlanıyor",
+    "app.audioModal.connectingEchoTest": "Ses testine bağlanılıyor",
+    "app.audioManager.joinedAudio": "Sesli görüşmeye katıldınız",
+    "app.audioManager.joinedEcho": "Ses yankı testine katıldınız",
+    "app.audioManager.leftAudio": "Sesli görüşmeden ayrıldınız",
+    "app.audioManager.genericError": "Hata: Bir hata oluştu, lütfen tekrar deneyin",
+    "app.audioManager.connectionError": "Hata: Bağlantı hatası",
+    "app.audioManager.requestTimeout": "Hata: İstek zaman aşımına uğradı",
+    "app.audioManager.invalidTarget": "Hata: Geçersiz hedeften talep denemesi hatası",
+    "app.audioManager.mediaError": "Hata: Medya cihazlarınıza erişim problemi oluştu",
+    "app.audio.joinAudio": "Sesli Katıl",
+    "app.audio.leaveAudio": "Sesli Katılımı Kapat",
+    "app.audio.enterSessionLabel": "Oturuma Katıl",
+    "app.audio.playSoundLabel": "Sesi Oynat",
+    "app.audio.backLabel": "Geri",
+    "app.audio.audioSettings.titleLabel": "Ses ayarlarınızı seçin",
+    "app.audio.audioSettings.descriptionLabel": "Web tarayıcınızda mikrofon paylaşımıyla ilgili iletişim kutusu görünecektir, onaylamayı unutmayınız.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Mikrofon kaynağı",
+    "app.audio.audioSettings.speakerSourceLabel": "Hoparlör kaynağı",
+    "app.audio.audioSettings.microphoneStreamLabel": "Sesinizin seviyesi",
+    "app.audio.audioSettings.retryLabel": "Yeniden Dene",
+    "app.audio.listenOnly.backLabel": "Geri",
+    "app.audio.listenOnly.closeLabel": "Kapat",
+    "app.audio.permissionsOverlay.title": "BigBlueButton'un Medya Cihazlarınızı kullanmasına izin verin",
+    "app.audio.permissionsOverlay.hint": "Sizi sesli görüşmeye katabilmemiz için Medya Cihazlarınıza erişimimize izin vermeniz gerekir :)",
+    "app.error.removed": "Konferanstan uzaklaştırıldınız",
+    "app.error.meeting.ended": "Konferanstan ayrıldınız",
+    "app.dropdown.close": "Kapat",
+    "app.error.500": "Hops, birşeyler ters gitti",
+    "app.error.404": "Bulunamadı",
+    "app.error.401": "Yetkisiz",
+    "app.error.403": "Yasaklı",
+    "app.error.leaveLabel": "Tekrar giriş yap",
+    "app.guest.waiting": "Katılım onayı bekleniyor",
+    "app.toast.breakoutRoomEnded": "Özel sonlandı. Lütfen sesli görüşmeye yeniden katılın.",
+    "app.toast.chat.public": "Yeni Genel Sohbet mesajı",
+    "app.toast.chat.private": "Yeni Özel Sohbet mesajı",
+    "app.toast.chat.system": "Sistem",
+    "app.notification.recordingStart": "Bu oturum şu anda kaydediliyor",
+    "app.notification.recordingStop": "Bu oturum artık kaydedilmiyor",
+    "app.shortcut-help.title": "Kısayol Tuşları",
+    "app.shortcut-help.accessKeyNotAvailable": "Erişim tuşları hazır değil",
+    "app.shortcut-help.comboLabel": "Açılan Kutu",
+    "app.shortcut-help.functionLabel": "Fonksiyon",
+    "app.shortcut-help.closeLabel": "Kapat",
+    "app.shortcut-help.closeDesc": "Kısayol kipini kapatır",
+    "app.shortcut-help.openOptions": "Seçenekleri Aç",
+    "app.shortcut-help.toggleUserList": "Kullanıcı Listesine Geç",
+    "app.shortcut-help.toggleMute": "Sustur / Konuştur",
+    "app.shortcut-help.togglePublicChat": "Genel Sohbete Geç (Kullanıcı Listesi açık olmalıdır)",
+    "app.shortcut-help.hidePrivateChat": "Özel Sohbeti Gizle",
+    "app.shortcut-help.closePrivateChat": "Özel Sohbeti Kapat",
+    "app.shortcut-help.openActions": "Eylem Menüsünü Aç",
+    "app.shortcut-help.openStatus": "Durum Menüsünü Aç",
+    "app.lock-viewers.webcamLabel": "Web Kamerası",
+    "app.lock-viewers.microphoneLable": "Mikrofon",
+    "app.lock-viewers.PublicChatLabel": "Genel Sohbet",
+    "app.lock-viewers.PrivateChatLable": "Özel Sohbet",
+    "app.lock-viewers.Layout": "Görünüm",
+    "app.videoPreview.cancelLabel": "Vazgeç",
+    "app.videoPreview.closeLabel": "Kapat",
+    "app.video.joinVideo": "Kamera Paylaş",
+    "app.video.leaveVideo": "Kamera Paylaşma",
+    "app.video.iceCandidateError": "ICE adayı ekleme hatası",
+    "app.video.permissionError": "Kamera paylaşımı hatası. Lütfen izinleri kontrol edin.",
+    "app.video.sharingError": "Kamera paylaşımı hatası",
+    "app.video.notFoundError": "Web kamerası bulunamadı. Lütfen bağlı olduğunu kontrol edin.",
+    "app.video.swapCam": "Değiştir",
+    "app.video.swapCamDesc": "Kameraların yönünü değiştir",
+    "app.video.videoMenu": "Video menüsü",
+    "app.video.videoMenuDisabled": "Ayarlarda Video menüsü Kamera devre dışı",
+    "app.video.videoMenuDesc": "Video menüsünü liste olarak aç",
+    "app.video.chromeExtensionError": "Yüklemeniz gerekiyor",
+    "app.video.chromeExtensionErrorLink": "Chrome Uzantısı",
+    "app.video.stats.title": "Bağlantı İstatistikleri",
+    "app.video.stats.packetsReceived": "Gelen paketler",
+    "app.video.stats.packetsSent": "Giden paketler",
+    "app.video.stats.packetsLost": "Kayıp paketler",
+    "app.video.stats.bitrate": "Bit hızı",
+    "app.video.stats.lostPercentage": "Toplam kayıp yüzdesi",
+    "app.video.stats.lostRecentPercentage": "Son kayıp yüzdesi",
+    "app.video.stats.dimensions": "Boyutlar",
+    "app.video.stats.codec": "Kodek",
+    "app.meeting.endNotification.ok.label": "TAMAM",
+    "app.whiteboard.toolbar.tools": "Araçlar",
+    "app.whiteboard.toolbar.tools.pencil": "Kalem",
+    "app.whiteboard.toolbar.tools.rectangle": "Dikdörtgen",
+    "app.whiteboard.toolbar.tools.triangle": "Üçgen",
+    "app.whiteboard.toolbar.tools.ellipse": "Elips",
+    "app.whiteboard.toolbar.tools.line": "Çizgi",
+    "app.whiteboard.toolbar.tools.text": "Metin",
+    "app.whiteboard.toolbar.thickness": "Çizim Kalınlığı",
+    "app.whiteboard.toolbar.thicknessDisabled": "Çizim Kalınlığı Devredışı",
+    "app.whiteboard.toolbar.color": "Renkler",
+    "app.whiteboard.toolbar.colorDisabled": "Renkler Devredışı",
+    "app.whiteboard.toolbar.color.black": "Siyah",
+    "app.whiteboard.toolbar.color.white": "Beyaz",
+    "app.whiteboard.toolbar.color.red": "Kırmızı",
+    "app.whiteboard.toolbar.color.orange": "Turuncu",
+    "app.whiteboard.toolbar.color.lime": "Açık Yeşil",
+    "app.whiteboard.toolbar.color.cyan": "Cam Göbeği",
+    "app.whiteboard.toolbar.color.dodgerBlue": "Hile Mavisi",
+    "app.whiteboard.toolbar.color.blue": "Mavi",
+    "app.whiteboard.toolbar.color.violet": "Menekşe",
+    "app.whiteboard.toolbar.color.magenta": "Fuşya",
+    "app.whiteboard.toolbar.color.silver": "Gümüş",
+    "app.whiteboard.toolbar.undo": "Ek Açıklamayı Geri Al",
+    "app.whiteboard.toolbar.clear": "Tüm Ek Açıklamaları Temizle",
+    "app.whiteboard.toolbar.multiUserOn": "Çoklu kullanıcı modunu aç",
+    "app.whiteboard.toolbar.multiUserOff": "Çoklu kullanıcı modunu kapat",
+    "app.whiteboard.toolbar.fontSize": "Yazı Tipi Büyüklüğü Listesi",
+    "app.feedback.title": "Konferanstan ayrıldınız",
+    "app.feedback.subtitle": "BigBlueButton deneyiminizi bizimle paylaşın (zorunlu değil)",
+    "app.feedback.textarea": "BigBlueButton'ı nasıl daha iyi yapabiliriz?",
+    "app.feedback.sendFeedback": "Geri bildirim yap",
+    "app.feedback.sendFeedbackDesc": "Geri bildirim yap ve görüşmeden ayrıl",
+    "app.videoDock.webcamFocusLabel": "Odakla",
+    "app.videoDock.webcamFocusDesc": "Seçili kamerayı odakla",
+    "app.videoDock.webcamUnfocusLabel": "Uzaklaş",
+    "app.videoDock.webcamUnfocusDesc": "Seçili kameradan uzaklaş",
+    "app.createBreakoutRoom.joinAudio": "Sesli Katıl",
+    "app.externalVideo.close": "Kapat"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/uk_UA.json b/bigbluebutton-html5/private/locales/uk_UA.json
new file mode 100644
index 0000000000..d6aa737db4
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/uk_UA.json
@@ -0,0 +1,406 @@
+{
+    "app.home.greeting": "Ласкаво просимо {0}! Ваша презентація почнеться найближчим часом... ",
+    "app.chat.submitLabel": "Надіслати повідомлення",
+    "app.chat.errorMinMessageLength": "Повідомлення із {0} символа(-ів) занадто коротке",
+    "app.chat.errorMaxMessageLength": "Повідомлення із {0} символа(-ів) занадто довге",
+    "app.chat.inputLabel": "Введення повідомлення для чату {0}",
+    "app.chat.inputPlaceholder": "Повідомлення {0}",
+    "app.chat.titlePublic": "Загальний чат",
+    "app.chat.titlePrivate": "Приватний чат з {0}",
+    "app.chat.partnerDisconnected": "{0} покинув конференцію",
+    "app.chat.closeChatLabel": "Закрити {0}",
+    "app.chat.hideChatLabel": "Приховати {0}",
+    "app.chat.moreMessages": "Більше повідомлень нижче",
+    "app.chat.dropdown.options": "Параметри чату",
+    "app.chat.dropdown.clear": "Очистити",
+    "app.chat.dropdown.copy": "Скопіювати",
+    "app.chat.dropdown.save": "Зберегти",
+    "app.chat.label": "Чат",
+    "app.chat.emptyLogLabel": "Журнал чату порожній",
+    "app.chat.clearPublicChatMessage": "Історія публічного чату була очищена модератором",
+    "app.userList.usersTitle": "Користувачі",
+    "app.userList.participantsTitle": "Учасники",
+    "app.userList.messagesTitle": "Повідомлення",
+    "app.userList.presenter": "Ведучий",
+    "app.userList.you": "Ви",
+    "app.userList.locked": "Заблокований",
+    "app.userList.label": "Список користувачів",
+    "app.userList.toggleCompactView.label": "Увімкнути/вимкнути компактний вид",
+    "app.userList.guest": "Гість",
+    "app.userList.menuTitleContext": "Доступні опції",
+    "app.userList.chatListItem.unreadSingular": "{0} нове повідомлення",
+    "app.userList.chatListItem.unreadPlural": "{0} нових повідомлень",
+    "app.userList.menu.chat.label": "Чат",
+    "app.userList.menu.clearStatus.label": "Очистити статус",
+    "app.userList.menu.makePresenter.label": "Зробити ведучим",
+    "app.userList.menu.removeUser.label": "Виключити користувача",
+    "app.userList.menu.muteUserAudio.label": "Вимкнути мікрофон користувача",
+    "app.userList.menu.unmuteUserAudio.label": "Увімкнути мікрофон користувача",
+    "app.userList.userAriaLabel": "{0} {1} {2}  Статус {3}",
+    "app.userList.menu.promoteUser.label": "Підвищити до модератора",
+    "app.userList.menu.demoteUser.label": "Понизити до глядача",
+    "app.media.label": "Медія",
+    "app.media.screenshare.start": "Демонстрація екрану розпочалася",
+    "app.media.screenshare.end": "Демонстрацію екрану закінчено",
+    "app.media.screenshare.safariNotSupported": "Демонстрація екрану наразі не підтримується Safari. Будь ласка, використовуйте Firefox або Google Chrome.",
+    "app.meeting.ended": "Ця сесія завершилася",
+    "app.meeting.endedMessage": "Ви будете перенаправлені на головний екран",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Попередній слайд",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Перемкнути презентацію на попередній слайд",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Наступний слайд",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Перемкнути презентацію на наступний слайд",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Пропустити слайд",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Перемкнути презентацію на вказаний слайд",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Підігнати по ширині",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Показати всю ширину слайда",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Підігнати до екрана",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Показати весь слайд",
+    "app.presentation.presentationToolbar.zoomLabel": "Масштаб",
+    "app.presentation.presentationToolbar.zoomDesc": "Змінити масштаб презентації",
+    "app.presentation.presentationToolbar.fitToWidth": "Підігнати по ширині",
+    "app.presentation.presentationToolbar.goToSlide": "Слайд {0}",
+    "app.presentationUploder.title": "Презентація",
+    "app.presentationUploder.message": "Як ведучий у BigBlueButton, ви маєте можливість завантажувати будь-який офісний документ або файл PDF. Ми рекомендуємо завантажувати файл PDF для отримання найкращих результатів.",
+    "app.presentationUploder.confirmLabel": "Почати",
+    "app.presentationUploder.confirmDesc": "Зберегти зміни та розпочати презентацію",
+    "app.presentationUploder.dismissLabel": "Відмінити",
+    "app.presentationUploder.dismissDesc": "Закрити вікно зображення та скасувати зміни",
+    "app.presentationUploder.dropzoneLabel": "Перетягніть файли сюди, щоб завантажити",
+    "app.presentationUploder.browseFilesLabel": "або виберіть файл",
+    "app.presentationUploder.fileToUpload": "Щоб завантажити",
+    "app.presentationUploder.currentBadge": "Поточний",
+    "app.presentationUploder.genericError": "Ой, щось пішло не так",
+    "app.presentationUploder.upload.progress": "Завантаження ({0}%)",
+    "app.presentationUploder.upload.413": "Файл занадто великий",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Обробка сторінки {0} з {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Файл конвертується...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Генерування мініатюр...",
+    "app.presentationUploder.conversion.generatedSlides": "Слайди генеруються...",
+    "app.presentationUploder.conversion.generatingSvg": "Генерація слайдів SVG...",
+    "app.presentationUploder.conversion.pageCountExceeded": "Ой, кількість сторінок перевищила ліміт",
+    "app.presentationUploder.conversion.timeout": "Ой, перетворення займає надто багато часу",
+    "app.poll.closeLabel": "Закрити",
+    "app.poll.liveResult.usersTitle": "Користувачі",
+    "app.polling.pollingTitle": "Варіанти опитування",
+    "app.polling.pollAnswerLabel": "Результат опитування {0}",
+    "app.polling.pollAnswerDesc": "Виберіть цей варіант щоб проголосувати за {0}",
+    "app.failedMessage": "Вибачте, проблеми з підключенням до сервера.",
+    "app.connectingMessage": "З'єднання...",
+    "app.waitingMessage": "Втрачено з'еднання. Спроба повторного підключення через {0} секунд...",
+    "app.navBar.settingsDropdown.optionsLabel": "Опції",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Розгорнути на весь екран",
+    "app.navBar.settingsDropdown.settingsLabel": "Відкрити параметри",
+    "app.navBar.settingsDropdown.aboutLabel": "Про програму",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Вихід",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Вийти з повноекранного режиму",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Розгорнути меню параметрів на весь екран",
+    "app.navBar.settingsDropdown.settingsDesc": "Змінити загальні параметри",
+    "app.navBar.settingsDropdown.aboutDesc": "Показати інформацію про клієнта",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Залишити конференцію",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Вийти з повноекранного режиму",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Швидкі клавіши",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Перелік наявних швидких клавіш",
+    "app.navBar.settingsDropdown.helpLabel": "Допомога",
+    "app.navBar.settingsDropdown.helpDesc": "Посилає користувача на відеоролики",
+    "app.navBar.userListToggleBtnLabel": "Увімкнути/вимкнути список користувачів",
+    "app.navBar.toggleUserList.ariaLabel": "Увімкнути/вимкнути Користувачів та Повідомлення",
+    "app.navBar.toggleUserList.newMessages": "зі сповіщенням про нове повідомлення",
+    "app.navBar.recording": "Ця сесія записується",
+    "app.navBar.recording.on": "Записується",
+    "app.navBar.recording.off": "Не записується",
+    "app.leaveConfirmation.confirmLabel": "Вийти",
+    "app.leaveConfirmation.confirmDesc": "Вийти з конференції",
+    "app.endMeeting.yesLabel": "Так",
+    "app.endMeeting.noLabel": "Ні",
+    "app.about.title": "Про програму",
+    "app.about.version": "Збірка клієнта:",
+    "app.about.copyright": "Авторське право:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Відміна",
+    "app.about.dismissDesc": "Закрити інформацію про клієнта",
+    "app.actionsBar.changeStatusLabel": "Змінити статус",
+    "app.actionsBar.muteLabel": "Вимкнути мікрофон",
+    "app.actionsBar.unmuteLabel": "Увімкнути мікрофон",
+    "app.actionsBar.camOffLabel": "Вимкнути камеру",
+    "app.actionsBar.raiseLabel": "Підняти",
+    "app.actionsBar.label": "Панель дій",
+    "app.submenu.application.applicationSectionTitle": "Застосунок",
+    "app.submenu.application.audioAlertLabel": "Аудіо сповіщення для чату",
+    "app.submenu.application.pushAlertLabel": "Спливаючі сповіщення для чату",
+    "app.submenu.application.fontSizeControlLabel": "Розмір шрифту",
+    "app.submenu.application.increaseFontBtnLabel": "Збільшити шрифт застосунку",
+    "app.submenu.application.decreaseFontBtnLabel": "Зменшити шрифт застосунку",
+    "app.submenu.application.languageLabel": "Мова застосунку",
+    "app.submenu.application.ariaLanguageLabel": "Змінити мову застосунку",
+    "app.submenu.application.languageOptionLabel": "Вибрати мову",
+    "app.submenu.application.noLocaleOptionLabel": "Відсутні доступні переклади",
+    "app.submenu.audio.micSourceLabel": "Джерело мікрофона",
+    "app.submenu.audio.speakerSourceLabel": "Джерело динаміків",
+    "app.submenu.audio.streamVolumeLabel": "Гучність аудіо потоку",
+    "app.submenu.video.title": "Відео",
+    "app.submenu.video.videoSourceLabel": "Джерело відео",
+    "app.submenu.video.videoOptionLabel": "Виберіть джерело відео",
+    "app.submenu.video.videoQualityLabel": "Якість відео",
+    "app.submenu.video.qualityOptionLabel": "Виберіть якість відео",
+    "app.submenu.video.participantsCamLabel": "Перегляд веб-камер учасників",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Субтитри",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Перехопити",
+    "app.submenu.closedCaptions.languageLabel": "Мова",
+    "app.submenu.closedCaptions.localeOptionLabel": "Виберіть мову",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "Відсутні доступні переклади",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Шрифт",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Виберіть шрифт",
+    "app.submenu.closedCaptions.fontSizeLabel": "Розмір шрифту",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Виберіть розмір шрифту",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Колір фону",
+    "app.submenu.closedCaptions.fontColorLabel": "Колір шрифта",
+    "app.submenu.participants.muteAllLabel": "Вимкнути мікрофони у всіх окрім ведучого",
+    "app.submenu.participants.lockAllLabel": "Заблокувати всіх учасників",
+    "app.submenu.participants.lockItemLabel": "Учасники {0}",
+    "app.submenu.participants.lockMicDesc": "Вимикає мікрофони усіх заблокованих учасників",
+    "app.submenu.participants.lockCamDesc": "Вимикає веб-камери усіх заблокованих учасників",
+    "app.submenu.participants.lockPublicChatDesc": "Вимикає загальний чат для усіх заблокованих учасників",
+    "app.submenu.participants.lockPrivateChatDesc": "Вимикає приватний чат для усіх заблокованих учасників",
+    "app.submenu.participants.lockLayoutDesc": "Блокує розміщення вікон для усіх заблокованих учасників",
+    "app.submenu.participants.lockMicAriaLabel": "Блокувати мікрофон",
+    "app.submenu.participants.lockCamAriaLabel": "Блокувати веб-камеру",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Блокувати публічний чат",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Блокувати приватний чат",
+    "app.submenu.participants.lockLayoutAriaLabel": "Блокувати розміщення вікон",
+    "app.submenu.participants.lockMicLabel": "Мікрофон",
+    "app.submenu.participants.lockCamLabel": "Веб-камера",
+    "app.submenu.participants.lockPublicChatLabel": "Публічний чат",
+    "app.submenu.participants.lockPrivateChatLabel": "Приватний чат",
+    "app.submenu.participants.lockLayoutLabel": "Розміщення вікон",
+    "app.settings.applicationTab.label": "Застосунок",
+    "app.settings.audioTab.label": "Аудіо",
+    "app.settings.videoTab.label": "Відео",
+    "app.settings.closedcaptionTab.label": "Субтитри",
+    "app.settings.usersTab.label": "Учасники",
+    "app.settings.main.label": "Налаштування",
+    "app.settings.main.cancel.label": "Відмінити",
+    "app.settings.main.cancel.label.description": "Відміняє зміни та закриває меню налаштувань",
+    "app.settings.main.save.label": "Зберегти",
+    "app.settings.main.save.label.description": "Зберігає зміни та закриває меню налаштувань",
+    "app.settings.dataSavingTab.label": "Збереження даних",
+    "app.settings.dataSavingTab.webcam": "Увімкнути веб-камери",
+    "app.settings.dataSavingTab.screenShare": "Увімкнути демонстрацію робочого столу",
+    "app.settings.dataSavingTab.description": "Щоб зберегти пропускну здатність, виберіть що зараз буде відображатись.",
+    "app.switch.onLabel": "УВІМК.",
+    "app.switch.offLabel": "ВИМК.",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Дії",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Завантажити презентацію",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Розпочати опитування",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Демонструвати ваш екран",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Зупинити демонстрацію екрану",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Завантажити вашу презентацію",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Розпочати опитування",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Демонструвати ваш екран іншим учасникам",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Зупинити демонстрацію екрану",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "Встановити статус",
+    "app.actionsBar.emojiMenu.awayLabel": "Відійшов",
+    "app.actionsBar.emojiMenu.awayDesc": "Змінює ваш статус на "Відійшов"",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Підняти руку",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Підняти руку щоб поставити питання",
+    "app.actionsBar.emojiMenu.neutralLabel": "Не визначився",
+    "app.actionsBar.emojiMenu.neutralDesc": "Змінює ваш статус на "Не визначився"",
+    "app.actionsBar.emojiMenu.confusedLabel": "Збентежений",
+    "app.actionsBar.emojiMenu.confusedDesc": "Змінює ваш статус на "Збентежений"",
+    "app.actionsBar.emojiMenu.sadLabel": "Сумний",
+    "app.actionsBar.emojiMenu.sadDesc": "Змінює ваш статус на "Сумний"",
+    "app.actionsBar.emojiMenu.happyLabel": "Щасливий",
+    "app.actionsBar.emojiMenu.happyDesc": "Змінює ваш статус на "Щасливий"",
+    "app.actionsBar.emojiMenu.noneLabel": "Очистити статус",
+    "app.actionsBar.emojiMenu.noneDesc": "Очищує ваш статус",
+    "app.actionsBar.emojiMenu.applauseLabel": "Оплески",
+    "app.actionsBar.emojiMenu.applauseDesc": "Змінює ваш статус на "Оплески"",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Подобається",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Змінює ваш статус на "Подобається"",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Не подобається",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Змінює ваш статус на "Не подобається"",
+    "app.actionsBar.currentStatusDesc": "нинішній статус {0}",
+    "app.audioNotification.audioFailedError1001": "Помилка 1001: WebSocket відключено",
+    "app.audioNotification.audioFailedError1002": "Помилка 1002: Не вдалось встановити з'єднання WebSocket",
+    "app.audioNotification.audioFailedError1003": "Помилка 1003: Версія браузера не підтримується",
+    "app.audioNotification.audioFailedError1004": "Помилка 1004: Збій виклика",
+    "app.audioNotification.audioFailedError1005": "Помилка 1005: Виклик раптово перервався",
+    "app.audioNotification.audioFailedError1006": "Помилка 1006: Час дзвінка минув",
+    "app.audioNotification.audioFailedError1007": "Помилка 1007: Узгодження ICE не відбулось",
+    "app.audioNotification.audioFailedError1008": "Помилка 1008: Передача не вдалась",
+    "app.audioNotification.audioFailedError1009": "Помилка 1009: Не вдалось отримати STUN/TURN інформацію з серверу",
+    "app.audioNotification.audioFailedError1010": "Помилка 1010: Час узгодження ICE вичерпано",
+    "app.audioNotification.audioFailedError1011": "Помилка 1011: Перевищено час збору ICE",
+    "app.audioNotification.audioFailedMessage": "Не вдалося встановити аудіо з'єднання",
+    "app.audioNotification.mediaFailedMessage": "Помилка getUserMicMedia, дозволені тільки безпечні джерела",
+    "app.audioNotification.closeLabel": "Закрити",
+    "app.audioNotificaion.reconnectingAsListenOnly": "Аудіо було заблоковано модератором, ви підключилися лише як слухач",
+    "app.breakoutJoinConfirmation.title": "Приєднатись до зустрічі",
+    "app.breakoutJoinConfirmation.message": "Чи хочете ви приєднатися до",
+    "app.breakoutJoinConfirmation.confirmLabel": "Приєднатися",
+    "app.breakoutJoinConfirmation.confirmDesc": "Приєднує вас до зустрічі",
+    "app.breakoutJoinConfirmation.dismissLabel": "Скасувати",
+    "app.breakoutJoinConfirmation.dismissDesc": "Закриває та відмовляє в приєднанні до зустрічі",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Виберіть конференцію до якої бажаєте під’єднатися",
+    "app.breakoutTimeRemainingMessage": "Час до закінчення конференції: {0}",
+    "app.breakoutWillCloseMessage": "Час вичерпано. Конференцію невдовзі буде закрито",
+    "app.calculatingBreakoutTimeRemaining": "Підрахунок часу що залишився...",
+    "app.audioModal.microphoneLabel": "Мікрофон",
+    "app.audioModal.listenOnlyLabel": "Тільки слухати",
+    "app.audioModal.audioChoiceLabel": "Як ви хочете увійти в аудіо-конференцію?",
+    "app.audioModal.iOSBrowser": "Аудіо/Відео не підтримується",
+    "app.audioModal.iOSErrorDescription": "Наразі аудіо та відео в Chrome для iOS не підтримуються.",
+    "app.audioModal.iOSErrorRecommendation": "Ми рекомендуємо використовувати Safari для iOS.",
+    "app.audioModal.audioChoiceDesc": "Виберіть як брати участь в аудіоконференції",
+    "app.audioModal.closeLabel": "Закрити",
+    "app.audioModal.yes": "Так",
+    "app.audioModal.no": "Ні",
+    "app.audioModal.yes.arialabel" : "Звучить ехо",
+    "app.audioModal.no.arialabel" : "Ехо не звучить",
+    "app.audioModal.echoTestTitle": "Це приватний ехо-тест. Промовте кілька слів. Чи чуєте ви себе в динаміках?",
+    "app.audioModal.settingsTitle": "Змінити налаштування аудіо",
+    "app.audioModal.helpTitle": "З'явилися проблеми з вашими аудіоприладами",
+    "app.audioModal.helpText": "Чи надали ви BigBlueButton дозвіл на доступ до мікрофона? Зверніть увагу що коли ви намагаєтеся приєднатися до аудіоконференції має з'явитися діалогове вікно запитуючи дозволи на підключення медіа-пристрою, будь ласка, прийміть це, щоб приєднатися до аудіоконференції. Якщо цього не відбулося спробуйте змінити дозволи мікрофона у налаштуваннях вашого веб-переглядача.",
+    "app.audioModal.connecting": "Підключення",
+    "app.audioModal.connectingEchoTest": "Підключення до ехо тесту",
+    "app.audioManager.joinedAudio": "Ви приєдналися до аудіоконференції",
+    "app.audioManager.joinedEcho": "Ви приєдналися до ехо тесту",
+    "app.audioManager.leftAudio": "Ви покинули аудіо конференцію",
+    "app.audioManager.genericError": "Помилка: Щось пішло не так, будь ласка, спробуйте ще раз",
+    "app.audioManager.connectionError": "Помилка: Підключення не вдалося",
+    "app.audioManager.requestTimeout": "Помилка: Час очікування підключення вичерпано",
+    "app.audioManager.invalidTarget": "Помилка: Спроба запросити що-небудь від невірної цілі",
+    "app.audioManager.mediaError": "Помилка: Виникли проблеми з вашими аудіопристроями",
+    "app.audio.joinAudio": "Приєднатися до аудіоконференції",
+    "app.audio.leaveAudio": "Залишити аудіоконференцію",
+    "app.audio.enterSessionLabel": "Підключитися до сеансу",
+    "app.audio.playSoundLabel": "Програти звук",
+    "app.audio.backLabel": "Назад",
+    "app.audio.audioSettings.titleLabel": "Виберіть налаштування звуку",
+    "app.audio.audioSettings.descriptionLabel": "Зверніть увагу, що в вашому браузері з'явиться діалогове вікно, що вимагає дозволу вашого мікрофона.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Джерело мікрофона",
+    "app.audio.audioSettings.speakerSourceLabel": "Джерело динаміків",
+    "app.audio.audioSettings.microphoneStreamLabel": "Гучність вашого аудіопотоку",
+    "app.audio.audioSettings.retryLabel": "Повторити",
+    "app.audio.listenOnly.backLabel": "Незад",
+    "app.audio.listenOnly.closeLabel": "Закрити",
+    "app.audio.permissionsOverlay.title": "Дозволити BigBlueButton використовувати ваші медіа-пристрої",
+    "app.audio.permissionsOverlay.hint": "Нам потрібно, щоб ви дозволили нам використовувати свої медіа-пристрої, щоб приєднатись до голосової конференції :)",
+    "app.error.removed": "Ви були вилучені з конференції",
+    "app.error.meeting.ended": "Ви вийшли з конференції",
+    "app.dropdown.close": "Закрити",
+    "app.error.500": "Ой, щось пішло не так",
+    "app.error.404": "Не знайдено",
+    "app.error.401": "Неавторизований",
+    "app.error.403": "Заборонено",
+    "app.error.leaveLabel": "Увійдіть знову",
+    "app.guest.waiting": "Очікування схвалення для приєднання",
+    "app.toast.breakoutRoomEnded": "Конференція закінчилася. Будь ласка, приєднайтесь знову до аудіо конференції.",
+    "app.toast.chat.public": "Нове повідомлення в публічному чаті",
+    "app.toast.chat.private": "Нове повідомлення в приватному чаті",
+    "app.toast.chat.system": "Система",
+    "app.notification.recordingStart": "Цей сеанс наразі записується",
+    "app.notification.recordingStop": "Цей сеанс більше не записується",
+    "app.shortcut-help.title": "Клавіші швидкого доступу",
+    "app.shortcut-help.accessKeyNotAvailable": "Ключі доступу недоступні.",
+    "app.shortcut-help.comboLabel": "Комбо",
+    "app.shortcut-help.functionLabel": "Функція",
+    "app.shortcut-help.closeLabel": "Закрити",
+    "app.shortcut-help.closeDesc": "Закриває модальні клавіші швидкого доступу",
+    "app.shortcut-help.openOptions": "Відкриває параметри",
+    "app.shortcut-help.toggleUserList": "Вмикає список користувачів",
+    "app.shortcut-help.toggleMute": "Вмикає / Вимикає мікрофон",
+    "app.shortcut-help.togglePublicChat": "Вмикає публічеий чат (Список користувачів має бути відкитим)",
+    "app.shortcut-help.hidePrivateChat": "Приховує приватний чат",
+    "app.shortcut-help.closePrivateChat": "Закриває приватний чат",
+    "app.shortcut-help.openActions": "Відкриває меню дій",
+    "app.shortcut-help.openStatus": "Відкриває меню статусу",
+    "app.lock-viewers.webcamLabel": "Веб-камера",
+    "app.lock-viewers.microphoneLable": "Мікрофон",
+    "app.lock-viewers.PublicChatLabel": "Публічний чат",
+    "app.lock-viewers.PrivateChatLable": "Приватний чат",
+    "app.lock-viewers.Layout": "Розміщення вікон",
+    "app.videoPreview.cancelLabel": "Відмінити",
+    "app.videoPreview.closeLabel": "Закрити",
+    "app.video.joinVideo": "Транслювати веб-камеру",
+    "app.video.leaveVideo": "Припинити транслювати веб-камеру",
+    "app.video.iceCandidateError": "Помилка при додаванні ice кандидата",
+    "app.video.iceConnectionStateError": "Помилка 1107: узгодження ICE не вдалося",
+    "app.video.permissionError": "Помилка при трансляції веб-камерию Будь ласка перевірте дозволи",
+    "app.video.sharingError": "Помилка при трансляції веб-камери",
+    "app.video.notFoundError": "Не вдалося знайти веб-камеру. Переконайтеся, що вона під'єднана",
+    "app.video.notAllowed": "Відсутній дозвіл на трансляцію веб-камери, будь ласка, переконайтеся, що ваш браузер має необхідні дозволи",
+    "app.video.notSupportedError": "Можна транслювати веб-камеру лише з безпечних джерел, переконайтеся, що сертифікат SSL дійсний",
+    "app.video.notReadableError": "Не вдалося отримати відео з веб-камери. Будь ласка, переконайтеся, що інша програма не використовує веб-камеру",
+    "app.video.swapCam": "Змінити",
+    "app.video.swapCamDesc": "поміняти напрямок веб-камер",
+    "app.video.videoMenu": "Меню відео",
+    "app.video.videoMenuDisabled": "Меню відео веб-камера відключено в налаштуваннях",
+    "app.video.videoMenuDesc": "Відкрити контекстне меню відео",
+    "app.video.chromeExtensionError": "Ви маєте встановити",
+    "app.video.chromeExtensionErrorLink": "Це розширення Chrome",
+    "app.video.stats.title": "Статистика з'єднань",
+    "app.video.stats.packetsReceived": "Пакети отримані",
+    "app.video.stats.packetsSent": "Пакети відправлені",
+    "app.video.stats.packetsLost": "Пакети втрачені",
+    "app.video.stats.bitrate": "Бітрейт",
+    "app.video.stats.lostPercentage": "Загальний відсоток втрачених",
+    "app.video.stats.lostRecentPercentage": "Нинішній відсоток втрачених",
+    "app.video.stats.dimensions": "Розміри",
+    "app.video.stats.codec": "Кодек",
+    "app.video.stats.decodeDelay": "Затримка декодування",
+    "app.video.stats.rtt": "RTT",
+    "app.video.stats.encodeUsagePercent": "Використання кодуванням",
+    "app.video.stats.currentDelay": "Поточна затримка",
+    "app.deskshare.iceConnectionStateError": "Помилка 1108: при з'єднанні екрана не вдалося підключити ICE",
+    "app.sfu.mediaServerConnectionError2000": "Помилка 2000: неможливо підключитися до медіасервера",
+    "app.sfu.mediaServerOffline2001": "Помилка 2001: медіасервер недоступний. Будь-ласка спробуйте пізніше.",
+    "app.sfu.mediaServerNoResources2002": "Помилка 2002: сервер медіа не має доступних ресурсів",
+    "app.sfu.mediaServerRequestTimeout2003": "Помилка 2003: вийшов час запиту на медіа сервер",
+    "app.sfu.serverIceGatheringFailed2021": "Помилка 2021: медіа сервер не може збирати ICE-кандидатів",
+    "app.sfu.serverIceGatheringFailed2022": "Помилка 2022: Медіа-серверу не вдалося ICE з’єднання ",
+    "app.sfu.invalidSdp2202":"Помилка 2202: Клієнт створив невірний SDP",
+    "app.sfu.noAvailableCodec2203": "Помилка 2203: сервер не зміг знайти відповідного кодека",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.whiteboard.toolbar.tools": "Інструменти",
+    "app.whiteboard.toolbar.tools.pencil": "Олівець",
+    "app.whiteboard.toolbar.tools.rectangle": "Чотирикутник",
+    "app.whiteboard.toolbar.tools.triangle": "Трикутник",
+    "app.whiteboard.toolbar.tools.ellipse": "Окружність",
+    "app.whiteboard.toolbar.tools.line": "Лінія",
+    "app.whiteboard.toolbar.tools.text": "Текст",
+    "app.whiteboard.toolbar.thickness": "Товщина малювання",
+    "app.whiteboard.toolbar.thicknessDisabled": "Товщину малювання вимкнуто",
+    "app.whiteboard.toolbar.color": "Кольори",
+    "app.whiteboard.toolbar.colorDisabled": "Кольори відключено",
+    "app.whiteboard.toolbar.color.black": "Чорний",
+    "app.whiteboard.toolbar.color.white": "Білий",
+    "app.whiteboard.toolbar.color.red": "Червоний",
+    "app.whiteboard.toolbar.color.orange": "Помаранчевий",
+    "app.whiteboard.toolbar.color.eletricLime": "Салатовий",
+    "app.whiteboard.toolbar.color.lime": "Зелений",
+    "app.whiteboard.toolbar.color.cyan": "Бірюзовий",
+    "app.whiteboard.toolbar.color.dodgerBlue": "Блакитний",
+    "app.whiteboard.toolbar.color.blue": "Синій",
+    "app.whiteboard.toolbar.color.violet": "Фіолетовий",
+    "app.whiteboard.toolbar.color.magenta": "Пурпурний",
+    "app.whiteboard.toolbar.color.silver": "Сірий",
+    "app.whiteboard.toolbar.undo": "Скасувати останній надпис",
+    "app.whiteboard.toolbar.clear": "Очистити всі надписи",
+    "app.whiteboard.toolbar.multiUserOn": "Увімкніть багатокористувацький режим",
+    "app.whiteboard.toolbar.multiUserOff": "Вимкніть режим багаторазового використання",
+    "app.whiteboard.toolbar.fontSize": "Вибір розміру шрифту",
+    "app.feedback.title": "Ви вийшли з конференції",
+    "app.feedback.subtitle": "Ми хотіли б почути про ваш досвід роботи з BigBlueButton (необов'язково)",
+    "app.feedback.textarea": "Як ми можемо зробити BigBlueButton краще?",
+    "app.feedback.sendFeedback": "Надіслати відгук",
+    "app.feedback.sendFeedbackDesc": "Надіслати відгук і залишити зустріч",
+    "app.videoDock.webcamFocusLabel": "Фокус",
+    "app.videoDock.webcamFocusDesc": "Сфокусувати вибрану веб-камеру",
+    "app.videoDock.webcamUnfocusLabel": "Розфокусувати",
+    "app.videoDock.webcamUnfocusDesc": "Розфокусувати вибрану веб-камеру",
+    "app.createBreakoutRoom.joinAudio": "Приєднатися до аудіоконференції",
+    "app.externalVideo.close": "Закрити"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/zh_CN.json b/bigbluebutton-html5/private/locales/zh_CN.json
new file mode 100644
index 0000000000..f457ef3b9a
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/zh_CN.json
@@ -0,0 +1,406 @@
+{
+    "app.home.greeting": "欢迎您，{0}！您的演示即将开始...",
+    "app.chat.submitLabel": "发送消息",
+    "app.chat.errorMinMessageLength": "消息只有{0}个字符，太短了",
+    "app.chat.errorMaxMessageLength": "消息有{0}个字符，太长了",
+    "app.chat.inputLabel": "在{0}聊天中输入的消息",
+    "app.chat.inputPlaceholder": "消息{0}",
+    "app.chat.titlePublic": "公共聊天",
+    "app.chat.titlePrivate": "和{0}的私聊",
+    "app.chat.partnerDisconnected": "{0}离开了会议",
+    "app.chat.closeChatLabel": "关闭{0}",
+    "app.chat.hideChatLabel": "隐藏{0}",
+    "app.chat.moreMessages": "更多消息见下面",
+    "app.chat.dropdown.options": "聊天选项",
+    "app.chat.dropdown.clear": "清除",
+    "app.chat.dropdown.copy": "复制",
+    "app.chat.dropdown.save": "保存",
+    "app.chat.label": "聊天",
+    "app.chat.emptyLogLabel": "聊天日志是空的",
+    "app.chat.clearPublicChatMessage": "公共聊天历史记录已被主持人清空",
+    "app.userList.usersTitle": "用户",
+    "app.userList.participantsTitle": "参会者",
+    "app.userList.messagesTitle": "消息",
+    "app.userList.presenter": "演示者",
+    "app.userList.you": "您",
+    "app.userList.locked": "已锁定",
+    "app.userList.label": "用户列表",
+    "app.userList.toggleCompactView.label": "打开/关闭紧凑视图模式",
+    "app.userList.guest": "游客",
+    "app.userList.menuTitleContext": "可用选项",
+    "app.userList.chatListItem.unreadSingular": "{0}条新消息",
+    "app.userList.chatListItem.unreadPlural": "{0}条新消息",
+    "app.userList.menu.chat.label": "聊天",
+    "app.userList.menu.clearStatus.label": "清除状态",
+    "app.userList.menu.makePresenter.label": "设为演示者",
+    "app.userList.menu.removeUser.label": "删除用户",
+    "app.userList.menu.muteUserAudio.label": "静音",
+    "app.userList.menu.unmuteUserAudio.label": "取消静音",
+    "app.userList.userAriaLabel": "{0}{1}{2}状态{3}",
+    "app.userList.menu.promoteUser.label": "提升为主持人 ",
+    "app.userList.menu.demoteUser.label": "降为普通参会者 ",
+    "app.media.label": "媒体",
+    "app.media.screenshare.start": "屏幕分享已开始",
+    "app.media.screenshare.end": "屏幕分享已结束",
+    "app.media.screenshare.safariNotSupported": "Safari浏览器现在还不支持屏幕分享，请换用Firefox或Chrome浏览器。",
+    "app.meeting.ended": "此会话已结束",
+    "app.meeting.endedMessage": "您将被跳转回首页",
+    "app.presentation.presentationToolbar.prevSlideLabel": "上一页",
+    "app.presentation.presentationToolbar.prevSlideDesc": "将幻灯片切换到上一页",
+    "app.presentation.presentationToolbar.nextSlideLabel": "下一页",
+    "app.presentation.presentationToolbar.nextSlideDesc": "将幻灯片切换到下一页",
+    "app.presentation.presentationToolbar.skipSlideLabel": "跳转",
+    "app.presentation.presentationToolbar.skipSlideDesc": "将幻灯片切换到指定页",
+    "app.presentation.presentationToolbar.fitWidthLabel": "适配宽度",
+    "app.presentation.presentationToolbar.fitWidthDesc": "幻灯片的宽度方向完整显示",
+    "app.presentation.presentationToolbar.fitScreenLabel": "适配屏幕",
+    "app.presentation.presentationToolbar.fitScreenDesc": "整个幻灯片在屏幕里完整显示",
+    "app.presentation.presentationToolbar.zoomLabel": "缩放",
+    "app.presentation.presentationToolbar.zoomDesc": "更改演示区的缩放级别",
+    "app.presentation.presentationToolbar.fitToWidth": "适配宽度",
+    "app.presentation.presentationToolbar.goToSlide": "幻灯片{0}",
+    "app.presentationUploder.title": "演示",
+    "app.presentationUploder.message": "您可以上传PDF文件和任意Office文档，对于后者，系统将其转换为PDF文件。推荐您上传PDF文件。",
+    "app.presentationUploder.confirmLabel": "开始",
+    "app.presentationUploder.confirmDesc": "保存更改并开始演示",
+    "app.presentationUploder.dismissLabel": "取消",
+    "app.presentationUploder.dismissDesc": "关闭窗口并丢弃更改",
+    "app.presentationUploder.dropzoneLabel": "拖放文件到此以上传",
+    "app.presentationUploder.browseFilesLabel": "或浏览文件",
+    "app.presentationUploder.fileToUpload": "将被上传...",
+    "app.presentationUploder.currentBadge": "当前",
+    "app.presentationUploder.genericError": "哎哟，出错了",
+    "app.presentationUploder.upload.progress": "上传中({0}%)",
+    "app.presentationUploder.upload.413": "文件太大，超过了服务器限制",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "处理中，第{0}页/共{1}页",
+    "app.presentationUploder.conversion.genericConversionStatus": "转换文件中...",
+    "app.presentationUploder.conversion.generatingThumbnail": "正在生成缩略图...",
+    "app.presentationUploder.conversion.generatedSlides": "幻灯片已生成...",
+    "app.presentationUploder.conversion.generatingSvg": "正在生成SVG图片...",
+    "app.presentationUploder.conversion.pageCountExceeded": "哎哟，页数超过了服务器限制",
+    "app.presentationUploder.conversion.timeout": "哎哟，转换耗费了太长时间",
+    "app.poll.closeLabel": "关闭",
+    "app.poll.liveResult.usersTitle": "用户",
+    "app.polling.pollingTitle": "调查选项",
+    "app.polling.pollAnswerLabel": "调查答案{0}",
+    "app.polling.pollAnswerDesc": "选择此选项以投给{0}",
+    "app.failedMessage": "抱歉，连接服务器时出现了问题。",
+    "app.connectingMessage": "连接中...",
+    "app.waitingMessage": "连接已断开。{0}秒后尝试重新连接...",
+    "app.navBar.settingsDropdown.optionsLabel": "选项",
+    "app.navBar.settingsDropdown.fullscreenLabel": "全屏显示",
+    "app.navBar.settingsDropdown.settingsLabel": "打开设置",
+    "app.navBar.settingsDropdown.aboutLabel": "关于",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "注销",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "退出全屏",
+    "app.navBar.settingsDropdown.fullscreenDesc": "将设置菜单全屏显示",
+    "app.navBar.settingsDropdown.settingsDesc": "更改通用设置",
+    "app.navBar.settingsDropdown.aboutDesc": "显示客户端的信息",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "离开当前会议",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "退出全屏模式",
+    "app.navBar.settingsDropdown.hotkeysLabel": "热键",
+    "app.navBar.settingsDropdown.hotkeysDesc": "可用热键列表",
+    "app.navBar.settingsDropdown.helpLabel": "帮助",
+    "app.navBar.settingsDropdown.helpDesc": "链接用户到视频教程",
+    "app.navBar.userListToggleBtnLabel": "切换用户列表",
+    "app.navBar.toggleUserList.ariaLabel": "在用户和消息之间切换显示",
+    "app.navBar.toggleUserList.newMessages": "有新消息提醒",
+    "app.navBar.recording": "正在录制当前会议",
+    "app.navBar.recording.on": "录制中",
+    "app.navBar.recording.off": "未录制",
+    "app.leaveConfirmation.confirmLabel": "退出",
+    "app.leaveConfirmation.confirmDesc": "您将从会议退出",
+    "app.endMeeting.yesLabel": "是",
+    "app.endMeeting.noLabel": "否",
+    "app.about.title": "关于",
+    "app.about.version": "客户端版本：",
+    "app.about.copyright": "版权：",
+    "app.about.confirmLabel": "确定",
+    "app.about.confirmDesc": "确定",
+    "app.about.dismissLabel": "取消",
+    "app.about.dismissDesc": "关闭客户端信息对话框",
+    "app.actionsBar.changeStatusLabel": "更改状态",
+    "app.actionsBar.muteLabel": "静音",
+    "app.actionsBar.unmuteLabel": "取消静音",
+    "app.actionsBar.camOffLabel": "关闭摄像头",
+    "app.actionsBar.raiseLabel": "举手",
+    "app.actionsBar.label": "操作栏",
+    "app.submenu.application.applicationSectionTitle": "应用",
+    "app.submenu.application.audioAlertLabel": "聊天音频提醒 ",
+    "app.submenu.application.pushAlertLabel": "聊天弹窗提醒",
+    "app.submenu.application.fontSizeControlLabel": "字号",
+    "app.submenu.application.increaseFontBtnLabel": "增大界面字号",
+    "app.submenu.application.decreaseFontBtnLabel": "减小界面字号",
+    "app.submenu.application.languageLabel": "界面语言",
+    "app.submenu.application.ariaLanguageLabel": "更改界面语言",
+    "app.submenu.application.languageOptionLabel": "选择语言",
+    "app.submenu.application.noLocaleOptionLabel": "没有可用的语言",
+    "app.submenu.audio.micSourceLabel": "麦克风源",
+    "app.submenu.audio.speakerSourceLabel": "扬声器源",
+    "app.submenu.audio.streamVolumeLabel": "您音频流的音量",
+    "app.submenu.video.title": "视频",
+    "app.submenu.video.videoSourceLabel": "视频源",
+    "app.submenu.video.videoOptionLabel": "选择视频源",
+    "app.submenu.video.videoQualityLabel": "视频质量",
+    "app.submenu.video.qualityOptionLabel": "选择视频质量",
+    "app.submenu.video.participantsCamLabel": "查看参会者的摄像头",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "隐藏式字幕",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "获取所有者权限",
+    "app.submenu.closedCaptions.languageLabel": "语言",
+    "app.submenu.closedCaptions.localeOptionLabel": "选择语言",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "无可用的语言",
+    "app.submenu.closedCaptions.fontFamilyLabel": "字体",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "选择字体",
+    "app.submenu.closedCaptions.fontSizeLabel": "字号",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "选择字号",
+    "app.submenu.closedCaptions.backgroundColorLabel": "背景色",
+    "app.submenu.closedCaptions.fontColorLabel": "字体颜色",
+    "app.submenu.participants.muteAllLabel": "将演示者以外的人都静音",
+    "app.submenu.participants.lockAllLabel": "锁定所有参会者",
+    "app.submenu.participants.lockItemLabel": "参会者{0}",
+    "app.submenu.participants.lockMicDesc": "禁用所有被锁定的参会者的麦克风",
+    "app.submenu.participants.lockCamDesc": "禁用所有被锁定的参会者的摄像头",
+    "app.submenu.participants.lockPublicChatDesc": "禁止所有被锁定的参会者参与公共聊天",
+    "app.submenu.participants.lockPrivateChatDesc": "禁止所有被锁定的参会者参与私聊",
+    "app.submenu.participants.lockLayoutDesc": "锁定所有被锁定的参会者的页面布局",
+    "app.submenu.participants.lockMicAriaLabel": "锁定麦克风",
+    "app.submenu.participants.lockCamAriaLabel": "锁定摄像头",
+    "app.submenu.participants.lockPublicChatAriaLabel": "锁定公共聊天",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "锁定私聊",
+    "app.submenu.participants.lockLayoutAriaLabel": "锁定页面布局",
+    "app.submenu.participants.lockMicLabel": "麦克风",
+    "app.submenu.participants.lockCamLabel": "摄像头",
+    "app.submenu.participants.lockPublicChatLabel": "公共聊天",
+    "app.submenu.participants.lockPrivateChatLabel": "私聊",
+    "app.submenu.participants.lockLayoutLabel": "页面布局",
+    "app.settings.applicationTab.label": "应用",
+    "app.settings.audioTab.label": "音频",
+    "app.settings.videoTab.label": "视频",
+    "app.settings.closedcaptionTab.label": "隐藏式字幕",
+    "app.settings.usersTab.label": "参会者",
+    "app.settings.main.label": "设置",
+    "app.settings.main.cancel.label": "取消",
+    "app.settings.main.cancel.label.description": "丢弃更改并关闭设置菜单",
+    "app.settings.main.save.label": "保存",
+    "app.settings.main.save.label.description": "保存更改并关闭设置菜单",
+    "app.settings.dataSavingTab.label": "节省流量",
+    "app.settings.dataSavingTab.webcam": "启用摄像头",
+    "app.settings.dataSavingTab.screenShare": "启用桌面分享",
+    "app.settings.dataSavingTab.description": "调整当前显示以节省带宽",
+    "app.switch.onLabel": "开启",
+    "app.switch.offLabel": "关闭",
+    "app.actionsBar.actionsDropdown.actionsLabel": "操作",
+    "app.actionsBar.actionsDropdown.presentationLabel": "上传幻灯片",
+    "app.actionsBar.actionsDropdown.initPollLabel": "发起调查",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "分享您的桌面",
+    "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "停止分享您的桌面",
+    "app.actionsBar.actionsDropdown.presentationDesc": "上传您的幻灯片",
+    "app.actionsBar.actionsDropdown.initPollDesc": "发起调查",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "和参会者分享您的桌面操作演示",
+    "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "停止分享您的桌面演示给",
+    "app.actionsBar.emojiMenu.statusTriggerLabel": "设置状态",
+    "app.actionsBar.emojiMenu.awayLabel": "离开",
+    "app.actionsBar.emojiMenu.awayDesc": "更改您的状态为离开",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "举手",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "举手提问",
+    "app.actionsBar.emojiMenu.neutralLabel": "未决定",
+    "app.actionsBar.emojiMenu.neutralDesc": "更改您的状态为未决定",
+    "app.actionsBar.emojiMenu.confusedLabel": "困惑",
+    "app.actionsBar.emojiMenu.confusedDesc": "更改您的状态为困惑",
+    "app.actionsBar.emojiMenu.sadLabel": "悲伤",
+    "app.actionsBar.emojiMenu.sadDesc": "更改您的状态为悲伤",
+    "app.actionsBar.emojiMenu.happyLabel": "高兴",
+    "app.actionsBar.emojiMenu.happyDesc": "更改您的状态为高兴",
+    "app.actionsBar.emojiMenu.noneLabel": "清除状态",
+    "app.actionsBar.emojiMenu.noneDesc": "清除您的状态",
+    "app.actionsBar.emojiMenu.applauseLabel": "鼓掌",
+    "app.actionsBar.emojiMenu.applauseDesc": "更改您的状态为鼓掌",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "点赞",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "更改你的状态为点赞",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "拍砖",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "更改您的状态为拍砖",
+    "app.actionsBar.currentStatusDesc": "当前状态{0}",
+    "app.audioNotification.audioFailedError1001": "Error 1001: WebSocket disconnected",
+    "app.audioNotification.audioFailedError1002": "Error 1002: Could not make a WebSocket connection",
+    "app.audioNotification.audioFailedError1003": "Error 1003: Browser version not supported",
+    "app.audioNotification.audioFailedError1004": "Error 1004: Failure on call",
+    "app.audioNotification.audioFailedError1005": "Error 1005: Call ended unexpectedly",
+    "app.audioNotification.audioFailedError1006": "Error 1006: Call timed out",
+    "app.audioNotification.audioFailedError1007": "Error 1007: ICE negotiation failed",
+    "app.audioNotification.audioFailedError1008": "Error 1008: Transfer failed",
+    "app.audioNotification.audioFailedError1009": "Error 1009: Could not fetch STUN/TURN server information",
+    "app.audioNotification.audioFailedError1010": "Error 1010: ICE negotiation timeout",
+    "app.audioNotification.audioFailedError1011": "Error 1011: ICE gathering timeout",
+    "app.audioNotification.audioFailedMessage": "您的音频连接失败了",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia failed, Only secure origins are allowed",
+    "app.audioNotification.closeLabel": "关闭",
+    "app.audioNotificaion.reconnectingAsListenOnly": "麦克风已被锁定给主持人使用，你只能当听众。",
+    "app.breakoutJoinConfirmation.title": "加入休息室",
+    "app.breakoutJoinConfirmation.message": "您想加入吗？",
+    "app.breakoutJoinConfirmation.confirmLabel": "加入",
+    "app.breakoutJoinConfirmation.confirmDesc": "将您加入休息室",
+    "app.breakoutJoinConfirmation.dismissLabel": "取消",
+    "app.breakoutJoinConfirmation.dismissDesc": "关闭并拒绝加入休息室",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "选择分组房间加入",
+    "app.breakoutTimeRemainingMessage": "休息时间还剩： {0}",
+    "app.breakoutWillCloseMessage": "休息时间结束。休息室即将关闭",
+    "app.calculatingBreakoutTimeRemaining": "计算剩余时间...",
+    "app.audioModal.microphoneLabel": "麦克风",
+    "app.audioModal.listenOnlyLabel": "只听",
+    "app.audioModal.audioChoiceLabel": "您想怎么加入音频交流？",
+    "app.audioModal.iOSBrowser": "不支持音频/视频",
+    "app.audioModal.iOSErrorDescription": "受制于苹果操作系统的局限，目前iOS里的Chrome浏览器仍无法支持音频和视频。",
+    "app.audioModal.iOSErrorRecommendation": "推荐使用Safari浏览器。",
+    "app.audioModal.audioChoiceDesc": "选择加入会议的音频交流模式",
+    "app.audioModal.closeLabel": "关闭",
+    "app.audioModal.yes": "是",
+    "app.audioModal.no": "否",
+    "app.audioModal.yes.arialabel" : "能听见回音",
+    "app.audioModal.no.arialabel" : "听不见回音",
+    "app.audioModal.echoTestTitle": "这是回音测试，别人无法听到。请说几句话。您能听得到从本会议系统里发出来的您的话语的回音吗？",
+    "app.audioModal.settingsTitle": "更改您的音频设置",
+    "app.audioModal.helpTitle": "您的视音频相关设备出了个问题。",
+    "app.audioModal.helpText": "您之前允许浏览器在本会议系统内访问您的麦克风了吗？请注意：当年尝试加入音频交流时，浏览器左上方会弹出一个对话框，询问您是否允许本会议系统访问您的音频设备，请允许。如果您当时不小心点了不允许，则需要在您的浏览器中调整设置（Chrome浏览器可点击地址栏最左侧的绿色小锁按钮来更改）。",
+    "app.audioModal.connecting": "正在连接",
+    "app.audioModal.connectingEchoTest": "连接回音测试",
+    "app.audioManager.joinedAudio": "您已加入会议的音频交流",
+    "app.audioManager.joinedEcho": "您已开始回音测试",
+    "app.audioManager.leftAudio": "您已退出会议音频交流",
+    "app.audioManager.genericError": "出错了，请重试",
+    "app.audioManager.connectionError": "连接错误",
+    "app.audioManager.requestTimeout": "请求超时",
+    "app.audioManager.invalidTarget": "获取您的媒体设备时出错",
+    "app.audioManager.mediaError": "获取您的媒体设备时出错",
+    "app.audio.joinAudio": "加入音频",
+    "app.audio.leaveAudio": "退出音频",
+    "app.audio.enterSessionLabel": "进入会话",
+    "app.audio.playSoundLabel": "播放声音",
+    "app.audio.backLabel": "后退",
+    "app.audio.audioSettings.titleLabel": "选择您的音频设置",
+    "app.audio.audioSettings.descriptionLabel": "请注意：您的浏览器会弹出一个对话框，请您选择允许浏览器访问您的麦克风。",
+    "app.audio.audioSettings.microphoneSourceLabel": "麦克风源",
+    "app.audio.audioSettings.speakerSourceLabel": "扬声器源",
+    "app.audio.audioSettings.microphoneStreamLabel": "您的音频流音量",
+    "app.audio.audioSettings.retryLabel": "重试",
+    "app.audio.listenOnly.backLabel": "后退",
+    "app.audio.listenOnly.closeLabel": "关闭",
+    "app.audio.permissionsOverlay.title": "允许本会议系统使用您的媒体设备",
+    "app.audio.permissionsOverlay.hint": "若您要加入音频交流，您必须要允许本会议系统访问您的媒体设备。",
+    "app.error.removed": "您已被移除出会议",
+    "app.error.meeting.ended": "您已从会议中注销",
+    "app.dropdown.close": "关闭",
+    "app.error.500": "哎哟，出错了",
+    "app.error.404": "未找到",
+    "app.error.401": "未授权",
+    "app.error.403": "禁止",
+    "app.error.leaveLabel": "再次登入",
+    "app.guest.waiting": "等待审核通过",
+    "app.toast.breakoutRoomEnded": "休息时间结束，请重新加入音频交流。",
+    "app.toast.chat.public": "新公共聊天消息",
+    "app.toast.chat.private": "新私聊消息",
+    "app.toast.chat.system": "系统",
+    "app.notification.recordingStart": "此会话正在被录制",
+    "app.notification.recordingStop": "此会话不再被录制",
+    "app.shortcut-help.title": "热键",
+    "app.shortcut-help.accessKeyNotAvailable": "键盘快捷键不可用。",
+    "app.shortcut-help.comboLabel": "组合键",
+    "app.shortcut-help.functionLabel": "功能",
+    "app.shortcut-help.closeLabel": "关闭",
+    "app.shortcut-help.closeDesc": "关闭热键对话框",
+    "app.shortcut-help.openOptions": "打开选项",
+    "app.shortcut-help.toggleUserList": "切换用户列表",
+    "app.shortcut-help.toggleMute": "静音/取消静音",
+    "app.shortcut-help.togglePublicChat": "切换公共聊天（用户列表必须先打开）",
+    "app.shortcut-help.hidePrivateChat": "隐藏私聊",
+    "app.shortcut-help.closePrivateChat": "关闭私聊",
+    "app.shortcut-help.openActions": "打开操作菜单",
+    "app.shortcut-help.openStatus": "打开状态菜单",
+    "app.lock-viewers.webcamLabel": "摄像头",
+    "app.lock-viewers.microphoneLable": "麦克风",
+    "app.lock-viewers.PublicChatLabel": "公共聊天",
+    "app.lock-viewers.PrivateChatLable": "私聊",
+    "app.lock-viewers.Layout": "页面布局",
+    "app.videoPreview.cancelLabel": "取消",
+    "app.videoPreview.closeLabel": "关闭",
+    "app.video.joinVideo": "分享摄像头",
+    "app.video.leaveVideo": "取消分享摄像头",
+    "app.video.iceCandidateError": "添加ice候选者时出错Error on adding ice candidate",
+    "app.video.iceConnectionStateError": "Error 1107: ICE 协商失败",
+    "app.video.permissionError": "分享摄像头时出错，请检查是否已授权",
+    "app.video.sharingError": "分享摄像头出错",
+    "app.video.notFoundError": "无法找到摄像头。请确认您已安装摄像头",
+    "app.video.notAllowed": "无权访问摄像头。请确认您已允许浏览器在本会议系统内访问您的摄像头。",
+    "app.video.notSupportedError": "为了保证安全和隐私，只能通过HTTPS连接访问摄像头，请确认本会议系统的SSL证书是有效的。",
+    "app.video.notReadableError": "无法访问摄像头视频源，请确认您的摄像头未被其他应用占用。",
+    "app.video.swapCam": "切换",
+    "app.video.swapCamDesc": "切换前置/后置摄像头",
+    "app.video.videoMenu": "视频菜单",
+    "app.video.videoMenuDisabled": "视频菜单摄像头在设置中被禁用",
+    "app.video.videoMenuDesc": "打开视频下拉菜单",
+    "app.video.chromeExtensionError": "您必须安装",
+    "app.video.chromeExtensionErrorLink": "此Chrome浏览器扩展",
+    "app.video.stats.title": "连接状态",
+    "app.video.stats.packetsReceived": "收到的数据包",
+    "app.video.stats.packetsSent": "发送的数据包",
+    "app.video.stats.packetsLost": "丢失的数据包",
+    "app.video.stats.bitrate": "比特率",
+    "app.video.stats.lostPercentage": "总丢包率",
+    "app.video.stats.lostRecentPercentage": "最近丢包率",
+    "app.video.stats.dimensions": "规格",
+    "app.video.stats.codec": "编码解码器",
+    "app.video.stats.decodeDelay": "解码延迟",
+    "app.video.stats.rtt": "往返时间",
+    "app.video.stats.encodeUsagePercent": "编码usage",
+    "app.video.stats.currentDelay": "当前延迟",
+    "app.deskshare.iceConnectionStateError": "Error 1108: 分享屏幕时ICE连接失败",
+    "app.sfu.mediaServerConnectionError2000": "Error 2000: 无法连接到媒体服务器",
+    "app.sfu.mediaServerOffline2001": "Error 2001: 媒体服务器下线了，请稍后再试",
+    "app.sfu.mediaServerNoResources2002": "Error 2002: 媒体服务器没有可用资源了",
+    "app.sfu.mediaServerRequestTimeout2003": "Error 2003: 媒体服务器请求超时",
+    "app.sfu.serverIceGatheringFailed2021": "Error 2021:  媒体服务器无法收集ICE 替补",
+    "app.sfu.serverIceGatheringFailed2022": "Error 2022: 媒体服务器ICE 连接失败",
+    "app.sfu.invalidSdp2202":"Error 2202: 客户端生成了无效的SDP",
+    "app.sfu.noAvailableCodec2203": "Error 2203: 服务器找不到合适的编解码器",
+    "app.meeting.endNotification.ok.label": "确认",
+    "app.whiteboard.toolbar.tools": "工具",
+    "app.whiteboard.toolbar.tools.pencil": "铅笔",
+    "app.whiteboard.toolbar.tools.rectangle": "长方形",
+    "app.whiteboard.toolbar.tools.triangle": "三角形",
+    "app.whiteboard.toolbar.tools.ellipse": "椭圆形",
+    "app.whiteboard.toolbar.tools.line": "线",
+    "app.whiteboard.toolbar.tools.text": "文字",
+    "app.whiteboard.toolbar.thickness": "笔触粗度",
+    "app.whiteboard.toolbar.thicknessDisabled": "笔触粗度设置已禁用",
+    "app.whiteboard.toolbar.color": "颜色",
+    "app.whiteboard.toolbar.colorDisabled": "颜色设置已禁用",
+    "app.whiteboard.toolbar.color.black": "黑",
+    "app.whiteboard.toolbar.color.white": "白",
+    "app.whiteboard.toolbar.color.red": "红",
+    "app.whiteboard.toolbar.color.orange": "橙",
+    "app.whiteboard.toolbar.color.eletricLime": "电青",
+    "app.whiteboard.toolbar.color.lime": "绿",
+    "app.whiteboard.toolbar.color.cyan": "青",
+    "app.whiteboard.toolbar.color.dodgerBlue": "道奇蓝",
+    "app.whiteboard.toolbar.color.blue": "蓝",
+    "app.whiteboard.toolbar.color.violet": "紫",
+    "app.whiteboard.toolbar.color.magenta": "品红",
+    "app.whiteboard.toolbar.color.silver": "银",
+    "app.whiteboard.toolbar.undo": "撤销批注",
+    "app.whiteboard.toolbar.clear": "清除所有批注",
+    "app.whiteboard.toolbar.multiUserOn": "开启多用户批注模式",
+    "app.whiteboard.toolbar.multiUserOff": "关闭多用户批注模式",
+    "app.whiteboard.toolbar.fontSize": "字号列表",
+    "app.feedback.title": "您已从会议中注销",
+    "app.feedback.subtitle": "我们希望能听到您对本会议系统的反馈",
+    "app.feedback.textarea": "我们怎么能把本会议系统做得更好？",
+    "app.feedback.sendFeedback": "发送反馈",
+    "app.feedback.sendFeedbackDesc": "发送反馈并退出会议",
+    "app.videoDock.webcamFocusLabel": "对焦",
+    "app.videoDock.webcamFocusDesc": "对焦选中的摄像头",
+    "app.videoDock.webcamUnfocusLabel": "取消对焦",
+    "app.videoDock.webcamUnfocusDesc": "取消对焦选中的摄像头",
+    "app.createBreakoutRoom.joinAudio": "加入音频",
+    "app.externalVideo.close": "关闭"
+
+}
+

From 975102fb0f47ffbfba0bbb401ead478a3b5e6cdb Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 23 Jan 2019 21:44:51 +0000
Subject: [PATCH 137/163] fixed json parsion issues in Transifex locale strings

---
 bigbluebutton-html5/private/locales/el_GR.json |  3 +--
 bigbluebutton-html5/private/locales/km.json    | 12 ++++++------
 bigbluebutton-html5/private/locales/ru_RU.json | 16 ++++++++--------
 bigbluebutton-html5/private/locales/uk_UA.json | 16 ++++++++--------
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/bigbluebutton-html5/private/locales/el_GR.json b/bigbluebutton-html5/private/locales/el_GR.json
index aa3ae038b2..319e100b55 100644
--- a/bigbluebutton-html5/private/locales/el_GR.json
+++ b/bigbluebutton-html5/private/locales/el_GR.json
@@ -27,8 +27,7 @@
     "app.userList.menu.makePresenter.label": "Κάνε τον/την Παρουσιαστή",
     "app.media.screenshare.start": "Ο διαμοιρασμός οθόνης έχει αρχίσει",
     "app.media.screenshare.end": "Ο διαμοιρασμός οθόνης έχει τελειώσει",
-    "app.media.screenshare.safariNotSupported": "Ο διαμοιρασμός οθόνης δεν υποστηρίζεται ακόμα από τον Safari.
-Παρακαλούμε, χρησιμοποιείστε τον Firefox ή το Google Chrome.",
+    "app.media.screenshare.safariNotSupported": "Ο διαμοιρασμός οθόνης δεν υποστηρίζεται ακόμα από τον Safari. Παρακαλούμε, χρησιμοποιείστε τον Firefox ή το Google Chrome.",
     "app.presentation.presentationToolbar.nextSlideLabel": "Επόμενη διαφάνεια",
     "app.presentation.presentationToolbar.skipSlideLabel": "Παρέλειψε διαφάνεια",
     "app.presentation.presentationToolbar.goToSlide": "Διαφάνεια {0}",
diff --git a/bigbluebutton-html5/private/locales/km.json b/bigbluebutton-html5/private/locales/km.json
index ec903b2d63..da3326c298 100644
--- a/bigbluebutton-html5/private/locales/km.json
+++ b/bigbluebutton-html5/private/locales/km.json
@@ -150,21 +150,21 @@
     "app.actionsBar.actionsDropdown.initPollDesc": "ចាប់​ផ្តើម​ការ​ស្ទង់មតិ",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "ចែក​រំលែក​អេក្រង់​របស់​អ្នក​ជាមួយ​អ្នក​ដទៃ",
     "app.actionsBar.emojiMenu.awayLabel": "នៅ​ឆ្ងាយ",
-    "app.actionsBar.emojiMenu.awayDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "នៅឆ្ងាយ"",
+    "app.actionsBar.emojiMenu.awayDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \\\"នៅឆ្ងាយ\\\"",
     "app.actionsBar.emojiMenu.raiseHandLabel": "លើកដៃ",
     "app.actionsBar.emojiMenu.raiseHandDesc": "លើកដៃ​របស់​អ្នក​ដើម្បី​សួរ​សំនួរ",
     "app.actionsBar.emojiMenu.neutralLabel": "មិន​សម្រេច​ចិត្ត",
-    "app.actionsBar.emojiMenu.neutralDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "មិន​សម្រេច​ចិត្ត"",
+    "app.actionsBar.emojiMenu.neutralDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \\\"មិន​សម្រេច​ចិត្ត\\\"",
     "app.actionsBar.emojiMenu.confusedLabel": "ច្រឡំ",
-    "app.actionsBar.emojiMenu.confusedDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "ច្រឡំ"",
+    "app.actionsBar.emojiMenu.confusedDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \\\"ច្រឡំ\\\"",
     "app.actionsBar.emojiMenu.sadLabel": "មិន​សប្បាយ​ចិត្ត",
-    "app.actionsBar.emojiMenu.sadDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ "មិន​សប្បាយ​ចិត្ត"",
+    "app.actionsBar.emojiMenu.sadDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ \\\"មិន​សប្បាយ​ចិត្ត\\\"",
     "app.actionsBar.emojiMenu.happyLabel": "សប្បាយចិត្ត",
-    "app.actionsBar.emojiMenu.happyDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ "សប្បាយចិត្ត"",
+    "app.actionsBar.emojiMenu.happyDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ​ \\\"សប្បាយចិត្ត\\\"",
     "app.actionsBar.emojiMenu.noneLabel": "លុប​ស្ថានភាព",
     "app.actionsBar.emojiMenu.noneDesc": "លុប​ស្ថានភាព​របស់​អ្នក",
     "app.actionsBar.emojiMenu.applauseLabel": "ទះដៃ",
-    "app.actionsBar.emojiMenu.applauseDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ "ទះដៃ"",
+    "app.actionsBar.emojiMenu.applauseDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \\\"ទះដៃ\\\"",
     "app.actionsBar.emojiMenu.thumbsUpLabel": "មេដៃ​ឡើង",
     "app.actionsBar.emojiMenu.thumbsUpDesc": "ប្តូរ​ស្ថានភាព​របស់​អ្នក​ទៅ \"មេដៃ​ឡើង\"",
     "app.actionsBar.emojiMenu.thumbsDownLabel": "មេ​ដៃ​ចុះ",
diff --git a/bigbluebutton-html5/private/locales/ru_RU.json b/bigbluebutton-html5/private/locales/ru_RU.json
index 9663d8e1dd..5fe88cb8e2 100644
--- a/bigbluebutton-html5/private/locales/ru_RU.json
+++ b/bigbluebutton-html5/private/locales/ru_RU.json
@@ -200,25 +200,25 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Остановить демонстрацию экрана ",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "Установить статус",
     "app.actionsBar.emojiMenu.awayLabel": "Отошел",
-    "app.actionsBar.emojiMenu.awayDesc": "Изменяет ваш статус на "Отошел"",
+    "app.actionsBar.emojiMenu.awayDesc": "Изменяет ваш статус на \\\"Отошел\\\"",
     "app.actionsBar.emojiMenu.raiseHandLabel": "Поднять руку",
     "app.actionsBar.emojiMenu.raiseHandDesc": "Поднять руку, чтобы задать вопрос",
     "app.actionsBar.emojiMenu.neutralLabel": "Нерешительный",
-    "app.actionsBar.emojiMenu.neutralDesc": "Изменяет ваш статус на "Нерешительный"",
+    "app.actionsBar.emojiMenu.neutralDesc": "Изменяет ваш статус на \\\"Нерешительный\\\"",
     "app.actionsBar.emojiMenu.confusedLabel": "Смущен",
-    "app.actionsBar.emojiMenu.confusedDesc": "Изменяет ваш статус на "Смущен"",
+    "app.actionsBar.emojiMenu.confusedDesc": "Изменяет ваш статус на \\\"Смущен\\\"",
     "app.actionsBar.emojiMenu.sadLabel": "Грустный",
-    "app.actionsBar.emojiMenu.sadDesc": "Изменяет ваш статус на "Грустный"",
+    "app.actionsBar.emojiMenu.sadDesc": "Изменяет ваш статус на \\\"Грустный\\\"",
     "app.actionsBar.emojiMenu.happyLabel": "Счастливый",
-    "app.actionsBar.emojiMenu.happyDesc": "Изменяет ваш статус на "Счастливый"",
+    "app.actionsBar.emojiMenu.happyDesc": "Изменяет ваш статус на \\\"Счастливый\\\"",
     "app.actionsBar.emojiMenu.noneLabel": "Очистить статус",
     "app.actionsBar.emojiMenu.noneDesc": "Очищает ваш статус",
     "app.actionsBar.emojiMenu.applauseLabel": "Апплодисменты",
-    "app.actionsBar.emojiMenu.applauseDesc": "Изменяет ваш статус на "Аплодисменты"",
+    "app.actionsBar.emojiMenu.applauseDesc": "Изменяет ваш статус на \\\"Аплодисменты\\\"",
     "app.actionsBar.emojiMenu.thumbsUpLabel": "Нравится",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Изменяет ваш статус на "Нравится"",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Изменяет ваш статус на \\\"Нравится\\\"",
     "app.actionsBar.emojiMenu.thumbsDownLabel": "Не нравится",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Изменяет ваш статус на "Не нравится"",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Изменяет ваш статус на \\\"Не нравится\\\"",
     "app.actionsBar.currentStatusDesc": "текущий статус {0}",
     "app.audioNotification.audioFailedError1001": "Ошибка 1001: WebSocket отключен",
     "app.audioNotification.audioFailedError1002": "Ошибка 1002: Не удалось установить соединение WebSocket",
diff --git a/bigbluebutton-html5/private/locales/uk_UA.json b/bigbluebutton-html5/private/locales/uk_UA.json
index d6aa737db4..a19cca2de5 100644
--- a/bigbluebutton-html5/private/locales/uk_UA.json
+++ b/bigbluebutton-html5/private/locales/uk_UA.json
@@ -200,25 +200,25 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Зупинити демонстрацію екрану",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "Встановити статус",
     "app.actionsBar.emojiMenu.awayLabel": "Відійшов",
-    "app.actionsBar.emojiMenu.awayDesc": "Змінює ваш статус на "Відійшов"",
+    "app.actionsBar.emojiMenu.awayDesc": "Змінює ваш статус на \\\"Відійшов\\\"",
     "app.actionsBar.emojiMenu.raiseHandLabel": "Підняти руку",
     "app.actionsBar.emojiMenu.raiseHandDesc": "Підняти руку щоб поставити питання",
     "app.actionsBar.emojiMenu.neutralLabel": "Не визначився",
-    "app.actionsBar.emojiMenu.neutralDesc": "Змінює ваш статус на "Не визначився"",
+    "app.actionsBar.emojiMenu.neutralDesc": "Змінює ваш статус на \\\"Не визначився\\\"",
     "app.actionsBar.emojiMenu.confusedLabel": "Збентежений",
-    "app.actionsBar.emojiMenu.confusedDesc": "Змінює ваш статус на "Збентежений"",
+    "app.actionsBar.emojiMenu.confusedDesc": "Змінює ваш статус на \\\"Збентежений\\\"",
     "app.actionsBar.emojiMenu.sadLabel": "Сумний",
-    "app.actionsBar.emojiMenu.sadDesc": "Змінює ваш статус на "Сумний"",
+    "app.actionsBar.emojiMenu.sadDesc": "Змінює ваш статус на \\\"Сумний\\\"",
     "app.actionsBar.emojiMenu.happyLabel": "Щасливий",
-    "app.actionsBar.emojiMenu.happyDesc": "Змінює ваш статус на "Щасливий"",
+    "app.actionsBar.emojiMenu.happyDesc": "Змінює ваш статус на \\\"Щасливий\\\"",
     "app.actionsBar.emojiMenu.noneLabel": "Очистити статус",
     "app.actionsBar.emojiMenu.noneDesc": "Очищує ваш статус",
     "app.actionsBar.emojiMenu.applauseLabel": "Оплески",
-    "app.actionsBar.emojiMenu.applauseDesc": "Змінює ваш статус на "Оплески"",
+    "app.actionsBar.emojiMenu.applauseDesc": "Змінює ваш статус на \\\"Оплески\\\"",
     "app.actionsBar.emojiMenu.thumbsUpLabel": "Подобається",
-    "app.actionsBar.emojiMenu.thumbsUpDesc": "Змінює ваш статус на "Подобається"",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Змінює ваш статус на \\\"Подобається\\\"",
     "app.actionsBar.emojiMenu.thumbsDownLabel": "Не подобається",
-    "app.actionsBar.emojiMenu.thumbsDownDesc": "Змінює ваш статус на "Не подобається"",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Змінює ваш статус на \\\"Не подобається\\\"",
     "app.actionsBar.currentStatusDesc": "нинішній статус {0}",
     "app.audioNotification.audioFailedError1001": "Помилка 1001: WebSocket відключено",
     "app.audioNotification.audioFailedError1002": "Помилка 1002: Не вдалось встановити з'єднання WebSocket",

From 0484a4c6045e6ee09e7c06022bd8ebf71cb16ceb Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Wed, 23 Jan 2019 16:46:31 -0500
Subject: [PATCH 138/163] Update index.html to join HTML5 user as Moderator

---
 bigbluebutton-config/web/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-config/web/index.html b/bigbluebutton-config/web/index.html
index 00a14c63d7..e4fffe534f 100644
--- a/bigbluebutton-config/web/index.html
+++ b/bigbluebutton-config/web/index.html
@@ -56,6 +56,7 @@
             <form name="form1" method="GET" onsubmit="return checkform(this);" action="/demo/demoHTML5.jsp">
               <input type="text" id="username" required="" name="username" placeholder="Enter Your Name" size="29" class="field input-default" autofocus>
               <input type="submit" value="Join" class="submit_btn button success large"><br>
+              <input type="hidden" name="isModerator" value="true">
               <input type="hidden" name="action" value="create">
             </form>
 

From 7e7617f89eb8c2436ef4fe0c597ca0b2ce7cd7f2 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 23 Jan 2019 21:56:38 +0000
Subject: [PATCH 139/163] Log errors with locale processing

---
 bigbluebutton-html5/imports/startup/server/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js
index 243a7e3bff..e7cfa3e639 100755
--- a/bigbluebutton-html5/imports/startup/server/index.js
+++ b/bigbluebutton-html5/imports/startup/server/index.js
@@ -52,6 +52,7 @@ WebApp.connectHandlers.use('/locale', (req, res) => {
       messages = Object.assign(messages, JSON.parse(data));
       normalizedLocale = locale;
     } catch (e) {
+      Logger.error(`'Could not process locale ${locale}:${e}`);
       // Getting here means the locale is not available on the files.
     }
   });
@@ -71,6 +72,7 @@ WebApp.connectHandlers.use('/locales', (req, res) => {
         name: Langmap[locale].nativeName,
       }));
   } catch (e) {
+    Logger.error(`'Could not process locales error: ${e}`);
     // Getting here means the locale is not available on the files.
   }
 

From 177c5cb2e7be703870d00d6d373b111bbd33a6c3 Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Thu, 24 Jan 2019 10:05:59 -0200
Subject: [PATCH 140/163] Fix audio test play button

---
 .../imports/ui/components/audio/audio-test/styles.scss         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-test/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-test/styles.scss
index 249e7919a9..9afd72703b 100644
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-test/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-test/styles.scss
@@ -2,7 +2,7 @@
 
 .testAudioBtn {
   --hover-color: #0c5cb2;
-
+  margin: 0 !important;
   background-color: transparent;
   color: var(--color-primary);
   font-weight: normal;
@@ -16,6 +16,7 @@
   &:hover,
   &:focus,
   &:active {
+    border: none;
     background-color: transparent !important;
     color: var(--hover-color) !important;
     i {

From 52fadaf4a685ed62f4a79c0b5b8053d45073f683 Mon Sep 17 00:00:00 2001
From: Calvin Walton <calvin.walton@kepstin.ca>
Date: Thu, 24 Jan 2019 14:56:48 -0500
Subject: [PATCH 141/163] Add a check to reject undecodable video streams.

In some cases, ffmpeg will be able to read the file, but the video itself
can't be decoded (missing/corrupt stream headers, for example). In this case,
some of the properties on the stream object will be nil.
Make sure that pix_fmt is present in the probed info, since that's a required
property.
---
 record-and-playback/core/lib/recordandplayback/edl/video.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/record-and-playback/core/lib/recordandplayback/edl/video.rb b/record-and-playback/core/lib/recordandplayback/edl/video.rb
index 57989c3b64..269be99a6a 100644
--- a/record-and-playback/core/lib/recordandplayback/edl/video.rb
+++ b/record-and-playback/core/lib/recordandplayback/edl/video.rb
@@ -287,6 +287,9 @@ module BigBlueButton
 
           info[:width] = info[:video][:width].to_i
           info[:height] = info[:video][:height].to_i
+
+          # Check for corrupt/undecodable video streams
+          return {} if info[:video][:pix_fmt].nil?
           return {} if info[:width] == 0 or info[:height] == 0
 
           info[:sample_aspect_ratio] = Rational(1, 1)

From d34ee2a90e66e817f550314291b77f3029be36c5 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Thu, 24 Jan 2019 12:55:33 -0800
Subject: [PATCH 142/163]  - when freeswitch initiates hanging up of global
 audio call, we need to hangup all    listen only callers. If not, the globak
 audio stream is destroyed and not re-recreated    resulting in no audio for
 listen only.

---
 bbb-fsesl-client/deploy.sh                    |  0
 .../voiceconf/sip/CallAgent.java              | 33 +++++++++++++------
 .../ForceHangupGlobalAudioUsersListener.java  |  5 +++
 .../voiceconf/sip/GlobalCall.java             |  8 +++++
 .../bigbluebutton/voiceconf/sip/SipPeer.java  | 12 ++++++-
 .../sip/VoiceConfToListenOnlyUsersMap.java    |  6 ++++
 6 files changed, 53 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 bbb-fsesl-client/deploy.sh
 create mode 100755 bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ForceHangupGlobalAudioUsersListener.java

diff --git a/bbb-fsesl-client/deploy.sh b/bbb-fsesl-client/deploy.sh
old mode 100644
new mode 100755
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
index 29af4ce241..513c77f8e3 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
@@ -63,7 +63,8 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver
     private String _destination;
     private Boolean listeningToGlobal = false;
     private IMessagingService messagingService;
-    
+    private ForceHangupGlobalAudioUsersListener forceHangupGlobalAudioUsersListener;
+
     private enum CallState {
     	UA_IDLE(0), UA_INCOMING_CALL(1), UA_OUTGOING_CALL(2), UA_ONCALL(3);    	
     	private final int state;
@@ -404,15 +405,23 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver
     
     /** Callback function called when arriving a BYE request */
     public void onCallClosing(Call call, Message bye) {
-    	log.info("Received a BYE from the other end telling us to hangup.");
-        
-    	if (!isCurrentCall(call)) return;               
-        closeVoiceStreams();
-        notifyListenersOfOnCallClosed();
-        callState = CallState.UA_IDLE;
+      log.info("Received a BYE from the other end telling us to hangup.");
 
-        // Reset local sdp for next call.
-        initSessionDescriptor();
+      if (!isCurrentCall(call)) return;
+      closeVoiceStreams();
+      notifyListenersOfOnCallClosed();
+
+      // FreeSWITCH initiated hangup of call. Hangup all listen only users.
+      // ralam jan 24, 2019
+      if (forceHangupGlobalAudioUsersListener != null) {
+        log.info("Forcing hangup for listen only users of of voice conf {}.", getDestination());
+        forceHangupGlobalAudioUsersListener.forceHangupGlobalAudioUsers(getDestination());
+      }
+
+      callState = CallState.UA_IDLE;
+
+      // Reset local sdp for next call.
+      initSessionDescriptor();
     }
 
 
@@ -451,7 +460,11 @@ public class CallAgent extends CallListenerAdapter implements CallStreamObserver
     private boolean isCurrentCall(Call call) {
     	return this.call == call;
     }
-    
+
+    public void setForceHangupGlobalAudioUsersListener(ForceHangupGlobalAudioUsersListener listener) {
+      forceHangupGlobalAudioUsersListener = listener;
+    }
+
     public void setCallStreamFactory(CallStreamFactory csf) {
     	this.callStreamFactory = csf;
     }
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ForceHangupGlobalAudioUsersListener.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ForceHangupGlobalAudioUsersListener.java
new file mode 100755
index 0000000000..a60a1c8b86
--- /dev/null
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/ForceHangupGlobalAudioUsersListener.java
@@ -0,0 +1,5 @@
+package org.bigbluebutton.voiceconf.sip;
+
+public interface ForceHangupGlobalAudioUsersListener {
+  void forceHangupGlobalAudioUsers(String voiceConf);
+}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
index 84c69c3ffe..aacc66bdcd 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
@@ -1,6 +1,7 @@
 package org.bigbluebutton.voiceconf.sip;
 
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.red5.app.sip.codecs.Codec;
@@ -80,6 +81,13 @@ public class GlobalCall {
     	return null;
     }
 
+    public static synchronized Collection<ListenOnlyUser> getAllListenOnlyUsers(String voiceConf) {
+        if (voiceConfToListenOnlyUsersMap.containsKey(voiceConf)) {
+            return voiceConfToListenOnlyUsersMap.get(voiceConf).getAllListenOnlyUsers();
+        }
+        return null;
+    }
+
     public static Codec getRoomCodec(String roomName) {
         return roomToCodecMap.get(roomName);
     }
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
index faa078a910..724e384c83 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
@@ -36,7 +36,7 @@ import org.red5.server.api.stream.IBroadcastStream;
  * @author Richard Alam
  *
  */
-public class SipPeer implements SipRegisterAgentListener {
+public class SipPeer implements SipRegisterAgentListener, ForceHangupGlobalAudioUsersListener {
     private static Logger log = Red5LoggerFactory.getLogger(SipPeer.class, "sip");
 
     private ClientConnectionManager clientConnManager;
@@ -130,6 +130,7 @@ public class SipPeer implements SipRegisterAgentListener {
     	SipPeerProfile callerProfile = SipPeerProfile.copy(registeredProfile);
     	CallAgent ca = new CallAgent(this.clientRtpIp, sipProvider, callerProfile, audioconfProvider, clientId, messagingService);
     	ca.setClientConnectionManager(clientConnManager);
+    	ca.setForceHangupGlobalAudioUsersListener(this);
     	ca.setCallStreamFactory(callStreamFactory);
     	callManager.add(ca);
 
@@ -229,6 +230,15 @@ public class SipPeer implements SipRegisterAgentListener {
 		log.info("Successfully unregistered with Sip Server");
 		registered = false;
 	}
+
+  public void forceHangupGlobalAudioUsers(String voiceConf) {
+      Collection<ListenOnlyUser> listenOnlyUsers = GlobalCall.getAllListenOnlyUsers(voiceConf);
+    Iterator iter = listenOnlyUsers.iterator();
+    while (iter.hasNext()) {
+      ListenOnlyUser listenOnlyUser = (ListenOnlyUser) iter.next();
+      hangup(listenOnlyUser.clientId, true);
+    }
+  }
 	
 	public void setCallStreamFactory(CallStreamFactory csf) {
 		callStreamFactory = csf;
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java
index 84d647cce0..c1e2646102 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/VoiceConfToListenOnlyUsersMap.java
@@ -1,5 +1,7 @@
 package org.bigbluebutton.voiceconf.sip;
 
+import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -23,4 +25,8 @@ public class VoiceConfToListenOnlyUsersMap {
 	public int numUsers() {
 		return listenOnlyUsers.size();
 	}
+
+	public Collection<ListenOnlyUser> getAllListenOnlyUsers() {
+		return listenOnlyUsers.values();
+	}
 }

From 5ecfbce82aa8d71fd11a696843b5420f68c021ee Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Thu, 24 Jan 2019 19:13:22 -0200
Subject: [PATCH 143/163] Information about the ended tag creation order

---
 .../src/main/java/org/bigbluebutton/api/MeetingService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index e5f6592359..808ca68b51 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -518,7 +518,11 @@ public class MeetingService implements MessageListener {
     if (m != null) {
       m.setForciblyEnded(true);
       processRecording(m);
-      if (keepEvents) recordingService.markAsEnded(m.getInternalId());
+      if (keepEvents) {
+        // The creation of the ended tag must occur after the creation of the
+        // recorded tag to avoid concurrency issues at the recording scripts
+        recordingService.markAsEnded(m.getInternalId());
+      }
       destroyMeeting(m.getInternalId());
       meetings.remove(m.getInternalId());
       removeUserSessions(m.getInternalId());

From e8577b9865b3620037de9aeefa6f92667447ebfe Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Fri, 25 Jan 2019 11:01:39 -0200
Subject: [PATCH 144/163] Fixed button style typo

---
 bigbluebutton-html5/imports/ui/components/button/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/button/styles.scss b/bigbluebutton-html5/imports/ui/components/button/styles.scss
index 70a37f4150..549b627585 100644
--- a/bigbluebutton-html5/imports/ui/components/button/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/button/styles.scss
@@ -260,7 +260,7 @@
 }
 
 .circle {
-  --btn-sm-padding-x: calc(var(--lg-padding-x) / 2.75);
+  --btn-sm-padding-x: calc(var(--sm-padding-x) / 2.75);
   --btn-md-padding-x: calc(var(--md-padding-x) / 2.75);
   --btn-lg-padding-x: calc(var(--lg-padding-x) / 2.75);
   --btn-jumbo-padding-x: calc(var(--jumbo-padding-x) / 2.75);

From d8fd9910bb014d4e86a2d01e4d0aaadbe53931bc Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Fri, 25 Jan 2019 11:03:51 -0200
Subject: [PATCH 145/163] Removed pt_BR translations made out transifex

---
 bigbluebutton-html5/private/locales/pt_BR.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
index 6013fb5346..6450371462 100644
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -224,8 +224,6 @@
     "app.actionsBar.emojiMenu.thumbsDownLabel": "Negativo",
     "app.actionsBar.emojiMenu.thumbsDownDesc": "Mudar seu status para negativo",
     "app.actionsBar.currentStatusDesc": "status atual {0}",
-    "app.actionsBar.actionsDropdown.restorePresentationLabel": "Re-abrir apresentação",
-    "app.actionsBar.actionsDropdown.restorePresentationDesc": "Botão que re-abre a apresentação depois dela ser fechada",
     "app.audioNotification.audioFailedError1001": "Erro 1001: WebSocket desconectou",
     "app.audioNotification.audioFailedError1002": "Erro 1002: Não foi possível estabelecer a conexão WebSocket",
     "app.audioNotification.audioFailedError1003": "Erro 1003: Versão do navegador não suportada",

From 906e11d3d260b7eeea08f85aa1144bc2869c78a5 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Fri, 25 Jan 2019 11:06:17 -0200
Subject: [PATCH 146/163] Moved fullscreen button style to it's own style sheet

---
 .../fullscreen-button/component.jsx           |  2 +-
 .../fullscreen-button/styles.scss             | 29 +++++++++++++++
 .../ui/components/video-provider/styles.scss  | 37 -------------------
 3 files changed, 30 insertions(+), 38 deletions(-)
 create mode 100644 bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
index b8bd74a29c..f619146a7b 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
 import cx from 'classnames';
-import { styles } from '../styles';
+import { styles } from './styles';
 
 const intlMessages = defineMessages({
   fullscreenButton: {
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
new file mode 100644
index 0000000000..b2146603dc
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
@@ -0,0 +1,29 @@
+:root {
+  --color-transparent: #ff000000;
+  ::-webkit-media-controls {
+    display:none !important;
+  }
+}
+
+.fullscreenButton {
+  position: absolute;
+  background-color: var(--color-transparent);
+  cursor: pointer;
+  border: none !important;
+}
+
+.button {
+  span, span:active, span:hover {
+    background-color: var(--color-transparent) !important;
+    border: none !important;
+    i {
+      border: none !important;
+      background-color: var(--color-transparent) !important;
+      font-weight: bold !important;
+    }
+  }
+}
+
+.dark .button span i {
+  color: var(--color-black);
+}
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
index 6ff4cf8022..0138f13af0 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/styles.scss
@@ -16,40 +16,3 @@
 //	 bottom: 0;
 //   }
 // }
-
-:root {
-  --color-transparent: #ff000000;
-}
-
-.fullscreenButton {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-
-  padding: 0;
-
-  background-color: var(--color-transparent);
-
-  cursor: pointer;
-
-  border: none;
-}
-
-.button {
-
-  span, span:active, span:hover {
-    background-color: var(--color-transparent);
-
-    border: none;
-
-    i {
-      border: none;
-      background-color: var(--color-transparent);
-      font-weight: bold;
-    }
-  }
-}
-
-.dark .button span i {
-  color: var(--color-black);
-}

From 9b882cbe5615b27e01dd286106741694216c3787 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Fri, 25 Jan 2019 14:21:05 -0200
Subject: [PATCH 147/163] Refactored fullscreen and presentation close buttons

---
 .../ui/components/presentation/component.jsx  | 74 ++++++++-----------
 .../presentation-close-button/component.jsx   | 34 ++++-----
 .../presentation-close-button/styles.scss     |  7 ++
 .../ui/components/presentation/styles.scss    | 27 -------
 .../fullscreen-button/component.jsx           |  9 +--
 .../fullscreen-button/styles.scss             |  4 +-
 6 files changed, 56 insertions(+), 99 deletions(-)
 create mode 100644 bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index f19ea09e43..1455624126 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -174,9 +174,7 @@ export default class PresentationArea extends Component {
 
   // renders the whole presentation area
   renderPresentationArea() {
-    // sometimes tomcat publishes the slide url, but the actual file is not accessible (why?)
-    if (!this.props.currentSlide
-        || !this.props.currentSlide.calculatedData) {
+    if (!this.isPresentationAccessible()) {
       return null;
     }
     // to control the size of the svg wrapper manually
@@ -185,6 +183,9 @@ export default class PresentationArea extends Component {
     // a reference to the slide object
     const slideObj = this.props.currentSlide;
 
+    const presentationCloseButton = this.renderPresentationClose();
+    const presentationFullscreenButton = this.renderPresentationFullscreen();
+
     // retrieving the pre-calculated data from the slide object
     const {
       x,
@@ -196,8 +197,10 @@ export default class PresentationArea extends Component {
       imageUri,
     } = slideObj.calculatedData;
     const svgDimensions = this.state.fitToWidth ? {
+      position: 'absolute',
       width: 'inherit',
     } : {
+      position: 'absolute',
       width: adjustedSizes.width,
       height: adjustedSizes.height,
     };
@@ -205,6 +208,8 @@ export default class PresentationArea extends Component {
       <div
         style={svgDimensions}
       >
+        {presentationCloseButton}
+        {presentationFullscreenButton}
         <TransitionGroup>
           <CSSTransition
             key={slideObj.id}
@@ -317,47 +322,29 @@ export default class PresentationArea extends Component {
     );
   }
 
-  renderPresentationClose() {
-    if (!this.props.currentSlide || !MediaService.shouldEnableSwapLayout()) {
-      return null;
-    }
+  isPresentationAccessible() {
+    // sometimes tomcat publishes the slide url, but the actual file is not accessible (why?)
+    return this.props.currentSlide && this.props.currentSlide.calculatedData;
+  };
 
-    const adjustedSizes = this.calculateSize();
-    const marginRight = (this.state.presentationWidth - adjustedSizes.width) / 2.0;
-    const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
-
-    const style = {
-      right: `${marginRight}px`,
-      top: `${marginTop}px`,
-    };
-
-    return (
-      <PresentationCloseButton
-        innerStyle={style}
-        toggleSwapLayout={MediaService.toggleSwapLayout}
-      />
-    );
+  isFullscreen() {
+    return document.fullscreenElement !== null;
   }
 
+  renderPresentationClose() {
+    if (!MediaService.shouldEnableSwapLayout() || this.isFullscreen()) {
+      return null;
+    }
+    return <PresentationCloseButton toggleSwapLayout={MediaService.toggleSwapLayout} />;
+  };
+
   renderPresentationFullscreen() {
-    const full = () => {
-      if (!this.refPresentationArea) {
-        return;
-      }
+    if (this.isFullscreen()) {
+      return null;
+    }
+    const full = () => this.refPresentationContainer.requestFullscreen();
 
-      this.refPresentationArea.requestFullscreen();
-    };
-
-    const adjustedSizes = this.calculateSize();
-    const marginRight = (this.state.presentationWidth - adjustedSizes.width) / 2.0;
-    const marginTop = (this.state.presentationHeight - adjustedSizes.height) / 2.0;
-
-    const style = {
-      right: `${marginRight}px`,
-      bottom: `${marginTop}px`,
-    };
-
-    return <FullscreenButton innerStyle={style} handleFullscreen={full} dark />;
+    return <FullscreenButton handleFullscreen={full} dark />;
   }
 
   renderPresentationToolbar() {
@@ -378,8 +365,7 @@ export default class PresentationArea extends Component {
   }
 
   renderWhiteboardToolbar() {
-    if (!this.props.currentSlide
-        || !this.props.currentSlide.calculatedData) {
+    if (!this.isPresentationAccessible()) {
       return null;
     }
 
@@ -394,7 +380,9 @@ export default class PresentationArea extends Component {
 
   render() {
     return (
-      <div className={styles.presentationContainer}>
+      <div
+        ref={(ref) => { this.refPresentationContainer = ref; }}
+        className={styles.presentationContainer}>
         <div
           ref={(ref) => { this.refPresentationArea = ref; }}
           className={styles.presentationArea}
@@ -403,8 +391,6 @@ export default class PresentationArea extends Component {
             ref={(ref) => { this.refWhiteboardArea = ref; }}
             className={styles.whiteboardSizeAvailable}
           />
-          { this.renderPresentationClose() }
-          { this.renderPresentationFullscreen() }
           {this.state.showSlide
             ? this.renderPresentationArea()
             : null }
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
index 6293f86546..8ea9abbaad 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/component.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
-import { styles } from '../styles';
+import { styles } from './styles';
 
 const intlMessages = defineMessages({
   closePresentationLabel: {
@@ -10,25 +10,19 @@ const intlMessages = defineMessages({
   },
 });
 
-const ClosePresentationComponent = ({
-  intl,
-  innerStyle,
-  toggleSwapLayout,
-}) => (
-  <div style={innerStyle} className={styles.topRight}>
-    <Button
-      role="button"
-      aria-labelledby="closeLabel"
-      aria-describedby="closeDesc"
-      color="default"
-      icon="close"
-      size="sm"
-      onClick={toggleSwapLayout}
-      label={intl.formatMessage(intlMessages.closePresentationLabel)}
-      hideLabel
-      className={styles.close}
-    />
-  </div>
+const ClosePresentationComponent = ({ intl, toggleSwapLayout }) => (
+  <Button
+    role="button"
+    aria-labelledby="closeLabel"
+    aria-describedby="closeDesc"
+    color="primary"
+    icon="close"
+    size="sm"
+    onClick={toggleSwapLayout}
+    label={intl.formatMessage(intlMessages.closePresentationLabel)}
+    hideLabel
+    className={styles.button}
+  />
 );
 
 export default injectIntl(ClosePresentationComponent);
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/styles.scss
new file mode 100644
index 0000000000..2c3384c4cd
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-close-button/styles.scss
@@ -0,0 +1,7 @@
+
+.button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  cursor: pointer;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
index 80ec1ff6b2..3630dc43e4 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/presentation/styles.scss
@@ -64,30 +64,3 @@
   right: 0;
   bottom: 0;
 }
-
-.topRight {
-  position: absolute;
-}
-
-.topRight .close {
-  transition: 1s;
-}
-
-.topRight:hover .close {
-  display: initial;
-}
-
-.close {
-  background-color: var(--btn-primary-bg);
-  padding: 0;
-  i {
-    color: white;
-    font-weight: bold;
-  }
-  cursor: pointer;
-
-  button.span.button {
-    background-color: var(--btn-primary-bg);
-  }
-}
-
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
index f619146a7b..2305f3bf05 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/component.jsx
@@ -11,13 +11,8 @@ const intlMessages = defineMessages({
   },
 });
 
-const FullscreenButtonComponent = ({
-  intl,
-  handleFullscreen,
-  innerStyle,
-  dark,
-}) => (
-  <div style={innerStyle} className={cx(styles.fullscreenButton, dark ? styles.dark : null)}>
+const FullscreenButtonComponent = ({ intl, handleFullscreen, dark }) => (
+  <div className={cx(styles.wrapper, dark ? styles.dark : null)}>
     <Button
       role="button"
       aria-labelledby="fullscreenButtonLabel"
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
index b2146603dc..5411403cb6 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
@@ -5,8 +5,10 @@
   }
 }
 
-.fullscreenButton {
+.wrapper {
   position: absolute;
+  bottom: 0;
+  right: 0;
   background-color: var(--color-transparent);
   cursor: pointer;
   border: none !important;

From 0d9117037d85dc65ae13772e74ef05eab75562df Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Fri, 25 Jan 2019 14:32:00 -0200
Subject: [PATCH 148/163] Reverting video-list style modification

---
 .../imports/ui/components/video-provider/video-list/styles.scss  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
index 67f473e4fb..3e42276c40 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss
@@ -118,7 +118,6 @@
   align-items: center;
   height: 1.25rem;
   z-index: 2;
-  width: 80%;
 }
 
 .dropdown {

From 585126b25d21299b236bb47d8a5509f47d8dabe9 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Fri, 25 Jan 2019 11:47:41 -0600
Subject: [PATCH 149/163] Add check for restarting etherpad

---
 bigbluebutton-config/bin/bbb-conf | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 9364c6a5a3..909ca35838 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -321,8 +321,11 @@ stop_bigbluebutton () {
        if [ -f /usr/lib/systemd/system/bbb-transcode-akka.service ]; then
           BBB_TRANSCODE_AKKA=bbb-transcode-akka
        fi
+       if [ -f /usr/share/etherpad-lite/settings.json ]; then
+          ETHERPAD=etherpad
+       fi
 
-       systemctl stop red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-rap-archive-worker.service bbb-rap-process-worker.service bbb-rap-publish-worker.service bbb-rap-sanity-worker.service bbb-record-core.timer $HTML5 $WEBHOOKS etherpad
+       systemctl stop red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-rap-archive-worker.service bbb-rap-process-worker.service bbb-rap-publish-worker.service bbb-rap-sanity-worker.service bbb-record-core.timer $HTML5 $WEBHOOKS $ETHERPAD
     else
 	/etc/init.d/monit stop
 
@@ -392,8 +395,11 @@ start_bigbluebutton () {
        if [ -f /usr/lib/systemd/system/bbb-transcode-akka.service ]; then
           BBB_TRANSCODE_AKKA=bbb-transcode-akka
        fi
+       if [ -f /usr/share/etherpad-lite/settings.json ]; then
+          ETHERPAD=etherpad
+       fi
 
-       systemctl start red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-record-core.timer $HTML5 $WEBHOOKS etherpad
+       systemctl start red5 $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka $BBB_TRANSCODE_AKKA bbb-fsesl-akka bbb-record-core.timer $HTML5 $WEBHOOKS $ETHERPAD
        if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
           systemctl start mongod
 	  sleep 3
@@ -1557,6 +1563,15 @@ check_state() {
                 echo "#"
         fi
 
+        NCPU=`nproc --all`
+        if [ "$NCPU" -lt "4" ]; then
+                echo "# Warning: found only $NCPU cores, whereas this sherver should have (at least) 4 CPU cores"
+                echo "# to run BigBlueButton in production."
+                echo "#"
+                echo "#   http://docs.bigbluebutton.org/install/install.html#minimum-server-requirements"
+                echo "#"
+        fi
+
 	exit 0
 }
 

From 032460480d51dd1d7800d216a5170b8214d5c815 Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Fri, 25 Jan 2019 10:03:01 -0800
Subject: [PATCH 150/163] update the version of adapterjs and renable sipjs
 logging

---
 .../client/compatibility/adapter.js           | 8490 +++++++++--------
 .../imports/api/audio/client/bridge/sip.js    |    8 +
 2 files changed, 4617 insertions(+), 3881 deletions(-)
 mode change 100644 => 100755 bigbluebutton-html5/client/compatibility/adapter.js

diff --git a/bigbluebutton-html5/client/compatibility/adapter.js b/bigbluebutton-html5/client/compatibility/adapter.js
old mode 100644
new mode 100755
index fc1d8c8ad9..c6d3b8725b
--- a/bigbluebutton-html5/client/compatibility/adapter.js
+++ b/bigbluebutton-html5/client/compatibility/adapter.js
@@ -1,2460 +1,356 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.adapter = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var SDPUtils = require('sdp');
-
-function writeMediaSection(transceiver, caps, type, stream, dtlsRole) {
-  var sdp = SDPUtils.writeRtpDescription(transceiver.kind, caps);
-
-  // Map ICE parameters (ufrag, pwd) to SDP.
-  sdp += SDPUtils.writeIceParameters(
-      transceiver.iceGatherer.getLocalParameters());
-
-  // Map DTLS parameters to SDP.
-  sdp += SDPUtils.writeDtlsParameters(
-      transceiver.dtlsTransport.getLocalParameters(),
-      type === 'offer' ? 'actpass' : dtlsRole || 'active');
-
-  sdp += 'a=mid:' + transceiver.mid + '\r\n';
-
-  if (transceiver.direction) {
-    sdp += 'a=' + transceiver.direction + '\r\n';
-  } else if (transceiver.rtpSender && transceiver.rtpReceiver) {
-    sdp += 'a=sendrecv\r\n';
-  } else if (transceiver.rtpSender) {
-    sdp += 'a=sendonly\r\n';
-  } else if (transceiver.rtpReceiver) {
-    sdp += 'a=recvonly\r\n';
-  } else {
-    sdp += 'a=inactive\r\n';
-  }
-
-  if (transceiver.rtpSender) {
-    // spec.
-    var msid = 'msid:' + stream.id + ' ' +
-        transceiver.rtpSender.track.id + '\r\n';
-    sdp += 'a=' + msid;
-
-    // for Chrome.
-    sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
-        ' ' + msid;
-    if (transceiver.sendEncodingParameters[0].rtx) {
-      sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
-          ' ' + msid;
-      sdp += 'a=ssrc-group:FID ' +
-          transceiver.sendEncodingParameters[0].ssrc + ' ' +
-          transceiver.sendEncodingParameters[0].rtx.ssrc +
-          '\r\n';
-    }
-  }
-  // FIXME: this should be written by writeRtpDescription.
-  sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
-      ' cname:' + SDPUtils.localCName + '\r\n';
-  if (transceiver.rtpSender && transceiver.sendEncodingParameters[0].rtx) {
-    sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
-        ' cname:' + SDPUtils.localCName + '\r\n';
-  }
-  return sdp;
-}
-
-// Edge does not like
-// 1) stun: filtered after 14393 unless ?transport=udp is present
-// 2) turn: that does not have all of turn:host:port?transport=udp
-// 3) turn: with ipv6 addresses
-// 4) turn: occurring muliple times
-function filterIceServers(iceServers, edgeVersion) {
-  var hasTurn = false;
-  iceServers = JSON.parse(JSON.stringify(iceServers));
-  return iceServers.filter(function(server) {
-    if (server && (server.urls || server.url)) {
-      var urls = server.urls || server.url;
-      if (server.url && !server.urls) {
-        console.warn('RTCIceServer.url is deprecated! Use urls instead.');
-      }
-      var isString = typeof urls === 'string';
-      if (isString) {
-        urls = [urls];
-      }
-      urls = urls.filter(function(url) {
-        var validTurn = url.indexOf('turn:') === 0 &&
-            url.indexOf('transport=udp') !== -1 &&
-            url.indexOf('turn:[') === -1 &&
-            !hasTurn;
-
-        if (validTurn) {
-          hasTurn = true;
-          return true;
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.adapter = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  
+  'use strict';
+  
+  var _adapter_factory = require('./adapter_factory.js');
+  
+  var adapter = (0, _adapter_factory.adapterFactory)({ window: window });
+  module.exports = adapter; // this is the difference from adapter_core.
+  
+  },{"./adapter_factory.js":2}],2:[function(require,module,exports){
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.adapterFactory = adapterFactory;
+  
+  var _utils = require('./utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  var _chrome_shim = require('./chrome/chrome_shim');
+  
+  var chromeShim = _interopRequireWildcard(_chrome_shim);
+  
+  var _edge_shim = require('./edge/edge_shim');
+  
+  var edgeShim = _interopRequireWildcard(_edge_shim);
+  
+  var _firefox_shim = require('./firefox/firefox_shim');
+  
+  var firefoxShim = _interopRequireWildcard(_firefox_shim);
+  
+  var _safari_shim = require('./safari/safari_shim');
+  
+  var safariShim = _interopRequireWildcard(_safari_shim);
+  
+  var _common_shim = require('./common_shim');
+  
+  var commonShim = _interopRequireWildcard(_common_shim);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  // Shimming starts here.
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  function adapterFactory() {
+    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        window = _ref.window;
+  
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      shimChrome: true,
+      shimFirefox: true,
+      shimEdge: true,
+      shimSafari: true
+    };
+  
+    // Utils.
+    var logging = utils.log;
+    var browserDetails = utils.detectBrowser(window);
+  
+    var adapter = {
+      browserDetails: browserDetails,
+      commonShim: commonShim,
+      extractVersion: utils.extractVersion,
+      disableLog: utils.disableLog,
+      disableWarnings: utils.disableWarnings
+    };
+  
+    // Shim browser if found.
+    switch (browserDetails.browser) {
+      case 'chrome':
+        if (!chromeShim || !chromeShim.shimPeerConnection || !options.shimChrome) {
+          logging('Chrome shim is not included in this adapter release.');
+          return adapter;
         }
-        return url.indexOf('stun:') === 0 && edgeVersion >= 14393 &&
-            url.indexOf('?transport=udp') === -1;
-      });
-
-      delete server.url;
-      server.urls = isString ? urls[0] : urls;
-      return !!urls.length;
-    }
-    return false;
-  });
-}
-
-// Determines the intersection of local and remote capabilities.
-function getCommonCapabilities(localCapabilities, remoteCapabilities) {
-  var commonCapabilities = {
-    codecs: [],
-    headerExtensions: [],
-    fecMechanisms: []
-  };
-
-  var findCodecByPayloadType = function(pt, codecs) {
-    pt = parseInt(pt, 10);
-    for (var i = 0; i < codecs.length; i++) {
-      if (codecs[i].payloadType === pt ||
-          codecs[i].preferredPayloadType === pt) {
-        return codecs[i];
-      }
-    }
-  };
-
-  var rtxCapabilityMatches = function(lRtx, rRtx, lCodecs, rCodecs) {
-    var lCodec = findCodecByPayloadType(lRtx.parameters.apt, lCodecs);
-    var rCodec = findCodecByPayloadType(rRtx.parameters.apt, rCodecs);
-    return lCodec && rCodec &&
-        lCodec.name.toLowerCase() === rCodec.name.toLowerCase();
-  };
-
-  localCapabilities.codecs.forEach(function(lCodec) {
-    for (var i = 0; i < remoteCapabilities.codecs.length; i++) {
-      var rCodec = remoteCapabilities.codecs[i];
-      if (lCodec.name.toLowerCase() === rCodec.name.toLowerCase() &&
-          lCodec.clockRate === rCodec.clockRate) {
-        if (lCodec.name.toLowerCase() === 'rtx' &&
-            lCodec.parameters && rCodec.parameters.apt) {
-          // for RTX we need to find the local rtx that has a apt
-          // which points to the same local codec as the remote one.
-          if (!rtxCapabilityMatches(lCodec, rCodec,
-              localCapabilities.codecs, remoteCapabilities.codecs)) {
-            continue;
-          }
+        logging('adapter.js shimming chrome.');
+        // Export to the adapter global object visible in the browser.
+        adapter.browserShim = chromeShim;
+  
+        chromeShim.shimGetUserMedia(window);
+        chromeShim.shimMediaStream(window);
+        chromeShim.shimPeerConnection(window);
+        chromeShim.shimOnTrack(window);
+        chromeShim.shimAddTrackRemoveTrack(window);
+        chromeShim.shimGetSendersWithDtmf(window);
+        chromeShim.shimSenderReceiverGetStats(window);
+        chromeShim.fixNegotiationNeeded(window);
+  
+        commonShim.shimRTCIceCandidate(window);
+        commonShim.shimConnectionState(window);
+        commonShim.shimMaxMessageSize(window);
+        commonShim.shimSendThrowTypeError(window);
+        break;
+      case 'firefox':
+        if (!firefoxShim || !firefoxShim.shimPeerConnection || !options.shimFirefox) {
+          logging('Firefox shim is not included in this adapter release.');
+          return adapter;
         }
-        rCodec = JSON.parse(JSON.stringify(rCodec)); // deepcopy
-        // number of channels is the highest common number of channels
-        rCodec.numChannels = Math.min(lCodec.numChannels,
-            rCodec.numChannels);
-        // push rCodec so we reply with offerer payload type
-        commonCapabilities.codecs.push(rCodec);
-
-        // determine common feedback mechanisms
-        rCodec.rtcpFeedback = rCodec.rtcpFeedback.filter(function(fb) {
-          for (var j = 0; j < lCodec.rtcpFeedback.length; j++) {
-            if (lCodec.rtcpFeedback[j].type === fb.type &&
-                lCodec.rtcpFeedback[j].parameter === fb.parameter) {
-              return true;
-            }
-          }
-          return false;
-        });
-        // FIXME: also need to determine .parameters
-        //  see https://github.com/openpeer/ortc/issues/569
+        logging('adapter.js shimming firefox.');
+        // Export to the adapter global object visible in the browser.
+        adapter.browserShim = firefoxShim;
+  
+        firefoxShim.shimGetUserMedia(window);
+        firefoxShim.shimPeerConnection(window);
+        firefoxShim.shimOnTrack(window);
+        firefoxShim.shimRemoveStream(window);
+        firefoxShim.shimSenderGetStats(window);
+        firefoxShim.shimReceiverGetStats(window);
+        firefoxShim.shimRTCDataChannel(window);
+  
+        commonShim.shimRTCIceCandidate(window);
+        commonShim.shimConnectionState(window);
+        commonShim.shimMaxMessageSize(window);
+        commonShim.shimSendThrowTypeError(window);
         break;
-      }
-    }
-  });
-
-  localCapabilities.headerExtensions.forEach(function(lHeaderExtension) {
-    for (var i = 0; i < remoteCapabilities.headerExtensions.length;
-         i++) {
-      var rHeaderExtension = remoteCapabilities.headerExtensions[i];
-      if (lHeaderExtension.uri === rHeaderExtension.uri) {
-        commonCapabilities.headerExtensions.push(rHeaderExtension);
+      case 'edge':
+        if (!edgeShim || !edgeShim.shimPeerConnection || !options.shimEdge) {
+          logging('MS edge shim is not included in this adapter release.');
+          return adapter;
+        }
+        logging('adapter.js shimming edge.');
+        // Export to the adapter global object visible in the browser.
+        adapter.browserShim = edgeShim;
+  
+        edgeShim.shimGetUserMedia(window);
+        edgeShim.shimGetDisplayMedia(window);
+        edgeShim.shimPeerConnection(window);
+        edgeShim.shimReplaceTrack(window);
+  
+        // the edge shim implements the full RTCIceCandidate object.
+  
+        commonShim.shimMaxMessageSize(window);
+        commonShim.shimSendThrowTypeError(window);
         break;
-      }
-    }
-  });
-
-  // FIXME: fecMechanisms
-  return commonCapabilities;
-}
-
-// is action=setLocalDescription with type allowed in signalingState
-function isActionAllowedInSignalingState(action, type, signalingState) {
-  return {
-    offer: {
-      setLocalDescription: ['stable', 'have-local-offer'],
-      setRemoteDescription: ['stable', 'have-remote-offer']
-    },
-    answer: {
-      setLocalDescription: ['have-remote-offer', 'have-local-pranswer'],
-      setRemoteDescription: ['have-local-offer', 'have-remote-pranswer']
-    }
-  }[type][action].indexOf(signalingState) !== -1;
-}
-
-function maybeAddCandidate(iceTransport, candidate) {
-  // Edge's internal representation adds some fields therefore
-  // not all fieldѕ are taken into account.
-  var alreadyAdded = iceTransport.getRemoteCandidates()
-      .find(function(remoteCandidate) {
-        return candidate.foundation === remoteCandidate.foundation &&
-            candidate.ip === remoteCandidate.ip &&
-            candidate.port === remoteCandidate.port &&
-            candidate.priority === remoteCandidate.priority &&
-            candidate.protocol === remoteCandidate.protocol &&
-            candidate.type === remoteCandidate.type;
-      });
-  if (!alreadyAdded) {
-    iceTransport.addRemoteCandidate(candidate);
-  }
-  return !alreadyAdded;
-}
-
-module.exports = function(window, edgeVersion) {
-  var RTCPeerConnection = function(config) {
-    var self = this;
-
-    var _eventTarget = document.createDocumentFragment();
-    ['addEventListener', 'removeEventListener', 'dispatchEvent']
-        .forEach(function(method) {
-          self[method] = _eventTarget[method].bind(_eventTarget);
-        });
-
-    this.onicecandidate = null;
-    this.onaddstream = null;
-    this.ontrack = null;
-    this.onremovestream = null;
-    this.onsignalingstatechange = null;
-    this.oniceconnectionstatechange = null;
-    this.onicegatheringstatechange = null;
-    this.onnegotiationneeded = null;
-    this.ondatachannel = null;
-    this.canTrickleIceCandidates = null;
-
-    this.needNegotiation = false;
-
-    this.localStreams = [];
-    this.remoteStreams = [];
-
-    this.localDescription = null;
-    this.remoteDescription = null;
-
-    this.signalingState = 'stable';
-    this.iceConnectionState = 'new';
-    this.iceGatheringState = 'new';
-
-    config = JSON.parse(JSON.stringify(config || {}));
-
-    this.usingBundle = config.bundlePolicy === 'max-bundle';
-    if (config.rtcpMuxPolicy === 'negotiate') {
-      var e = new Error('rtcpMuxPolicy \'negotiate\' is not supported');
-      e.name = 'NotSupportedError';
-      throw(e);
-    } else if (!config.rtcpMuxPolicy) {
-      config.rtcpMuxPolicy = 'require';
-    }
-
-    switch (config.iceTransportPolicy) {
-      case 'all':
-      case 'relay':
+      case 'safari':
+        if (!safariShim || !options.shimSafari) {
+          logging('Safari shim is not included in this adapter release.');
+          return adapter;
+        }
+        logging('adapter.js shimming safari.');
+        // Export to the adapter global object visible in the browser.
+        adapter.browserShim = safariShim;
+  
+        safariShim.shimRTCIceServerUrls(window);
+        safariShim.shimCreateOfferLegacy(window);
+        safariShim.shimCallbacksAPI(window);
+        safariShim.shimLocalStreamsAPI(window);
+        safariShim.shimRemoteStreamsAPI(window);
+        safariShim.shimTrackEventTransceiver(window);
+        safariShim.shimGetUserMedia(window);
+  
+        commonShim.shimRTCIceCandidate(window);
+        commonShim.shimMaxMessageSize(window);
+        commonShim.shimSendThrowTypeError(window);
         break;
       default:
-        config.iceTransportPolicy = 'all';
+        logging('Unsupported browser!');
         break;
     }
-
-    switch (config.bundlePolicy) {
-      case 'balanced':
-      case 'max-compat':
-      case 'max-bundle':
-        break;
-      default:
-        config.bundlePolicy = 'balanced';
-        break;
-    }
-
-    config.iceServers = filterIceServers(config.iceServers || [], edgeVersion);
-
-    this._iceGatherers = [];
-    if (config.iceCandidatePoolSize) {
-      for (var i = config.iceCandidatePoolSize; i > 0; i--) {
-        this._iceGatherers = new window.RTCIceGatherer({
-          iceServers: config.iceServers,
-          gatherPolicy: config.iceTransportPolicy
-        });
-      }
-    } else {
-      config.iceCandidatePoolSize = 0;
-    }
-
-    this._config = config;
-
-    // per-track iceGathers, iceTransports, dtlsTransports, rtpSenders, ...
-    // everything that is needed to describe a SDP m-line.
-    this.transceivers = [];
-
-    this._sdpSessionId = SDPUtils.generateSessionId();
-    this._sdpSessionVersion = 0;
-
-    this._dtlsRole = undefined; // role for a=setup to use in answers.
-  };
-
-  RTCPeerConnection.prototype._emitGatheringStateChange = function() {
-    var event = new Event('icegatheringstatechange');
-    this.dispatchEvent(event);
-    if (typeof this.onicegatheringstatechange === 'function') {
-      this.onicegatheringstatechange(event);
-    }
-  };
-
-  RTCPeerConnection.prototype.getConfiguration = function() {
-    return this._config;
-  };
-
-  RTCPeerConnection.prototype.getLocalStreams = function() {
-    return this.localStreams;
-  };
-
-  RTCPeerConnection.prototype.getRemoteStreams = function() {
-    return this.remoteStreams;
-  };
-
-  // internal helper to create a transceiver object.
-  // (whih is not yet the same as the WebRTC 1.0 transceiver)
-  RTCPeerConnection.prototype._createTransceiver = function(kind) {
-    var hasBundleTransport = this.transceivers.length > 0;
-    var transceiver = {
-      track: null,
-      iceGatherer: null,
-      iceTransport: null,
-      dtlsTransport: null,
-      localCapabilities: null,
-      remoteCapabilities: null,
-      rtpSender: null,
-      rtpReceiver: null,
-      kind: kind,
-      mid: null,
-      sendEncodingParameters: null,
-      recvEncodingParameters: null,
-      stream: null,
-      wantReceive: true
-    };
-    if (this.usingBundle && hasBundleTransport) {
-      transceiver.iceTransport = this.transceivers[0].iceTransport;
-      transceiver.dtlsTransport = this.transceivers[0].dtlsTransport;
-    } else {
-      var transports = this._createIceAndDtlsTransports();
-      transceiver.iceTransport = transports.iceTransport;
-      transceiver.dtlsTransport = transports.dtlsTransport;
-    }
-    this.transceivers.push(transceiver);
-    return transceiver;
-  };
-
-  RTCPeerConnection.prototype.addTrack = function(track, stream) {
-    var transceiver;
-    for (var i = 0; i < this.transceivers.length; i++) {
-      if (!this.transceivers[i].track &&
-          this.transceivers[i].kind === track.kind) {
-        transceiver = this.transceivers[i];
-      }
-    }
-    if (!transceiver) {
-      transceiver = this._createTransceiver(track.kind);
-    }
-
-    this._maybeFireNegotiationNeeded();
-
-    if (this.localStreams.indexOf(stream) === -1) {
-      this.localStreams.push(stream);
-    }
-
-    transceiver.track = track;
-    transceiver.stream = stream;
-    transceiver.rtpSender = new window.RTCRtpSender(track,
-        transceiver.dtlsTransport);
-    return transceiver.rtpSender;
-  };
-
-  RTCPeerConnection.prototype.addStream = function(stream) {
-    var self = this;
-    if (edgeVersion >= 15025) {
-      stream.getTracks().forEach(function(track) {
-        self.addTrack(track, stream);
-      });
-    } else {
-      // Clone is necessary for local demos mostly, attaching directly
-      // to two different senders does not work (build 10547).
-      // Fixed in 15025 (or earlier)
-      var clonedStream = stream.clone();
-      stream.getTracks().forEach(function(track, idx) {
-        var clonedTrack = clonedStream.getTracks()[idx];
-        track.addEventListener('enabled', function(event) {
-          clonedTrack.enabled = event.enabled;
-        });
-      });
-      clonedStream.getTracks().forEach(function(track) {
-        self.addTrack(track, clonedStream);
-      });
-    }
-  };
-
-  RTCPeerConnection.prototype.removeStream = function(stream) {
-    var idx = this.localStreams.indexOf(stream);
-    if (idx > -1) {
-      this.localStreams.splice(idx, 1);
-      this._maybeFireNegotiationNeeded();
-    }
-  };
-
-  RTCPeerConnection.prototype.getSenders = function() {
-    return this.transceivers.filter(function(transceiver) {
-      return !!transceiver.rtpSender;
-    })
-    .map(function(transceiver) {
-      return transceiver.rtpSender;
-    });
-  };
-
-  RTCPeerConnection.prototype.getReceivers = function() {
-    return this.transceivers.filter(function(transceiver) {
-      return !!transceiver.rtpReceiver;
-    })
-    .map(function(transceiver) {
-      return transceiver.rtpReceiver;
-    });
-  };
-
-
-  RTCPeerConnection.prototype._createIceGatherer = function(sdpMLineIndex,
-      usingBundle) {
-    var self = this;
-    if (usingBundle && sdpMLineIndex > 0) {
-      return this.transceivers[0].iceGatherer;
-    } else if (this._iceGatherers.length) {
-      return this._iceGatherers.shift();
-    }
-    var iceGatherer = new window.RTCIceGatherer({
-      iceServers: this._config.iceServers,
-      gatherPolicy: this._config.iceTransportPolicy
-    });
-    Object.defineProperty(iceGatherer, 'state',
-        {value: 'new', writable: true}
-    );
-
-    this.transceivers[sdpMLineIndex].candidates = [];
-    this.transceivers[sdpMLineIndex].bufferCandidates = function(event) {
-      var end = !event.candidate || Object.keys(event.candidate).length === 0;
-      // polyfill since RTCIceGatherer.state is not implemented in
-      // Edge 10547 yet.
-      iceGatherer.state = end ? 'completed' : 'gathering';
-      if (self.transceivers[sdpMLineIndex].candidates !== null) {
-        self.transceivers[sdpMLineIndex].candidates.push(event.candidate);
-      }
-    };
-    iceGatherer.addEventListener('localcandidate',
-      this.transceivers[sdpMLineIndex].bufferCandidates);
-    return iceGatherer;
-  };
-
-  // start gathering from an RTCIceGatherer.
-  RTCPeerConnection.prototype._gather = function(mid, sdpMLineIndex) {
-    var self = this;
-    var iceGatherer = this.transceivers[sdpMLineIndex].iceGatherer;
-    if (iceGatherer.onlocalcandidate) {
-      return;
-    }
-    var candidates = this.transceivers[sdpMLineIndex].candidates;
-    this.transceivers[sdpMLineIndex].candidates = null;
-    iceGatherer.removeEventListener('localcandidate',
-      this.transceivers[sdpMLineIndex].bufferCandidates);
-    iceGatherer.onlocalcandidate = function(evt) {
-      if (self.usingBundle && sdpMLineIndex > 0) {
-        // if we know that we use bundle we can drop candidates with
-        // ѕdpMLineIndex > 0. If we don't do this then our state gets
-        // confused since we dispose the extra ice gatherer.
-        return;
-      }
-      var event = new Event('icecandidate');
-      event.candidate = {sdpMid: mid, sdpMLineIndex: sdpMLineIndex};
-
-      var cand = evt.candidate;
-      // Edge emits an empty object for RTCIceCandidateComplete‥
-      var end = !cand || Object.keys(cand).length === 0;
-      if (end) {
-        // polyfill since RTCIceGatherer.state is not implemented in
-        // Edge 10547 yet.
-        if (iceGatherer.state === 'new' || iceGatherer.state === 'gathering') {
-          iceGatherer.state = 'completed';
-        }
-      } else {
-        if (iceGatherer.state === 'new') {
-          iceGatherer.state = 'gathering';
-        }
-        // RTCIceCandidate doesn't have a component, needs to be added
-        cand.component = 1;
-        event.candidate.candidate = SDPUtils.writeCandidate(cand);
-      }
-
-      // update local description.
-      var sections = SDPUtils.splitSections(self.localDescription.sdp);
-      if (!end) {
-        sections[event.candidate.sdpMLineIndex + 1] +=
-            'a=' + event.candidate.candidate + '\r\n';
-      } else {
-        sections[event.candidate.sdpMLineIndex + 1] +=
-            'a=end-of-candidates\r\n';
-      }
-      self.localDescription.sdp = sections.join('');
-      var complete = self.transceivers.every(function(transceiver) {
-        return transceiver.iceGatherer &&
-            transceiver.iceGatherer.state === 'completed';
-      });
-
-      if (self.iceGatheringState !== 'gathering') {
-        self.iceGatheringState = 'gathering';
-        self._emitGatheringStateChange();
-      }
-
-      // Emit candidate. Also emit null candidate when all gatherers are
-      // complete.
-      if (!end) {
-        self.dispatchEvent(event);
-        if (typeof self.onicecandidate === 'function') {
-          self.onicecandidate(event);
-        }
-      }
-      if (complete) {
-        self.dispatchEvent(new Event('icecandidate'));
-        if (typeof self.onicecandidate === 'function') {
-          self.onicecandidate(new Event('icecandidate'));
-        }
-        self.iceGatheringState = 'complete';
-        self._emitGatheringStateChange();
-      }
-    };
-
-    // emit already gathered candidates.
-    window.setTimeout(function() {
-      candidates.forEach(function(candidate) {
-        var e = new Event('RTCIceGatherEvent');
-        e.candidate = candidate;
-        iceGatherer.onlocalcandidate(e);
-      });
-    }, 0);
-  };
-
-  // Create ICE transport and DTLS transport.
-  RTCPeerConnection.prototype._createIceAndDtlsTransports = function() {
-    var self = this;
-    var iceTransport = new window.RTCIceTransport(null);
-    iceTransport.onicestatechange = function() {
-      self._updateConnectionState();
-    };
-
-    var dtlsTransport = new window.RTCDtlsTransport(iceTransport);
-    dtlsTransport.ondtlsstatechange = function() {
-      self._updateConnectionState();
-    };
-    dtlsTransport.onerror = function() {
-      // onerror does not set state to failed by itself.
-      Object.defineProperty(dtlsTransport, 'state',
-          {value: 'failed', writable: true});
-      self._updateConnectionState();
-    };
-
-    return {
-      iceTransport: iceTransport,
-      dtlsTransport: dtlsTransport
-    };
-  };
-
-  // Destroy ICE gatherer, ICE transport and DTLS transport.
-  // Without triggering the callbacks.
-  RTCPeerConnection.prototype._disposeIceAndDtlsTransports = function(
-      sdpMLineIndex) {
-    var iceGatherer = this.transceivers[sdpMLineIndex].iceGatherer;
-    if (iceGatherer) {
-      delete iceGatherer.onlocalcandidate;
-      delete this.transceivers[sdpMLineIndex].iceGatherer;
-    }
-    var iceTransport = this.transceivers[sdpMLineIndex].iceTransport;
-    if (iceTransport) {
-      delete iceTransport.onicestatechange;
-      delete this.transceivers[sdpMLineIndex].iceTransport;
-    }
-    var dtlsTransport = this.transceivers[sdpMLineIndex].dtlsTransport;
-    if (dtlsTransport) {
-      delete dtlsTransport.ondtlsstatechange;
-      delete dtlsTransport.onerror;
-      delete this.transceivers[sdpMLineIndex].dtlsTransport;
-    }
-  };
-
-  // Start the RTP Sender and Receiver for a transceiver.
-  RTCPeerConnection.prototype._transceive = function(transceiver,
-      send, recv) {
-    var params = getCommonCapabilities(transceiver.localCapabilities,
-        transceiver.remoteCapabilities);
-    if (send && transceiver.rtpSender) {
-      params.encodings = transceiver.sendEncodingParameters;
-      params.rtcp = {
-        cname: SDPUtils.localCName,
-        compound: transceiver.rtcpParameters.compound
-      };
-      if (transceiver.recvEncodingParameters.length) {
-        params.rtcp.ssrc = transceiver.recvEncodingParameters[0].ssrc;
-      }
-      transceiver.rtpSender.send(params);
-    }
-    if (recv && transceiver.rtpReceiver && params.codecs.length > 0) {
-      // remove RTX field in Edge 14942
-      if (transceiver.kind === 'video'
-          && transceiver.recvEncodingParameters
-          && edgeVersion < 15019) {
-        transceiver.recvEncodingParameters.forEach(function(p) {
-          delete p.rtx;
-        });
-      }
-      params.encodings = transceiver.recvEncodingParameters;
-      params.rtcp = {
-        cname: transceiver.rtcpParameters.cname,
-        compound: transceiver.rtcpParameters.compound
-      };
-      if (transceiver.sendEncodingParameters.length) {
-        params.rtcp.ssrc = transceiver.sendEncodingParameters[0].ssrc;
-      }
-      transceiver.rtpReceiver.receive(params);
-    }
-  };
-
-  RTCPeerConnection.prototype.setLocalDescription = function(description) {
-    var self = this;
-    var args = arguments;
-
-    if (!isActionAllowedInSignalingState('setLocalDescription',
-        description.type, this.signalingState)) {
-      return new Promise(function(resolve, reject) {
-        var e = new Error('Can not set local ' + description.type +
-            ' in state ' + self.signalingState);
-        e.name = 'InvalidStateError';
-        if (args.length > 2 && typeof args[2] === 'function') {
-          args[2].apply(null, [e]);
-        }
-        reject(e);
-      });
-    }
-
-    var sections;
-    var sessionpart;
-    if (description.type === 'offer') {
-      // VERY limited support for SDP munging. Limited to:
-      // * changing the order of codecs
-      sections = SDPUtils.splitSections(description.sdp);
-      sessionpart = sections.shift();
-      sections.forEach(function(mediaSection, sdpMLineIndex) {
-        var caps = SDPUtils.parseRtpParameters(mediaSection);
-        self.transceivers[sdpMLineIndex].localCapabilities = caps;
-      });
-
-      this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
-        self._gather(transceiver.mid, sdpMLineIndex);
-      });
-    } else if (description.type === 'answer') {
-      sections = SDPUtils.splitSections(self.remoteDescription.sdp);
-      sessionpart = sections.shift();
-      var isIceLite = SDPUtils.matchPrefix(sessionpart,
-          'a=ice-lite').length > 0;
-      sections.forEach(function(mediaSection, sdpMLineIndex) {
-        var transceiver = self.transceivers[sdpMLineIndex];
-        var iceGatherer = transceiver.iceGatherer;
-        var iceTransport = transceiver.iceTransport;
-        var dtlsTransport = transceiver.dtlsTransport;
-        var localCapabilities = transceiver.localCapabilities;
-        var remoteCapabilities = transceiver.remoteCapabilities;
-
-        // treat bundle-only as not-rejected.
-        var rejected = SDPUtils.isRejected(mediaSection) &&
-            !SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 1;
-
-        if (!rejected && !transceiver.isDatachannel) {
-          var remoteIceParameters = SDPUtils.getIceParameters(
-              mediaSection, sessionpart);
-          var remoteDtlsParameters = SDPUtils.getDtlsParameters(
-              mediaSection, sessionpart);
-          if (isIceLite) {
-            remoteDtlsParameters.role = 'server';
-          }
-
-          if (!self.usingBundle || sdpMLineIndex === 0) {
-            self._gather(transceiver.mid, sdpMLineIndex);
-            if (iceTransport.state === 'new') {
-              iceTransport.start(iceGatherer, remoteIceParameters,
-                  isIceLite ? 'controlling' : 'controlled');
-            }
-            if (dtlsTransport.state === 'new') {
-              dtlsTransport.start(remoteDtlsParameters);
-            }
-          }
-
-          // Calculate intersection of capabilities.
-          var params = getCommonCapabilities(localCapabilities,
-              remoteCapabilities);
-
-          // Start the RTCRtpSender. The RTCRtpReceiver for this
-          // transceiver has already been started in setRemoteDescription.
-          self._transceive(transceiver,
-              params.codecs.length > 0,
-              false);
-        }
-      });
-    }
-
-    this.localDescription = {
-      type: description.type,
-      sdp: description.sdp
-    };
-    switch (description.type) {
-      case 'offer':
-        this._updateSignalingState('have-local-offer');
-        break;
-      case 'answer':
-        this._updateSignalingState('stable');
-        break;
-      default:
-        throw new TypeError('unsupported type "' + description.type +
-            '"');
-    }
-
-    // If a success callback was provided, emit ICE candidates after it
-    // has been executed. Otherwise, emit callback after the Promise is
-    // resolved.
-    var cb = arguments.length > 1 && typeof arguments[1] === 'function' &&
-        arguments[1];
-    return new Promise(function(resolve) {
-      if (cb) {
-        cb.apply(null);
-      }
-      resolve();
-    });
-  };
-
-  RTCPeerConnection.prototype.setRemoteDescription = function(description) {
-    var self = this;
-    var args = arguments;
-
-    if (!isActionAllowedInSignalingState('setRemoteDescription',
-        description.type, this.signalingState)) {
-      return new Promise(function(resolve, reject) {
-        var e = new Error('Can not set remote ' + description.type +
-            ' in state ' + self.signalingState);
-        e.name = 'InvalidStateError';
-        if (args.length > 2 && typeof args[2] === 'function') {
-          args[2].apply(null, [e]);
-        }
-        reject(e);
-      });
-    }
-
-    var streams = {};
-    this.remoteStreams.forEach(function(stream) {
-      streams[stream.id] = stream;
-    });
-    var receiverList = [];
-    var sections = SDPUtils.splitSections(description.sdp);
-    var sessionpart = sections.shift();
-    var isIceLite = SDPUtils.matchPrefix(sessionpart,
-        'a=ice-lite').length > 0;
-    var usingBundle = SDPUtils.matchPrefix(sessionpart,
-        'a=group:BUNDLE ').length > 0;
-    this.usingBundle = usingBundle;
-    var iceOptions = SDPUtils.matchPrefix(sessionpart,
-        'a=ice-options:')[0];
-    if (iceOptions) {
-      this.canTrickleIceCandidates = iceOptions.substr(14).split(' ')
-          .indexOf('trickle') >= 0;
-    } else {
-      this.canTrickleIceCandidates = false;
-    }
-
-    sections.forEach(function(mediaSection, sdpMLineIndex) {
-      var lines = SDPUtils.splitLines(mediaSection);
-      var kind = SDPUtils.getKind(mediaSection);
-      // treat bundle-only as not-rejected.
-      var rejected = SDPUtils.isRejected(mediaSection) &&
-          !SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 1;
-      var protocol = lines[0].substr(2).split(' ')[2];
-
-      var direction = SDPUtils.getDirection(mediaSection, sessionpart);
-      var remoteMsid = SDPUtils.parseMsid(mediaSection);
-
-      var mid = SDPUtils.getMid(mediaSection) || SDPUtils.generateIdentifier();
-
-      // Reject datachannels which are not implemented yet.
-      if (kind === 'application' && protocol === 'DTLS/SCTP') {
-        self.transceivers[sdpMLineIndex] = {
-          mid: mid,
-          isDatachannel: true
-        };
-        return;
-      }
-
-      var transceiver;
-      var iceGatherer;
-      var iceTransport;
-      var dtlsTransport;
-      var rtpReceiver;
-      var sendEncodingParameters;
-      var recvEncodingParameters;
-      var localCapabilities;
-
-      var track;
-      // FIXME: ensure the mediaSection has rtcp-mux set.
-      var remoteCapabilities = SDPUtils.parseRtpParameters(mediaSection);
-      var remoteIceParameters;
-      var remoteDtlsParameters;
-      if (!rejected) {
-        remoteIceParameters = SDPUtils.getIceParameters(mediaSection,
-            sessionpart);
-        remoteDtlsParameters = SDPUtils.getDtlsParameters(mediaSection,
-            sessionpart);
-        remoteDtlsParameters.role = 'client';
-      }
-      recvEncodingParameters =
-          SDPUtils.parseRtpEncodingParameters(mediaSection);
-
-      var rtcpParameters = SDPUtils.parseRtcpParameters(mediaSection);
-
-      var isComplete = SDPUtils.matchPrefix(mediaSection,
-          'a=end-of-candidates', sessionpart).length > 0;
-      var cands = SDPUtils.matchPrefix(mediaSection, 'a=candidate:')
-          .map(function(cand) {
-            return SDPUtils.parseCandidate(cand);
-          })
-          .filter(function(cand) {
-            return cand.component === 1;
-          });
-
-      // Check if we can use BUNDLE and dispose transports.
-      if ((description.type === 'offer' || description.type === 'answer') &&
-          !rejected && usingBundle && sdpMLineIndex > 0 &&
-          self.transceivers[sdpMLineIndex]) {
-        self._disposeIceAndDtlsTransports(sdpMLineIndex);
-        self.transceivers[sdpMLineIndex].iceGatherer =
-            self.transceivers[0].iceGatherer;
-        self.transceivers[sdpMLineIndex].iceTransport =
-            self.transceivers[0].iceTransport;
-        self.transceivers[sdpMLineIndex].dtlsTransport =
-            self.transceivers[0].dtlsTransport;
-        if (self.transceivers[sdpMLineIndex].rtpSender) {
-          self.transceivers[sdpMLineIndex].rtpSender.setTransport(
-              self.transceivers[0].dtlsTransport);
-        }
-        if (self.transceivers[sdpMLineIndex].rtpReceiver) {
-          self.transceivers[sdpMLineIndex].rtpReceiver.setTransport(
-              self.transceivers[0].dtlsTransport);
-        }
-      }
-      if (description.type === 'offer' && !rejected) {
-        transceiver = self.transceivers[sdpMLineIndex] ||
-            self._createTransceiver(kind);
-        transceiver.mid = mid;
-
-        if (!transceiver.iceGatherer) {
-          transceiver.iceGatherer = self._createIceGatherer(sdpMLineIndex,
-              usingBundle);
-        }
-
-        if (cands.length && transceiver.iceTransport.state === 'new') {
-          if (isComplete && (!usingBundle || sdpMLineIndex === 0)) {
-            transceiver.iceTransport.setRemoteCandidates(cands);
-          } else {
-            cands.forEach(function(candidate) {
-              maybeAddCandidate(transceiver.iceTransport, candidate);
-            });
-          }
-        }
-
-        localCapabilities = window.RTCRtpReceiver.getCapabilities(kind);
-
-        // filter RTX until additional stuff needed for RTX is implemented
-        // in adapter.js
-        if (edgeVersion < 15019) {
-          localCapabilities.codecs = localCapabilities.codecs.filter(
-              function(codec) {
-                return codec.name !== 'rtx';
-              });
-        }
-
-        sendEncodingParameters = transceiver.sendEncodingParameters || [{
-          ssrc: (2 * sdpMLineIndex + 2) * 1001
-        }];
-
-        var isNewTrack = false;
-        if (direction === 'sendrecv' || direction === 'sendonly') {
-          isNewTrack = !transceiver.rtpReceiver;
-          rtpReceiver = transceiver.rtpReceiver ||
-              new window.RTCRtpReceiver(transceiver.dtlsTransport, kind);
-
-          if (isNewTrack) {
-            var stream;
-            track = rtpReceiver.track;
-            // FIXME: does not work with Plan B.
-            if (remoteMsid) {
-              if (!streams[remoteMsid.stream]) {
-                streams[remoteMsid.stream] = new window.MediaStream();
-                Object.defineProperty(streams[remoteMsid.stream], 'id', {
-                  get: function() {
-                    return remoteMsid.stream;
-                  }
-                });
-              }
-              Object.defineProperty(track, 'id', {
-                get: function() {
-                  return remoteMsid.track;
-                }
-              });
-              stream = streams[remoteMsid.stream];
-            } else {
-              if (!streams.default) {
-                streams.default = new window.MediaStream();
-              }
-              stream = streams.default;
-            }
-            stream.addTrack(track);
-            receiverList.push([track, rtpReceiver, stream]);
-          }
-        }
-
-        transceiver.localCapabilities = localCapabilities;
-        transceiver.remoteCapabilities = remoteCapabilities;
-        transceiver.rtpReceiver = rtpReceiver;
-        transceiver.rtcpParameters = rtcpParameters;
-        transceiver.sendEncodingParameters = sendEncodingParameters;
-        transceiver.recvEncodingParameters = recvEncodingParameters;
-
-        // Start the RTCRtpReceiver now. The RTPSender is started in
-        // setLocalDescription.
-        self._transceive(self.transceivers[sdpMLineIndex],
-            false,
-            isNewTrack);
-      } else if (description.type === 'answer' && !rejected) {
-        transceiver = self.transceivers[sdpMLineIndex];
-        iceGatherer = transceiver.iceGatherer;
-        iceTransport = transceiver.iceTransport;
-        dtlsTransport = transceiver.dtlsTransport;
-        rtpReceiver = transceiver.rtpReceiver;
-        sendEncodingParameters = transceiver.sendEncodingParameters;
-        localCapabilities = transceiver.localCapabilities;
-
-        self.transceivers[sdpMLineIndex].recvEncodingParameters =
-            recvEncodingParameters;
-        self.transceivers[sdpMLineIndex].remoteCapabilities =
-            remoteCapabilities;
-        self.transceivers[sdpMLineIndex].rtcpParameters = rtcpParameters;
-
-        if (cands.length && iceTransport.state === 'new') {
-          if ((isIceLite || isComplete) &&
-              (!usingBundle || sdpMLineIndex === 0)) {
-            iceTransport.setRemoteCandidates(cands);
-          } else {
-            cands.forEach(function(candidate) {
-              maybeAddCandidate(transceiver.iceTransport, candidate);
-            });
-          }
-        }
-
-        if (!usingBundle || sdpMLineIndex === 0) {
-          if (iceTransport.state === 'new') {
-            iceTransport.start(iceGatherer, remoteIceParameters,
-                'controlling');
-          }
-          if (dtlsTransport.state === 'new') {
-            dtlsTransport.start(remoteDtlsParameters);
-          }
-        }
-
-        self._transceive(transceiver,
-            direction === 'sendrecv' || direction === 'recvonly',
-            direction === 'sendrecv' || direction === 'sendonly');
-
-        if (rtpReceiver &&
-            (direction === 'sendrecv' || direction === 'sendonly')) {
-          track = rtpReceiver.track;
-          if (remoteMsid) {
-            if (!streams[remoteMsid.stream]) {
-              streams[remoteMsid.stream] = new window.MediaStream();
-            }
-            streams[remoteMsid.stream].addTrack(track);
-            receiverList.push([track, rtpReceiver, streams[remoteMsid.stream]]);
-          } else {
-            if (!streams.default) {
-              streams.default = new window.MediaStream();
-            }
-            streams.default.addTrack(track);
-            receiverList.push([track, rtpReceiver, streams.default]);
-          }
-        } else {
-          // FIXME: actually the receiver should be created later.
-          delete transceiver.rtpReceiver;
-        }
-      }
-    });
-
-    if (this._dtlsRole === undefined) {
-      this._dtlsRole = description.type === 'offer' ? 'active' : 'passive';
-    }
-
-    this.remoteDescription = {
-      type: description.type,
-      sdp: description.sdp
-    };
-    switch (description.type) {
-      case 'offer':
-        this._updateSignalingState('have-remote-offer');
-        break;
-      case 'answer':
-        this._updateSignalingState('stable');
-        break;
-      default:
-        throw new TypeError('unsupported type "' + description.type +
-            '"');
-    }
-    Object.keys(streams).forEach(function(sid) {
-      var stream = streams[sid];
-      if (stream.getTracks().length) {
-        if (self.remoteStreams.indexOf(stream) === -1) {
-          self.remoteStreams.push(stream);
-          var event = new Event('addstream');
-          event.stream = stream;
-          window.setTimeout(function() {
-            self.dispatchEvent(event);
-            if (typeof self.onaddstream === 'function') {
-              self.onaddstream(event);
-            }
-          });
-        }
-
-        receiverList.forEach(function(item) {
-          var track = item[0];
-          var receiver = item[1];
-          if (stream.id !== item[2].id) {
-            return;
-          }
-          var trackEvent = new Event('track');
-          trackEvent.track = track;
-          trackEvent.receiver = receiver;
-          trackEvent.transceiver = {receiver: receiver};
-          trackEvent.streams = [stream];
-          window.setTimeout(function() {
-            self.dispatchEvent(trackEvent);
-            if (typeof self.ontrack === 'function') {
-              self.ontrack(trackEvent);
-            }
-          });
-        });
-      }
-    });
-
-    // check whether addIceCandidate({}) was called within four seconds after
-    // setRemoteDescription.
-    window.setTimeout(function() {
-      if (!(self && self.transceivers)) {
-        return;
-      }
-      self.transceivers.forEach(function(transceiver) {
-        if (transceiver.iceTransport &&
-            transceiver.iceTransport.state === 'new' &&
-            transceiver.iceTransport.getRemoteCandidates().length > 0) {
-          console.warn('Timeout for addRemoteCandidate. Consider sending ' +
-              'an end-of-candidates notification');
-          transceiver.iceTransport.addRemoteCandidate({});
-        }
-      });
-    }, 4000);
-
-    return new Promise(function(resolve) {
-      if (args.length > 1 && typeof args[1] === 'function') {
-        args[1].apply(null);
-      }
-      resolve();
-    });
-  };
-
-  RTCPeerConnection.prototype.close = function() {
-    this.transceivers.forEach(function(transceiver) {
-      /* not yet
-      if (transceiver.iceGatherer) {
-        transceiver.iceGatherer.close();
-      }
-      */
-      if (transceiver.iceTransport) {
-        transceiver.iceTransport.stop();
-      }
-      if (transceiver.dtlsTransport) {
-        transceiver.dtlsTransport.stop();
-      }
-      if (transceiver.rtpSender) {
-        transceiver.rtpSender.stop();
-      }
-      if (transceiver.rtpReceiver) {
-        transceiver.rtpReceiver.stop();
-      }
-    });
-    // FIXME: clean up tracks, local streams, remote streams, etc
-    this._updateSignalingState('closed');
-  };
-
-  // Update the signaling state.
-  RTCPeerConnection.prototype._updateSignalingState = function(newState) {
-    this.signalingState = newState;
-    var event = new Event('signalingstatechange');
-    this.dispatchEvent(event);
-    if (typeof this.onsignalingstatechange === 'function') {
-      this.onsignalingstatechange(event);
-    }
-  };
-
-  // Determine whether to fire the negotiationneeded event.
-  RTCPeerConnection.prototype._maybeFireNegotiationNeeded = function() {
-    var self = this;
-    if (this.signalingState !== 'stable' || this.needNegotiation === true) {
-      return;
-    }
-    this.needNegotiation = true;
-    window.setTimeout(function() {
-      if (self.needNegotiation === false) {
-        return;
-      }
-      self.needNegotiation = false;
-      var event = new Event('negotiationneeded');
-      self.dispatchEvent(event);
-      if (typeof self.onnegotiationneeded === 'function') {
-        self.onnegotiationneeded(event);
-      }
-    }, 0);
-  };
-
-  // Update the connection state.
-  RTCPeerConnection.prototype._updateConnectionState = function() {
-    var newState;
-    var states = {
-      'new': 0,
-      closed: 0,
-      connecting: 0,
-      checking: 0,
-      connected: 0,
-      completed: 0,
-      disconnected: 0,
-      failed: 0
-    };
-    this.transceivers.forEach(function(transceiver) {
-      states[transceiver.iceTransport.state]++;
-      states[transceiver.dtlsTransport.state]++;
-    });
-    // ICETransport.completed and connected are the same for this purpose.
-    states.connected += states.completed;
-
-    newState = 'new';
-    if (states.failed > 0) {
-      newState = 'failed';
-    } else if (states.connecting > 0 || states.checking > 0) {
-      newState = 'connecting';
-    } else if (states.disconnected > 0) {
-      newState = 'disconnected';
-    } else if (states.new > 0) {
-      newState = 'new';
-    } else if (states.connected > 0 || states.completed > 0) {
-      newState = 'connected';
-    }
-
-    if (newState !== this.iceConnectionState) {
-      this.iceConnectionState = newState;
-      var event = new Event('iceconnectionstatechange');
-      this.dispatchEvent(event);
-      if (typeof this.oniceconnectionstatechange === 'function') {
-        this.oniceconnectionstatechange(event);
-      }
-    }
-  };
-
-  RTCPeerConnection.prototype.createOffer = function() {
-    var self = this;
-    var args = arguments;
-
-    var offerOptions;
-    if (arguments.length === 1 && typeof arguments[0] !== 'function') {
-      offerOptions = arguments[0];
-    } else if (arguments.length === 3) {
-      offerOptions = arguments[2];
-    }
-
-    var numAudioTracks = this.transceivers.filter(function(t) {
-      return t.kind === 'audio';
-    }).length;
-    var numVideoTracks = this.transceivers.filter(function(t) {
-      return t.kind === 'video';
-    }).length;
-
-    // Determine number of audio and video tracks we need to send/recv.
-    if (offerOptions) {
-      // Reject Chrome legacy constraints.
-      if (offerOptions.mandatory || offerOptions.optional) {
-        throw new TypeError(
-            'Legacy mandatory/optional constraints not supported.');
-      }
-      if (offerOptions.offerToReceiveAudio !== undefined) {
-        if (offerOptions.offerToReceiveAudio === true) {
-          numAudioTracks = 1;
-        } else if (offerOptions.offerToReceiveAudio === false) {
-          numAudioTracks = 0;
-        } else {
-          numAudioTracks = offerOptions.offerToReceiveAudio;
-        }
-      }
-      if (offerOptions.offerToReceiveVideo !== undefined) {
-        if (offerOptions.offerToReceiveVideo === true) {
-          numVideoTracks = 1;
-        } else if (offerOptions.offerToReceiveVideo === false) {
-          numVideoTracks = 0;
-        } else {
-          numVideoTracks = offerOptions.offerToReceiveVideo;
-        }
-      }
-    }
-
-    this.transceivers.forEach(function(transceiver) {
-      if (transceiver.kind === 'audio') {
-        numAudioTracks--;
-        if (numAudioTracks < 0) {
-          transceiver.wantReceive = false;
-        }
-      } else if (transceiver.kind === 'video') {
-        numVideoTracks--;
-        if (numVideoTracks < 0) {
-          transceiver.wantReceive = false;
-        }
-      }
-    });
-
-    // Create M-lines for recvonly streams.
-    while (numAudioTracks > 0 || numVideoTracks > 0) {
-      if (numAudioTracks > 0) {
-        this._createTransceiver('audio');
-        numAudioTracks--;
-      }
-      if (numVideoTracks > 0) {
-        this._createTransceiver('video');
-        numVideoTracks--;
-      }
-    }
-
-    var sdp = SDPUtils.writeSessionBoilerplate(this._sdpSessionId,
-        this._sdpSessionVersion++);
-    this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
-      // For each track, create an ice gatherer, ice transport,
-      // dtls transport, potentially rtpsender and rtpreceiver.
-      var track = transceiver.track;
-      var kind = transceiver.kind;
-      var mid = SDPUtils.generateIdentifier();
-      transceiver.mid = mid;
-
-      if (!transceiver.iceGatherer) {
-        transceiver.iceGatherer = self._createIceGatherer(sdpMLineIndex,
-            self.usingBundle);
-      }
-
-      var localCapabilities = window.RTCRtpSender.getCapabilities(kind);
-      // filter RTX until additional stuff needed for RTX is implemented
-      // in adapter.js
-      if (edgeVersion < 15019) {
-        localCapabilities.codecs = localCapabilities.codecs.filter(
-            function(codec) {
-              return codec.name !== 'rtx';
-            });
-      }
-      localCapabilities.codecs.forEach(function(codec) {
-        // work around https://bugs.chromium.org/p/webrtc/issues/detail?id=6552
-        // by adding level-asymmetry-allowed=1
-        if (codec.name === 'H264' &&
-            codec.parameters['level-asymmetry-allowed'] === undefined) {
-          codec.parameters['level-asymmetry-allowed'] = '1';
-        }
-      });
-
-      // generate an ssrc now, to be used later in rtpSender.send
-      var sendEncodingParameters = transceiver.sendEncodingParameters || [{
-        ssrc: (2 * sdpMLineIndex + 1) * 1001
-      }];
-      if (track) {
-        // add RTX
-        if (edgeVersion >= 15019 && kind === 'video' &&
-            !sendEncodingParameters[0].rtx) {
-          sendEncodingParameters[0].rtx = {
-            ssrc: sendEncodingParameters[0].ssrc + 1
-          };
-        }
-      }
-
-      if (transceiver.wantReceive) {
-        transceiver.rtpReceiver = new window.RTCRtpReceiver(
-            transceiver.dtlsTransport, kind);
-      }
-
-      transceiver.localCapabilities = localCapabilities;
-      transceiver.sendEncodingParameters = sendEncodingParameters;
-    });
-
-    // always offer BUNDLE and dispose on return if not supported.
-    if (this._config.bundlePolicy !== 'max-compat') {
-      sdp += 'a=group:BUNDLE ' + this.transceivers.map(function(t) {
-        return t.mid;
-      }).join(' ') + '\r\n';
-    }
-    sdp += 'a=ice-options:trickle\r\n';
-
-    this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
-      sdp += writeMediaSection(transceiver, transceiver.localCapabilities,
-          'offer', transceiver.stream, self._dtlsRole);
-      sdp += 'a=rtcp-rsize\r\n';
-
-      if (transceiver.iceGatherer && self.iceGatheringState !== 'new' &&
-          (sdpMLineIndex === 0 || !self.usingBundle)) {
-        transceiver.iceGatherer.getLocalCandidates().forEach(function(cand) {
-          cand.component = 1;
-          sdp += 'a=' + SDPUtils.writeCandidate(cand) + '\r\n';
-        });
-
-        if (transceiver.iceGatherer.state === 'completed') {
-          sdp += 'a=end-of-candidates\r\n';
-        }
-      }
-    });
-
-    var desc = new window.RTCSessionDescription({
-      type: 'offer',
-      sdp: sdp
-    });
-    return new Promise(function(resolve) {
-      if (args.length > 0 && typeof args[0] === 'function') {
-        args[0].apply(null, [desc]);
-        resolve();
-        return;
-      }
-      resolve(desc);
-    });
-  };
-
-  RTCPeerConnection.prototype.createAnswer = function() {
-    var self = this;
-    var args = arguments;
-
-    var sdp = SDPUtils.writeSessionBoilerplate(this._sdpSessionId,
-        this._sdpSessionVersion++);
-    if (this.usingBundle) {
-      sdp += 'a=group:BUNDLE ' + this.transceivers.map(function(t) {
-        return t.mid;
-      }).join(' ') + '\r\n';
-    }
-    var mediaSectionsInOffer = SDPUtils.splitSections(
-        this.remoteDescription.sdp).length - 1;
-    this.transceivers.forEach(function(transceiver, sdpMLineIndex) {
-      if (sdpMLineIndex + 1 > mediaSectionsInOffer) {
-        return;
-      }
-      if (transceiver.isDatachannel) {
-        sdp += 'm=application 0 DTLS/SCTP 5000\r\n' +
-            'c=IN IP4 0.0.0.0\r\n' +
-            'a=mid:' + transceiver.mid + '\r\n';
-        return;
-      }
-
-      // FIXME: look at direction.
-      if (transceiver.stream) {
-        var localTrack;
-        if (transceiver.kind === 'audio') {
-          localTrack = transceiver.stream.getAudioTracks()[0];
-        } else if (transceiver.kind === 'video') {
-          localTrack = transceiver.stream.getVideoTracks()[0];
-        }
-        if (localTrack) {
-          // add RTX
-          if (edgeVersion >= 15019 && transceiver.kind === 'video' &&
-              !transceiver.sendEncodingParameters[0].rtx) {
-            transceiver.sendEncodingParameters[0].rtx = {
-              ssrc: transceiver.sendEncodingParameters[0].ssrc + 1
-            };
-          }
-        }
-      }
-
-      // Calculate intersection of capabilities.
-      var commonCapabilities = getCommonCapabilities(
-          transceiver.localCapabilities,
-          transceiver.remoteCapabilities);
-
-      var hasRtx = commonCapabilities.codecs.filter(function(c) {
-        return c.name.toLowerCase() === 'rtx';
-      }).length;
-      if (!hasRtx && transceiver.sendEncodingParameters[0].rtx) {
-        delete transceiver.sendEncodingParameters[0].rtx;
-      }
-
-      sdp += writeMediaSection(transceiver, commonCapabilities,
-          'answer', transceiver.stream, self._dtlsRole);
-      if (transceiver.rtcpParameters &&
-          transceiver.rtcpParameters.reducedSize) {
-        sdp += 'a=rtcp-rsize\r\n';
-      }
-    });
-
-    var desc = new window.RTCSessionDescription({
-      type: 'answer',
-      sdp: sdp
-    });
-    return new Promise(function(resolve) {
-      if (args.length > 0 && typeof args[0] === 'function') {
-        args[0].apply(null, [desc]);
-        resolve();
-        return;
-      }
-      resolve(desc);
-    });
-  };
-
-  RTCPeerConnection.prototype.addIceCandidate = function(candidate) {
-    var err;
-    var sections;
-    if (!candidate || candidate.candidate === '') {
-      for (var j = 0; j < this.transceivers.length; j++) {
-        if (this.transceivers[j].isDatachannel) {
-          continue;
-        }
-        this.transceivers[j].iceTransport.addRemoteCandidate({});
-        sections = SDPUtils.splitSections(this.remoteDescription.sdp);
-        sections[j + 1] += 'a=end-of-candidates\r\n';
-        this.remoteDescription.sdp = sections.join('');
-        if (this.usingBundle) {
-          break;
-        }
-      }
-    } else if (!(candidate.sdpMLineIndex !== undefined || candidate.sdpMid)) {
-      throw new TypeError('sdpMLineIndex or sdpMid required');
-    } else if (!this.remoteDescription) {
-      err = new Error('Can not add ICE candidate without ' +
-          'a remote description');
-      err.name = 'InvalidStateError';
-    } else {
-      var sdpMLineIndex = candidate.sdpMLineIndex;
-      if (candidate.sdpMid) {
-        for (var i = 0; i < this.transceivers.length; i++) {
-          if (this.transceivers[i].mid === candidate.sdpMid) {
-            sdpMLineIndex = i;
-            break;
-          }
-        }
-      }
-      var transceiver = this.transceivers[sdpMLineIndex];
-      if (transceiver) {
-        if (transceiver.isDatachannel) {
-          return Promise.resolve();
-        }
-        var cand = Object.keys(candidate.candidate).length > 0 ?
-            SDPUtils.parseCandidate(candidate.candidate) : {};
-        // Ignore Chrome's invalid candidates since Edge does not like them.
-        if (cand.protocol === 'tcp' && (cand.port === 0 || cand.port === 9)) {
-          return Promise.resolve();
-        }
-        // Ignore RTCP candidates, we assume RTCP-MUX.
-        if (cand.component && cand.component !== 1) {
-          return Promise.resolve();
-        }
-        // when using bundle, avoid adding candidates to the wrong
-        // ice transport. And avoid adding candidates added in the SDP.
-        if (sdpMLineIndex === 0 || (sdpMLineIndex > 0 &&
-            transceiver.iceTransport !== this.transceivers[0].iceTransport)) {
-          if (!maybeAddCandidate(transceiver.iceTransport, cand)) {
-            err = new Error('Can not add ICE candidate');
-            err.name = 'OperationError';
-          }
-        }
-
-        if (!err) {
-          // update the remoteDescription.
-          var candidateString = candidate.candidate.trim();
-          if (candidateString.indexOf('a=') === 0) {
-            candidateString = candidateString.substr(2);
-          }
-          sections = SDPUtils.splitSections(this.remoteDescription.sdp);
-          sections[sdpMLineIndex + 1] += 'a=' +
-              (cand.type ? candidateString : 'end-of-candidates')
-              + '\r\n';
-          this.remoteDescription.sdp = sections.join('');
-        }
-      } else {
-        err = new Error('Can not add ICE candidate');
-        err.name = 'OperationError';
-      }
-    }
-    var args = arguments;
-    return new Promise(function(resolve, reject) {
-      if (err) {
-        if (args.length > 2 && typeof args[2] === 'function') {
-          args[2].apply(null, [err]);
-        }
-        reject(err);
-      } else {
-        if (args.length > 1 && typeof args[1] === 'function') {
-          args[1].apply(null);
-        }
-        resolve();
-      }
-    });
-  };
-
-  RTCPeerConnection.prototype.getStats = function() {
-    var promises = [];
-    this.transceivers.forEach(function(transceiver) {
-      ['rtpSender', 'rtpReceiver', 'iceGatherer', 'iceTransport',
-          'dtlsTransport'].forEach(function(method) {
-            if (transceiver[method]) {
-              promises.push(transceiver[method].getStats());
-            }
-          });
-    });
-    var cb = arguments.length > 1 && typeof arguments[1] === 'function' &&
-        arguments[1];
-    var fixStatsType = function(stat) {
-      return {
-        inboundrtp: 'inbound-rtp',
-        outboundrtp: 'outbound-rtp',
-        candidatepair: 'candidate-pair',
-        localcandidate: 'local-candidate',
-        remotecandidate: 'remote-candidate'
-      }[stat.type] || stat.type;
-    };
-    return new Promise(function(resolve) {
-      // shim getStats with maplike support
-      var results = new Map();
-      Promise.all(promises).then(function(res) {
-        res.forEach(function(result) {
-          Object.keys(result).forEach(function(id) {
-            result[id].type = fixStatsType(result[id]);
-            results.set(id, result[id]);
-          });
-        });
-        if (cb) {
-          cb.apply(null, results);
-        }
-        resolve(results);
-      });
-    });
-  };
-  return RTCPeerConnection;
-};
-
-},{"sdp":2}],2:[function(require,module,exports){
- /* eslint-env node */
-'use strict';
-
-// SDP helpers.
-var SDPUtils = {};
-
-// Generate an alphanumeric identifier for cname or mids.
-// TODO: use UUIDs instead? https://gist.github.com/jed/982883
-SDPUtils.generateIdentifier = function() {
-  return Math.random().toString(36).substr(2, 10);
-};
-
-// The RTCP CNAME used by all peerconnections from the same JS.
-SDPUtils.localCName = SDPUtils.generateIdentifier();
-
-// Splits SDP into lines, dealing with both CRLF and LF.
-SDPUtils.splitLines = function(blob) {
-  return blob.trim().split('\n').map(function(line) {
-    return line.trim();
-  });
-};
-// Splits SDP into sessionpart and mediasections. Ensures CRLF.
-SDPUtils.splitSections = function(blob) {
-  var parts = blob.split('\nm=');
-  return parts.map(function(part, index) {
-    return (index > 0 ? 'm=' + part : part).trim() + '\r\n';
-  });
-};
-
-// Returns lines that start with a certain prefix.
-SDPUtils.matchPrefix = function(blob, prefix) {
-  return SDPUtils.splitLines(blob).filter(function(line) {
-    return line.indexOf(prefix) === 0;
-  });
-};
-
-// Parses an ICE candidate line. Sample input:
-// candidate:702786350 2 udp 41819902 8.8.8.8 60769 typ relay raddr 8.8.8.8
-// rport 55996"
-SDPUtils.parseCandidate = function(line) {
-  var parts;
-  // Parse both variants.
-  if (line.indexOf('a=candidate:') === 0) {
-    parts = line.substring(12).split(' ');
-  } else {
-    parts = line.substring(10).split(' ');
+  
+    return adapter;
   }
-
-  var candidate = {
-    foundation: parts[0],
-    component: parseInt(parts[1], 10),
-    protocol: parts[2].toLowerCase(),
-    priority: parseInt(parts[3], 10),
-    ip: parts[4],
-    port: parseInt(parts[5], 10),
-    // skip parts[6] == 'typ'
-    type: parts[7]
-  };
-
-  for (var i = 8; i < parts.length; i += 2) {
-    switch (parts[i]) {
-      case 'raddr':
-        candidate.relatedAddress = parts[i + 1];
-        break;
-      case 'rport':
-        candidate.relatedPort = parseInt(parts[i + 1], 10);
-        break;
-      case 'tcptype':
-        candidate.tcpType = parts[i + 1];
-        break;
-      case 'ufrag':
-        candidate.ufrag = parts[i + 1]; // for backward compability.
-        candidate.usernameFragment = parts[i + 1];
-        break;
-      default: // extension handling, in particular ufrag
-        candidate[parts[i]] = parts[i + 1];
-        break;
-    }
-  }
-  return candidate;
-};
-
-// Translates a candidate object into SDP candidate attribute.
-SDPUtils.writeCandidate = function(candidate) {
-  var sdp = [];
-  sdp.push(candidate.foundation);
-  sdp.push(candidate.component);
-  sdp.push(candidate.protocol.toUpperCase());
-  sdp.push(candidate.priority);
-  sdp.push(candidate.ip);
-  sdp.push(candidate.port);
-
-  var type = candidate.type;
-  sdp.push('typ');
-  sdp.push(type);
-  if (type !== 'host' && candidate.relatedAddress &&
-      candidate.relatedPort) {
-    sdp.push('raddr');
-    sdp.push(candidate.relatedAddress); // was: relAddr
-    sdp.push('rport');
-    sdp.push(candidate.relatedPort); // was: relPort
-  }
-  if (candidate.tcpType && candidate.protocol.toLowerCase() === 'tcp') {
-    sdp.push('tcptype');
-    sdp.push(candidate.tcpType);
-  }
-  if (candidate.ufrag) {
-    sdp.push('ufrag');
-    sdp.push(candidate.ufrag);
-  }
-  return 'candidate:' + sdp.join(' ');
-};
-
-// Parses an ice-options line, returns an array of option tags.
-// a=ice-options:foo bar
-SDPUtils.parseIceOptions = function(line) {
-  return line.substr(14).split(' ');
-}
-
-// Parses an rtpmap line, returns RTCRtpCoddecParameters. Sample input:
-// a=rtpmap:111 opus/48000/2
-SDPUtils.parseRtpMap = function(line) {
-  var parts = line.substr(9).split(' ');
-  var parsed = {
-    payloadType: parseInt(parts.shift(), 10) // was: id
-  };
-
-  parts = parts[0].split('/');
-
-  parsed.name = parts[0];
-  parsed.clockRate = parseInt(parts[1], 10); // was: clockrate
-  // was: channels
-  parsed.numChannels = parts.length === 3 ? parseInt(parts[2], 10) : 1;
-  return parsed;
-};
-
-// Generate an a=rtpmap line from RTCRtpCodecCapability or
-// RTCRtpCodecParameters.
-SDPUtils.writeRtpMap = function(codec) {
-  var pt = codec.payloadType;
-  if (codec.preferredPayloadType !== undefined) {
-    pt = codec.preferredPayloadType;
-  }
-  return 'a=rtpmap:' + pt + ' ' + codec.name + '/' + codec.clockRate +
-      (codec.numChannels !== 1 ? '/' + codec.numChannels : '') + '\r\n';
-};
-
-// Parses an a=extmap line (headerextension from RFC 5285). Sample input:
-// a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
-// a=extmap:2/sendonly urn:ietf:params:rtp-hdrext:toffset
-SDPUtils.parseExtmap = function(line) {
-  var parts = line.substr(9).split(' ');
-  return {
-    id: parseInt(parts[0], 10),
-    direction: parts[0].indexOf('/') > 0 ? parts[0].split('/')[1] : 'sendrecv',
-    uri: parts[1]
-  };
-};
-
-// Generates a=extmap line from RTCRtpHeaderExtensionParameters or
-// RTCRtpHeaderExtension.
-SDPUtils.writeExtmap = function(headerExtension) {
-  return 'a=extmap:' + (headerExtension.id || headerExtension.preferredId) +
-      (headerExtension.direction && headerExtension.direction !== 'sendrecv'
-          ? '/' + headerExtension.direction
-          : '') +
-      ' ' + headerExtension.uri + '\r\n';
-};
-
-// Parses an ftmp line, returns dictionary. Sample input:
-// a=fmtp:96 vbr=on;cng=on
-// Also deals with vbr=on; cng=on
-SDPUtils.parseFmtp = function(line) {
-  var parsed = {};
-  var kv;
-  var parts = line.substr(line.indexOf(' ') + 1).split(';');
-  for (var j = 0; j < parts.length; j++) {
-    kv = parts[j].trim().split('=');
-    parsed[kv[0].trim()] = kv[1];
-  }
-  return parsed;
-};
-
-// Generates an a=ftmp line from RTCRtpCodecCapability or RTCRtpCodecParameters.
-SDPUtils.writeFmtp = function(codec) {
-  var line = '';
-  var pt = codec.payloadType;
-  if (codec.preferredPayloadType !== undefined) {
-    pt = codec.preferredPayloadType;
-  }
-  if (codec.parameters && Object.keys(codec.parameters).length) {
-    var params = [];
-    Object.keys(codec.parameters).forEach(function(param) {
-      params.push(param + '=' + codec.parameters[param]);
-    });
-    line += 'a=fmtp:' + pt + ' ' + params.join(';') + '\r\n';
-  }
-  return line;
-};
-
-// Parses an rtcp-fb line, returns RTCPRtcpFeedback object. Sample input:
-// a=rtcp-fb:98 nack rpsi
-SDPUtils.parseRtcpFb = function(line) {
-  var parts = line.substr(line.indexOf(' ') + 1).split(' ');
-  return {
-    type: parts.shift(),
-    parameter: parts.join(' ')
-  };
-};
-// Generate a=rtcp-fb lines from RTCRtpCodecCapability or RTCRtpCodecParameters.
-SDPUtils.writeRtcpFb = function(codec) {
-  var lines = '';
-  var pt = codec.payloadType;
-  if (codec.preferredPayloadType !== undefined) {
-    pt = codec.preferredPayloadType;
-  }
-  if (codec.rtcpFeedback && codec.rtcpFeedback.length) {
-    // FIXME: special handling for trr-int?
-    codec.rtcpFeedback.forEach(function(fb) {
-      lines += 'a=rtcp-fb:' + pt + ' ' + fb.type +
-      (fb.parameter && fb.parameter.length ? ' ' + fb.parameter : '') +
-          '\r\n';
-    });
-  }
-  return lines;
-};
-
-// Parses an RFC 5576 ssrc media attribute. Sample input:
-// a=ssrc:3735928559 cname:something
-SDPUtils.parseSsrcMedia = function(line) {
-  var sp = line.indexOf(' ');
-  var parts = {
-    ssrc: parseInt(line.substr(7, sp - 7), 10)
-  };
-  var colon = line.indexOf(':', sp);
-  if (colon > -1) {
-    parts.attribute = line.substr(sp + 1, colon - sp - 1);
-    parts.value = line.substr(colon + 1);
-  } else {
-    parts.attribute = line.substr(sp + 1);
-  }
-  return parts;
-};
-
-// Extracts the MID (RFC 5888) from a media section.
-// returns the MID or undefined if no mid line was found.
-SDPUtils.getMid = function(mediaSection) {
-  var mid = SDPUtils.matchPrefix(mediaSection, 'a=mid:')[0];
-  if (mid) {
-    return mid.substr(6);
-  }
-}
-
-SDPUtils.parseFingerprint = function(line) {
-  var parts = line.substr(14).split(' ');
-  return {
-    algorithm: parts[0].toLowerCase(), // algorithm is case-sensitive in Edge.
-    value: parts[1]
-  };
-};
-
-// Extracts DTLS parameters from SDP media section or sessionpart.
-// FIXME: for consistency with other functions this should only
-//   get the fingerprint line as input. See also getIceParameters.
-SDPUtils.getDtlsParameters = function(mediaSection, sessionpart) {
-  var lines = SDPUtils.matchPrefix(mediaSection + sessionpart,
-      'a=fingerprint:');
-  // Note: a=setup line is ignored since we use the 'auto' role.
-  // Note2: 'algorithm' is not case sensitive except in Edge.
-  return {
-    role: 'auto',
-    fingerprints: lines.map(SDPUtils.parseFingerprint)
-  };
-};
-
-// Serializes DTLS parameters to SDP.
-SDPUtils.writeDtlsParameters = function(params, setupType) {
-  var sdp = 'a=setup:' + setupType + '\r\n';
-  params.fingerprints.forEach(function(fp) {
-    sdp += 'a=fingerprint:' + fp.algorithm + ' ' + fp.value + '\r\n';
-  });
-  return sdp;
-};
-// Parses ICE information from SDP media section or sessionpart.
-// FIXME: for consistency with other functions this should only
-//   get the ice-ufrag and ice-pwd lines as input.
-SDPUtils.getIceParameters = function(mediaSection, sessionpart) {
-  var lines = SDPUtils.splitLines(mediaSection);
-  // Search in session part, too.
-  lines = lines.concat(SDPUtils.splitLines(sessionpart));
-  var iceParameters = {
-    usernameFragment: lines.filter(function(line) {
-      return line.indexOf('a=ice-ufrag:') === 0;
-    })[0].substr(12),
-    password: lines.filter(function(line) {
-      return line.indexOf('a=ice-pwd:') === 0;
-    })[0].substr(10)
-  };
-  return iceParameters;
-};
-
-// Serializes ICE parameters to SDP.
-SDPUtils.writeIceParameters = function(params) {
-  return 'a=ice-ufrag:' + params.usernameFragment + '\r\n' +
-      'a=ice-pwd:' + params.password + '\r\n';
-};
-
-// Parses the SDP media section and returns RTCRtpParameters.
-SDPUtils.parseRtpParameters = function(mediaSection) {
-  var description = {
-    codecs: [],
-    headerExtensions: [],
-    fecMechanisms: [],
-    rtcp: []
-  };
-  var lines = SDPUtils.splitLines(mediaSection);
-  var mline = lines[0].split(' ');
-  for (var i = 3; i < mline.length; i++) { // find all codecs from mline[3..]
-    var pt = mline[i];
-    var rtpmapline = SDPUtils.matchPrefix(
-        mediaSection, 'a=rtpmap:' + pt + ' ')[0];
-    if (rtpmapline) {
-      var codec = SDPUtils.parseRtpMap(rtpmapline);
-      var fmtps = SDPUtils.matchPrefix(
-          mediaSection, 'a=fmtp:' + pt + ' ');
-      // Only the first a=fmtp:<pt> is considered.
-      codec.parameters = fmtps.length ? SDPUtils.parseFmtp(fmtps[0]) : {};
-      codec.rtcpFeedback = SDPUtils.matchPrefix(
-          mediaSection, 'a=rtcp-fb:' + pt + ' ')
-        .map(SDPUtils.parseRtcpFb);
-      description.codecs.push(codec);
-      // parse FEC mechanisms from rtpmap lines.
-      switch (codec.name.toUpperCase()) {
-        case 'RED':
-        case 'ULPFEC':
-          description.fecMechanisms.push(codec.name.toUpperCase());
-          break;
-        default: // only RED and ULPFEC are recognized as FEC mechanisms.
-          break;
-      }
-    }
-  }
-  SDPUtils.matchPrefix(mediaSection, 'a=extmap:').forEach(function(line) {
-    description.headerExtensions.push(SDPUtils.parseExtmap(line));
-  });
-  // FIXME: parse rtcp.
-  return description;
-};
-
-// Generates parts of the SDP media section describing the capabilities /
-// parameters.
-SDPUtils.writeRtpDescription = function(kind, caps) {
-  var sdp = '';
-
-  // Build the mline.
-  sdp += 'm=' + kind + ' ';
-  sdp += caps.codecs.length > 0 ? '9' : '0'; // reject if no codecs.
-  sdp += ' UDP/TLS/RTP/SAVPF ';
-  sdp += caps.codecs.map(function(codec) {
-    if (codec.preferredPayloadType !== undefined) {
-      return codec.preferredPayloadType;
-    }
-    return codec.payloadType;
-  }).join(' ') + '\r\n';
-
-  sdp += 'c=IN IP4 0.0.0.0\r\n';
-  sdp += 'a=rtcp:9 IN IP4 0.0.0.0\r\n';
-
-  // Add a=rtpmap lines for each codec. Also fmtp and rtcp-fb.
-  caps.codecs.forEach(function(codec) {
-    sdp += SDPUtils.writeRtpMap(codec);
-    sdp += SDPUtils.writeFmtp(codec);
-    sdp += SDPUtils.writeRtcpFb(codec);
-  });
-  var maxptime = 0;
-  caps.codecs.forEach(function(codec) {
-    if (codec.maxptime > maxptime) {
-      maxptime = codec.maxptime;
-    }
-  });
-  if (maxptime > 0) {
-    sdp += 'a=maxptime:' + maxptime + '\r\n';
-  }
-  sdp += 'a=rtcp-mux\r\n';
-
-  caps.headerExtensions.forEach(function(extension) {
-    sdp += SDPUtils.writeExtmap(extension);
-  });
-  // FIXME: write fecMechanisms.
-  return sdp;
-};
-
-// Parses the SDP media section and returns an array of
-// RTCRtpEncodingParameters.
-SDPUtils.parseRtpEncodingParameters = function(mediaSection) {
-  var encodingParameters = [];
-  var description = SDPUtils.parseRtpParameters(mediaSection);
-  var hasRed = description.fecMechanisms.indexOf('RED') !== -1;
-  var hasUlpfec = description.fecMechanisms.indexOf('ULPFEC') !== -1;
-
-  // filter a=ssrc:... cname:, ignore PlanB-msid
-  var ssrcs = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
-  .map(function(line) {
-    return SDPUtils.parseSsrcMedia(line);
-  })
-  .filter(function(parts) {
-    return parts.attribute === 'cname';
-  });
-  var primarySsrc = ssrcs.length > 0 && ssrcs[0].ssrc;
-  var secondarySsrc;
-
-  var flows = SDPUtils.matchPrefix(mediaSection, 'a=ssrc-group:FID')
-  .map(function(line) {
-    var parts = line.split(' ');
-    parts.shift();
-    return parts.map(function(part) {
-      return parseInt(part, 10);
-    });
-  });
-  if (flows.length > 0 && flows[0].length > 1 && flows[0][0] === primarySsrc) {
-    secondarySsrc = flows[0][1];
-  }
-
-  description.codecs.forEach(function(codec) {
-    if (codec.name.toUpperCase() === 'RTX' && codec.parameters.apt) {
-      var encParam = {
-        ssrc: primarySsrc,
-        codecPayloadType: parseInt(codec.parameters.apt, 10),
-        rtx: {
-          ssrc: secondarySsrc
-        }
-      };
-      encodingParameters.push(encParam);
-      if (hasRed) {
-        encParam = JSON.parse(JSON.stringify(encParam));
-        encParam.fec = {
-          ssrc: secondarySsrc,
-          mechanism: hasUlpfec ? 'red+ulpfec' : 'red'
-        };
-        encodingParameters.push(encParam);
-      }
-    }
-  });
-  if (encodingParameters.length === 0 && primarySsrc) {
-    encodingParameters.push({
-      ssrc: primarySsrc
-    });
-  }
-
-  // we support both b=AS and b=TIAS but interpret AS as TIAS.
-  var bandwidth = SDPUtils.matchPrefix(mediaSection, 'b=');
-  if (bandwidth.length) {
-    if (bandwidth[0].indexOf('b=TIAS:') === 0) {
-      bandwidth = parseInt(bandwidth[0].substr(7), 10);
-    } else if (bandwidth[0].indexOf('b=AS:') === 0) {
-      // use formula from JSEP to convert b=AS to TIAS value.
-      bandwidth = parseInt(bandwidth[0].substr(5), 10) * 1000 * 0.95
-          - (50 * 40 * 8);
-    } else {
-      bandwidth = undefined;
-    }
-    encodingParameters.forEach(function(params) {
-      params.maxBitrate = bandwidth;
-    });
-  }
-  return encodingParameters;
-};
-
-// parses http://draft.ortc.org/#rtcrtcpparameters*
-SDPUtils.parseRtcpParameters = function(mediaSection) {
-  var rtcpParameters = {};
-
-  var cname;
-  // Gets the first SSRC. Note that with RTX there might be multiple
-  // SSRCs.
-  var remoteSsrc = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
-      .map(function(line) {
-        return SDPUtils.parseSsrcMedia(line);
-      })
-      .filter(function(obj) {
-        return obj.attribute === 'cname';
-      })[0];
-  if (remoteSsrc) {
-    rtcpParameters.cname = remoteSsrc.value;
-    rtcpParameters.ssrc = remoteSsrc.ssrc;
-  }
-
-  // Edge uses the compound attribute instead of reducedSize
-  // compound is !reducedSize
-  var rsize = SDPUtils.matchPrefix(mediaSection, 'a=rtcp-rsize');
-  rtcpParameters.reducedSize = rsize.length > 0;
-  rtcpParameters.compound = rsize.length === 0;
-
-  // parses the rtcp-mux attrіbute.
-  // Note that Edge does not support unmuxed RTCP.
-  var mux = SDPUtils.matchPrefix(mediaSection, 'a=rtcp-mux');
-  rtcpParameters.mux = mux.length > 0;
-
-  return rtcpParameters;
-};
-
-// parses either a=msid: or a=ssrc:... msid lines and returns
-// the id of the MediaStream and MediaStreamTrack.
-SDPUtils.parseMsid = function(mediaSection) {
-  var parts;
-  var spec = SDPUtils.matchPrefix(mediaSection, 'a=msid:');
-  if (spec.length === 1) {
-    parts = spec[0].substr(7).split(' ');
-    return {stream: parts[0], track: parts[1]};
-  }
-  var planB = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
-  .map(function(line) {
-    return SDPUtils.parseSsrcMedia(line);
-  })
-  .filter(function(parts) {
-    return parts.attribute === 'msid';
-  });
-  if (planB.length > 0) {
-    parts = planB[0].value.split(' ');
-    return {stream: parts[0], track: parts[1]};
-  }
-};
-
-// Generate a session ID for SDP.
-// https://tools.ietf.org/html/draft-ietf-rtcweb-jsep-20#section-5.2.1
-// recommends using a cryptographically random +ve 64-bit value
-// but right now this should be acceptable and within the right range
-SDPUtils.generateSessionId = function() {
-  return Math.random().toString().substr(2, 21);
-};
-
-// Write boilder plate for start of SDP
-// sessId argument is optional - if not supplied it will
-// be generated randomly
-// sessVersion is optional and defaults to 2
-SDPUtils.writeSessionBoilerplate = function(sessId, sessVer) {
-  var sessionId;
-  var version = sessVer !== undefined ? sessVer : 2;
-  if (sessId) {
-    sessionId = sessId;
-  } else {
-    sessionId = SDPUtils.generateSessionId();
-  }
-  // FIXME: sess-id should be an NTP timestamp.
-  return 'v=0\r\n' +
-      'o=thisisadapterortc ' + sessionId + ' ' + version + ' IN IP4 127.0.0.1\r\n' +
-      's=-\r\n' +
-      't=0 0\r\n';
-};
-
-SDPUtils.writeMediaSection = function(transceiver, caps, type, stream) {
-  var sdp = SDPUtils.writeRtpDescription(transceiver.kind, caps);
-
-  // Map ICE parameters (ufrag, pwd) to SDP.
-  sdp += SDPUtils.writeIceParameters(
-      transceiver.iceGatherer.getLocalParameters());
-
-  // Map DTLS parameters to SDP.
-  sdp += SDPUtils.writeDtlsParameters(
-      transceiver.dtlsTransport.getLocalParameters(),
-      type === 'offer' ? 'actpass' : 'active');
-
-  sdp += 'a=mid:' + transceiver.mid + '\r\n';
-
-  if (transceiver.direction) {
-    sdp += 'a=' + transceiver.direction + '\r\n';
-  } else if (transceiver.rtpSender && transceiver.rtpReceiver) {
-    sdp += 'a=sendrecv\r\n';
-  } else if (transceiver.rtpSender) {
-    sdp += 'a=sendonly\r\n';
-  } else if (transceiver.rtpReceiver) {
-    sdp += 'a=recvonly\r\n';
-  } else {
-    sdp += 'a=inactive\r\n';
-  }
-
-  if (transceiver.rtpSender) {
-    // spec.
-    var msid = 'msid:' + stream.id + ' ' +
-        transceiver.rtpSender.track.id + '\r\n';
-    sdp += 'a=' + msid;
-
-    // for Chrome.
-    sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
-        ' ' + msid;
-    if (transceiver.sendEncodingParameters[0].rtx) {
-      sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
-          ' ' + msid;
-      sdp += 'a=ssrc-group:FID ' +
-          transceiver.sendEncodingParameters[0].ssrc + ' ' +
-          transceiver.sendEncodingParameters[0].rtx.ssrc +
-          '\r\n';
-    }
-  }
-  // FIXME: this should be written by writeRtpDescription.
-  sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
-      ' cname:' + SDPUtils.localCName + '\r\n';
-  if (transceiver.rtpSender && transceiver.sendEncodingParameters[0].rtx) {
-    sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
-        ' cname:' + SDPUtils.localCName + '\r\n';
-  }
-  return sdp;
-};
-
-// Gets the direction from the mediaSection or the sessionpart.
-SDPUtils.getDirection = function(mediaSection, sessionpart) {
-  // Look for sendrecv, sendonly, recvonly, inactive, default to sendrecv.
-  var lines = SDPUtils.splitLines(mediaSection);
-  for (var i = 0; i < lines.length; i++) {
-    switch (lines[i]) {
-      case 'a=sendrecv':
-      case 'a=sendonly':
-      case 'a=recvonly':
-      case 'a=inactive':
-        return lines[i].substr(2);
-      default:
-        // FIXME: What should happen here?
-    }
-  }
-  if (sessionpart) {
-    return SDPUtils.getDirection(sessionpart);
-  }
-  return 'sendrecv';
-};
-
-SDPUtils.getKind = function(mediaSection) {
-  var lines = SDPUtils.splitLines(mediaSection);
-  var mline = lines[0].split(' ');
-  return mline[0].substr(2);
-};
-
-SDPUtils.isRejected = function(mediaSection) {
-  return mediaSection.split(' ', 2)[1] === '0';
-};
-
-SDPUtils.parseMLine = function(mediaSection) {
-  var lines = SDPUtils.splitLines(mediaSection);
-  var mline = lines[0].split(' ');
-  return {
-    kind: mline[0].substr(2),
-    port: parseInt(mline[1], 10),
-    protocol: mline[2],
-    fmt: mline.slice(3).join(' ')
-  };
-};
-
-// Expose public methods.
-if (typeof module === 'object') {
-  module.exports = SDPUtils;
-}
-
-},{}],3:[function(require,module,exports){
-(function (global){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-
-'use strict';
-
-var adapterFactory = require('./adapter_factory.js');
-module.exports = adapterFactory({window: global.window});
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./adapter_factory.js":4}],4:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-
-'use strict';
-
-var utils = require('./utils');
-// Shimming starts here.
-module.exports = function(dependencies, opts) {
-  var window = dependencies && dependencies.window;
-
-  var options = {
-    shimChrome: true,
-    shimFirefox: true,
-    shimEdge: true,
-    shimSafari: true,
-  };
-
-  for (var key in opts) {
-    if (hasOwnProperty.call(opts, key)) {
-      options[key] = opts[key];
-    }
-  }
-
-  // Utils.
-  var logging = utils.log;
-  var browserDetails = utils.detectBrowser(window);
-
-  // Export to the adapter global object visible in the browser.
-  var adapter = {
-    browserDetails: browserDetails,
-    extractVersion: utils.extractVersion,
-    disableLog: utils.disableLog,
-    disableWarnings: utils.disableWarnings
-  };
-
-  // Uncomment the line below if you want logging to occur, including logging
-  // for the switch statement below. Can also be turned on in the browser via
-  // adapter.disableLog(false), but then logging from the switch statement below
-  // will not appear.
-  // require('./utils').disableLog(false);
-
+  
   // Browser shims.
-  var chromeShim = require('./chrome/chrome_shim') || null;
-  var edgeShim = require('./edge/edge_shim') || null;
-  var firefoxShim = require('./firefox/firefox_shim') || null;
-  var safariShim = require('./safari/safari_shim') || null;
-  var commonShim = require('./common_shim') || null;
-
-  // Shim browser if found.
-  switch (browserDetails.browser) {
-    case 'chrome':
-      if (!chromeShim || !chromeShim.shimPeerConnection ||
-          !options.shimChrome) {
-        logging('Chrome shim is not included in this adapter release.');
-        return adapter;
+  
+  },{"./chrome/chrome_shim":3,"./common_shim":6,"./edge/edge_shim":7,"./firefox/firefox_shim":11,"./safari/safari_shim":14,"./utils":15}],3:[function(require,module,exports){
+  
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetDisplayMedia = exports.shimGetUserMedia = undefined;
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  var _getusermedia = require('./getusermedia');
+  
+  Object.defineProperty(exports, 'shimGetUserMedia', {
+    enumerable: true,
+    get: function get() {
+      return _getusermedia.shimGetUserMedia;
+    }
+  });
+  
+  var _getdisplaymedia = require('./getdisplaymedia');
+  
+  Object.defineProperty(exports, 'shimGetDisplayMedia', {
+    enumerable: true,
+    get: function get() {
+      return _getdisplaymedia.shimGetDisplayMedia;
+    }
+  });
+  exports.shimMediaStream = shimMediaStream;
+  exports.shimOnTrack = shimOnTrack;
+  exports.shimGetSendersWithDtmf = shimGetSendersWithDtmf;
+  exports.shimSenderReceiverGetStats = shimSenderReceiverGetStats;
+  exports.shimAddTrackRemoveTrackWithNative = shimAddTrackRemoveTrackWithNative;
+  exports.shimAddTrackRemoveTrack = shimAddTrackRemoveTrack;
+  exports.shimPeerConnection = shimPeerConnection;
+  exports.fixNegotiationNeeded = fixNegotiationNeeded;
+  
+  var _utils = require('../utils.js');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  /* iterates the stats graph recursively. */
+  function walkStats(stats, base, resultSet) {
+    if (!base || resultSet.has(base.id)) {
+      return;
+    }
+    resultSet.set(base.id, base);
+    Object.keys(base).forEach(function (name) {
+      if (name.endsWith('Id')) {
+        walkStats(stats, stats.get(base[name]), resultSet);
+      } else if (name.endsWith('Ids')) {
+        base[name].forEach(function (id) {
+          walkStats(stats, stats.get(id), resultSet);
+        });
       }
-      logging('adapter.js shimming chrome.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = chromeShim;
-      commonShim.shimCreateObjectURL(window);
-
-      chromeShim.shimGetUserMedia(window);
-      chromeShim.shimMediaStream(window);
-      chromeShim.shimSourceObject(window);
-      chromeShim.shimPeerConnection(window);
-      chromeShim.shimOnTrack(window);
-      chromeShim.shimAddTrackRemoveTrack(window);
-      chromeShim.shimGetSendersWithDtmf(window);
-
-      commonShim.shimRTCIceCandidate(window);
-      break;
-    case 'firefox':
-      if (!firefoxShim || !firefoxShim.shimPeerConnection ||
-          !options.shimFirefox) {
-        logging('Firefox shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming firefox.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = firefoxShim;
-      commonShim.shimCreateObjectURL(window);
-
-      firefoxShim.shimGetUserMedia(window);
-      firefoxShim.shimSourceObject(window);
-      firefoxShim.shimPeerConnection(window);
-      firefoxShim.shimOnTrack(window);
-
-      commonShim.shimRTCIceCandidate(window);
-      break;
-    case 'edge':
-      if (!edgeShim || !edgeShim.shimPeerConnection || !options.shimEdge) {
-        logging('MS edge shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming edge.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = edgeShim;
-      commonShim.shimCreateObjectURL(window);
-
-      edgeShim.shimGetUserMedia(window);
-      edgeShim.shimPeerConnection(window);
-      edgeShim.shimReplaceTrack(window);
-
-      // the edge shim implements the full RTCIceCandidate object.
-      break;
-    case 'safari':
-      if (!safariShim || !options.shimSafari) {
-        logging('Safari shim is not included in this adapter release.');
-        return adapter;
-      }
-      logging('adapter.js shimming safari.');
-      // Export to the adapter global object visible in the browser.
-      adapter.browserShim = safariShim;
-      commonShim.shimCreateObjectURL(window);
-
-      safariShim.shimRTCIceServerUrls(window);
-      safariShim.shimCallbacksAPI(window);
-      safariShim.shimLocalStreamsAPI(window);
-      safariShim.shimRemoteStreamsAPI(window);
-      safariShim.shimTrackEventTransceiver(window);
-      safariShim.shimGetUserMedia(window);
-      safariShim.shimCreateOfferLegacy(window);
-
-      commonShim.shimRTCIceCandidate(window);
-      break;
-    default:
-      logging('Unsupported browser!');
-      break;
+    });
   }
-
-  return adapter;
-};
-
-},{"./chrome/chrome_shim":5,"./common_shim":7,"./edge/edge_shim":8,"./firefox/firefox_shim":10,"./safari/safari_shim":12,"./utils":13}],5:[function(require,module,exports){
-
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-var utils = require('../utils.js');
-var logging = utils.log;
-
-var chromeShim = {
-  shimMediaStream: function(window) {
+  
+  /* filter getStats for a sender/receiver track. */
+  function filterStats(result, track, outbound) {
+    var streamStatsType = outbound ? 'outbound-rtp' : 'inbound-rtp';
+    var filteredResult = new Map();
+    if (track === null) {
+      return filteredResult;
+    }
+    var trackStats = [];
+    result.forEach(function (value) {
+      if (value.type === 'track' && value.trackIdentifier === track.id) {
+        trackStats.push(value);
+      }
+    });
+    trackStats.forEach(function (trackStat) {
+      result.forEach(function (stats) {
+        if (stats.type === streamStatsType && stats.trackId === trackStat.id) {
+          walkStats(result, stats, filteredResult);
+        }
+      });
+    });
+    return filteredResult;
+  }
+  
+  function shimMediaStream(window) {
     window.MediaStream = window.MediaStream || window.webkitMediaStream;
-  },
-
-  shimOnTrack: function(window) {
-    if (typeof window === 'object' && window.RTCPeerConnection && !('ontrack' in
-        window.RTCPeerConnection.prototype)) {
+  }
+  
+  function shimOnTrack(window) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && !('ontrack' in window.RTCPeerConnection.prototype)) {
       Object.defineProperty(window.RTCPeerConnection.prototype, 'ontrack', {
-        get: function() {
+        get: function get() {
           return this._ontrack;
         },
-        set: function(f) {
+        set: function set(f) {
           if (this._ontrack) {
             this.removeEventListener('track', this._ontrack);
           }
           this.addEventListener('track', this._ontrack = f);
-        }
+        },
+  
+        enumerable: true,
+        configurable: true
       });
-      var origSetRemoteDescription =
-          window.RTCPeerConnection.prototype.setRemoteDescription;
-      window.RTCPeerConnection.prototype.setRemoteDescription = function() {
-        var pc = this;
-        if (!pc._ontrackpoly) {
-          pc._ontrackpoly = function(e) {
+      var origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+      window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+        var _this = this;
+  
+        if (!this._ontrackpoly) {
+          this._ontrackpoly = function (e) {
             // onaddstream does not fire when a track is added to an existing
             // stream. But stream.onaddtrack is implemented so we use that.
-            e.stream.addEventListener('addtrack', function(te) {
-              var receiver;
+            e.stream.addEventListener('addtrack', function (te) {
+              var receiver = void 0;
               if (window.RTCPeerConnection.prototype.getReceivers) {
-                receiver = pc.getReceivers().find(function(r) {
+                receiver = _this.getReceivers().find(function (r) {
                   return r.track && r.track.id === te.track.id;
                 });
               } else {
-                receiver = {track: te.track};
+                receiver = { track: te.track };
               }
-
+  
               var event = new Event('track');
               event.track = te.track;
               event.receiver = receiver;
-              event.transceiver = {receiver: receiver};
+              event.transceiver = { receiver: receiver };
               event.streams = [e.stream];
-              pc.dispatchEvent(event);
+              _this.dispatchEvent(event);
             });
-            e.stream.getTracks().forEach(function(track) {
-              var receiver;
+            e.stream.getTracks().forEach(function (track) {
+              var receiver = void 0;
               if (window.RTCPeerConnection.prototype.getReceivers) {
-                receiver = pc.getReceivers().find(function(r) {
+                receiver = _this.getReceivers().find(function (r) {
                   return r.track && r.track.id === track.id;
                 });
               } else {
-                receiver = {track: track};
+                receiver = { track: track };
               }
               var event = new Event('track');
               event.track = track;
               event.receiver = receiver;
-              event.transceiver = {receiver: receiver};
+              event.transceiver = { receiver: receiver };
               event.streams = [e.stream];
-              pc.dispatchEvent(event);
+              _this.dispatchEvent(event);
             });
           };
-          pc.addEventListener('addstream', pc._ontrackpoly);
+          this.addEventListener('addstream', this._ontrackpoly);
         }
-        return origSetRemoteDescription.apply(pc, arguments);
+        return origSetRemoteDescription.apply(this, arguments);
       };
+    } else {
+      // even if RTCRtpTransceiver is in window, it is only used and
+      // emitted in unified-plan. Unfortunately this means we need
+      // to unconditionally wrap the event.
+      utils.wrapPeerConnectionEvent(window, 'track', function (e) {
+        if (!e.transceiver) {
+          Object.defineProperty(e, 'transceiver', { value: { receiver: e.receiver } });
+        }
+        return e;
+      });
     }
-  },
-
-  shimGetSendersWithDtmf: function(window) {
+  }
+  
+  function shimGetSendersWithDtmf(window) {
     // Overrides addTrack/removeTrack, depends on shimAddTrackRemoveTrack.
-    if (typeof window === 'object' && window.RTCPeerConnection &&
-        !('getSenders' in window.RTCPeerConnection.prototype) &&
-        'createDTMFSender' in window.RTCPeerConnection.prototype) {
-      var shimSenderWithDtmf = function(pc, track) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && !('getSenders' in window.RTCPeerConnection.prototype) && 'createDTMFSender' in window.RTCPeerConnection.prototype) {
+      var shimSenderWithDtmf = function shimSenderWithDtmf(pc, track) {
         return {
           track: track,
           get dtmf() {
@@ -2470,76 +366,74 @@ var chromeShim = {
           _pc: pc
         };
       };
-
+  
       // augment addTrack when getSenders is not available.
       if (!window.RTCPeerConnection.prototype.getSenders) {
-        window.RTCPeerConnection.prototype.getSenders = function() {
+        window.RTCPeerConnection.prototype.getSenders = function () {
           this._senders = this._senders || [];
           return this._senders.slice(); // return a copy of the internal state.
         };
         var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
-        window.RTCPeerConnection.prototype.addTrack = function(track, stream) {
-          var pc = this;
-          var sender = origAddTrack.apply(pc, arguments);
+        window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+          var sender = origAddTrack.apply(this, arguments);
           if (!sender) {
-            sender = shimSenderWithDtmf(pc, track);
-            pc._senders.push(sender);
+            sender = shimSenderWithDtmf(this, track);
+            this._senders.push(sender);
           }
           return sender;
         };
-
+  
         var origRemoveTrack = window.RTCPeerConnection.prototype.removeTrack;
-        window.RTCPeerConnection.prototype.removeTrack = function(sender) {
-          var pc = this;
-          origRemoveTrack.apply(pc, arguments);
-          var idx = pc._senders.indexOf(sender);
+        window.RTCPeerConnection.prototype.removeTrack = function (sender) {
+          origRemoveTrack.apply(this, arguments);
+          var idx = this._senders.indexOf(sender);
           if (idx !== -1) {
-            pc._senders.splice(idx, 1);
+            this._senders.splice(idx, 1);
           }
         };
       }
       var origAddStream = window.RTCPeerConnection.prototype.addStream;
-      window.RTCPeerConnection.prototype.addStream = function(stream) {
-        var pc = this;
-        pc._senders = pc._senders || [];
-        origAddStream.apply(pc, [stream]);
-        stream.getTracks().forEach(function(track) {
-          pc._senders.push(shimSenderWithDtmf(pc, track));
+      window.RTCPeerConnection.prototype.addStream = function (stream) {
+        var _this2 = this;
+  
+        this._senders = this._senders || [];
+        origAddStream.apply(this, [stream]);
+        stream.getTracks().forEach(function (track) {
+          _this2._senders.push(shimSenderWithDtmf(_this2, track));
         });
       };
-
+  
       var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
-      window.RTCPeerConnection.prototype.removeStream = function(stream) {
-        var pc = this;
-        pc._senders = pc._senders || [];
-        origRemoveStream.apply(pc, [stream]);
-
-        stream.getTracks().forEach(function(track) {
-          var sender = pc._senders.find(function(s) {
+      window.RTCPeerConnection.prototype.removeStream = function (stream) {
+        var _this3 = this;
+  
+        this._senders = this._senders || [];
+        origRemoveStream.apply(this, [stream]);
+  
+        stream.getTracks().forEach(function (track) {
+          var sender = _this3._senders.find(function (s) {
             return s.track === track;
           });
           if (sender) {
-            pc._senders.splice(pc._senders.indexOf(sender), 1); // remove sender
+            // remove sender
+            _this3._senders.splice(_this3._senders.indexOf(sender), 1);
           }
         });
       };
-    } else if (typeof window === 'object' && window.RTCPeerConnection &&
-               'getSenders' in window.RTCPeerConnection.prototype &&
-               'createDTMFSender' in window.RTCPeerConnection.prototype &&
-               window.RTCRtpSender &&
-               !('dtmf' in window.RTCRtpSender.prototype)) {
+    } else if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && 'getSenders' in window.RTCPeerConnection.prototype && 'createDTMFSender' in window.RTCPeerConnection.prototype && window.RTCRtpSender && !('dtmf' in window.RTCRtpSender.prototype)) {
       var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
-      window.RTCPeerConnection.prototype.getSenders = function() {
-        var pc = this;
-        var senders = origGetSenders.apply(pc, []);
-        senders.forEach(function(sender) {
-          sender._pc = pc;
+      window.RTCPeerConnection.prototype.getSenders = function () {
+        var _this4 = this;
+  
+        var senders = origGetSenders.apply(this, []);
+        senders.forEach(function (sender) {
+          return sender._pc = _this4;
         });
         return senders;
       };
-
+  
       Object.defineProperty(window.RTCRtpSender.prototype, 'dtmf', {
-        get: function() {
+        get: function get() {
           if (this._dtmf === undefined) {
             if (this.track.kind === 'audio') {
               this._dtmf = this._pc.createDTMFSender(this.track);
@@ -2551,173 +445,312 @@ var chromeShim = {
         }
       });
     }
-  },
-
-  shimSourceObject: function(window) {
-    var URL = window && window.URL;
-
-    if (typeof window === 'object') {
-      if (window.HTMLMediaElement &&
-        !('srcObject' in window.HTMLMediaElement.prototype)) {
-        // Shim the srcObject property, once, when HTMLMediaElement is found.
-        Object.defineProperty(window.HTMLMediaElement.prototype, 'srcObject', {
-          get: function() {
-            return this._srcObject;
-          },
-          set: function(stream) {
-            var self = this;
-            // Use _srcObject as a private property for this shim
-            this._srcObject = stream;
-            if (this.src) {
-              URL.revokeObjectURL(this.src);
-            }
-
-            if (!stream) {
-              this.src = '';
-              return undefined;
-            }
-            this.src = URL.createObjectURL(stream);
-            // We need to recreate the blob url when a track is added or
-            // removed. Doing it manually since we want to avoid a recursion.
-            stream.addEventListener('addtrack', function() {
-              if (self.src) {
-                URL.revokeObjectURL(self.src);
-              }
-              self.src = URL.createObjectURL(stream);
-            });
-            stream.addEventListener('removetrack', function() {
-              if (self.src) {
-                URL.revokeObjectURL(self.src);
-              }
-              self.src = URL.createObjectURL(stream);
-            });
-          }
-        });
-      }
-    }
-  },
-
-  shimAddTrackRemoveTrack: function(window) {
-    var browserDetails = utils.detectBrowser(window);
-    // shim addTrack and removeTrack.
-    if (window.RTCPeerConnection.prototype.addTrack &&
-        browserDetails.version >= 63) {
+  }
+  
+  function shimSenderReceiverGetStats(window) {
+    if (!((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && window.RTCRtpSender && window.RTCRtpReceiver)) {
       return;
     }
-
-    // also shim pc.getLocalStreams when addTrack is shimmed
-    // to return the original streams.
-    var origGetLocalStreams = window.RTCPeerConnection.prototype
-        .getLocalStreams;
-    window.RTCPeerConnection.prototype.getLocalStreams = function() {
-      var self = this;
-      var nativeStreams = origGetLocalStreams.apply(this);
-      self._reverseStreams = self._reverseStreams || {};
-      return nativeStreams.map(function(stream) {
-        return self._reverseStreams[stream.id];
+  
+    // shim sender stats.
+    if (!('getStats' in window.RTCRtpSender.prototype)) {
+      var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
+      if (origGetSenders) {
+        window.RTCPeerConnection.prototype.getSenders = function () {
+          var _this5 = this;
+  
+          var senders = origGetSenders.apply(this, []);
+          senders.forEach(function (sender) {
+            return sender._pc = _this5;
+          });
+          return senders;
+        };
+      }
+  
+      var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+      if (origAddTrack) {
+        window.RTCPeerConnection.prototype.addTrack = function () {
+          var sender = origAddTrack.apply(this, arguments);
+          sender._pc = this;
+          return sender;
+        };
+      }
+      window.RTCRtpSender.prototype.getStats = function () {
+        var sender = this;
+        return this._pc.getStats().then(function (result) {
+          return (
+            /* Note: this will include stats of all senders that
+             *   send a track with the same id as sender.track as
+             *   it is not possible to identify the RTCRtpSender.
+             */
+            filterStats(result, sender.track, true)
+          );
+        });
+      };
+    }
+  
+    // shim receiver stats.
+    if (!('getStats' in window.RTCRtpReceiver.prototype)) {
+      var origGetReceivers = window.RTCPeerConnection.prototype.getReceivers;
+      if (origGetReceivers) {
+        window.RTCPeerConnection.prototype.getReceivers = function () {
+          var _this6 = this;
+  
+          var receivers = origGetReceivers.apply(this, []);
+          receivers.forEach(function (receiver) {
+            return receiver._pc = _this6;
+          });
+          return receivers;
+        };
+      }
+      utils.wrapPeerConnectionEvent(window, 'track', function (e) {
+        e.receiver._pc = e.srcElement;
+        return e;
+      });
+      window.RTCRtpReceiver.prototype.getStats = function () {
+        var receiver = this;
+        return this._pc.getStats().then(function (result) {
+          return filterStats(result, receiver.track, false);
+        });
+      };
+    }
+  
+    if (!('getStats' in window.RTCRtpSender.prototype && 'getStats' in window.RTCRtpReceiver.prototype)) {
+      return;
+    }
+  
+    // shim RTCPeerConnection.getStats(track).
+    var origGetStats = window.RTCPeerConnection.prototype.getStats;
+    window.RTCPeerConnection.prototype.getStats = function () {
+      if (arguments.length > 0 && arguments[0] instanceof window.MediaStreamTrack) {
+        var track = arguments[0];
+        var sender = void 0;
+        var receiver = void 0;
+        var err = void 0;
+        this.getSenders().forEach(function (s) {
+          if (s.track === track) {
+            if (sender) {
+              err = true;
+            } else {
+              sender = s;
+            }
+          }
+        });
+        this.getReceivers().forEach(function (r) {
+          if (r.track === track) {
+            if (receiver) {
+              err = true;
+            } else {
+              receiver = r;
+            }
+          }
+          return r.track === track;
+        });
+        if (err || sender && receiver) {
+          return Promise.reject(new DOMException('There are more than one sender or receiver for the track.', 'InvalidAccessError'));
+        } else if (sender) {
+          return sender.getStats();
+        } else if (receiver) {
+          return receiver.getStats();
+        }
+        return Promise.reject(new DOMException('There is no sender or receiver for the track.', 'InvalidAccessError'));
+      }
+      return origGetStats.apply(this, arguments);
+    };
+  }
+  
+  function shimAddTrackRemoveTrackWithNative(window) {
+    // shim addTrack/removeTrack with native variants in order to make
+    // the interactions with legacy getLocalStreams behave as in other browsers.
+    // Keeps a mapping stream.id => [stream, rtpsenders...]
+    window.RTCPeerConnection.prototype.getLocalStreams = function () {
+      var _this7 = this;
+  
+      this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+      return Object.keys(this._shimmedLocalStreams).map(function (streamId) {
+        return _this7._shimmedLocalStreams[streamId][0];
       });
     };
-
+  
+    var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+    window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+      if (!stream) {
+        return origAddTrack.apply(this, arguments);
+      }
+      this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+  
+      var sender = origAddTrack.apply(this, arguments);
+      if (!this._shimmedLocalStreams[stream.id]) {
+        this._shimmedLocalStreams[stream.id] = [stream, sender];
+      } else if (this._shimmedLocalStreams[stream.id].indexOf(sender) === -1) {
+        this._shimmedLocalStreams[stream.id].push(sender);
+      }
+      return sender;
+    };
+  
     var origAddStream = window.RTCPeerConnection.prototype.addStream;
-    window.RTCPeerConnection.prototype.addStream = function(stream) {
-      var pc = this;
-      pc._streams = pc._streams || {};
-      pc._reverseStreams = pc._reverseStreams || {};
-
-      stream.getTracks().forEach(function(track) {
-        var alreadyExists = pc.getSenders().find(function(s) {
+    window.RTCPeerConnection.prototype.addStream = function (stream) {
+      var _this8 = this;
+  
+      this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+  
+      stream.getTracks().forEach(function (track) {
+        var alreadyExists = _this8.getSenders().find(function (s) {
           return s.track === track;
         });
         if (alreadyExists) {
-          throw new DOMException('Track already exists.',
-              'InvalidAccessError');
+          throw new DOMException('Track already exists.', 'InvalidAccessError');
+        }
+      });
+      var existingSenders = this.getSenders();
+      origAddStream.apply(this, arguments);
+      var newSenders = this.getSenders().filter(function (newSender) {
+        return existingSenders.indexOf(newSender) === -1;
+      });
+      this._shimmedLocalStreams[stream.id] = [stream].concat(newSenders);
+    };
+  
+    var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
+    window.RTCPeerConnection.prototype.removeStream = function (stream) {
+      this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+      delete this._shimmedLocalStreams[stream.id];
+      return origRemoveStream.apply(this, arguments);
+    };
+  
+    var origRemoveTrack = window.RTCPeerConnection.prototype.removeTrack;
+    window.RTCPeerConnection.prototype.removeTrack = function (sender) {
+      var _this9 = this;
+  
+      this._shimmedLocalStreams = this._shimmedLocalStreams || {};
+      if (sender) {
+        Object.keys(this._shimmedLocalStreams).forEach(function (streamId) {
+          var idx = _this9._shimmedLocalStreams[streamId].indexOf(sender);
+          if (idx !== -1) {
+            _this9._shimmedLocalStreams[streamId].splice(idx, 1);
+          }
+          if (_this9._shimmedLocalStreams[streamId].length === 1) {
+            delete _this9._shimmedLocalStreams[streamId];
+          }
+        });
+      }
+      return origRemoveTrack.apply(this, arguments);
+    };
+  }
+  
+  function shimAddTrackRemoveTrack(window) {
+    if (!window.RTCPeerConnection) {
+      return;
+    }
+    var browserDetails = utils.detectBrowser(window);
+    // shim addTrack and removeTrack.
+    if (window.RTCPeerConnection.prototype.addTrack && browserDetails.version >= 65) {
+      return shimAddTrackRemoveTrackWithNative(window);
+    }
+  
+    // also shim pc.getLocalStreams when addTrack is shimmed
+    // to return the original streams.
+    var origGetLocalStreams = window.RTCPeerConnection.prototype.getLocalStreams;
+    window.RTCPeerConnection.prototype.getLocalStreams = function () {
+      var _this10 = this;
+  
+      var nativeStreams = origGetLocalStreams.apply(this);
+      this._reverseStreams = this._reverseStreams || {};
+      return nativeStreams.map(function (stream) {
+        return _this10._reverseStreams[stream.id];
+      });
+    };
+  
+    var origAddStream = window.RTCPeerConnection.prototype.addStream;
+    window.RTCPeerConnection.prototype.addStream = function (stream) {
+      var _this11 = this;
+  
+      this._streams = this._streams || {};
+      this._reverseStreams = this._reverseStreams || {};
+  
+      stream.getTracks().forEach(function (track) {
+        var alreadyExists = _this11.getSenders().find(function (s) {
+          return s.track === track;
+        });
+        if (alreadyExists) {
+          throw new DOMException('Track already exists.', 'InvalidAccessError');
         }
       });
       // Add identity mapping for consistency with addTrack.
       // Unless this is being used with a stream from addTrack.
-      if (!pc._reverseStreams[stream.id]) {
+      if (!this._reverseStreams[stream.id]) {
         var newStream = new window.MediaStream(stream.getTracks());
-        pc._streams[stream.id] = newStream;
-        pc._reverseStreams[newStream.id] = stream;
+        this._streams[stream.id] = newStream;
+        this._reverseStreams[newStream.id] = stream;
         stream = newStream;
       }
-      origAddStream.apply(pc, [stream]);
+      origAddStream.apply(this, [stream]);
     };
-
+  
     var origRemoveStream = window.RTCPeerConnection.prototype.removeStream;
-    window.RTCPeerConnection.prototype.removeStream = function(stream) {
-      var pc = this;
-      pc._streams = pc._streams || {};
-      pc._reverseStreams = pc._reverseStreams || {};
-
-      origRemoveStream.apply(pc, [(pc._streams[stream.id] || stream)]);
-      delete pc._reverseStreams[(pc._streams[stream.id] ?
-          pc._streams[stream.id].id : stream.id)];
-      delete pc._streams[stream.id];
+    window.RTCPeerConnection.prototype.removeStream = function (stream) {
+      this._streams = this._streams || {};
+      this._reverseStreams = this._reverseStreams || {};
+  
+      origRemoveStream.apply(this, [this._streams[stream.id] || stream]);
+      delete this._reverseStreams[this._streams[stream.id] ? this._streams[stream.id].id : stream.id];
+      delete this._streams[stream.id];
     };
-
-    window.RTCPeerConnection.prototype.addTrack = function(track, stream) {
-      var pc = this;
-      if (pc.signalingState === 'closed') {
-        throw new DOMException(
-          'The RTCPeerConnection\'s signalingState is \'closed\'.',
-          'InvalidStateError');
+  
+    window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
+      var _this12 = this;
+  
+      if (this.signalingState === 'closed') {
+        throw new DOMException('The RTCPeerConnection\'s signalingState is \'closed\'.', 'InvalidStateError');
       }
       var streams = [].slice.call(arguments, 1);
-      if (streams.length !== 1 ||
-          !streams[0].getTracks().find(function(t) {
-            return t === track;
-          })) {
+      if (streams.length !== 1 || !streams[0].getTracks().find(function (t) {
+        return t === track;
+      })) {
         // this is not fully correct but all we can manage without
         // [[associated MediaStreams]] internal slot.
-        throw new DOMException(
-          'The adapter.js addTrack polyfill only supports a single ' +
-          ' stream which is associated with the specified track.',
-          'NotSupportedError');
+        throw new DOMException('The adapter.js addTrack polyfill only supports a single ' + ' stream which is associated with the specified track.', 'NotSupportedError');
       }
-
-      var alreadyExists = pc.getSenders().find(function(s) {
+  
+      var alreadyExists = this.getSenders().find(function (s) {
         return s.track === track;
       });
       if (alreadyExists) {
-        throw new DOMException('Track already exists.',
-            'InvalidAccessError');
+        throw new DOMException('Track already exists.', 'InvalidAccessError');
       }
-
-      pc._streams = pc._streams || {};
-      pc._reverseStreams = pc._reverseStreams || {};
-      var oldStream = pc._streams[stream.id];
+  
+      this._streams = this._streams || {};
+      this._reverseStreams = this._reverseStreams || {};
+      var oldStream = this._streams[stream.id];
       if (oldStream) {
         // this is using odd Chrome behaviour, use with caution:
         // https://bugs.chromium.org/p/webrtc/issues/detail?id=7815
         // Note: we rely on the high-level addTrack/dtmf shim to
         // create the sender with a dtmf sender.
         oldStream.addTrack(track);
-
+  
         // Trigger ONN async.
-        Promise.resolve().then(function() {
-          pc.dispatchEvent(new Event('negotiationneeded'));
+        Promise.resolve().then(function () {
+          _this12.dispatchEvent(new Event('negotiationneeded'));
         });
       } else {
         var newStream = new window.MediaStream([track]);
-        pc._streams[stream.id] = newStream;
-        pc._reverseStreams[newStream.id] = stream;
-        pc.addStream(newStream);
+        this._streams[stream.id] = newStream;
+        this._reverseStreams[newStream.id] = stream;
+        this.addStream(newStream);
       }
-      return pc.getSenders().find(function(s) {
+      return this.getSenders().find(function (s) {
         return s.track === track;
       });
     };
-
+  
     // replace the internal stream id with the external one and
     // vice versa.
     function replaceInternalStreamId(pc, description) {
       var sdp = description.sdp;
-      Object.keys(pc._reverseStreams || []).forEach(function(internalId) {
+      Object.keys(pc._reverseStreams || []).forEach(function (internalId) {
         var externalStream = pc._reverseStreams[internalId];
         var internalStream = pc._streams[externalStream.id];
-        sdp = sdp.replace(new RegExp(internalStream.id, 'g'),
-            externalStream.id);
+        sdp = sdp.replace(new RegExp(internalStream.id, 'g'), externalStream.id);
       });
       return new RTCSessionDescription({
         type: description.type,
@@ -2726,196 +759,134 @@ var chromeShim = {
     }
     function replaceExternalStreamId(pc, description) {
       var sdp = description.sdp;
-      Object.keys(pc._reverseStreams || []).forEach(function(internalId) {
+      Object.keys(pc._reverseStreams || []).forEach(function (internalId) {
         var externalStream = pc._reverseStreams[internalId];
         var internalStream = pc._streams[externalStream.id];
-        sdp = sdp.replace(new RegExp(externalStream.id, 'g'),
-            internalStream.id);
+        sdp = sdp.replace(new RegExp(externalStream.id, 'g'), internalStream.id);
       });
       return new RTCSessionDescription({
         type: description.type,
         sdp: sdp
       });
     }
-    ['createOffer', 'createAnswer'].forEach(function(method) {
+    ['createOffer', 'createAnswer'].forEach(function (method) {
       var nativeMethod = window.RTCPeerConnection.prototype[method];
-      window.RTCPeerConnection.prototype[method] = function() {
-        var pc = this;
+      window.RTCPeerConnection.prototype[method] = function () {
+        var _this13 = this;
+  
         var args = arguments;
-        var isLegacyCall = arguments.length &&
-            typeof arguments[0] === 'function';
+        var isLegacyCall = arguments.length && typeof arguments[0] === 'function';
         if (isLegacyCall) {
-          return nativeMethod.apply(pc, [
-            function(description) {
-              var desc = replaceInternalStreamId(pc, description);
-              args[0].apply(null, [desc]);
-            },
-            function(err) {
-              if (args[1]) {
-                args[1].apply(null, err);
-              }
-            }, arguments[2]
-          ]);
+          return nativeMethod.apply(this, [function (description) {
+            var desc = replaceInternalStreamId(_this13, description);
+            args[0].apply(null, [desc]);
+          }, function (err) {
+            if (args[1]) {
+              args[1].apply(null, err);
+            }
+          }, arguments[2]]);
         }
-        return nativeMethod.apply(pc, arguments)
-        .then(function(description) {
-          return replaceInternalStreamId(pc, description);
+        return nativeMethod.apply(this, arguments).then(function (description) {
+          return replaceInternalStreamId(_this13, description);
         });
       };
     });
-
-    var origSetLocalDescription =
-        window.RTCPeerConnection.prototype.setLocalDescription;
-    window.RTCPeerConnection.prototype.setLocalDescription = function() {
-      var pc = this;
+  
+    var origSetLocalDescription = window.RTCPeerConnection.prototype.setLocalDescription;
+    window.RTCPeerConnection.prototype.setLocalDescription = function () {
       if (!arguments.length || !arguments[0].type) {
-        return origSetLocalDescription.apply(pc, arguments);
+        return origSetLocalDescription.apply(this, arguments);
       }
-      arguments[0] = replaceExternalStreamId(pc, arguments[0]);
-      return origSetLocalDescription.apply(pc, arguments);
+      arguments[0] = replaceExternalStreamId(this, arguments[0]);
+      return origSetLocalDescription.apply(this, arguments);
     };
-
+  
     // TODO: mangle getStats: https://w3c.github.io/webrtc-stats/#dom-rtcmediastreamstats-streamidentifier
-
-    var origLocalDescription = Object.getOwnPropertyDescriptor(
-        window.RTCPeerConnection.prototype, 'localDescription');
-    Object.defineProperty(window.RTCPeerConnection.prototype,
-        'localDescription', {
-          get: function() {
-            var pc = this;
-            var description = origLocalDescription.get.apply(this);
-            if (description.type === '') {
-              return description;
-            }
-            return replaceInternalStreamId(pc, description);
-          }
-        });
-
-    window.RTCPeerConnection.prototype.removeTrack = function(sender) {
-      var pc = this;
-      if (pc.signalingState === 'closed') {
-        throw new DOMException(
-          'The RTCPeerConnection\'s signalingState is \'closed\'.',
-          'InvalidStateError');
+  
+    var origLocalDescription = Object.getOwnPropertyDescriptor(window.RTCPeerConnection.prototype, 'localDescription');
+    Object.defineProperty(window.RTCPeerConnection.prototype, 'localDescription', {
+      get: function get() {
+        var description = origLocalDescription.get.apply(this);
+        if (description.type === '') {
+          return description;
+        }
+        return replaceInternalStreamId(this, description);
+      }
+    });
+  
+    window.RTCPeerConnection.prototype.removeTrack = function (sender) {
+      var _this14 = this;
+  
+      if (this.signalingState === 'closed') {
+        throw new DOMException('The RTCPeerConnection\'s signalingState is \'closed\'.', 'InvalidStateError');
       }
       // We can not yet check for sender instanceof RTCRtpSender
       // since we shim RTPSender. So we check if sender._pc is set.
       if (!sender._pc) {
-        throw new DOMException('Argument 1 of RTCPeerConnection.removeTrack ' +
-            'does not implement interface RTCRtpSender.', 'TypeError');
+        throw new DOMException('Argument 1 of RTCPeerConnection.removeTrack ' + 'does not implement interface RTCRtpSender.', 'TypeError');
       }
-      var isLocal = sender._pc === pc;
+      var isLocal = sender._pc === this;
       if (!isLocal) {
-        throw new DOMException('Sender was not created by this connection.',
-            'InvalidAccessError');
+        throw new DOMException('Sender was not created by this connection.', 'InvalidAccessError');
       }
-
+  
       // Search for the native stream the senders track belongs to.
-      pc._streams = pc._streams || {};
-      var stream;
-      Object.keys(pc._streams).forEach(function(streamid) {
-        var hasTrack = pc._streams[streamid].getTracks().find(function(track) {
+      this._streams = this._streams || {};
+      var stream = void 0;
+      Object.keys(this._streams).forEach(function (streamid) {
+        var hasTrack = _this14._streams[streamid].getTracks().find(function (track) {
           return sender.track === track;
         });
         if (hasTrack) {
-          stream = pc._streams[streamid];
+          stream = _this14._streams[streamid];
         }
       });
-
+  
       if (stream) {
         if (stream.getTracks().length === 1) {
           // if this is the last track of the stream, remove the stream. This
           // takes care of any shimmed _senders.
-          pc.removeStream(pc._reverseStreams[stream.id]);
+          this.removeStream(this._reverseStreams[stream.id]);
         } else {
           // relying on the same odd chrome behaviour as above.
           stream.removeTrack(sender.track);
         }
-        pc.dispatchEvent(new Event('negotiationneeded'));
+        this.dispatchEvent(new Event('negotiationneeded'));
       }
     };
-  },
-
-  shimPeerConnection: function(window) {
-    var browserDetails = utils.detectBrowser(window);
-
-    // The RTCPeerConnection object.
-    if (!window.RTCPeerConnection) {
-      window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-        // Translate iceTransportPolicy to iceTransports,
-        // see https://code.google.com/p/webrtc/issues/detail?id=4869
-        // this was fixed in M56 along with unprefixing RTCPeerConnection.
-        logging('PeerConnection');
-        if (pcConfig && pcConfig.iceTransportPolicy) {
-          pcConfig.iceTransports = pcConfig.iceTransportPolicy;
-        }
-
-        return new window.webkitRTCPeerConnection(pcConfig, pcConstraints);
-      };
-      window.RTCPeerConnection.prototype =
-          window.webkitRTCPeerConnection.prototype;
-      // wrap static methods. Currently just generateCertificate.
-      if (window.webkitRTCPeerConnection.generateCertificate) {
-        Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-          get: function() {
-            return window.webkitRTCPeerConnection.generateCertificate;
-          }
-        });
-      }
-    } else {
-      // migrate from non-spec RTCIceServer.url to RTCIceServer.urls
-      var OrigPeerConnection = window.RTCPeerConnection;
-      window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-        if (pcConfig && pcConfig.iceServers) {
-          var newIceServers = [];
-          for (var i = 0; i < pcConfig.iceServers.length; i++) {
-            var server = pcConfig.iceServers[i];
-            if (!server.hasOwnProperty('urls') &&
-                server.hasOwnProperty('url')) {
-              utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
-              server = JSON.parse(JSON.stringify(server));
-              server.urls = server.url;
-              newIceServers.push(server);
-            } else {
-              newIceServers.push(pcConfig.iceServers[i]);
-            }
-          }
-          pcConfig.iceServers = newIceServers;
-        }
-        return new OrigPeerConnection(pcConfig, pcConstraints);
-      };
-      window.RTCPeerConnection.prototype = OrigPeerConnection.prototype;
-      // wrap static methods. Currently just generateCertificate.
-      Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-        get: function() {
-          return OrigPeerConnection.generateCertificate;
-        }
-      });
+  }
+  
+  function shimPeerConnection(window) {
+    if (!window.RTCPeerConnection && window.webkitRTCPeerConnection) {
+      // very basic support for old versions.
+      window.RTCPeerConnection = window.webkitRTCPeerConnection;
     }
-
+    if (!window.RTCPeerConnection) {
+      return;
+    }
+  
     var origGetStats = window.RTCPeerConnection.prototype.getStats;
-    window.RTCPeerConnection.prototype.getStats = function(selector,
-        successCallback, errorCallback) {
-      var self = this;
+    window.RTCPeerConnection.prototype.getStats = function (selector, successCallback, errorCallback) {
+      var _this15 = this;
+  
       var args = arguments;
-
+  
       // If selector is a function then we are in the old style stats so just
       // pass back the original getStats format to avoid breaking old users.
       if (arguments.length > 0 && typeof selector === 'function') {
         return origGetStats.apply(this, arguments);
       }
-
+  
       // When spec-style getStats is supported, return those when called with
       // either no arguments or the selector argument is null.
-      if (origGetStats.length === 0 && (arguments.length === 0 ||
-          typeof arguments[0] !== 'function')) {
+      if (origGetStats.length === 0 && (arguments.length === 0 || typeof arguments[0] !== 'function')) {
         return origGetStats.apply(this, []);
       }
-
-      var fixChromeStats_ = function(response) {
+  
+      var fixChromeStats_ = function fixChromeStats_(response) {
         var standardReport = {};
         var reports = response.result();
-        reports.forEach(function(report) {
+        reports.forEach(function (report) {
           var standardStats = {
             id: report.id,
             timestamp: report.timestamp,
@@ -2924,101 +895,50 @@ var chromeShim = {
               remotecandidate: 'remote-candidate'
             }[report.type] || report.type
           };
-          report.names().forEach(function(name) {
+          report.names().forEach(function (name) {
             standardStats[name] = report.stat(name);
           });
           standardReport[standardStats.id] = standardStats;
         });
-
+  
         return standardReport;
       };
-
+  
       // shim getStats with maplike support
-      var makeMapStats = function(stats) {
-        return new Map(Object.keys(stats).map(function(key) {
+      var makeMapStats = function makeMapStats(stats) {
+        return new Map(Object.keys(stats).map(function (key) {
           return [key, stats[key]];
         }));
       };
-
+  
       if (arguments.length >= 2) {
-        var successCallbackWrapper_ = function(response) {
+        var successCallbackWrapper_ = function successCallbackWrapper_(response) {
           args[1](makeMapStats(fixChromeStats_(response)));
         };
-
-        return origGetStats.apply(this, [successCallbackWrapper_,
-          arguments[0]]);
+  
+        return origGetStats.apply(this, [successCallbackWrapper_, arguments[0]]);
       }
-
+  
       // promise-support
-      return new Promise(function(resolve, reject) {
-        origGetStats.apply(self, [
-          function(response) {
-            resolve(makeMapStats(fixChromeStats_(response)));
-          }, reject]);
+      return new Promise(function (resolve, reject) {
+        origGetStats.apply(_this15, [function (response) {
+          resolve(makeMapStats(fixChromeStats_(response)));
+        }, reject]);
       }).then(successCallback, errorCallback);
     };
-
-    // add promise support -- natively available in Chrome 51
-    if (browserDetails.version < 51) {
-      ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate']
-          .forEach(function(method) {
-            var nativeMethod = window.RTCPeerConnection.prototype[method];
-            window.RTCPeerConnection.prototype[method] = function() {
-              var args = arguments;
-              var self = this;
-              var promise = new Promise(function(resolve, reject) {
-                nativeMethod.apply(self, [args[0], resolve, reject]);
-              });
-              if (args.length < 2) {
-                return promise;
-              }
-              return promise.then(function() {
-                args[1].apply(null, []);
-              },
-              function(err) {
-                if (args.length >= 3) {
-                  args[2].apply(null, [err]);
-                }
-              });
-            };
-          });
-    }
-
-    // promise support for createOffer and createAnswer. Available (without
-    // bugs) since M52: crbug/619289
-    if (browserDetails.version < 52) {
-      ['createOffer', 'createAnswer'].forEach(function(method) {
-        var nativeMethod = window.RTCPeerConnection.prototype[method];
-        window.RTCPeerConnection.prototype[method] = function() {
-          var self = this;
-          if (arguments.length < 1 || (arguments.length === 1 &&
-              typeof arguments[0] === 'object')) {
-            var opts = arguments.length === 1 ? arguments[0] : undefined;
-            return new Promise(function(resolve, reject) {
-              nativeMethod.apply(self, [resolve, reject, opts]);
-            });
-          }
-          return nativeMethod.apply(this, arguments);
-        };
-      });
-    }
-
+  
     // shim implicit creation of RTCSessionDescription/RTCIceCandidate
-    ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate']
-        .forEach(function(method) {
-          var nativeMethod = window.RTCPeerConnection.prototype[method];
-          window.RTCPeerConnection.prototype[method] = function() {
-            arguments[0] = new ((method === 'addIceCandidate') ?
-                window.RTCIceCandidate :
-                window.RTCSessionDescription)(arguments[0]);
-            return nativeMethod.apply(this, arguments);
-          };
-        });
-
+    ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate'].forEach(function (method) {
+      var nativeMethod = window.RTCPeerConnection.prototype[method];
+      window.RTCPeerConnection.prototype[method] = function () {
+        arguments[0] = new (method === 'addIceCandidate' ? window.RTCIceCandidate : window.RTCSessionDescription)(arguments[0]);
+        return nativeMethod.apply(this, arguments);
+      };
+    });
+  
     // support for addIceCandidate(null or undefined)
-    var nativeAddIceCandidate =
-        window.RTCPeerConnection.prototype.addIceCandidate;
-    window.RTCPeerConnection.prototype.addIceCandidate = function() {
+    var nativeAddIceCandidate = window.RTCPeerConnection.prototype.addIceCandidate;
+    window.RTCPeerConnection.prototype.addIceCandidate = function () {
       if (!arguments[0]) {
         if (arguments[1]) {
           arguments[1].apply(null);
@@ -3028,363 +948,346 @@ var chromeShim = {
       return nativeAddIceCandidate.apply(this, arguments);
     };
   }
-};
-
-
-// Expose public methods.
-module.exports = {
-  shimMediaStream: chromeShim.shimMediaStream,
-  shimOnTrack: chromeShim.shimOnTrack,
-  shimAddTrackRemoveTrack: chromeShim.shimAddTrackRemoveTrack,
-  shimGetSendersWithDtmf: chromeShim.shimGetSendersWithDtmf,
-  shimSourceObject: chromeShim.shimSourceObject,
-  shimPeerConnection: chromeShim.shimPeerConnection,
-  shimGetUserMedia: require('./getusermedia')
-};
-
-},{"../utils.js":13,"./getusermedia":6}],6:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-var utils = require('../utils.js');
-var logging = utils.log;
-
-// Expose public methods.
-module.exports = function(window) {
-  var browserDetails = utils.detectBrowser(window);
-  var navigator = window && window.navigator;
-
-  var constraintsToChrome_ = function(c) {
-    if (typeof c !== 'object' || c.mandatory || c.optional) {
-      return c;
-    }
-    var cc = {};
-    Object.keys(c).forEach(function(key) {
-      if (key === 'require' || key === 'advanced' || key === 'mediaSource') {
+  
+  function fixNegotiationNeeded(window) {
+    utils.wrapPeerConnectionEvent(window, 'negotiationneeded', function (e) {
+      var pc = e.target;
+      if (pc.signalingState !== 'stable') {
         return;
       }
-      var r = (typeof c[key] === 'object') ? c[key] : {ideal: c[key]};
-      if (r.exact !== undefined && typeof r.exact === 'number') {
-        r.min = r.max = r.exact;
-      }
-      var oldname_ = function(prefix, name) {
-        if (prefix) {
-          return prefix + name.charAt(0).toUpperCase() + name.slice(1);
-        }
-        return (name === 'deviceId') ? 'sourceId' : name;
-      };
-      if (r.ideal !== undefined) {
-        cc.optional = cc.optional || [];
-        var oc = {};
-        if (typeof r.ideal === 'number') {
-          oc[oldname_('min', key)] = r.ideal;
-          cc.optional.push(oc);
-          oc = {};
-          oc[oldname_('max', key)] = r.ideal;
-          cc.optional.push(oc);
-        } else {
-          oc[oldname_('', key)] = r.ideal;
-          cc.optional.push(oc);
-        }
-      }
-      if (r.exact !== undefined && typeof r.exact !== 'number') {
-        cc.mandatory = cc.mandatory || {};
-        cc.mandatory[oldname_('', key)] = r.exact;
-      } else {
-        ['min', 'max'].forEach(function(mix) {
-          if (r[mix] !== undefined) {
-            cc.mandatory = cc.mandatory || {};
-            cc.mandatory[oldname_(mix, key)] = r[mix];
+      return e;
+    });
+  }
+  
+  },{"../utils.js":15,"./getdisplaymedia":4,"./getusermedia":5}],4:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2018 The adapter.js project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetDisplayMedia = shimGetDisplayMedia;
+  function shimGetDisplayMedia(window, getSourceId) {
+    if (window.navigator.mediaDevices && 'getDisplayMedia' in window.navigator.mediaDevices) {
+      return;
+    }
+    if (!window.navigator.mediaDevices) {
+      return;
+    }
+    // getSourceId is a function that returns a promise resolving with
+    // the sourceId of the screen/window/tab to be shared.
+    if (typeof getSourceId !== 'function') {
+      console.error('shimGetDisplayMedia: getSourceId argument is not ' + 'a function');
+      return;
+    }
+    window.navigator.mediaDevices.getDisplayMedia = function (constraints) {
+      return getSourceId(constraints).then(function (sourceId) {
+        var widthSpecified = constraints.video && constraints.video.width;
+        var heightSpecified = constraints.video && constraints.video.height;
+        var frameRateSpecified = constraints.video && constraints.video.frameRate;
+        constraints.video = {
+          mandatory: {
+            chromeMediaSource: 'desktop',
+            chromeMediaSourceId: sourceId,
+            maxFrameRate: frameRateSpecified || 3
           }
-        });
-      }
-    });
-    if (c.advanced) {
-      cc.optional = (cc.optional || []).concat(c.advanced);
-    }
-    return cc;
-  };
-
-  var shimConstraints_ = function(constraints, func) {
-    constraints = JSON.parse(JSON.stringify(constraints));
-    if (constraints && typeof constraints.audio === 'object') {
-      var remap = function(obj, a, b) {
-        if (a in obj && !(b in obj)) {
-          obj[b] = obj[a];
-          delete obj[a];
-        }
-      };
-      constraints = JSON.parse(JSON.stringify(constraints));
-      remap(constraints.audio, 'autoGainControl', 'googAutoGainControl');
-      remap(constraints.audio, 'noiseSuppression', 'googNoiseSuppression');
-      constraints.audio = constraintsToChrome_(constraints.audio);
-    }
-    if (constraints && typeof constraints.video === 'object') {
-      // Shim facingMode for mobile & surface pro.
-      var face = constraints.video.facingMode;
-      face = face && ((typeof face === 'object') ? face : {ideal: face});
-      var getSupportedFacingModeLies = browserDetails.version < 66;
-
-      if ((face && (face.exact === 'user' || face.exact === 'environment' ||
-                    face.ideal === 'user' || face.ideal === 'environment')) &&
-          !(navigator.mediaDevices.getSupportedConstraints &&
-            navigator.mediaDevices.getSupportedConstraints().facingMode &&
-            !getSupportedFacingModeLies)) {
-        delete constraints.video.facingMode;
-        var matches;
-        if (face.exact === 'environment' || face.ideal === 'environment') {
-          matches = ['back', 'rear'];
-        } else if (face.exact === 'user' || face.ideal === 'user') {
-          matches = ['front'];
-        }
-        if (matches) {
-          // Look for matches in label, or use last cam for back (typical).
-          return navigator.mediaDevices.enumerateDevices()
-          .then(function(devices) {
-            devices = devices.filter(function(d) {
-              return d.kind === 'videoinput';
-            });
-            var dev = devices.find(function(d) {
-              return matches.some(function(match) {
-                return d.label.toLowerCase().indexOf(match) !== -1;
-              });
-            });
-            if (!dev && devices.length && matches.indexOf('back') !== -1) {
-              dev = devices[devices.length - 1]; // more likely the back cam
-            }
-            if (dev) {
-              constraints.video.deviceId = face.exact ? {exact: dev.deviceId} :
-                                                        {ideal: dev.deviceId};
-            }
-            constraints.video = constraintsToChrome_(constraints.video);
-            logging('chrome: ' + JSON.stringify(constraints));
-            return func(constraints);
-          });
-        }
-      }
-      constraints.video = constraintsToChrome_(constraints.video);
-    }
-    logging('chrome: ' + JSON.stringify(constraints));
-    return func(constraints);
-  };
-
-  var shimError_ = function(e) {
-    return {
-      name: {
-        PermissionDeniedError: 'NotAllowedError',
-        InvalidStateError: 'NotReadableError',
-        DevicesNotFoundError: 'NotFoundError',
-        ConstraintNotSatisfiedError: 'OverconstrainedError',
-        TrackStartError: 'NotReadableError',
-        MediaDeviceFailedDueToShutdown: 'NotReadableError',
-        MediaDeviceKillSwitchOn: 'NotReadableError'
-      }[e.name] || e.name,
-      message: e.message,
-      constraint: e.constraintName,
-      toString: function() {
-        return this.name + (this.message && ': ') + this.message;
-      }
-    };
-  };
-
-  var getUserMedia_ = function(constraints, onSuccess, onError) {
-    shimConstraints_(constraints, function(c) {
-      navigator.webkitGetUserMedia(c, onSuccess, function(e) {
-        if (onError) {
-          onError(shimError_(e));
-        }
-      });
-    });
-  };
-
-  navigator.getUserMedia = getUserMedia_;
-
-  // Returns the result of getUserMedia as a Promise.
-  var getUserMediaPromise_ = function(constraints) {
-    return new Promise(function(resolve, reject) {
-      navigator.getUserMedia(constraints, resolve, reject);
-    });
-  };
-
-  if (!navigator.mediaDevices) {
-    navigator.mediaDevices = {
-      getUserMedia: getUserMediaPromise_,
-      enumerateDevices: function() {
-        return new Promise(function(resolve) {
-          var kinds = {audio: 'audioinput', video: 'videoinput'};
-          return window.MediaStreamTrack.getSources(function(devices) {
-            resolve(devices.map(function(device) {
-              return {label: device.label,
-                kind: kinds[device.kind],
-                deviceId: device.id,
-                groupId: ''};
-            }));
-          });
-        });
-      },
-      getSupportedConstraints: function() {
-        return {
-          deviceId: true, echoCancellation: true, facingMode: true,
-          frameRate: true, height: true, width: true
         };
-      }
+        if (widthSpecified) {
+          constraints.video.mandatory.maxWidth = widthSpecified;
+        }
+        if (heightSpecified) {
+          constraints.video.mandatory.maxHeight = heightSpecified;
+        }
+        return window.navigator.mediaDevices.getUserMedia(constraints);
+      });
     };
   }
-
-  // A shim for getUserMedia method on the mediaDevices object.
-  // TODO(KaptenJansson) remove once implemented in Chrome stable.
-  if (!navigator.mediaDevices.getUserMedia) {
-    navigator.mediaDevices.getUserMedia = function(constraints) {
-      return getUserMediaPromise_(constraints);
+  
+  },{}],5:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  exports.shimGetUserMedia = shimGetUserMedia;
+  
+  var _utils = require('../utils.js');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  var logging = utils.log;
+  
+  function shimGetUserMedia(window) {
+    var navigator = window && window.navigator;
+  
+    if (!navigator.mediaDevices) {
+      return;
+    }
+  
+    var browserDetails = utils.detectBrowser(window);
+  
+    var constraintsToChrome_ = function constraintsToChrome_(c) {
+      if ((typeof c === 'undefined' ? 'undefined' : _typeof(c)) !== 'object' || c.mandatory || c.optional) {
+        return c;
+      }
+      var cc = {};
+      Object.keys(c).forEach(function (key) {
+        if (key === 'require' || key === 'advanced' || key === 'mediaSource') {
+          return;
+        }
+        var r = _typeof(c[key]) === 'object' ? c[key] : { ideal: c[key] };
+        if (r.exact !== undefined && typeof r.exact === 'number') {
+          r.min = r.max = r.exact;
+        }
+        var oldname_ = function oldname_(prefix, name) {
+          if (prefix) {
+            return prefix + name.charAt(0).toUpperCase() + name.slice(1);
+          }
+          return name === 'deviceId' ? 'sourceId' : name;
+        };
+        if (r.ideal !== undefined) {
+          cc.optional = cc.optional || [];
+          var oc = {};
+          if (typeof r.ideal === 'number') {
+            oc[oldname_('min', key)] = r.ideal;
+            cc.optional.push(oc);
+            oc = {};
+            oc[oldname_('max', key)] = r.ideal;
+            cc.optional.push(oc);
+          } else {
+            oc[oldname_('', key)] = r.ideal;
+            cc.optional.push(oc);
+          }
+        }
+        if (r.exact !== undefined && typeof r.exact !== 'number') {
+          cc.mandatory = cc.mandatory || {};
+          cc.mandatory[oldname_('', key)] = r.exact;
+        } else {
+          ['min', 'max'].forEach(function (mix) {
+            if (r[mix] !== undefined) {
+              cc.mandatory = cc.mandatory || {};
+              cc.mandatory[oldname_(mix, key)] = r[mix];
+            }
+          });
+        }
+      });
+      if (c.advanced) {
+        cc.optional = (cc.optional || []).concat(c.advanced);
+      }
+      return cc;
     };
-  } else {
+  
+    var shimConstraints_ = function shimConstraints_(constraints, func) {
+      if (browserDetails.version >= 61) {
+        return func(constraints);
+      }
+      constraints = JSON.parse(JSON.stringify(constraints));
+      if (constraints && _typeof(constraints.audio) === 'object') {
+        var remap = function remap(obj, a, b) {
+          if (a in obj && !(b in obj)) {
+            obj[b] = obj[a];
+            delete obj[a];
+          }
+        };
+        constraints = JSON.parse(JSON.stringify(constraints));
+        remap(constraints.audio, 'autoGainControl', 'googAutoGainControl');
+        remap(constraints.audio, 'noiseSuppression', 'googNoiseSuppression');
+        constraints.audio = constraintsToChrome_(constraints.audio);
+      }
+      if (constraints && _typeof(constraints.video) === 'object') {
+        // Shim facingMode for mobile & surface pro.
+        var face = constraints.video.facingMode;
+        face = face && ((typeof face === 'undefined' ? 'undefined' : _typeof(face)) === 'object' ? face : { ideal: face });
+        var getSupportedFacingModeLies = browserDetails.version < 66;
+  
+        if (face && (face.exact === 'user' || face.exact === 'environment' || face.ideal === 'user' || face.ideal === 'environment') && !(navigator.mediaDevices.getSupportedConstraints && navigator.mediaDevices.getSupportedConstraints().facingMode && !getSupportedFacingModeLies)) {
+          delete constraints.video.facingMode;
+          var matches = void 0;
+          if (face.exact === 'environment' || face.ideal === 'environment') {
+            matches = ['back', 'rear'];
+          } else if (face.exact === 'user' || face.ideal === 'user') {
+            matches = ['front'];
+          }
+          if (matches) {
+            // Look for matches in label, or use last cam for back (typical).
+            return navigator.mediaDevices.enumerateDevices().then(function (devices) {
+              devices = devices.filter(function (d) {
+                return d.kind === 'videoinput';
+              });
+              var dev = devices.find(function (d) {
+                return matches.some(function (match) {
+                  return d.label.toLowerCase().includes(match);
+                });
+              });
+              if (!dev && devices.length && matches.includes('back')) {
+                dev = devices[devices.length - 1]; // more likely the back cam
+              }
+              if (dev) {
+                constraints.video.deviceId = face.exact ? { exact: dev.deviceId } : { ideal: dev.deviceId };
+              }
+              constraints.video = constraintsToChrome_(constraints.video);
+              logging('chrome: ' + JSON.stringify(constraints));
+              return func(constraints);
+            });
+          }
+        }
+        constraints.video = constraintsToChrome_(constraints.video);
+      }
+      logging('chrome: ' + JSON.stringify(constraints));
+      return func(constraints);
+    };
+  
+    var shimError_ = function shimError_(e) {
+      if (browserDetails.version >= 64) {
+        return e;
+      }
+      return {
+        name: {
+          PermissionDeniedError: 'NotAllowedError',
+          PermissionDismissedError: 'NotAllowedError',
+          InvalidStateError: 'NotAllowedError',
+          DevicesNotFoundError: 'NotFoundError',
+          ConstraintNotSatisfiedError: 'OverconstrainedError',
+          TrackStartError: 'NotReadableError',
+          MediaDeviceFailedDueToShutdown: 'NotAllowedError',
+          MediaDeviceKillSwitchOn: 'NotAllowedError',
+          TabCaptureError: 'AbortError',
+          ScreenCaptureError: 'AbortError',
+          DeviceCaptureError: 'AbortError'
+        }[e.name] || e.name,
+        message: e.message,
+        constraint: e.constraint || e.constraintName,
+        toString: function toString() {
+          return this.name + (this.message && ': ') + this.message;
+        }
+      };
+    };
+  
+    var getUserMedia_ = function getUserMedia_(constraints, onSuccess, onError) {
+      shimConstraints_(constraints, function (c) {
+        navigator.webkitGetUserMedia(c, onSuccess, function (e) {
+          if (onError) {
+            onError(shimError_(e));
+          }
+        });
+      });
+    };
+    navigator.getUserMedia = getUserMedia_.bind(navigator);
+  
     // Even though Chrome 45 has navigator.mediaDevices and a getUserMedia
     // function which returns a Promise, it does not accept spec-style
     // constraints.
-    var origGetUserMedia = navigator.mediaDevices.getUserMedia.
-        bind(navigator.mediaDevices);
-    navigator.mediaDevices.getUserMedia = function(cs) {
-      return shimConstraints_(cs, function(c) {
-        return origGetUserMedia(c).then(function(stream) {
-          if (c.audio && !stream.getAudioTracks().length ||
-              c.video && !stream.getVideoTracks().length) {
-            stream.getTracks().forEach(function(track) {
+    var origGetUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+    navigator.mediaDevices.getUserMedia = function (cs) {
+      return shimConstraints_(cs, function (c) {
+        return origGetUserMedia(c).then(function (stream) {
+          if (c.audio && !stream.getAudioTracks().length || c.video && !stream.getVideoTracks().length) {
+            stream.getTracks().forEach(function (track) {
               track.stop();
             });
             throw new DOMException('', 'NotFoundError');
           }
           return stream;
-        }, function(e) {
+        }, function (e) {
           return Promise.reject(shimError_(e));
         });
       });
     };
   }
-
-  // Dummy devicechange event methods.
-  // TODO(KaptenJansson) remove once implemented in Chrome stable.
-  if (typeof navigator.mediaDevices.addEventListener === 'undefined') {
-    navigator.mediaDevices.addEventListener = function() {
-      logging('Dummy mediaDevices.addEventListener called.');
-    };
-  }
-  if (typeof navigator.mediaDevices.removeEventListener === 'undefined') {
-    navigator.mediaDevices.removeEventListener = function() {
-      logging('Dummy mediaDevices.removeEventListener called.');
-    };
-  }
-};
-
-},{"../utils.js":13}],7:[function(require,module,exports){
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var SDPUtils = require('sdp');
-var utils = require('./utils');
-
-// Wraps the peerconnection event eventNameToWrap in a function
-// which returns the modified event object.
-function wrapPeerConnectionEvent(window, eventNameToWrap, wrapper) {
-  if (!window.RTCPeerConnection) {
-    return;
-  }
-  var proto = window.RTCPeerConnection.prototype;
-  var nativeAddEventListener = proto.addEventListener;
-  proto.addEventListener = function(nativeEventName, cb) {
-    if (nativeEventName !== eventNameToWrap) {
-      return nativeAddEventListener.apply(this, arguments);
-    }
-    var wrappedCallback = function(e) {
-      cb(wrapper(e));
-    };
-    this._eventMap = this._eventMap || {};
-    this._eventMap[cb] = wrappedCallback;
-    return nativeAddEventListener.apply(this, [nativeEventName,
-      wrappedCallback]);
-  };
-
-  var nativeRemoveEventListener = proto.removeEventListener;
-  proto.removeEventListener = function(nativeEventName, cb) {
-    if (nativeEventName !== eventNameToWrap || !this._eventMap
-        || !this._eventMap[cb]) {
-      return nativeRemoveEventListener.apply(this, arguments);
-    }
-    var unwrappedCb = this._eventMap[cb];
-    delete this._eventMap[cb];
-    return nativeRemoveEventListener.apply(this, [nativeEventName,
-      unwrappedCb]);
-  };
-
-  Object.defineProperty(proto, 'on' + eventNameToWrap, {
-    get: function() {
-      return this['_on' + eventNameToWrap];
-    },
-    set: function(cb) {
-      if (this['_on' + eventNameToWrap]) {
-        this.removeEventListener(eventNameToWrap,
-            this['_on' + eventNameToWrap]);
-        delete this['_on' + eventNameToWrap];
-      }
-      if (cb) {
-        this.addEventListener(eventNameToWrap,
-            this['_on' + eventNameToWrap] = cb);
-      }
-    }
+  
+  },{"../utils.js":15}],6:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
   });
-}
-
-module.exports = {
-  shimRTCIceCandidate: function(window) {
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  exports.shimRTCIceCandidate = shimRTCIceCandidate;
+  exports.shimMaxMessageSize = shimMaxMessageSize;
+  exports.shimSendThrowTypeError = shimSendThrowTypeError;
+  exports.shimConnectionState = shimConnectionState;
+  
+  var _sdp = require('sdp');
+  
+  var _sdp2 = _interopRequireDefault(_sdp);
+  
+  var _utils = require('./utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  
+  function shimRTCIceCandidate(window) {
     // foundation is arbitrarily chosen as an indicator for full support for
     // https://w3c.github.io/webrtc-pc/#rtcicecandidate-interface
-    if (window.RTCIceCandidate && 'foundation' in
-        window.RTCIceCandidate.prototype) {
+    if (!window.RTCIceCandidate || window.RTCIceCandidate && 'foundation' in window.RTCIceCandidate.prototype) {
       return;
     }
-
+  
     var NativeRTCIceCandidate = window.RTCIceCandidate;
-    window.RTCIceCandidate = function(args) {
+    window.RTCIceCandidate = function (args) {
       // Remove the a= which shouldn't be part of the candidate string.
-      if (typeof args === 'object' && args.candidate &&
-          args.candidate.indexOf('a=') === 0) {
+      if ((typeof args === 'undefined' ? 'undefined' : _typeof(args)) === 'object' && args.candidate && args.candidate.indexOf('a=') === 0) {
         args = JSON.parse(JSON.stringify(args));
         args.candidate = args.candidate.substr(2);
       }
-
-      // Augment the native candidate with the parsed fields.
-      var nativeCandidate = new NativeRTCIceCandidate(args);
-      var parsedCandidate = SDPUtils.parseCandidate(args.candidate);
-      var augmentedCandidate = Object.assign(nativeCandidate,
-          parsedCandidate);
-
-      // Add a serializer that does not serialize the extra attributes.
-      augmentedCandidate.toJSON = function() {
-        return {
-          candidate: augmentedCandidate.candidate,
-          sdpMid: augmentedCandidate.sdpMid,
-          sdpMLineIndex: augmentedCandidate.sdpMLineIndex,
-          usernameFragment: augmentedCandidate.usernameFragment,
+  
+      if (args.candidate && args.candidate.length) {
+        // Augment the native candidate with the parsed fields.
+        var nativeCandidate = new NativeRTCIceCandidate(args);
+        var parsedCandidate = _sdp2.default.parseCandidate(args.candidate);
+        var augmentedCandidate = Object.assign(nativeCandidate, parsedCandidate);
+  
+        // Add a serializer that does not serialize the extra attributes.
+        augmentedCandidate.toJSON = function () {
+          return {
+            candidate: augmentedCandidate.candidate,
+            sdpMid: augmentedCandidate.sdpMid,
+            sdpMLineIndex: augmentedCandidate.sdpMLineIndex,
+            usernameFragment: augmentedCandidate.usernameFragment
+          };
         };
-      };
-      return augmentedCandidate;
+        return augmentedCandidate;
+      }
+      return new NativeRTCIceCandidate(args);
     };
-
+    window.RTCIceCandidate.prototype = NativeRTCIceCandidate.prototype;
+  
     // Hook up the augmented candidate in onicecandidate and
     // addEventListener('icecandidate', ...)
-    wrapPeerConnectionEvent(window, 'icecandidate', function(e) {
+    utils.wrapPeerConnectionEvent(window, 'icecandidate', function (e) {
       if (e.candidate) {
         Object.defineProperty(e, 'candidate', {
           value: new window.RTCIceCandidate(e.candidate),
@@ -3393,94 +1296,290 @@ module.exports = {
       }
       return e;
     });
-  },
-
-  // shimCreateObjectURL must be called before shimSourceObject to avoid loop.
-
-  shimCreateObjectURL: function(window) {
-    var URL = window && window.URL;
-
-    if (!(typeof window === 'object' && window.HTMLMediaElement &&
-          'srcObject' in window.HTMLMediaElement.prototype &&
-        URL.createObjectURL && URL.revokeObjectURL)) {
-      // Only shim CreateObjectURL using srcObject if srcObject exists.
-      return undefined;
+  }
+  
+  function shimMaxMessageSize(window) {
+    if (window.RTCSctpTransport || !window.RTCPeerConnection) {
+      return;
     }
-
-    var nativeCreateObjectURL = URL.createObjectURL.bind(URL);
-    var nativeRevokeObjectURL = URL.revokeObjectURL.bind(URL);
-    var streams = new Map(), newId = 0;
-
-    URL.createObjectURL = function(stream) {
-      if ('getTracks' in stream) {
-        var url = 'polyblob:' + (++newId);
-        streams.set(url, stream);
-        utils.deprecated('URL.createObjectURL(stream)',
-            'elem.srcObject = stream');
-        return url;
-      }
-      return nativeCreateObjectURL(stream);
+    var browserDetails = utils.detectBrowser(window);
+  
+    if (!('sctp' in window.RTCPeerConnection.prototype)) {
+      Object.defineProperty(window.RTCPeerConnection.prototype, 'sctp', {
+        get: function get() {
+          return typeof this._sctp === 'undefined' ? null : this._sctp;
+        }
+      });
+    }
+  
+    var sctpInDescription = function sctpInDescription(description) {
+      var sections = _sdp2.default.splitSections(description.sdp);
+      sections.shift();
+      return sections.some(function (mediaSection) {
+        var mLine = _sdp2.default.parseMLine(mediaSection);
+        return mLine && mLine.kind === 'application' && mLine.protocol.indexOf('SCTP') !== -1;
+      });
     };
-    URL.revokeObjectURL = function(url) {
-      nativeRevokeObjectURL(url);
-      streams.delete(url);
+  
+    var getRemoteFirefoxVersion = function getRemoteFirefoxVersion(description) {
+      // TODO: Is there a better solution for detecting Firefox?
+      var match = description.sdp.match(/mozilla...THIS_IS_SDPARTA-(\d+)/);
+      if (match === null || match.length < 2) {
+        return -1;
+      }
+      var version = parseInt(match[1], 10);
+      // Test for NaN (yes, this is ugly)
+      return version !== version ? -1 : version;
     };
-
-    var dsc = Object.getOwnPropertyDescriptor(window.HTMLMediaElement.prototype,
-                                              'src');
-    Object.defineProperty(window.HTMLMediaElement.prototype, 'src', {
-      get: function() {
-        return dsc.get.apply(this);
-      },
-      set: function(url) {
-        this.srcObject = streams.get(url) || null;
-        return dsc.set.apply(this, [url]);
+  
+    var getCanSendMaxMessageSize = function getCanSendMaxMessageSize(remoteIsFirefox) {
+      // Every implementation we know can send at least 64 KiB.
+      // Note: Although Chrome is technically able to send up to 256 KiB, the
+      //       data does not reach the other peer reliably.
+      //       See: https://bugs.chromium.org/p/webrtc/issues/detail?id=8419
+      var canSendMaxMessageSize = 65536;
+      if (browserDetails.browser === 'firefox') {
+        if (browserDetails.version < 57) {
+          if (remoteIsFirefox === -1) {
+            // FF < 57 will send in 16 KiB chunks using the deprecated PPID
+            // fragmentation.
+            canSendMaxMessageSize = 16384;
+          } else {
+            // However, other FF (and RAWRTC) can reassemble PPID-fragmented
+            // messages. Thus, supporting ~2 GiB when sending.
+            canSendMaxMessageSize = 2147483637;
+          }
+        } else if (browserDetails.version < 60) {
+          // Currently, all FF >= 57 will reset the remote maximum message size
+          // to the default value when a data channel is created at a later
+          // stage. :(
+          // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1426831
+          canSendMaxMessageSize = browserDetails.version === 57 ? 65535 : 65536;
+        } else {
+          // FF >= 60 supports sending ~2 GiB
+          canSendMaxMessageSize = 2147483637;
+        }
       }
-    });
-
-    var nativeSetAttribute = window.HTMLMediaElement.prototype.setAttribute;
-    window.HTMLMediaElement.prototype.setAttribute = function() {
-      if (arguments.length === 2 &&
-          ('' + arguments[0]).toLowerCase() === 'src') {
-        this.srcObject = streams.get(arguments[1]) || null;
+      return canSendMaxMessageSize;
+    };
+  
+    var getMaxMessageSize = function getMaxMessageSize(description, remoteIsFirefox) {
+      // Note: 65536 bytes is the default value from the SDP spec. Also,
+      //       every implementation we know supports receiving 65536 bytes.
+      var maxMessageSize = 65536;
+  
+      // FF 57 has a slightly incorrect default remote max message size, so
+      // we need to adjust it here to avoid a failure when sending.
+      // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1425697
+      if (browserDetails.browser === 'firefox' && browserDetails.version === 57) {
+        maxMessageSize = 65535;
       }
-      return nativeSetAttribute.apply(this, arguments);
+  
+      var match = _sdp2.default.matchPrefix(description.sdp, 'a=max-message-size:');
+      if (match.length > 0) {
+        maxMessageSize = parseInt(match[0].substr(19), 10);
+      } else if (browserDetails.browser === 'firefox' && remoteIsFirefox !== -1) {
+        // If the maximum message size is not present in the remote SDP and
+        // both local and remote are Firefox, the remote peer can receive
+        // ~2 GiB.
+        maxMessageSize = 2147483637;
+      }
+      return maxMessageSize;
+    };
+  
+    var origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+    window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+      this._sctp = null;
+  
+      if (sctpInDescription(arguments[0])) {
+        // Check if the remote is FF.
+        var isFirefox = getRemoteFirefoxVersion(arguments[0]);
+  
+        // Get the maximum message size the local peer is capable of sending
+        var canSendMMS = getCanSendMaxMessageSize(isFirefox);
+  
+        // Get the maximum message size of the remote peer.
+        var remoteMMS = getMaxMessageSize(arguments[0], isFirefox);
+  
+        // Determine final maximum message size
+        var maxMessageSize = void 0;
+        if (canSendMMS === 0 && remoteMMS === 0) {
+          maxMessageSize = Number.POSITIVE_INFINITY;
+        } else if (canSendMMS === 0 || remoteMMS === 0) {
+          maxMessageSize = Math.max(canSendMMS, remoteMMS);
+        } else {
+          maxMessageSize = Math.min(canSendMMS, remoteMMS);
+        }
+  
+        // Create a dummy RTCSctpTransport object and the 'maxMessageSize'
+        // attribute.
+        var sctp = {};
+        Object.defineProperty(sctp, 'maxMessageSize', {
+          get: function get() {
+            return maxMessageSize;
+          }
+        });
+        this._sctp = sctp;
+      }
+  
+      return origSetRemoteDescription.apply(this, arguments);
     };
   }
-};
-
-},{"./utils":13,"sdp":2}],8:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var utils = require('../utils');
-var shimRTCPeerConnection = require('rtcpeerconnection-shim');
-
-module.exports = {
-  shimGetUserMedia: require('./getusermedia'),
-  shimPeerConnection: function(window) {
+  
+  function shimSendThrowTypeError(window) {
+    if (!(window.RTCPeerConnection && 'createDataChannel' in window.RTCPeerConnection.prototype)) {
+      return;
+    }
+  
+    // Note: Although Firefox >= 57 has a native implementation, the maximum
+    //       message size can be reset for all data channels at a later stage.
+    //       See: https://bugzilla.mozilla.org/show_bug.cgi?id=1426831
+  
+    function wrapDcSend(dc, pc) {
+      var origDataChannelSend = dc.send;
+      dc.send = function () {
+        var data = arguments[0];
+        var length = data.length || data.size || data.byteLength;
+        if (dc.readyState === 'open' && pc.sctp && length > pc.sctp.maxMessageSize) {
+          throw new TypeError('Message too large (can send a maximum of ' + pc.sctp.maxMessageSize + ' bytes)');
+        }
+        return origDataChannelSend.apply(dc, arguments);
+      };
+    }
+    var origCreateDataChannel = window.RTCPeerConnection.prototype.createDataChannel;
+    window.RTCPeerConnection.prototype.createDataChannel = function () {
+      var dataChannel = origCreateDataChannel.apply(this, arguments);
+      wrapDcSend(dataChannel, this);
+      return dataChannel;
+    };
+    utils.wrapPeerConnectionEvent(window, 'datachannel', function (e) {
+      wrapDcSend(e.channel, e.target);
+      return e;
+    });
+  }
+  
+  /* shims RTCConnectionState by pretending it is the same as iceConnectionState.
+   * See https://bugs.chromium.org/p/webrtc/issues/detail?id=6145#c12
+   * for why this is a valid hack in Chrome. In Firefox it is slightly incorrect
+   * since DTLS failures would be hidden. See
+   * https://bugzilla.mozilla.org/show_bug.cgi?id=1265827
+   * for the Firefox tracking bug.
+   */
+  function shimConnectionState(window) {
+    if (!window.RTCPeerConnection || 'connectionState' in window.RTCPeerConnection.prototype) {
+      return;
+    }
+    var proto = window.RTCPeerConnection.prototype;
+    Object.defineProperty(proto, 'connectionState', {
+      get: function get() {
+        return {
+          completed: 'connected',
+          checking: 'connecting'
+        }[this.iceConnectionState] || this.iceConnectionState;
+      },
+  
+      enumerable: true,
+      configurable: true
+    });
+    Object.defineProperty(proto, 'onconnectionstatechange', {
+      get: function get() {
+        return this._onconnectionstatechange || null;
+      },
+      set: function set(cb) {
+        if (this._onconnectionstatechange) {
+          this.removeEventListener('connectionstatechange', this._onconnectionstatechange);
+          delete this._onconnectionstatechange;
+        }
+        if (cb) {
+          this.addEventListener('connectionstatechange', this._onconnectionstatechange = cb);
+        }
+      },
+  
+      enumerable: true,
+      configurable: true
+    });
+  
+    ['setLocalDescription', 'setRemoteDescription'].forEach(function (method) {
+      var origMethod = proto[method];
+      proto[method] = function () {
+        if (!this._connectionstatechangepoly) {
+          this._connectionstatechangepoly = function (e) {
+            var pc = e.target;
+            if (pc._lastConnectionState !== pc.connectionState) {
+              pc._lastConnectionState = pc.connectionState;
+              var newEvent = new Event('connectionstatechange', e);
+              pc.dispatchEvent(newEvent);
+            }
+            return e;
+          };
+          this.addEventListener('iceconnectionstatechange', this._connectionstatechangepoly);
+        }
+        return origMethod.apply(this, arguments);
+      };
+    });
+  }
+  
+  },{"./utils":15,"sdp":17}],7:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetDisplayMedia = exports.shimGetUserMedia = undefined;
+  
+  var _getusermedia = require('./getusermedia');
+  
+  Object.defineProperty(exports, 'shimGetUserMedia', {
+    enumerable: true,
+    get: function get() {
+      return _getusermedia.shimGetUserMedia;
+    }
+  });
+  
+  var _getdisplaymedia = require('./getdisplaymedia');
+  
+  Object.defineProperty(exports, 'shimGetDisplayMedia', {
+    enumerable: true,
+    get: function get() {
+      return _getdisplaymedia.shimGetDisplayMedia;
+    }
+  });
+  exports.shimPeerConnection = shimPeerConnection;
+  exports.shimReplaceTrack = shimReplaceTrack;
+  
+  var _utils = require('../utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  var _filtericeservers = require('./filtericeservers');
+  
+  var _rtcpeerconnectionShim = require('rtcpeerconnection-shim');
+  
+  var _rtcpeerconnectionShim2 = _interopRequireDefault(_rtcpeerconnectionShim);
+  
+  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  function shimPeerConnection(window) {
     var browserDetails = utils.detectBrowser(window);
-
+  
     if (window.RTCIceGatherer) {
-      // ORTC defines an RTCIceCandidate object but no constructor.
-      // Not implemented in Edge.
       if (!window.RTCIceCandidate) {
-        window.RTCIceCandidate = function(args) {
+        window.RTCIceCandidate = function (args) {
           return args;
         };
       }
-      // ORTC does not have a session description object but
-      // other browsers (i.e. Chrome) that will support both PC and ORTC
-      // in the future might have this defined already.
       if (!window.RTCSessionDescription) {
-        window.RTCSessionDescription = function(args) {
+        window.RTCSessionDescription = function (args) {
           return args;
         };
       }
@@ -3488,10 +1587,9 @@ module.exports = {
       // when a tracks enabled property was changed. Workaround for a bug in
       // addStream, see below. No longer required in 15025+
       if (browserDetails.version < 15025) {
-        var origMSTEnabled = Object.getOwnPropertyDescriptor(
-            window.MediaStreamTrack.prototype, 'enabled');
+        var origMSTEnabled = Object.getOwnPropertyDescriptor(window.MediaStreamTrack.prototype, 'enabled');
         Object.defineProperty(window.MediaStreamTrack.prototype, 'enabled', {
-          set: function(value) {
+          set: function set(value) {
             origMSTEnabled.set.call(this, value);
             var ev = new Event('enabled');
             ev.enabled = value;
@@ -3500,12 +1598,12 @@ module.exports = {
         });
       }
     }
-
+  
     // ORTC defines the DTMF sender a bit different.
     // https://github.com/w3c/ortc/issues/714
     if (window.RTCRtpSender && !('dtmf' in window.RTCRtpSender.prototype)) {
       Object.defineProperty(window.RTCRtpSender.prototype, 'dtmf', {
-        get: function() {
+        get: function get() {
           if (this._dtmf === undefined) {
             if (this.track.kind === 'audio') {
               this._dtmf = new window.RTCDtmfSender(this);
@@ -3517,194 +1615,238 @@ module.exports = {
         }
       });
     }
-
-    window.RTCPeerConnection =
-        shimRTCPeerConnection(window, browserDetails.version);
-  },
-  shimReplaceTrack: function(window) {
+    // Edge currently only implements the RTCDtmfSender, not the
+    // RTCDTMFSender alias. See http://draft.ortc.org/#rtcdtmfsender2*
+    if (window.RTCDtmfSender && !window.RTCDTMFSender) {
+      window.RTCDTMFSender = window.RTCDtmfSender;
+    }
+  
+    var RTCPeerConnectionShim = (0, _rtcpeerconnectionShim2.default)(window, browserDetails.version);
+    window.RTCPeerConnection = function (config) {
+      if (config && config.iceServers) {
+        config.iceServers = (0, _filtericeservers.filterIceServers)(config.iceServers, browserDetails.version);
+        utils.log('ICE servers after filtering:', config.iceServers);
+      }
+      return new RTCPeerConnectionShim(config);
+    };
+    window.RTCPeerConnection.prototype = RTCPeerConnectionShim.prototype;
+  }
+  
+  function shimReplaceTrack(window) {
     // ORTC has replaceTrack -- https://github.com/w3c/ortc/issues/614
-    if (window.RTCRtpSender &&
-        !('replaceTrack' in window.RTCRtpSender.prototype)) {
-      window.RTCRtpSender.prototype.replaceTrack =
-          window.RTCRtpSender.prototype.setTrack;
+    if (window.RTCRtpSender && !('replaceTrack' in window.RTCRtpSender.prototype)) {
+      window.RTCRtpSender.prototype.replaceTrack = window.RTCRtpSender.prototype.setTrack;
     }
   }
-};
-
-},{"../utils":13,"./getusermedia":9,"rtcpeerconnection-shim":1}],9:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-// Expose public methods.
-module.exports = function(window) {
-  var navigator = window && window.navigator;
-
-  var shimError_ = function(e) {
-    return {
-      name: {PermissionDeniedError: 'NotAllowedError'}[e.name] || e.name,
-      message: e.message,
-      constraint: e.constraint,
-      toString: function() {
-        return this.name;
-      }
-    };
-  };
-
-  // getUserMedia error shim.
-  var origGetUserMedia = navigator.mediaDevices.getUserMedia.
-      bind(navigator.mediaDevices);
-  navigator.mediaDevices.getUserMedia = function(c) {
-    return origGetUserMedia(c).catch(function(e) {
-      return Promise.reject(shimError_(e));
-    });
-  };
-};
-
-},{}],10:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var utils = require('../utils');
-
-var firefoxShim = {
-  shimOnTrack: function(window) {
-    if (typeof window === 'object' && window.RTCPeerConnection && !('ontrack' in
-        window.RTCPeerConnection.prototype)) {
-      Object.defineProperty(window.RTCPeerConnection.prototype, 'ontrack', {
-        get: function() {
-          return this._ontrack;
-        },
-        set: function(f) {
-          if (this._ontrack) {
-            this.removeEventListener('track', this._ontrack);
-            this.removeEventListener('addstream', this._ontrackpoly);
-          }
-          this.addEventListener('track', this._ontrack = f);
-          this.addEventListener('addstream', this._ontrackpoly = function(e) {
-            e.stream.getTracks().forEach(function(track) {
-              var event = new Event('track');
-              event.track = track;
-              event.receiver = {track: track};
-              event.transceiver = {receiver: event.receiver};
-              event.streams = [e.stream];
-              this.dispatchEvent(event);
-            }.bind(this));
-          }.bind(this));
+  
+  },{"../utils":15,"./filtericeservers":8,"./getdisplaymedia":9,"./getusermedia":10,"rtcpeerconnection-shim":16}],8:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.filterIceServers = filterIceServers;
+  
+  var _utils = require('../utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  // Edge does not like
+  // 1) stun: filtered after 14393 unless ?transport=udp is present
+  // 2) turn: that does not have all of turn:host:port?transport=udp
+  // 3) turn: with ipv6 addresses
+  // 4) turn: occurring muliple times
+  function filterIceServers(iceServers, edgeVersion) {
+    var hasTurn = false;
+    iceServers = JSON.parse(JSON.stringify(iceServers));
+    return iceServers.filter(function (server) {
+      if (server && (server.urls || server.url)) {
+        var urls = server.urls || server.url;
+        if (server.url && !server.urls) {
+          utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
         }
-      });
-    }
-    if (typeof window === 'object' && window.RTCTrackEvent &&
-        ('receiver' in window.RTCTrackEvent.prototype) &&
-        !('transceiver' in window.RTCTrackEvent.prototype)) {
-      Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
-        get: function() {
-          return {receiver: this.receiver};
+        var isString = typeof urls === 'string';
+        if (isString) {
+          urls = [urls];
         }
-      });
-    }
-  },
-
-  shimSourceObject: function(window) {
-    // Firefox has supported mozSrcObject since FF22, unprefixed in 42.
-    if (typeof window === 'object') {
-      if (window.HTMLMediaElement &&
-        !('srcObject' in window.HTMLMediaElement.prototype)) {
-        // Shim the srcObject property, once, when HTMLMediaElement is found.
-        Object.defineProperty(window.HTMLMediaElement.prototype, 'srcObject', {
-          get: function() {
-            return this.mozSrcObject;
-          },
-          set: function(stream) {
-            this.mozSrcObject = stream;
+        urls = urls.filter(function (url) {
+          // filter STUN unconditionally.
+          if (url.indexOf('stun:') === 0) {
+            return false;
           }
+  
+          var validTurn = url.startsWith('turn') && !url.startsWith('turn:[') && url.includes('transport=udp');
+          if (validTurn && !hasTurn) {
+            hasTurn = true;
+            return true;
+          }
+          return validTurn && !hasTurn;
         });
+  
+        delete server.url;
+        server.urls = isString ? urls[0] : urls;
+        return !!urls.length;
       }
+    });
+  }
+  
+  },{"../utils":15}],9:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2018 The adapter.js project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetDisplayMedia = shimGetDisplayMedia;
+  function shimGetDisplayMedia(window) {
+    if (!('getDisplayMedia' in window.navigator)) {
+      return;
     }
-  },
-
-  shimPeerConnection: function(window) {
+    if (!window.navigator.mediaDevices) {
+      return;
+    }
+    if (window.navigator.mediaDevices && 'getDisplayMedia' in window.navigator.mediaDevices) {
+      return;
+    }
+    window.navigator.mediaDevices.getDisplayMedia = window.navigator.getDisplayMedia.bind(window.navigator.mediaDevices);
+  }
+  
+  },{}],10:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetUserMedia = shimGetUserMedia;
+  function shimGetUserMedia(window) {
+    var navigator = window && window.navigator;
+  
+    var shimError_ = function shimError_(e) {
+      return {
+        name: { PermissionDeniedError: 'NotAllowedError' }[e.name] || e.name,
+        message: e.message,
+        constraint: e.constraint,
+        toString: function toString() {
+          return this.name;
+        }
+      };
+    };
+  
+    // getUserMedia error shim.
+    var origGetUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+    navigator.mediaDevices.getUserMedia = function (c) {
+      return origGetUserMedia(c).catch(function (e) {
+        return Promise.reject(shimError_(e));
+      });
+    };
+  }
+  
+  },{}],11:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetDisplayMedia = exports.shimGetUserMedia = undefined;
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  var _getusermedia = require('./getusermedia');
+  
+  Object.defineProperty(exports, 'shimGetUserMedia', {
+    enumerable: true,
+    get: function get() {
+      return _getusermedia.shimGetUserMedia;
+    }
+  });
+  
+  var _getdisplaymedia = require('./getdisplaymedia');
+  
+  Object.defineProperty(exports, 'shimGetDisplayMedia', {
+    enumerable: true,
+    get: function get() {
+      return _getdisplaymedia.shimGetDisplayMedia;
+    }
+  });
+  exports.shimOnTrack = shimOnTrack;
+  exports.shimPeerConnection = shimPeerConnection;
+  exports.shimSenderGetStats = shimSenderGetStats;
+  exports.shimReceiverGetStats = shimReceiverGetStats;
+  exports.shimRemoveStream = shimRemoveStream;
+  exports.shimRTCDataChannel = shimRTCDataChannel;
+  
+  var _utils = require('../utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  function shimOnTrack(window) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCTrackEvent && 'receiver' in window.RTCTrackEvent.prototype && !('transceiver' in window.RTCTrackEvent.prototype)) {
+      Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
+        get: function get() {
+          return { receiver: this.receiver };
+        }
+      });
+    }
+  }
+  
+  function shimPeerConnection(window) {
     var browserDetails = utils.detectBrowser(window);
-
-    if (typeof window !== 'object' || !(window.RTCPeerConnection ||
-        window.mozRTCPeerConnection)) {
+  
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !(window.RTCPeerConnection || window.mozRTCPeerConnection)) {
       return; // probably media.peerconnection.enabled=false in about:config
     }
-    // The RTCPeerConnection object.
-    if (!window.RTCPeerConnection) {
-      window.RTCPeerConnection = function(pcConfig, pcConstraints) {
-        if (browserDetails.version < 38) {
-          // .urls is not supported in FF < 38.
-          // create RTCIceServers with a single url.
-          if (pcConfig && pcConfig.iceServers) {
-            var newIceServers = [];
-            for (var i = 0; i < pcConfig.iceServers.length; i++) {
-              var server = pcConfig.iceServers[i];
-              if (server.hasOwnProperty('urls')) {
-                for (var j = 0; j < server.urls.length; j++) {
-                  var newServer = {
-                    url: server.urls[j]
-                  };
-                  if (server.urls[j].indexOf('turn') === 0) {
-                    newServer.username = server.username;
-                    newServer.credential = server.credential;
-                  }
-                  newIceServers.push(newServer);
-                }
-              } else {
-                newIceServers.push(pcConfig.iceServers[i]);
-              }
-            }
-            pcConfig.iceServers = newIceServers;
-          }
-        }
-        return new window.mozRTCPeerConnection(pcConfig, pcConstraints);
-      };
-      window.RTCPeerConnection.prototype =
-          window.mozRTCPeerConnection.prototype;
-
-      // wrap static methods. Currently just generateCertificate.
-      if (window.mozRTCPeerConnection.generateCertificate) {
-        Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-          get: function() {
-            return window.mozRTCPeerConnection.generateCertificate;
-          }
-        });
-      }
-
-      window.RTCSessionDescription = window.mozRTCSessionDescription;
-      window.RTCIceCandidate = window.mozRTCIceCandidate;
+    if (!window.RTCPeerConnection && window.mozRTCPeerConnection) {
+      // very basic support for old versions.
+      window.RTCPeerConnection = window.mozRTCPeerConnection;
     }
-
+  
     // shim away need for obsolete RTCIceCandidate/RTCSessionDescription.
-    ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate']
-        .forEach(function(method) {
-          var nativeMethod = window.RTCPeerConnection.prototype[method];
-          window.RTCPeerConnection.prototype[method] = function() {
-            arguments[0] = new ((method === 'addIceCandidate') ?
-                window.RTCIceCandidate :
-                window.RTCSessionDescription)(arguments[0]);
-            return nativeMethod.apply(this, arguments);
-          };
-        });
-
+    ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate'].forEach(function (method) {
+      var nativeMethod = window.RTCPeerConnection.prototype[method];
+      window.RTCPeerConnection.prototype[method] = function () {
+        arguments[0] = new (method === 'addIceCandidate' ? window.RTCIceCandidate : window.RTCSessionDescription)(arguments[0]);
+        return nativeMethod.apply(this, arguments);
+      };
+    });
+  
     // support for addIceCandidate(null or undefined)
-    var nativeAddIceCandidate =
-        window.RTCPeerConnection.prototype.addIceCandidate;
-    window.RTCPeerConnection.prototype.addIceCandidate = function() {
+    var nativeAddIceCandidate = window.RTCPeerConnection.prototype.addIceCandidate;
+    window.RTCPeerConnection.prototype.addIceCandidate = function () {
       if (!arguments[0]) {
         if (arguments[1]) {
           arguments[1].apply(null);
@@ -3713,17 +1855,7 @@ var firefoxShim = {
       }
       return nativeAddIceCandidate.apply(this, arguments);
     };
-
-    // shim getStats with maplike support
-    var makeMapStats = function(stats) {
-      var map = new Map();
-      Object.keys(stats).forEach(function(key) {
-        map.set(key, stats[key]);
-        map[key] = stats[key];
-      });
-      return map;
-    };
-
+  
     var modernStatsTypes = {
       inboundrtp: 'inbound-rtp',
       outboundrtp: 'outbound-rtp',
@@ -3731,341 +1863,309 @@ var firefoxShim = {
       localcandidate: 'local-candidate',
       remotecandidate: 'remote-candidate'
     };
-
+  
     var nativeGetStats = window.RTCPeerConnection.prototype.getStats;
-    window.RTCPeerConnection.prototype.getStats = function(
-      selector,
-      onSucc,
-      onErr
-    ) {
-      return nativeGetStats.apply(this, [selector || null])
-        .then(function(stats) {
-          if (browserDetails.version < 48) {
-            stats = makeMapStats(stats);
-          }
-          if (browserDetails.version < 53 && !onSucc) {
-            // Shim only promise getStats with spec-hyphens in type names
-            // Leave callback version alone; misc old uses of forEach before Map
-            try {
-              stats.forEach(function(stat) {
-                stat.type = modernStatsTypes[stat.type] || stat.type;
-              });
-            } catch (e) {
-              if (e.name !== 'TypeError') {
-                throw e;
-              }
-              // Avoid TypeError: "type" is read-only, in old versions. 34-43ish
-              stats.forEach(function(stat, i) {
-                stats.set(i, Object.assign({}, stat, {
-                  type: modernStatsTypes[stat.type] || stat.type
-                }));
-              });
+    window.RTCPeerConnection.prototype.getStats = function (selector, onSucc, onErr) {
+      return nativeGetStats.apply(this, [selector || null]).then(function (stats) {
+        if (browserDetails.version < 53 && !onSucc) {
+          // Shim only promise getStats with spec-hyphens in type names
+          // Leave callback version alone; misc old uses of forEach before Map
+          try {
+            stats.forEach(function (stat) {
+              stat.type = modernStatsTypes[stat.type] || stat.type;
+            });
+          } catch (e) {
+            if (e.name !== 'TypeError') {
+              throw e;
             }
+            // Avoid TypeError: "type" is read-only, in old versions. 34-43ish
+            stats.forEach(function (stat, i) {
+              stats.set(i, Object.assign({}, stat, {
+                type: modernStatsTypes[stat.type] || stat.type
+              }));
+            });
           }
-          return stats;
-        })
-        .then(onSucc, onErr);
+        }
+        return stats;
+      }).then(onSucc, onErr);
     };
   }
-};
-
-// Expose public methods.
-module.exports = {
-  shimOnTrack: firefoxShim.shimOnTrack,
-  shimSourceObject: firefoxShim.shimSourceObject,
-  shimPeerConnection: firefoxShim.shimPeerConnection,
-  shimGetUserMedia: require('./getusermedia')
-};
-
-},{"../utils":13,"./getusermedia":11}],11:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var utils = require('../utils');
-var logging = utils.log;
-
-// Expose public methods.
-module.exports = function(window) {
-  var browserDetails = utils.detectBrowser(window);
-  var navigator = window && window.navigator;
-  var MediaStreamTrack = window && window.MediaStreamTrack;
-
-  var shimError_ = function(e) {
-    return {
-      name: {
-        InternalError: 'NotReadableError',
-        NotSupportedError: 'TypeError',
-        PermissionDeniedError: 'NotAllowedError',
-        SecurityError: 'NotAllowedError'
-      }[e.name] || e.name,
-      message: {
-        'The operation is insecure.': 'The request is not allowed by the ' +
-        'user agent or the platform in the current context.'
-      }[e.message] || e.message,
-      constraint: e.constraint,
-      toString: function() {
-        return this.name + (this.message && ': ') + this.message;
-      }
-    };
-  };
-
-  // getUserMedia constraints shim.
-  var getUserMedia_ = function(constraints, onSuccess, onError) {
-    var constraintsToFF37_ = function(c) {
-      if (typeof c !== 'object' || c.require) {
-        return c;
-      }
-      var require = [];
-      Object.keys(c).forEach(function(key) {
-        if (key === 'require' || key === 'advanced' || key === 'mediaSource') {
-          return;
-        }
-        var r = c[key] = (typeof c[key] === 'object') ?
-            c[key] : {ideal: c[key]};
-        if (r.min !== undefined ||
-            r.max !== undefined || r.exact !== undefined) {
-          require.push(key);
-        }
-        if (r.exact !== undefined) {
-          if (typeof r.exact === 'number') {
-            r. min = r.max = r.exact;
-          } else {
-            c[key] = r.exact;
-          }
-          delete r.exact;
-        }
-        if (r.ideal !== undefined) {
-          c.advanced = c.advanced || [];
-          var oc = {};
-          if (typeof r.ideal === 'number') {
-            oc[key] = {min: r.ideal, max: r.ideal};
-          } else {
-            oc[key] = r.ideal;
-          }
-          c.advanced.push(oc);
-          delete r.ideal;
-          if (!Object.keys(r).length) {
-            delete c[key];
-          }
-        }
-      });
-      if (require.length) {
-        c.require = require;
-      }
-      return c;
-    };
-    constraints = JSON.parse(JSON.stringify(constraints));
-    if (browserDetails.version < 38) {
-      logging('spec: ' + JSON.stringify(constraints));
-      if (constraints.audio) {
-        constraints.audio = constraintsToFF37_(constraints.audio);
-      }
-      if (constraints.video) {
-        constraints.video = constraintsToFF37_(constraints.video);
-      }
-      logging('ff37: ' + JSON.stringify(constraints));
+  
+  function shimSenderGetStats(window) {
+    if (!((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && window.RTCRtpSender)) {
+      return;
     }
-    return navigator.mozGetUserMedia(constraints, onSuccess, function(e) {
-      onError(shimError_(e));
-    });
-  };
-
-  // Returns the result of getUserMedia as a Promise.
-  var getUserMediaPromise_ = function(constraints) {
-    return new Promise(function(resolve, reject) {
-      getUserMedia_(constraints, resolve, reject);
-    });
-  };
-
-  // Shim for mediaDevices on older versions.
-  if (!navigator.mediaDevices) {
-    navigator.mediaDevices = {getUserMedia: getUserMediaPromise_,
-      addEventListener: function() { },
-      removeEventListener: function() { }
-    };
-  }
-  navigator.mediaDevices.enumerateDevices =
-      navigator.mediaDevices.enumerateDevices || function() {
-        return new Promise(function(resolve) {
-          var infos = [
-            {kind: 'audioinput', deviceId: 'default', label: '', groupId: ''},
-            {kind: 'videoinput', deviceId: 'default', label: '', groupId: ''}
-          ];
-          resolve(infos);
+    if (window.RTCRtpSender && 'getStats' in window.RTCRtpSender.prototype) {
+      return;
+    }
+    var origGetSenders = window.RTCPeerConnection.prototype.getSenders;
+    if (origGetSenders) {
+      window.RTCPeerConnection.prototype.getSenders = function () {
+        var _this = this;
+  
+        var senders = origGetSenders.apply(this, []);
+        senders.forEach(function (sender) {
+          return sender._pc = _this;
         });
-      };
-
-  if (browserDetails.version < 41) {
-    // Work around http://bugzil.la/1169665
-    var orgEnumerateDevices =
-        navigator.mediaDevices.enumerateDevices.bind(navigator.mediaDevices);
-    navigator.mediaDevices.enumerateDevices = function() {
-      return orgEnumerateDevices().then(undefined, function(e) {
-        if (e.name === 'NotFoundError') {
-          return [];
-        }
-        throw e;
-      });
-    };
-  }
-  if (browserDetails.version < 49) {
-    var origGetUserMedia = navigator.mediaDevices.getUserMedia.
-        bind(navigator.mediaDevices);
-    navigator.mediaDevices.getUserMedia = function(c) {
-      return origGetUserMedia(c).then(function(stream) {
-        // Work around https://bugzil.la/802326
-        if (c.audio && !stream.getAudioTracks().length ||
-            c.video && !stream.getVideoTracks().length) {
-          stream.getTracks().forEach(function(track) {
-            track.stop();
-          });
-          throw new DOMException('The object can not be found here.',
-                                 'NotFoundError');
-        }
-        return stream;
-      }, function(e) {
-        return Promise.reject(shimError_(e));
-      });
-    };
-  }
-  if (!(browserDetails.version > 55 &&
-      'autoGainControl' in navigator.mediaDevices.getSupportedConstraints())) {
-    var remap = function(obj, a, b) {
-      if (a in obj && !(b in obj)) {
-        obj[b] = obj[a];
-        delete obj[a];
-      }
-    };
-
-    var nativeGetUserMedia = navigator.mediaDevices.getUserMedia.
-        bind(navigator.mediaDevices);
-    navigator.mediaDevices.getUserMedia = function(c) {
-      if (typeof c === 'object' && typeof c.audio === 'object') {
-        c = JSON.parse(JSON.stringify(c));
-        remap(c.audio, 'autoGainControl', 'mozAutoGainControl');
-        remap(c.audio, 'noiseSuppression', 'mozNoiseSuppression');
-      }
-      return nativeGetUserMedia(c);
-    };
-
-    if (MediaStreamTrack && MediaStreamTrack.prototype.getSettings) {
-      var nativeGetSettings = MediaStreamTrack.prototype.getSettings;
-      MediaStreamTrack.prototype.getSettings = function() {
-        var obj = nativeGetSettings.apply(this, arguments);
-        remap(obj, 'mozAutoGainControl', 'autoGainControl');
-        remap(obj, 'mozNoiseSuppression', 'noiseSuppression');
-        return obj;
+        return senders;
       };
     }
-
-    if (MediaStreamTrack && MediaStreamTrack.prototype.applyConstraints) {
-      var nativeApplyConstraints = MediaStreamTrack.prototype.applyConstraints;
-      MediaStreamTrack.prototype.applyConstraints = function(c) {
-        if (this.kind === 'audio' && typeof c === 'object') {
+  
+    var origAddTrack = window.RTCPeerConnection.prototype.addTrack;
+    if (origAddTrack) {
+      window.RTCPeerConnection.prototype.addTrack = function () {
+        var sender = origAddTrack.apply(this, arguments);
+        sender._pc = this;
+        return sender;
+      };
+    }
+    window.RTCRtpSender.prototype.getStats = function () {
+      return this.track ? this._pc.getStats(this.track) : Promise.resolve(new Map());
+    };
+  }
+  
+  function shimReceiverGetStats(window) {
+    if (!((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && window.RTCRtpSender)) {
+      return;
+    }
+    if (window.RTCRtpSender && 'getStats' in window.RTCRtpReceiver.prototype) {
+      return;
+    }
+    var origGetReceivers = window.RTCPeerConnection.prototype.getReceivers;
+    if (origGetReceivers) {
+      window.RTCPeerConnection.prototype.getReceivers = function () {
+        var _this2 = this;
+  
+        var receivers = origGetReceivers.apply(this, []);
+        receivers.forEach(function (receiver) {
+          return receiver._pc = _this2;
+        });
+        return receivers;
+      };
+    }
+    utils.wrapPeerConnectionEvent(window, 'track', function (e) {
+      e.receiver._pc = e.srcElement;
+      return e;
+    });
+    window.RTCRtpReceiver.prototype.getStats = function () {
+      return this._pc.getStats(this.track);
+    };
+  }
+  
+  function shimRemoveStream(window) {
+    if (!window.RTCPeerConnection || 'removeStream' in window.RTCPeerConnection.prototype) {
+      return;
+    }
+    window.RTCPeerConnection.prototype.removeStream = function (stream) {
+      var _this3 = this;
+  
+      utils.deprecated('removeStream', 'removeTrack');
+      this.getSenders().forEach(function (sender) {
+        if (sender.track && stream.getTracks().includes(sender.track)) {
+          _this3.removeTrack(sender);
+        }
+      });
+    };
+  }
+  
+  function shimRTCDataChannel(window) {
+    // rename DataChannel to RTCDataChannel (native fix in FF60):
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1173851
+    if (window.DataChannel && !window.RTCDataChannel) {
+      window.RTCDataChannel = window.DataChannel;
+    }
+  }
+  
+  },{"../utils":15,"./getdisplaymedia":12,"./getusermedia":13}],12:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2018 The adapter.js project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.shimGetDisplayMedia = shimGetDisplayMedia;
+  function shimGetDisplayMedia(window, preferredMediaSource) {
+    if (window.navigator.mediaDevices && 'getDisplayMedia' in window.navigator.mediaDevices) {
+      return;
+    }
+    if (!window.navigator.mediaDevices) {
+      return;
+    }
+    window.navigator.mediaDevices.getDisplayMedia = function (constraints) {
+      if (!(constraints && constraints.video)) {
+        var err = new DOMException('getDisplayMedia without video ' + 'constraints is undefined');
+        err.name = 'NotFoundError';
+        // from https://heycam.github.io/webidl/#idl-DOMException-error-names
+        err.code = 8;
+        return Promise.reject(err);
+      }
+      if (constraints.video === true) {
+        constraints.video = { mediaSource: preferredMediaSource };
+      } else {
+        constraints.video.mediaSource = preferredMediaSource;
+      }
+      return window.navigator.mediaDevices.getUserMedia(constraints);
+    };
+  }
+  
+  },{}],13:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  exports.shimGetUserMedia = shimGetUserMedia;
+  
+  var _utils = require('../utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  function shimGetUserMedia(window) {
+    var browserDetails = utils.detectBrowser(window);
+    var navigator = window && window.navigator;
+    var MediaStreamTrack = window && window.MediaStreamTrack;
+  
+    navigator.getUserMedia = function (constraints, onSuccess, onError) {
+      // Replace Firefox 44+'s deprecation warning with unprefixed version.
+      utils.deprecated('navigator.getUserMedia', 'navigator.mediaDevices.getUserMedia');
+      navigator.mediaDevices.getUserMedia(constraints).then(onSuccess, onError);
+    };
+  
+    if (!(browserDetails.version > 55 && 'autoGainControl' in navigator.mediaDevices.getSupportedConstraints())) {
+      var remap = function remap(obj, a, b) {
+        if (a in obj && !(b in obj)) {
+          obj[b] = obj[a];
+          delete obj[a];
+        }
+      };
+  
+      var nativeGetUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices);
+      navigator.mediaDevices.getUserMedia = function (c) {
+        if ((typeof c === 'undefined' ? 'undefined' : _typeof(c)) === 'object' && _typeof(c.audio) === 'object') {
           c = JSON.parse(JSON.stringify(c));
-          remap(c, 'autoGainControl', 'mozAutoGainControl');
-          remap(c, 'noiseSuppression', 'mozNoiseSuppression');
+          remap(c.audio, 'autoGainControl', 'mozAutoGainControl');
+          remap(c.audio, 'noiseSuppression', 'mozNoiseSuppression');
         }
-        return nativeApplyConstraints.apply(this, [c]);
+        return nativeGetUserMedia(c);
       };
+  
+      if (MediaStreamTrack && MediaStreamTrack.prototype.getSettings) {
+        var nativeGetSettings = MediaStreamTrack.prototype.getSettings;
+        MediaStreamTrack.prototype.getSettings = function () {
+          var obj = nativeGetSettings.apply(this, arguments);
+          remap(obj, 'mozAutoGainControl', 'autoGainControl');
+          remap(obj, 'mozNoiseSuppression', 'noiseSuppression');
+          return obj;
+        };
+      }
+  
+      if (MediaStreamTrack && MediaStreamTrack.prototype.applyConstraints) {
+        var nativeApplyConstraints = MediaStreamTrack.prototype.applyConstraints;
+        MediaStreamTrack.prototype.applyConstraints = function (c) {
+          if (this.kind === 'audio' && (typeof c === 'undefined' ? 'undefined' : _typeof(c)) === 'object') {
+            c = JSON.parse(JSON.stringify(c));
+            remap(c, 'autoGainControl', 'mozAutoGainControl');
+            remap(c, 'noiseSuppression', 'mozNoiseSuppression');
+          }
+          return nativeApplyConstraints.apply(this, [c]);
+        };
+      }
     }
   }
-  navigator.getUserMedia = function(constraints, onSuccess, onError) {
-    if (browserDetails.version < 44) {
-      return getUserMedia_(constraints, onSuccess, onError);
-    }
-    // Replace Firefox 44+'s deprecation warning with unprefixed version.
-    utils.deprecated('navigator.getUserMedia',
-        'navigator.mediaDevices.getUserMedia');
-    navigator.mediaDevices.getUserMedia(constraints).then(onSuccess, onError);
-  };
-};
-
-},{"../utils":13}],12:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
-'use strict';
-var utils = require('../utils');
-
-var safariShim = {
-  // TODO: DrAlex, should be here, double check against LayoutTests
-
-  // TODO: once the back-end for the mac port is done, add.
-  // TODO: check for webkitGTK+
-  // shimPeerConnection: function() { },
-
-  shimLocalStreamsAPI: function(window) {
-    if (typeof window !== 'object' || !window.RTCPeerConnection) {
+  
+  },{"../utils":15}],14:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  exports.shimLocalStreamsAPI = shimLocalStreamsAPI;
+  exports.shimRemoteStreamsAPI = shimRemoteStreamsAPI;
+  exports.shimCallbacksAPI = shimCallbacksAPI;
+  exports.shimGetUserMedia = shimGetUserMedia;
+  exports.shimRTCIceServerUrls = shimRTCIceServerUrls;
+  exports.shimTrackEventTransceiver = shimTrackEventTransceiver;
+  exports.shimCreateOfferLegacy = shimCreateOfferLegacy;
+  
+  var _utils = require('../utils');
+  
+  var utils = _interopRequireWildcard(_utils);
+  
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+  
+  function shimLocalStreamsAPI(window) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !window.RTCPeerConnection) {
       return;
     }
     if (!('getLocalStreams' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.getLocalStreams = function() {
+      window.RTCPeerConnection.prototype.getLocalStreams = function () {
         if (!this._localStreams) {
           this._localStreams = [];
         }
         return this._localStreams;
       };
     }
-    if (!('getStreamById' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.getStreamById = function(id) {
-        var result = null;
-        if (this._localStreams) {
-          this._localStreams.forEach(function(stream) {
-            if (stream.id === id) {
-              result = stream;
-            }
-          });
-        }
-        if (this._remoteStreams) {
-          this._remoteStreams.forEach(function(stream) {
-            if (stream.id === id) {
-              result = stream;
-            }
-          });
-        }
-        return result;
-      };
-    }
     if (!('addStream' in window.RTCPeerConnection.prototype)) {
       var _addTrack = window.RTCPeerConnection.prototype.addTrack;
-      window.RTCPeerConnection.prototype.addStream = function(stream) {
+      window.RTCPeerConnection.prototype.addStream = function (stream) {
+        var _this = this;
+  
         if (!this._localStreams) {
           this._localStreams = [];
         }
-        if (this._localStreams.indexOf(stream) === -1) {
+        if (!this._localStreams.includes(stream)) {
           this._localStreams.push(stream);
         }
-        var self = this;
-        stream.getTracks().forEach(function(track) {
-          _addTrack.call(self, track, stream);
+        stream.getTracks().forEach(function (track) {
+          return _addTrack.call(_this, track, stream);
         });
       };
-
-      window.RTCPeerConnection.prototype.addTrack = function(track, stream) {
+  
+      window.RTCPeerConnection.prototype.addTrack = function (track, stream) {
         if (stream) {
           if (!this._localStreams) {
             this._localStreams = [stream];
-          } else if (this._localStreams.indexOf(stream) === -1) {
+          } else if (!this._localStreams.includes(stream)) {
             this._localStreams.push(stream);
           }
         }
-        _addTrack.call(this, track, stream);
+        return _addTrack.call(this, track, stream);
       };
     }
     if (!('removeStream' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.removeStream = function(stream) {
+      window.RTCPeerConnection.prototype.removeStream = function (stream) {
+        var _this2 = this;
+  
         if (!this._localStreams) {
           this._localStreams = [];
         }
@@ -4074,55 +2174,80 @@ var safariShim = {
           return;
         }
         this._localStreams.splice(index, 1);
-        var self = this;
         var tracks = stream.getTracks();
-        this.getSenders().forEach(function(sender) {
-          if (tracks.indexOf(sender.track) !== -1) {
-            self.removeTrack(sender);
+        this.getSenders().forEach(function (sender) {
+          if (tracks.includes(sender.track)) {
+            _this2.removeTrack(sender);
           }
         });
       };
     }
-  },
-  shimRemoteStreamsAPI: function(window) {
-    if (typeof window !== 'object' || !window.RTCPeerConnection) {
+  }
+  
+  function shimRemoteStreamsAPI(window) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !window.RTCPeerConnection) {
       return;
     }
     if (!('getRemoteStreams' in window.RTCPeerConnection.prototype)) {
-      window.RTCPeerConnection.prototype.getRemoteStreams = function() {
+      window.RTCPeerConnection.prototype.getRemoteStreams = function () {
         return this._remoteStreams ? this._remoteStreams : [];
       };
     }
     if (!('onaddstream' in window.RTCPeerConnection.prototype)) {
       Object.defineProperty(window.RTCPeerConnection.prototype, 'onaddstream', {
-        get: function() {
+        get: function get() {
           return this._onaddstream;
         },
-        set: function(f) {
+        set: function set(f) {
+          var _this3 = this;
+  
           if (this._onaddstream) {
             this.removeEventListener('addstream', this._onaddstream);
             this.removeEventListener('track', this._onaddstreampoly);
           }
           this.addEventListener('addstream', this._onaddstream = f);
-          this.addEventListener('track', this._onaddstreampoly = function(e) {
-            var stream = e.streams[0];
-            if (!this._remoteStreams) {
-              this._remoteStreams = [];
-            }
-            if (this._remoteStreams.indexOf(stream) >= 0) {
-              return;
-            }
-            this._remoteStreams.push(stream);
-            var event = new Event('addstream');
-            event.stream = e.streams[0];
-            this.dispatchEvent(event);
-          }.bind(this));
+          this.addEventListener('track', this._onaddstreampoly = function (e) {
+            e.streams.forEach(function (stream) {
+              if (!_this3._remoteStreams) {
+                _this3._remoteStreams = [];
+              }
+              if (_this3._remoteStreams.includes(stream)) {
+                return;
+              }
+              _this3._remoteStreams.push(stream);
+              var event = new Event('addstream');
+              event.stream = stream;
+              _this3.dispatchEvent(event);
+            });
+          });
         }
       });
+      var origSetRemoteDescription = window.RTCPeerConnection.prototype.setRemoteDescription;
+      window.RTCPeerConnection.prototype.setRemoteDescription = function () {
+        var pc = this;
+        if (!this._onaddstreampoly) {
+          this.addEventListener('track', this._onaddstreampoly = function (e) {
+            e.streams.forEach(function (stream) {
+              if (!pc._remoteStreams) {
+                pc._remoteStreams = [];
+              }
+              if (pc._remoteStreams.indexOf(stream) >= 0) {
+                return;
+              }
+              pc._remoteStreams.push(stream);
+              var event = new Event('addstream');
+              event.stream = stream;
+              pc.dispatchEvent(event);
+            });
+          });
+        }
+        return origSetRemoteDescription.apply(pc, arguments);
+      };
     }
-  },
-  shimCallbacksAPI: function(window) {
-    if (typeof window !== 'object' || !window.RTCPeerConnection) {
+  }
+  
+  function shimCallbacksAPI(window) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) !== 'object' || !window.RTCPeerConnection) {
       return;
     }
     var prototype = window.RTCPeerConnection.prototype;
@@ -4131,9 +2256,9 @@ var safariShim = {
     var setLocalDescription = prototype.setLocalDescription;
     var setRemoteDescription = prototype.setRemoteDescription;
     var addIceCandidate = prototype.addIceCandidate;
-
-    prototype.createOffer = function(successCallback, failureCallback) {
-      var options = (arguments.length >= 2) ? arguments[2] : arguments[0];
+  
+    prototype.createOffer = function (successCallback, failureCallback) {
+      var options = arguments.length >= 2 ? arguments[2] : arguments[0];
       var promise = createOffer.apply(this, [options]);
       if (!failureCallback) {
         return promise;
@@ -4141,9 +2266,9 @@ var safariShim = {
       promise.then(successCallback, failureCallback);
       return Promise.resolve();
     };
-
-    prototype.createAnswer = function(successCallback, failureCallback) {
-      var options = (arguments.length >= 2) ? arguments[2] : arguments[0];
+  
+    prototype.createAnswer = function (successCallback, failureCallback) {
+      var options = arguments.length >= 2 ? arguments[2] : arguments[0];
       var promise = createAnswer.apply(this, [options]);
       if (!failureCallback) {
         return promise;
@@ -4151,8 +2276,8 @@ var safariShim = {
       promise.then(successCallback, failureCallback);
       return Promise.resolve();
     };
-
-    var withCallback = function(description, successCallback, failureCallback) {
+  
+    var withCallback = function withCallback(description, successCallback, failureCallback) {
       var promise = setLocalDescription.apply(this, [description]);
       if (!failureCallback) {
         return promise;
@@ -4161,8 +2286,8 @@ var safariShim = {
       return Promise.resolve();
     };
     prototype.setLocalDescription = withCallback;
-
-    withCallback = function(description, successCallback, failureCallback) {
+  
+    withCallback = function withCallback(description, successCallback, failureCallback) {
       var promise = setRemoteDescription.apply(this, [description]);
       if (!failureCallback) {
         return promise;
@@ -4171,8 +2296,8 @@ var safariShim = {
       return Promise.resolve();
     };
     prototype.setRemoteDescription = withCallback;
-
-    withCallback = function(candidate, successCallback, failureCallback) {
+  
+    withCallback = function withCallback(candidate, successCallback, failureCallback) {
       var promise = addIceCandidate.apply(this, [candidate]);
       if (!failureCallback) {
         return promise;
@@ -4181,32 +2306,27 @@ var safariShim = {
       return Promise.resolve();
     };
     prototype.addIceCandidate = withCallback;
-  },
-  shimGetUserMedia: function(window) {
+  }
+  
+  function shimGetUserMedia(window) {
     var navigator = window && window.navigator;
-
-    if (!navigator.getUserMedia) {
-      if (navigator.webkitGetUserMedia) {
-        navigator.getUserMedia = navigator.webkitGetUserMedia.bind(navigator);
-      } else if (navigator.mediaDevices &&
-          navigator.mediaDevices.getUserMedia) {
-        navigator.getUserMedia = function(constraints, cb, errcb) {
-          navigator.mediaDevices.getUserMedia(constraints)
-          .then(cb, errcb);
-        }.bind(navigator);
-      }
+  
+    if (!navigator.getUserMedia && navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+      navigator.getUserMedia = function (constraints, cb, errcb) {
+        navigator.mediaDevices.getUserMedia(constraints).then(cb, errcb);
+      }.bind(navigator);
     }
-  },
-  shimRTCIceServerUrls: function(window) {
+  }
+  
+  function shimRTCIceServerUrls(window) {
     // migrate from non-spec RTCIceServer.url to RTCIceServer.urls
     var OrigPeerConnection = window.RTCPeerConnection;
-    window.RTCPeerConnection = function(pcConfig, pcConstraints) {
+    window.RTCPeerConnection = function (pcConfig, pcConstraints) {
       if (pcConfig && pcConfig.iceServers) {
         var newIceServers = [];
         for (var i = 0; i < pcConfig.iceServers.length; i++) {
           var server = pcConfig.iceServers[i];
-          if (!server.hasOwnProperty('urls') &&
-              server.hasOwnProperty('url')) {
+          if (!server.hasOwnProperty('urls') && server.hasOwnProperty('url')) {
             utils.deprecated('RTCIceServer.url', 'RTCIceServer.urls');
             server = JSON.parse(JSON.stringify(server));
             server.urls = server.url;
@@ -4224,141 +2344,112 @@ var safariShim = {
     // wrap static methods. Currently just generateCertificate.
     if ('generateCertificate' in window.RTCPeerConnection) {
       Object.defineProperty(window.RTCPeerConnection, 'generateCertificate', {
-        get: function() {
+        get: function get() {
           return OrigPeerConnection.generateCertificate;
         }
       });
     }
-  },
-  shimTrackEventTransceiver: function(window) {
+  }
+  
+  function shimTrackEventTransceiver(window) {
     // Add event.transceiver member over deprecated event.receiver
-    if (typeof window === 'object' && window.RTCPeerConnection &&
-        ('receiver' in window.RTCTrackEvent.prototype) &&
-        // can't check 'transceiver' in window.RTCTrackEvent.prototype, as it is
-        // defined for some reason even when window.RTCTransceiver is not.
-        !window.RTCTransceiver) {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && window.RTCPeerConnection && 'receiver' in window.RTCTrackEvent.prototype &&
+    // can't check 'transceiver' in window.RTCTrackEvent.prototype, as it is
+    // defined for some reason even when window.RTCTransceiver is not.
+    !window.RTCTransceiver) {
       Object.defineProperty(window.RTCTrackEvent.prototype, 'transceiver', {
-        get: function() {
-          return {receiver: this.receiver};
+        get: function get() {
+          return { receiver: this.receiver };
         }
       });
     }
-  },
-
-  shimCreateOfferLegacy: function(window) {
+  }
+  
+  function shimCreateOfferLegacy(window) {
     var origCreateOffer = window.RTCPeerConnection.prototype.createOffer;
-    window.RTCPeerConnection.prototype.createOffer = function(offerOptions) {
-      var pc = this;
+    window.RTCPeerConnection.prototype.createOffer = function (offerOptions) {
       if (offerOptions) {
-        var audioTransceiver = pc.getTransceivers().find(function(transceiver) {
-          return transceiver.sender.track &&
-              transceiver.sender.track.kind === 'audio';
+        if (typeof offerOptions.offerToReceiveAudio !== 'undefined') {
+          // support bit values
+          offerOptions.offerToReceiveAudio = !!offerOptions.offerToReceiveAudio;
+        }
+        var audioTransceiver = this.getTransceivers().find(function (transceiver) {
+          return transceiver.sender.track && transceiver.sender.track.kind === 'audio';
         });
         if (offerOptions.offerToReceiveAudio === false && audioTransceiver) {
           if (audioTransceiver.direction === 'sendrecv') {
-            audioTransceiver.setDirection('sendonly');
+            if (audioTransceiver.setDirection) {
+              audioTransceiver.setDirection('sendonly');
+            } else {
+              audioTransceiver.direction = 'sendonly';
+            }
           } else if (audioTransceiver.direction === 'recvonly') {
-            audioTransceiver.setDirection('inactive');
+            if (audioTransceiver.setDirection) {
+              audioTransceiver.setDirection('inactive');
+            } else {
+              audioTransceiver.direction = 'inactive';
+            }
           }
-        } else if (offerOptions.offerToReceiveAudio === true &&
-            !audioTransceiver) {
-          pc.addTransceiver('audio');
+        } else if (offerOptions.offerToReceiveAudio === true && !audioTransceiver) {
+          this.addTransceiver('audio');
         }
-
-        var videoTransceiver = pc.getTransceivers().find(function(transceiver) {
-          return transceiver.sender.track &&
-              transceiver.sender.track.kind === 'video';
+  
+        if (typeof offerOptions.offerToReceiveVideo !== 'undefined') {
+          // support bit values
+          offerOptions.offerToReceiveVideo = !!offerOptions.offerToReceiveVideo;
+        }
+        var videoTransceiver = this.getTransceivers().find(function (transceiver) {
+          return transceiver.sender.track && transceiver.sender.track.kind === 'video';
         });
         if (offerOptions.offerToReceiveVideo === false && videoTransceiver) {
           if (videoTransceiver.direction === 'sendrecv') {
-            videoTransceiver.setDirection('sendonly');
+            if (videoTransceiver.setDirection) {
+              videoTransceiver.setDirection('sendonly');
+            } else {
+              videoTransceiver.direction = 'sendonly';
+            }
           } else if (videoTransceiver.direction === 'recvonly') {
-            videoTransceiver.setDirection('inactive');
+            if (videoTransceiver.setDirection) {
+              videoTransceiver.setDirection('inactive');
+            } else {
+              videoTransceiver.direction = 'inactive';
+            }
           }
-        } else if (offerOptions.offerToReceiveVideo === true &&
-            !videoTransceiver) {
-          pc.addTransceiver('video');
+        } else if (offerOptions.offerToReceiveVideo === true && !videoTransceiver) {
+          this.addTransceiver('video');
         }
       }
-      return origCreateOffer.apply(pc, arguments);
+      return origCreateOffer.apply(this, arguments);
     };
   }
-};
-
-// Expose public methods.
-module.exports = {
-  shimCallbacksAPI: safariShim.shimCallbacksAPI,
-  shimLocalStreamsAPI: safariShim.shimLocalStreamsAPI,
-  shimRemoteStreamsAPI: safariShim.shimRemoteStreamsAPI,
-  shimGetUserMedia: safariShim.shimGetUserMedia,
-  shimRTCIceServerUrls: safariShim.shimRTCIceServerUrls,
-  shimTrackEventTransceiver: safariShim.shimTrackEventTransceiver,
-  shimCreateOfferLegacy: safariShim.shimCreateOfferLegacy
-  // TODO
-  // shimPeerConnection: safariShim.shimPeerConnection
-};
-
-},{"../utils":13}],13:[function(require,module,exports){
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree.
- */
- /* eslint-env node */
-'use strict';
-
-var logDisabled_ = true;
-var deprecationWarnings_ = true;
-
-// Utility methods.
-var utils = {
-  disableLog: function(bool) {
-    if (typeof bool !== 'boolean') {
-      return new Error('Argument type: ' + typeof bool +
-          '. Please use a boolean.');
-    }
-    logDisabled_ = bool;
-    return (bool) ? 'adapter.js logging disabled' :
-        'adapter.js logging enabled';
-  },
-
-  /**
-   * Disable or enable deprecation warnings
-   * @param {!boolean} bool set to true to disable warnings.
+  
+  },{"../utils":15}],15:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
    */
-  disableWarnings: function(bool) {
-    if (typeof bool !== 'boolean') {
-      return new Error('Argument type: ' + typeof bool +
-          '. Please use a boolean.');
-    }
-    deprecationWarnings_ = !bool;
-    return 'adapter.js deprecation warnings ' + (bool ? 'disabled' : 'enabled');
-  },
-
-  log: function() {
-    if (typeof window === 'object') {
-      if (logDisabled_) {
-        return;
-      }
-      if (typeof console !== 'undefined' && typeof console.log === 'function') {
-        console.log.apply(console, arguments);
-      }
-    }
-  },
-
-  /**
-   * Shows a deprecation warning suggesting the modern and spec-compatible API.
-   */
-  deprecated: function(oldMethod, newMethod) {
-    if (!deprecationWarnings_) {
-      return;
-    }
-    console.warn(oldMethod + ' is deprecated, please use ' + newMethod +
-        ' instead.');
-  },
-
+  /* eslint-env node */
+  'use strict';
+  
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+  
+  exports.extractVersion = extractVersion;
+  exports.wrapPeerConnectionEvent = wrapPeerConnectionEvent;
+  exports.disableLog = disableLog;
+  exports.disableWarnings = disableWarnings;
+  exports.log = log;
+  exports.deprecated = deprecated;
+  exports.detectBrowser = detectBrowser;
+  var logDisabled_ = true;
+  var deprecationWarnings_ = true;
+  
   /**
    * Extract browser version out of the provided user agent string.
    *
@@ -4367,84 +2458,2721 @@ var utils = {
    * @param {!number} pos position in the version string to be returned.
    * @return {!number} browser version.
    */
-  extractVersion: function(uastring, expr, pos) {
+  function extractVersion(uastring, expr, pos) {
     var match = uastring.match(expr);
     return match && match.length >= pos && parseInt(match[pos], 10);
-  },
-
+  }
+  
+  // Wraps the peerconnection event eventNameToWrap in a function
+  // which returns the modified event object (or false to prevent
+  // the event).
+  function wrapPeerConnectionEvent(window, eventNameToWrap, wrapper) {
+    if (!window.RTCPeerConnection) {
+      return;
+    }
+    var proto = window.RTCPeerConnection.prototype;
+    var nativeAddEventListener = proto.addEventListener;
+    proto.addEventListener = function (nativeEventName, cb) {
+      if (nativeEventName !== eventNameToWrap) {
+        return nativeAddEventListener.apply(this, arguments);
+      }
+      var wrappedCallback = function wrappedCallback(e) {
+        var modifiedEvent = wrapper(e);
+        if (modifiedEvent) {
+          cb(modifiedEvent);
+        }
+      };
+      this._eventMap = this._eventMap || {};
+      this._eventMap[cb] = wrappedCallback;
+      return nativeAddEventListener.apply(this, [nativeEventName, wrappedCallback]);
+    };
+  
+    var nativeRemoveEventListener = proto.removeEventListener;
+    proto.removeEventListener = function (nativeEventName, cb) {
+      if (nativeEventName !== eventNameToWrap || !this._eventMap || !this._eventMap[cb]) {
+        return nativeRemoveEventListener.apply(this, arguments);
+      }
+      var unwrappedCb = this._eventMap[cb];
+      delete this._eventMap[cb];
+      return nativeRemoveEventListener.apply(this, [nativeEventName, unwrappedCb]);
+    };
+  
+    Object.defineProperty(proto, 'on' + eventNameToWrap, {
+      get: function get() {
+        return this['_on' + eventNameToWrap];
+      },
+      set: function set(cb) {
+        if (this['_on' + eventNameToWrap]) {
+          this.removeEventListener(eventNameToWrap, this['_on' + eventNameToWrap]);
+          delete this['_on' + eventNameToWrap];
+        }
+        if (cb) {
+          this.addEventListener(eventNameToWrap, this['_on' + eventNameToWrap] = cb);
+        }
+      },
+  
+      enumerable: true,
+      configurable: true
+    });
+  }
+  
+  function disableLog(bool) {
+    if (typeof bool !== 'boolean') {
+      return new Error('Argument type: ' + (typeof bool === 'undefined' ? 'undefined' : _typeof(bool)) + '. Please use a boolean.');
+    }
+    logDisabled_ = bool;
+    return bool ? 'adapter.js logging disabled' : 'adapter.js logging enabled';
+  }
+  
+  /**
+   * Disable or enable deprecation warnings
+   * @param {!boolean} bool set to true to disable warnings.
+   */
+  function disableWarnings(bool) {
+    if (typeof bool !== 'boolean') {
+      return new Error('Argument type: ' + (typeof bool === 'undefined' ? 'undefined' : _typeof(bool)) + '. Please use a boolean.');
+    }
+    deprecationWarnings_ = !bool;
+    return 'adapter.js deprecation warnings ' + (bool ? 'disabled' : 'enabled');
+  }
+  
+  function log() {
+    if ((typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object') {
+      if (logDisabled_) {
+        return;
+      }
+      if (typeof console !== 'undefined' && typeof console.log === 'function') {
+        console.log.apply(console, arguments);
+      }
+    }
+  }
+  
+  /**
+   * Shows a deprecation warning suggesting the modern and spec-compatible API.
+   */
+  function deprecated(oldMethod, newMethod) {
+    if (!deprecationWarnings_) {
+      return;
+    }
+    console.warn(oldMethod + ' is deprecated, please use ' + newMethod + ' instead.');
+  }
+  
   /**
    * Browser detector.
    *
    * @return {object} result containing browser and version
    *     properties.
    */
-  detectBrowser: function(window) {
-    var navigator = window && window.navigator;
-
+  function detectBrowser(window) {
+    var navigator = window.navigator;
+  
     // Returned result object.
-    var result = {};
-    result.browser = null;
-    result.version = null;
-
+  
+    var result = { browser: null, version: null };
+  
     // Fail early if it's not a browser
     if (typeof window === 'undefined' || !window.navigator) {
       result.browser = 'Not a browser.';
       return result;
     }
-
-    // Firefox.
+  
     if (navigator.mozGetUserMedia) {
+      // Firefox.
       result.browser = 'firefox';
-      result.version = this.extractVersion(navigator.userAgent,
-          /Firefox\/(\d+)\./, 1);
+      result.version = extractVersion(navigator.userAgent, /Firefox\/(\d+)\./, 1);
     } else if (navigator.webkitGetUserMedia) {
-      // Chrome, Chromium, Webview, Opera, all use the chrome shim for now
-      if (window.webkitRTCPeerConnection) {
-        result.browser = 'chrome';
-        result.version = this.extractVersion(navigator.userAgent,
-          /Chrom(e|ium)\/(\d+)\./, 2);
-      } else { // Safari (in an unpublished version) or unknown webkit-based.
-        if (navigator.userAgent.match(/Version\/(\d+).(\d+)/)) {
-          result.browser = 'safari';
-          result.version = this.extractVersion(navigator.userAgent,
-            /AppleWebKit\/(\d+)\./, 1);
-        } else { // unknown webkit-based browser.
-          result.browser = 'Unsupported webkit-based browser ' +
-              'with GUM support but no WebRTC support.';
-          return result;
-        }
-      }
-    } else if (navigator.mediaDevices &&
-        navigator.userAgent.match(/Edge\/(\d+).(\d+)$/)) { // Edge.
+      // Chrome, Chromium, Webview, Opera.
+      // Version matches Chrome/WebRTC version.
+      result.browser = 'chrome';
+      result.version = extractVersion(navigator.userAgent, /Chrom(e|ium)\/(\d+)\./, 2);
+    } else if (navigator.mediaDevices && navigator.userAgent.match(/Edge\/(\d+).(\d+)$/)) {
+      // Edge.
       result.browser = 'edge';
-      result.version = this.extractVersion(navigator.userAgent,
-          /Edge\/(\d+).(\d+)$/, 2);
-    } else if (navigator.mediaDevices &&
-        navigator.userAgent.match(/AppleWebKit\/(\d+)\./)) {
-        // Safari, with webkitGetUserMedia removed.
+      result.version = extractVersion(navigator.userAgent, /Edge\/(\d+).(\d+)$/, 2);
+    } else if (window.RTCPeerConnection && navigator.userAgent.match(/AppleWebKit\/(\d+)\./)) {
+      // Safari.
       result.browser = 'safari';
-      result.version = this.extractVersion(navigator.userAgent,
-          /AppleWebKit\/(\d+)\./, 1);
-    } else { // Default fallthrough: not supported.
+      result.version = extractVersion(navigator.userAgent, /AppleWebKit\/(\d+)\./, 1);
+    } else {
+      // Default fallthrough: not supported.
       result.browser = 'Not a supported browser.';
       return result;
     }
-
+  
     return result;
-  },
-
-};
-
-// Export.
-module.exports = {
-  log: utils.log,
-  deprecated: utils.deprecated,
-  disableLog: utils.disableLog,
-  disableWarnings: utils.disableWarnings,
-  extractVersion: utils.extractVersion,
-  shimCreateObjectURL: utils.shimCreateObjectURL,
-  detectBrowser: utils.detectBrowser.bind(utils)
-};
-
-},{}]},{},[3])(3)
-});
\ No newline at end of file
+  }
+  
+  },{}],16:[function(require,module,exports){
+  /*
+   *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+   *
+   *  Use of this source code is governed by a BSD-style license
+   *  that can be found in the LICENSE file in the root of the source
+   *  tree.
+   */
+   /* eslint-env node */
+  'use strict';
+  
+  var SDPUtils = require('sdp');
+  
+  function fixStatsType(stat) {
+    return {
+      inboundrtp: 'inbound-rtp',
+      outboundrtp: 'outbound-rtp',
+      candidatepair: 'candidate-pair',
+      localcandidate: 'local-candidate',
+      remotecandidate: 'remote-candidate'
+    }[stat.type] || stat.type;
+  }
+  
+  function writeMediaSection(transceiver, caps, type, stream, dtlsRole) {
+    var sdp = SDPUtils.writeRtpDescription(transceiver.kind, caps);
+  
+    // Map ICE parameters (ufrag, pwd) to SDP.
+    sdp += SDPUtils.writeIceParameters(
+        transceiver.iceGatherer.getLocalParameters());
+  
+    // Map DTLS parameters to SDP.
+    sdp += SDPUtils.writeDtlsParameters(
+        transceiver.dtlsTransport.getLocalParameters(),
+        type === 'offer' ? 'actpass' : dtlsRole || 'active');
+  
+    sdp += 'a=mid:' + transceiver.mid + '\r\n';
+  
+    if (transceiver.rtpSender && transceiver.rtpReceiver) {
+      sdp += 'a=sendrecv\r\n';
+    } else if (transceiver.rtpSender) {
+      sdp += 'a=sendonly\r\n';
+    } else if (transceiver.rtpReceiver) {
+      sdp += 'a=recvonly\r\n';
+    } else {
+      sdp += 'a=inactive\r\n';
+    }
+  
+    if (transceiver.rtpSender) {
+      var trackId = transceiver.rtpSender._initialTrackId ||
+          transceiver.rtpSender.track.id;
+      transceiver.rtpSender._initialTrackId = trackId;
+      // spec.
+      var msid = 'msid:' + (stream ? stream.id : '-') + ' ' +
+          trackId + '\r\n';
+      sdp += 'a=' + msid;
+      // for Chrome. Legacy should no longer be required.
+      sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
+          ' ' + msid;
+  
+      // RTX
+      if (transceiver.sendEncodingParameters[0].rtx) {
+        sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
+            ' ' + msid;
+        sdp += 'a=ssrc-group:FID ' +
+            transceiver.sendEncodingParameters[0].ssrc + ' ' +
+            transceiver.sendEncodingParameters[0].rtx.ssrc +
+            '\r\n';
+      }
+    }
+    // FIXME: this should be written by writeRtpDescription.
+    sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
+        ' cname:' + SDPUtils.localCName + '\r\n';
+    if (transceiver.rtpSender && transceiver.sendEncodingParameters[0].rtx) {
+      sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
+          ' cname:' + SDPUtils.localCName + '\r\n';
+    }
+    return sdp;
+  }
+  
+  // Edge does not like
+  // 1) stun: filtered after 14393 unless ?transport=udp is present
+  // 2) turn: that does not have all of turn:host:port?transport=udp
+  // 3) turn: with ipv6 addresses
+  // 4) turn: occurring muliple times
+  function filterIceServers(iceServers, edgeVersion) {
+    var hasTurn = false;
+    iceServers = JSON.parse(JSON.stringify(iceServers));
+    return iceServers.filter(function(server) {
+      if (server && (server.urls || server.url)) {
+        var urls = server.urls || server.url;
+        if (server.url && !server.urls) {
+          console.warn('RTCIceServer.url is deprecated! Use urls instead.');
+        }
+        var isString = typeof urls === 'string';
+        if (isString) {
+          urls = [urls];
+        }
+        urls = urls.filter(function(url) {
+          var validTurn = url.indexOf('turn:') === 0 &&
+              url.indexOf('transport=udp') !== -1 &&
+              url.indexOf('turn:[') === -1 &&
+              !hasTurn;
+  
+          if (validTurn) {
+            hasTurn = true;
+            return true;
+          }
+          return url.indexOf('stun:') === 0 && edgeVersion >= 14393 &&
+              url.indexOf('?transport=udp') === -1;
+        });
+  
+        delete server.url;
+        server.urls = isString ? urls[0] : urls;
+        return !!urls.length;
+      }
+    });
+  }
+  
+  // Determines the intersection of local and remote capabilities.
+  function getCommonCapabilities(localCapabilities, remoteCapabilities) {
+    var commonCapabilities = {
+      codecs: [],
+      headerExtensions: [],
+      fecMechanisms: []
+    };
+  
+    var findCodecByPayloadType = function(pt, codecs) {
+      pt = parseInt(pt, 10);
+      for (var i = 0; i < codecs.length; i++) {
+        if (codecs[i].payloadType === pt ||
+            codecs[i].preferredPayloadType === pt) {
+          return codecs[i];
+        }
+      }
+    };
+  
+    var rtxCapabilityMatches = function(lRtx, rRtx, lCodecs, rCodecs) {
+      var lCodec = findCodecByPayloadType(lRtx.parameters.apt, lCodecs);
+      var rCodec = findCodecByPayloadType(rRtx.parameters.apt, rCodecs);
+      return lCodec && rCodec &&
+          lCodec.name.toLowerCase() === rCodec.name.toLowerCase();
+    };
+  
+    localCapabilities.codecs.forEach(function(lCodec) {
+      for (var i = 0; i < remoteCapabilities.codecs.length; i++) {
+        var rCodec = remoteCapabilities.codecs[i];
+        if (lCodec.name.toLowerCase() === rCodec.name.toLowerCase() &&
+            lCodec.clockRate === rCodec.clockRate) {
+          if (lCodec.name.toLowerCase() === 'rtx' &&
+              lCodec.parameters && rCodec.parameters.apt) {
+            // for RTX we need to find the local rtx that has a apt
+            // which points to the same local codec as the remote one.
+            if (!rtxCapabilityMatches(lCodec, rCodec,
+                localCapabilities.codecs, remoteCapabilities.codecs)) {
+              continue;
+            }
+          }
+          rCodec = JSON.parse(JSON.stringify(rCodec)); // deepcopy
+          // number of channels is the highest common number of channels
+          rCodec.numChannels = Math.min(lCodec.numChannels,
+              rCodec.numChannels);
+          // push rCodec so we reply with offerer payload type
+          commonCapabilities.codecs.push(rCodec);
+  
+          // determine common feedback mechanisms
+          rCodec.rtcpFeedback = rCodec.rtcpFeedback.filter(function(fb) {
+            for (var j = 0; j < lCodec.rtcpFeedback.length; j++) {
+              if (lCodec.rtcpFeedback[j].type === fb.type &&
+                  lCodec.rtcpFeedback[j].parameter === fb.parameter) {
+                return true;
+              }
+            }
+            return false;
+          });
+          // FIXME: also need to determine .parameters
+          //  see https://github.com/openpeer/ortc/issues/569
+          break;
+        }
+      }
+    });
+  
+    localCapabilities.headerExtensions.forEach(function(lHeaderExtension) {
+      for (var i = 0; i < remoteCapabilities.headerExtensions.length;
+           i++) {
+        var rHeaderExtension = remoteCapabilities.headerExtensions[i];
+        if (lHeaderExtension.uri === rHeaderExtension.uri) {
+          commonCapabilities.headerExtensions.push(rHeaderExtension);
+          break;
+        }
+      }
+    });
+  
+    // FIXME: fecMechanisms
+    return commonCapabilities;
+  }
+  
+  // is action=setLocalDescription with type allowed in signalingState
+  function isActionAllowedInSignalingState(action, type, signalingState) {
+    return {
+      offer: {
+        setLocalDescription: ['stable', 'have-local-offer'],
+        setRemoteDescription: ['stable', 'have-remote-offer']
+      },
+      answer: {
+        setLocalDescription: ['have-remote-offer', 'have-local-pranswer'],
+        setRemoteDescription: ['have-local-offer', 'have-remote-pranswer']
+      }
+    }[type][action].indexOf(signalingState) !== -1;
+  }
+  
+  function maybeAddCandidate(iceTransport, candidate) {
+    // Edge's internal representation adds some fields therefore
+    // not all fieldѕ are taken into account.
+    var alreadyAdded = iceTransport.getRemoteCandidates()
+        .find(function(remoteCandidate) {
+          return candidate.foundation === remoteCandidate.foundation &&
+              candidate.ip === remoteCandidate.ip &&
+              candidate.port === remoteCandidate.port &&
+              candidate.priority === remoteCandidate.priority &&
+              candidate.protocol === remoteCandidate.protocol &&
+              candidate.type === remoteCandidate.type;
+        });
+    if (!alreadyAdded) {
+      iceTransport.addRemoteCandidate(candidate);
+    }
+    return !alreadyAdded;
+  }
+  
+  
+  function makeError(name, description) {
+    var e = new Error(description);
+    e.name = name;
+    // legacy error codes from https://heycam.github.io/webidl/#idl-DOMException-error-names
+    e.code = {
+      NotSupportedError: 9,
+      InvalidStateError: 11,
+      InvalidAccessError: 15,
+      TypeError: undefined,
+      OperationError: undefined
+    }[name];
+    return e;
+  }
+  
+  module.exports = function(window, edgeVersion) {
+    // https://w3c.github.io/mediacapture-main/#mediastream
+    // Helper function to add the track to the stream and
+    // dispatch the event ourselves.
+    function addTrackToStreamAndFireEvent(track, stream) {
+      stream.addTrack(track);
+      stream.dispatchEvent(new window.MediaStreamTrackEvent('addtrack',
+          {track: track}));
+    }
+  
+    function removeTrackFromStreamAndFireEvent(track, stream) {
+      stream.removeTrack(track);
+      stream.dispatchEvent(new window.MediaStreamTrackEvent('removetrack',
+          {track: track}));
+    }
+  
+    function fireAddTrack(pc, track, receiver, streams) {
+      var trackEvent = new Event('track');
+      trackEvent.track = track;
+      trackEvent.receiver = receiver;
+      trackEvent.transceiver = {receiver: receiver};
+      trackEvent.streams = streams;
+      window.setTimeout(function() {
+        pc._dispatchEvent('track', trackEvent);
+      });
+    }
+  
+    var RTCPeerConnection = function(config) {
+      var pc = this;
+  
+      var _eventTarget = document.createDocumentFragment();
+      ['addEventListener', 'removeEventListener', 'dispatchEvent']
+          .forEach(function(method) {
+            pc[method] = _eventTarget[method].bind(_eventTarget);
+          });
+  
+      this.canTrickleIceCandidates = null;
+  
+      this.needNegotiation = false;
+  
+      this.localStreams = [];
+      this.remoteStreams = [];
+  
+      this._localDescription = null;
+      this._remoteDescription = null;
+  
+      this.signalingState = 'stable';
+      this.iceConnectionState = 'new';
+      this.connectionState = 'new';
+      this.iceGatheringState = 'new';
+  
+      config = JSON.parse(JSON.stringify(config || {}));
+  
+      this.usingBundle = config.bundlePolicy === 'max-bundle';
+      if (config.rtcpMuxPolicy === 'negotiate') {
+        throw(makeError('NotSupportedError',
+            'rtcpMuxPolicy \'negotiate\' is not supported'));
+      } else if (!config.rtcpMuxPolicy) {
+        config.rtcpMuxPolicy = 'require';
+      }
+  
+      switch (config.iceTransportPolicy) {
+        case 'all':
+        case 'relay':
+          break;
+        default:
+          config.iceTransportPolicy = 'all';
+          break;
+      }
+  
+      switch (config.bundlePolicy) {
+        case 'balanced':
+        case 'max-compat':
+        case 'max-bundle':
+          break;
+        default:
+          config.bundlePolicy = 'balanced';
+          break;
+      }
+  
+      config.iceServers = filterIceServers(config.iceServers || [], edgeVersion);
+  
+      this._iceGatherers = [];
+      if (config.iceCandidatePoolSize) {
+        for (var i = config.iceCandidatePoolSize; i > 0; i--) {
+          this._iceGatherers.push(new window.RTCIceGatherer({
+            iceServers: config.iceServers,
+            gatherPolicy: config.iceTransportPolicy
+          }));
+        }
+      } else {
+        config.iceCandidatePoolSize = 0;
+      }
+  
+      this._config = config;
+  
+      // per-track iceGathers, iceTransports, dtlsTransports, rtpSenders, ...
+      // everything that is needed to describe a SDP m-line.
+      this.transceivers = [];
+  
+      this._sdpSessionId = SDPUtils.generateSessionId();
+      this._sdpSessionVersion = 0;
+  
+      this._dtlsRole = undefined; // role for a=setup to use in answers.
+  
+      this._isClosed = false;
+    };
+  
+    Object.defineProperty(RTCPeerConnection.prototype, 'localDescription', {
+      configurable: true,
+      get: function() {
+        return this._localDescription;
+      }
+    });
+    Object.defineProperty(RTCPeerConnection.prototype, 'remoteDescription', {
+      configurable: true,
+      get: function() {
+        return this._remoteDescription;
+      }
+    });
+  
+    // set up event handlers on prototype
+    RTCPeerConnection.prototype.onicecandidate = null;
+    RTCPeerConnection.prototype.onaddstream = null;
+    RTCPeerConnection.prototype.ontrack = null;
+    RTCPeerConnection.prototype.onremovestream = null;
+    RTCPeerConnection.prototype.onsignalingstatechange = null;
+    RTCPeerConnection.prototype.oniceconnectionstatechange = null;
+    RTCPeerConnection.prototype.onconnectionstatechange = null;
+    RTCPeerConnection.prototype.onicegatheringstatechange = null;
+    RTCPeerConnection.prototype.onnegotiationneeded = null;
+    RTCPeerConnection.prototype.ondatachannel = null;
+  
+    RTCPeerConnection.prototype._dispatchEvent = function(name, event) {
+      if (this._isClosed) {
+        return;
+      }
+      this.dispatchEvent(event);
+      if (typeof this['on' + name] === 'function') {
+        this['on' + name](event);
+      }
+    };
+  
+    RTCPeerConnection.prototype._emitGatheringStateChange = function() {
+      var event = new Event('icegatheringstatechange');
+      this._dispatchEvent('icegatheringstatechange', event);
+    };
+  
+    RTCPeerConnection.prototype.getConfiguration = function() {
+      return this._config;
+    };
+  
+    RTCPeerConnection.prototype.getLocalStreams = function() {
+      return this.localStreams;
+    };
+  
+    RTCPeerConnection.prototype.getRemoteStreams = function() {
+      return this.remoteStreams;
+    };
+  
+    // internal helper to create a transceiver object.
+    // (which is not yet the same as the WebRTC 1.0 transceiver)
+    RTCPeerConnection.prototype._createTransceiver = function(kind, doNotAdd) {
+      var hasBundleTransport = this.transceivers.length > 0;
+      var transceiver = {
+        track: null,
+        iceGatherer: null,
+        iceTransport: null,
+        dtlsTransport: null,
+        localCapabilities: null,
+        remoteCapabilities: null,
+        rtpSender: null,
+        rtpReceiver: null,
+        kind: kind,
+        mid: null,
+        sendEncodingParameters: null,
+        recvEncodingParameters: null,
+        stream: null,
+        associatedRemoteMediaStreams: [],
+        wantReceive: true
+      };
+      if (this.usingBundle && hasBundleTransport) {
+        transceiver.iceTransport = this.transceivers[0].iceTransport;
+        transceiver.dtlsTransport = this.transceivers[0].dtlsTransport;
+      } else {
+        var transports = this._createIceAndDtlsTransports();
+        transceiver.iceTransport = transports.iceTransport;
+        transceiver.dtlsTransport = transports.dtlsTransport;
+      }
+      if (!doNotAdd) {
+        this.transceivers.push(transceiver);
+      }
+      return transceiver;
+    };
+  
+    RTCPeerConnection.prototype.addTrack = function(track, stream) {
+      if (this._isClosed) {
+        throw makeError('InvalidStateError',
+            'Attempted to call addTrack on a closed peerconnection.');
+      }
+  
+      var alreadyExists = this.transceivers.find(function(s) {
+        return s.track === track;
+      });
+  
+      if (alreadyExists) {
+        throw makeError('InvalidAccessError', 'Track already exists.');
+      }
+  
+      var transceiver;
+      for (var i = 0; i < this.transceivers.length; i++) {
+        if (!this.transceivers[i].track &&
+            this.transceivers[i].kind === track.kind) {
+          transceiver = this.transceivers[i];
+        }
+      }
+      if (!transceiver) {
+        transceiver = this._createTransceiver(track.kind);
+      }
+  
+      this._maybeFireNegotiationNeeded();
+  
+      if (this.localStreams.indexOf(stream) === -1) {
+        this.localStreams.push(stream);
+      }
+  
+      transceiver.track = track;
+      transceiver.stream = stream;
+      transceiver.rtpSender = new window.RTCRtpSender(track,
+          transceiver.dtlsTransport);
+      return transceiver.rtpSender;
+    };
+  
+    RTCPeerConnection.prototype.addStream = function(stream) {
+      var pc = this;
+      if (edgeVersion >= 15025) {
+        stream.getTracks().forEach(function(track) {
+          pc.addTrack(track, stream);
+        });
+      } else {
+        // Clone is necessary for local demos mostly, attaching directly
+        // to two different senders does not work (build 10547).
+        // Fixed in 15025 (or earlier)
+        var clonedStream = stream.clone();
+        stream.getTracks().forEach(function(track, idx) {
+          var clonedTrack = clonedStream.getTracks()[idx];
+          track.addEventListener('enabled', function(event) {
+            clonedTrack.enabled = event.enabled;
+          });
+        });
+        clonedStream.getTracks().forEach(function(track) {
+          pc.addTrack(track, clonedStream);
+        });
+      }
+    };
+  
+    RTCPeerConnection.prototype.removeTrack = function(sender) {
+      if (this._isClosed) {
+        throw makeError('InvalidStateError',
+            'Attempted to call removeTrack on a closed peerconnection.');
+      }
+  
+      if (!(sender instanceof window.RTCRtpSender)) {
+        throw new TypeError('Argument 1 of RTCPeerConnection.removeTrack ' +
+            'does not implement interface RTCRtpSender.');
+      }
+  
+      var transceiver = this.transceivers.find(function(t) {
+        return t.rtpSender === sender;
+      });
+  
+      if (!transceiver) {
+        throw makeError('InvalidAccessError',
+            'Sender was not created by this connection.');
+      }
+      var stream = transceiver.stream;
+  
+      transceiver.rtpSender.stop();
+      transceiver.rtpSender = null;
+      transceiver.track = null;
+      transceiver.stream = null;
+  
+      // remove the stream from the set of local streams
+      var localStreams = this.transceivers.map(function(t) {
+        return t.stream;
+      });
+      if (localStreams.indexOf(stream) === -1 &&
+          this.localStreams.indexOf(stream) > -1) {
+        this.localStreams.splice(this.localStreams.indexOf(stream), 1);
+      }
+  
+      this._maybeFireNegotiationNeeded();
+    };
+  
+    RTCPeerConnection.prototype.removeStream = function(stream) {
+      var pc = this;
+      stream.getTracks().forEach(function(track) {
+        var sender = pc.getSenders().find(function(s) {
+          return s.track === track;
+        });
+        if (sender) {
+          pc.removeTrack(sender);
+        }
+      });
+    };
+  
+    RTCPeerConnection.prototype.getSenders = function() {
+      return this.transceivers.filter(function(transceiver) {
+        return !!transceiver.rtpSender;
+      })
+      .map(function(transceiver) {
+        return transceiver.rtpSender;
+      });
+    };
+  
+    RTCPeerConnection.prototype.getReceivers = function() {
+      return this.transceivers.filter(function(transceiver) {
+        return !!transceiver.rtpReceiver;
+      })
+      .map(function(transceiver) {
+        return transceiver.rtpReceiver;
+      });
+    };
+  
+  
+    RTCPeerConnection.prototype._createIceGatherer = function(sdpMLineIndex,
+        usingBundle) {
+      var pc = this;
+      if (usingBundle && sdpMLineIndex > 0) {
+        return this.transceivers[0].iceGatherer;
+      } else if (this._iceGatherers.length) {
+        return this._iceGatherers.shift();
+      }
+      var iceGatherer = new window.RTCIceGatherer({
+        iceServers: this._config.iceServers,
+        gatherPolicy: this._config.iceTransportPolicy
+      });
+      Object.defineProperty(iceGatherer, 'state',
+          {value: 'new', writable: true}
+      );
+  
+      this.transceivers[sdpMLineIndex].bufferedCandidateEvents = [];
+      this.transceivers[sdpMLineIndex].bufferCandidates = function(event) {
+        var end = !event.candidate || Object.keys(event.candidate).length === 0;
+        // polyfill since RTCIceGatherer.state is not implemented in
+        // Edge 10547 yet.
+        iceGatherer.state = end ? 'completed' : 'gathering';
+        if (pc.transceivers[sdpMLineIndex].bufferedCandidateEvents !== null) {
+          pc.transceivers[sdpMLineIndex].bufferedCandidateEvents.push(event);
+        }
+      };
+      iceGatherer.addEventListener('localcandidate',
+        this.transceivers[sdpMLineIndex].bufferCandidates);
+      return iceGatherer;
+    };
+  
+    // start gathering from an RTCIceGatherer.
+    RTCPeerConnection.prototype._gather = function(mid, sdpMLineIndex) {
+      var pc = this;
+      var iceGatherer = this.transceivers[sdpMLineIndex].iceGatherer;
+      if (iceGatherer.onlocalcandidate) {
+        return;
+      }
+      var bufferedCandidateEvents =
+        this.transceivers[sdpMLineIndex].bufferedCandidateEvents;
+      this.transceivers[sdpMLineIndex].bufferedCandidateEvents = null;
+      iceGatherer.removeEventListener('localcandidate',
+        this.transceivers[sdpMLineIndex].bufferCandidates);
+      iceGatherer.onlocalcandidate = function(evt) {
+        if (pc.usingBundle && sdpMLineIndex > 0) {
+          // if we know that we use bundle we can drop candidates with
+          // ѕdpMLineIndex > 0. If we don't do this then our state gets
+          // confused since we dispose the extra ice gatherer.
+          return;
+        }
+        var event = new Event('icecandidate');
+        event.candidate = {sdpMid: mid, sdpMLineIndex: sdpMLineIndex};
+  
+        var cand = evt.candidate;
+        // Edge emits an empty object for RTCIceCandidateComplete‥
+        var end = !cand || Object.keys(cand).length === 0;
+        if (end) {
+          // polyfill since RTCIceGatherer.state is not implemented in
+          // Edge 10547 yet.
+          if (iceGatherer.state === 'new' || iceGatherer.state === 'gathering') {
+            iceGatherer.state = 'completed';
+          }
+        } else {
+          if (iceGatherer.state === 'new') {
+            iceGatherer.state = 'gathering';
+          }
+          // RTCIceCandidate doesn't have a component, needs to be added
+          cand.component = 1;
+          // also the usernameFragment. TODO: update SDP to take both variants.
+          cand.ufrag = iceGatherer.getLocalParameters().usernameFragment;
+  
+          var serializedCandidate = SDPUtils.writeCandidate(cand);
+          event.candidate = Object.assign(event.candidate,
+              SDPUtils.parseCandidate(serializedCandidate));
+  
+          event.candidate.candidate = serializedCandidate;
+          event.candidate.toJSON = function() {
+            return {
+              candidate: event.candidate.candidate,
+              sdpMid: event.candidate.sdpMid,
+              sdpMLineIndex: event.candidate.sdpMLineIndex,
+              usernameFragment: event.candidate.usernameFragment
+            };
+          };
+        }
+  
+        // update local description.
+        var sections = SDPUtils.getMediaSections(pc._localDescription.sdp);
+        if (!end) {
+          sections[event.candidate.sdpMLineIndex] +=
+              'a=' + event.candidate.candidate + '\r\n';
+        } else {
+          sections[event.candidate.sdpMLineIndex] +=
+              'a=end-of-candidates\r\n';
+        }
+        pc._localDescription.sdp =
+            SDPUtils.getDescription(pc._localDescription.sdp) +
+            sections.join('');
+        var complete = pc.transceivers.every(function(transceiver) {
+          return transceiver.iceGatherer &&
+              transceiver.iceGatherer.state === 'completed';
+        });
+  
+        if (pc.iceGatheringState !== 'gathering') {
+          pc.iceGatheringState = 'gathering';
+          pc._emitGatheringStateChange();
+        }
+  
+        // Emit candidate. Also emit null candidate when all gatherers are
+        // complete.
+        if (!end) {
+          pc._dispatchEvent('icecandidate', event);
+        }
+        if (complete) {
+          pc._dispatchEvent('icecandidate', new Event('icecandidate'));
+          pc.iceGatheringState = 'complete';
+          pc._emitGatheringStateChange();
+        }
+      };
+  
+      // emit already gathered candidates.
+      window.setTimeout(function() {
+        bufferedCandidateEvents.forEach(function(e) {
+          iceGatherer.onlocalcandidate(e);
+        });
+      }, 0);
+    };
+  
+    // Create ICE transport and DTLS transport.
+    RTCPeerConnection.prototype._createIceAndDtlsTransports = function() {
+      var pc = this;
+      var iceTransport = new window.RTCIceTransport(null);
+      iceTransport.onicestatechange = function() {
+        pc._updateIceConnectionState();
+        pc._updateConnectionState();
+      };
+  
+      var dtlsTransport = new window.RTCDtlsTransport(iceTransport);
+      dtlsTransport.ondtlsstatechange = function() {
+        pc._updateConnectionState();
+      };
+      dtlsTransport.onerror = function() {
+        // onerror does not set state to failed by itself.
+        Object.defineProperty(dtlsTransport, 'state',
+            {value: 'failed', writable: true});
+        pc._updateConnectionState();
+      };
+  
+      return {
+        iceTransport: iceTransport,
+        dtlsTransport: dtlsTransport
+      };
+    };
+  
+    // Destroy ICE gatherer, ICE transport and DTLS transport.
+    // Without triggering the callbacks.
+    RTCPeerConnection.prototype._disposeIceAndDtlsTransports = function(
+        sdpMLineIndex) {
+      var iceGatherer = this.transceivers[sdpMLineIndex].iceGatherer;
+      if (iceGatherer) {
+        delete iceGatherer.onlocalcandidate;
+        delete this.transceivers[sdpMLineIndex].iceGatherer;
+      }
+      var iceTransport = this.transceivers[sdpMLineIndex].iceTransport;
+      if (iceTransport) {
+        delete iceTransport.onicestatechange;
+        delete this.transceivers[sdpMLineIndex].iceTransport;
+      }
+      var dtlsTransport = this.transceivers[sdpMLineIndex].dtlsTransport;
+      if (dtlsTransport) {
+        delete dtlsTransport.ondtlsstatechange;
+        delete dtlsTransport.onerror;
+        delete this.transceivers[sdpMLineIndex].dtlsTransport;
+      }
+    };
+  
+    // Start the RTP Sender and Receiver for a transceiver.
+    RTCPeerConnection.prototype._transceive = function(transceiver,
+        send, recv) {
+      var params = getCommonCapabilities(transceiver.localCapabilities,
+          transceiver.remoteCapabilities);
+      if (send && transceiver.rtpSender) {
+        params.encodings = transceiver.sendEncodingParameters;
+        params.rtcp = {
+          cname: SDPUtils.localCName,
+          compound: transceiver.rtcpParameters.compound
+        };
+        if (transceiver.recvEncodingParameters.length) {
+          params.rtcp.ssrc = transceiver.recvEncodingParameters[0].ssrc;
+        }
+        transceiver.rtpSender.send(params);
+      }
+      if (recv && transceiver.rtpReceiver && params.codecs.length > 0) {
+        // remove RTX field in Edge 14942
+        if (transceiver.kind === 'video'
+            && transceiver.recvEncodingParameters
+            && edgeVersion < 15019) {
+          transceiver.recvEncodingParameters.forEach(function(p) {
+            delete p.rtx;
+          });
+        }
+        if (transceiver.recvEncodingParameters.length) {
+          params.encodings = transceiver.recvEncodingParameters;
+        } else {
+          params.encodings = [{}];
+        }
+        params.rtcp = {
+          compound: transceiver.rtcpParameters.compound
+        };
+        if (transceiver.rtcpParameters.cname) {
+          params.rtcp.cname = transceiver.rtcpParameters.cname;
+        }
+        if (transceiver.sendEncodingParameters.length) {
+          params.rtcp.ssrc = transceiver.sendEncodingParameters[0].ssrc;
+        }
+        transceiver.rtpReceiver.receive(params);
+      }
+    };
+  
+    RTCPeerConnection.prototype.setLocalDescription = function(description) {
+      var pc = this;
+  
+      // Note: pranswer is not supported.
+      if (['offer', 'answer'].indexOf(description.type) === -1) {
+        return Promise.reject(makeError('TypeError',
+            'Unsupported type "' + description.type + '"'));
+      }
+  
+      if (!isActionAllowedInSignalingState('setLocalDescription',
+          description.type, pc.signalingState) || pc._isClosed) {
+        return Promise.reject(makeError('InvalidStateError',
+            'Can not set local ' + description.type +
+            ' in state ' + pc.signalingState));
+      }
+  
+      var sections;
+      var sessionpart;
+      if (description.type === 'offer') {
+        // VERY limited support for SDP munging. Limited to:
+        // * changing the order of codecs
+        sections = SDPUtils.splitSections(description.sdp);
+        sessionpart = sections.shift();
+        sections.forEach(function(mediaSection, sdpMLineIndex) {
+          var caps = SDPUtils.parseRtpParameters(mediaSection);
+          pc.transceivers[sdpMLineIndex].localCapabilities = caps;
+        });
+  
+        pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+          pc._gather(transceiver.mid, sdpMLineIndex);
+        });
+      } else if (description.type === 'answer') {
+        sections = SDPUtils.splitSections(pc._remoteDescription.sdp);
+        sessionpart = sections.shift();
+        var isIceLite = SDPUtils.matchPrefix(sessionpart,
+            'a=ice-lite').length > 0;
+        sections.forEach(function(mediaSection, sdpMLineIndex) {
+          var transceiver = pc.transceivers[sdpMLineIndex];
+          var iceGatherer = transceiver.iceGatherer;
+          var iceTransport = transceiver.iceTransport;
+          var dtlsTransport = transceiver.dtlsTransport;
+          var localCapabilities = transceiver.localCapabilities;
+          var remoteCapabilities = transceiver.remoteCapabilities;
+  
+          // treat bundle-only as not-rejected.
+          var rejected = SDPUtils.isRejected(mediaSection) &&
+              SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 0;
+  
+          if (!rejected && !transceiver.rejected) {
+            var remoteIceParameters = SDPUtils.getIceParameters(
+                mediaSection, sessionpart);
+            var remoteDtlsParameters = SDPUtils.getDtlsParameters(
+                mediaSection, sessionpart);
+            if (isIceLite) {
+              remoteDtlsParameters.role = 'server';
+            }
+  
+            if (!pc.usingBundle || sdpMLineIndex === 0) {
+              pc._gather(transceiver.mid, sdpMLineIndex);
+              if (iceTransport.state === 'new') {
+                iceTransport.start(iceGatherer, remoteIceParameters,
+                    isIceLite ? 'controlling' : 'controlled');
+              }
+              if (dtlsTransport.state === 'new') {
+                dtlsTransport.start(remoteDtlsParameters);
+              }
+            }
+  
+            // Calculate intersection of capabilities.
+            var params = getCommonCapabilities(localCapabilities,
+                remoteCapabilities);
+  
+            // Start the RTCRtpSender. The RTCRtpReceiver for this
+            // transceiver has already been started in setRemoteDescription.
+            pc._transceive(transceiver,
+                params.codecs.length > 0,
+                false);
+          }
+        });
+      }
+  
+      pc._localDescription = {
+        type: description.type,
+        sdp: description.sdp
+      };
+      if (description.type === 'offer') {
+        pc._updateSignalingState('have-local-offer');
+      } else {
+        pc._updateSignalingState('stable');
+      }
+  
+      return Promise.resolve();
+    };
+  
+    RTCPeerConnection.prototype.setRemoteDescription = function(description) {
+      var pc = this;
+  
+      // Note: pranswer is not supported.
+      if (['offer', 'answer'].indexOf(description.type) === -1) {
+        return Promise.reject(makeError('TypeError',
+            'Unsupported type "' + description.type + '"'));
+      }
+  
+      if (!isActionAllowedInSignalingState('setRemoteDescription',
+          description.type, pc.signalingState) || pc._isClosed) {
+        return Promise.reject(makeError('InvalidStateError',
+            'Can not set remote ' + description.type +
+            ' in state ' + pc.signalingState));
+      }
+  
+      var streams = {};
+      pc.remoteStreams.forEach(function(stream) {
+        streams[stream.id] = stream;
+      });
+      var receiverList = [];
+      var sections = SDPUtils.splitSections(description.sdp);
+      var sessionpart = sections.shift();
+      var isIceLite = SDPUtils.matchPrefix(sessionpart,
+          'a=ice-lite').length > 0;
+      var usingBundle = SDPUtils.matchPrefix(sessionpart,
+          'a=group:BUNDLE ').length > 0;
+      pc.usingBundle = usingBundle;
+      var iceOptions = SDPUtils.matchPrefix(sessionpart,
+          'a=ice-options:')[0];
+      if (iceOptions) {
+        pc.canTrickleIceCandidates = iceOptions.substr(14).split(' ')
+            .indexOf('trickle') >= 0;
+      } else {
+        pc.canTrickleIceCandidates = false;
+      }
+  
+      sections.forEach(function(mediaSection, sdpMLineIndex) {
+        var lines = SDPUtils.splitLines(mediaSection);
+        var kind = SDPUtils.getKind(mediaSection);
+        // treat bundle-only as not-rejected.
+        var rejected = SDPUtils.isRejected(mediaSection) &&
+            SDPUtils.matchPrefix(mediaSection, 'a=bundle-only').length === 0;
+        var protocol = lines[0].substr(2).split(' ')[2];
+  
+        var direction = SDPUtils.getDirection(mediaSection, sessionpart);
+        var remoteMsid = SDPUtils.parseMsid(mediaSection);
+  
+        var mid = SDPUtils.getMid(mediaSection) || SDPUtils.generateIdentifier();
+  
+        // Reject datachannels which are not implemented yet.
+        if (rejected || (kind === 'application' && (protocol === 'DTLS/SCTP' ||
+            protocol === 'UDP/DTLS/SCTP'))) {
+          // TODO: this is dangerous in the case where a non-rejected m-line
+          //     becomes rejected.
+          pc.transceivers[sdpMLineIndex] = {
+            mid: mid,
+            kind: kind,
+            protocol: protocol,
+            rejected: true
+          };
+          return;
+        }
+  
+        if (!rejected && pc.transceivers[sdpMLineIndex] &&
+            pc.transceivers[sdpMLineIndex].rejected) {
+          // recycle a rejected transceiver.
+          pc.transceivers[sdpMLineIndex] = pc._createTransceiver(kind, true);
+        }
+  
+        var transceiver;
+        var iceGatherer;
+        var iceTransport;
+        var dtlsTransport;
+        var rtpReceiver;
+        var sendEncodingParameters;
+        var recvEncodingParameters;
+        var localCapabilities;
+  
+        var track;
+        // FIXME: ensure the mediaSection has rtcp-mux set.
+        var remoteCapabilities = SDPUtils.parseRtpParameters(mediaSection);
+        var remoteIceParameters;
+        var remoteDtlsParameters;
+        if (!rejected) {
+          remoteIceParameters = SDPUtils.getIceParameters(mediaSection,
+              sessionpart);
+          remoteDtlsParameters = SDPUtils.getDtlsParameters(mediaSection,
+              sessionpart);
+          remoteDtlsParameters.role = 'client';
+        }
+        recvEncodingParameters =
+            SDPUtils.parseRtpEncodingParameters(mediaSection);
+  
+        var rtcpParameters = SDPUtils.parseRtcpParameters(mediaSection);
+  
+        var isComplete = SDPUtils.matchPrefix(mediaSection,
+            'a=end-of-candidates', sessionpart).length > 0;
+        var cands = SDPUtils.matchPrefix(mediaSection, 'a=candidate:')
+            .map(function(cand) {
+              return SDPUtils.parseCandidate(cand);
+            })
+            .filter(function(cand) {
+              return cand.component === 1;
+            });
+  
+        // Check if we can use BUNDLE and dispose transports.
+        if ((description.type === 'offer' || description.type === 'answer') &&
+            !rejected && usingBundle && sdpMLineIndex > 0 &&
+            pc.transceivers[sdpMLineIndex]) {
+          pc._disposeIceAndDtlsTransports(sdpMLineIndex);
+          pc.transceivers[sdpMLineIndex].iceGatherer =
+              pc.transceivers[0].iceGatherer;
+          pc.transceivers[sdpMLineIndex].iceTransport =
+              pc.transceivers[0].iceTransport;
+          pc.transceivers[sdpMLineIndex].dtlsTransport =
+              pc.transceivers[0].dtlsTransport;
+          if (pc.transceivers[sdpMLineIndex].rtpSender) {
+            pc.transceivers[sdpMLineIndex].rtpSender.setTransport(
+                pc.transceivers[0].dtlsTransport);
+          }
+          if (pc.transceivers[sdpMLineIndex].rtpReceiver) {
+            pc.transceivers[sdpMLineIndex].rtpReceiver.setTransport(
+                pc.transceivers[0].dtlsTransport);
+          }
+        }
+        if (description.type === 'offer' && !rejected) {
+          transceiver = pc.transceivers[sdpMLineIndex] ||
+              pc._createTransceiver(kind);
+          transceiver.mid = mid;
+  
+          if (!transceiver.iceGatherer) {
+            transceiver.iceGatherer = pc._createIceGatherer(sdpMLineIndex,
+                usingBundle);
+          }
+  
+          if (cands.length && transceiver.iceTransport.state === 'new') {
+            if (isComplete && (!usingBundle || sdpMLineIndex === 0)) {
+              transceiver.iceTransport.setRemoteCandidates(cands);
+            } else {
+              cands.forEach(function(candidate) {
+                maybeAddCandidate(transceiver.iceTransport, candidate);
+              });
+            }
+          }
+  
+          localCapabilities = window.RTCRtpReceiver.getCapabilities(kind);
+  
+          // filter RTX until additional stuff needed for RTX is implemented
+          // in adapter.js
+          if (edgeVersion < 15019) {
+            localCapabilities.codecs = localCapabilities.codecs.filter(
+                function(codec) {
+                  return codec.name !== 'rtx';
+                });
+          }
+  
+          sendEncodingParameters = transceiver.sendEncodingParameters || [{
+            ssrc: (2 * sdpMLineIndex + 2) * 1001
+          }];
+  
+          // TODO: rewrite to use http://w3c.github.io/webrtc-pc/#set-associated-remote-streams
+          var isNewTrack = false;
+          if (direction === 'sendrecv' || direction === 'sendonly') {
+            isNewTrack = !transceiver.rtpReceiver;
+            rtpReceiver = transceiver.rtpReceiver ||
+                new window.RTCRtpReceiver(transceiver.dtlsTransport, kind);
+  
+            if (isNewTrack) {
+              var stream;
+              track = rtpReceiver.track;
+              // FIXME: does not work with Plan B.
+              if (remoteMsid && remoteMsid.stream === '-') {
+                // no-op. a stream id of '-' means: no associated stream.
+              } else if (remoteMsid) {
+                if (!streams[remoteMsid.stream]) {
+                  streams[remoteMsid.stream] = new window.MediaStream();
+                  Object.defineProperty(streams[remoteMsid.stream], 'id', {
+                    get: function() {
+                      return remoteMsid.stream;
+                    }
+                  });
+                }
+                Object.defineProperty(track, 'id', {
+                  get: function() {
+                    return remoteMsid.track;
+                  }
+                });
+                stream = streams[remoteMsid.stream];
+              } else {
+                if (!streams.default) {
+                  streams.default = new window.MediaStream();
+                }
+                stream = streams.default;
+              }
+              if (stream) {
+                addTrackToStreamAndFireEvent(track, stream);
+                transceiver.associatedRemoteMediaStreams.push(stream);
+              }
+              receiverList.push([track, rtpReceiver, stream]);
+            }
+          } else if (transceiver.rtpReceiver && transceiver.rtpReceiver.track) {
+            transceiver.associatedRemoteMediaStreams.forEach(function(s) {
+              var nativeTrack = s.getTracks().find(function(t) {
+                return t.id === transceiver.rtpReceiver.track.id;
+              });
+              if (nativeTrack) {
+                removeTrackFromStreamAndFireEvent(nativeTrack, s);
+              }
+            });
+            transceiver.associatedRemoteMediaStreams = [];
+          }
+  
+          transceiver.localCapabilities = localCapabilities;
+          transceiver.remoteCapabilities = remoteCapabilities;
+          transceiver.rtpReceiver = rtpReceiver;
+          transceiver.rtcpParameters = rtcpParameters;
+          transceiver.sendEncodingParameters = sendEncodingParameters;
+          transceiver.recvEncodingParameters = recvEncodingParameters;
+  
+          // Start the RTCRtpReceiver now. The RTPSender is started in
+          // setLocalDescription.
+          pc._transceive(pc.transceivers[sdpMLineIndex],
+              false,
+              isNewTrack);
+        } else if (description.type === 'answer' && !rejected) {
+          transceiver = pc.transceivers[sdpMLineIndex];
+          iceGatherer = transceiver.iceGatherer;
+          iceTransport = transceiver.iceTransport;
+          dtlsTransport = transceiver.dtlsTransport;
+          rtpReceiver = transceiver.rtpReceiver;
+          sendEncodingParameters = transceiver.sendEncodingParameters;
+          localCapabilities = transceiver.localCapabilities;
+  
+          pc.transceivers[sdpMLineIndex].recvEncodingParameters =
+              recvEncodingParameters;
+          pc.transceivers[sdpMLineIndex].remoteCapabilities =
+              remoteCapabilities;
+          pc.transceivers[sdpMLineIndex].rtcpParameters = rtcpParameters;
+  
+          if (cands.length && iceTransport.state === 'new') {
+            if ((isIceLite || isComplete) &&
+                (!usingBundle || sdpMLineIndex === 0)) {
+              iceTransport.setRemoteCandidates(cands);
+            } else {
+              cands.forEach(function(candidate) {
+                maybeAddCandidate(transceiver.iceTransport, candidate);
+              });
+            }
+          }
+  
+          if (!usingBundle || sdpMLineIndex === 0) {
+            if (iceTransport.state === 'new') {
+              iceTransport.start(iceGatherer, remoteIceParameters,
+                  'controlling');
+            }
+            if (dtlsTransport.state === 'new') {
+              dtlsTransport.start(remoteDtlsParameters);
+            }
+          }
+  
+          // If the offer contained RTX but the answer did not,
+          // remove RTX from sendEncodingParameters.
+          var commonCapabilities = getCommonCapabilities(
+            transceiver.localCapabilities,
+            transceiver.remoteCapabilities);
+  
+          var hasRtx = commonCapabilities.codecs.filter(function(c) {
+            return c.name.toLowerCase() === 'rtx';
+          }).length;
+          if (!hasRtx && transceiver.sendEncodingParameters[0].rtx) {
+            delete transceiver.sendEncodingParameters[0].rtx;
+          }
+  
+          pc._transceive(transceiver,
+              direction === 'sendrecv' || direction === 'recvonly',
+              direction === 'sendrecv' || direction === 'sendonly');
+  
+          // TODO: rewrite to use http://w3c.github.io/webrtc-pc/#set-associated-remote-streams
+          if (rtpReceiver &&
+              (direction === 'sendrecv' || direction === 'sendonly')) {
+            track = rtpReceiver.track;
+            if (remoteMsid) {
+              if (!streams[remoteMsid.stream]) {
+                streams[remoteMsid.stream] = new window.MediaStream();
+              }
+              addTrackToStreamAndFireEvent(track, streams[remoteMsid.stream]);
+              receiverList.push([track, rtpReceiver, streams[remoteMsid.stream]]);
+            } else {
+              if (!streams.default) {
+                streams.default = new window.MediaStream();
+              }
+              addTrackToStreamAndFireEvent(track, streams.default);
+              receiverList.push([track, rtpReceiver, streams.default]);
+            }
+          } else {
+            // FIXME: actually the receiver should be created later.
+            delete transceiver.rtpReceiver;
+          }
+        }
+      });
+  
+      if (pc._dtlsRole === undefined) {
+        pc._dtlsRole = description.type === 'offer' ? 'active' : 'passive';
+      }
+  
+      pc._remoteDescription = {
+        type: description.type,
+        sdp: description.sdp
+      };
+      if (description.type === 'offer') {
+        pc._updateSignalingState('have-remote-offer');
+      } else {
+        pc._updateSignalingState('stable');
+      }
+      Object.keys(streams).forEach(function(sid) {
+        var stream = streams[sid];
+        if (stream.getTracks().length) {
+          if (pc.remoteStreams.indexOf(stream) === -1) {
+            pc.remoteStreams.push(stream);
+            var event = new Event('addstream');
+            event.stream = stream;
+            window.setTimeout(function() {
+              pc._dispatchEvent('addstream', event);
+            });
+          }
+  
+          receiverList.forEach(function(item) {
+            var track = item[0];
+            var receiver = item[1];
+            if (stream.id !== item[2].id) {
+              return;
+            }
+            fireAddTrack(pc, track, receiver, [stream]);
+          });
+        }
+      });
+      receiverList.forEach(function(item) {
+        if (item[2]) {
+          return;
+        }
+        fireAddTrack(pc, item[0], item[1], []);
+      });
+  
+      // check whether addIceCandidate({}) was called within four seconds after
+      // setRemoteDescription.
+      window.setTimeout(function() {
+        if (!(pc && pc.transceivers)) {
+          return;
+        }
+        pc.transceivers.forEach(function(transceiver) {
+          if (transceiver.iceTransport &&
+              transceiver.iceTransport.state === 'new' &&
+              transceiver.iceTransport.getRemoteCandidates().length > 0) {
+            console.warn('Timeout for addRemoteCandidate. Consider sending ' +
+                'an end-of-candidates notification');
+            transceiver.iceTransport.addRemoteCandidate({});
+          }
+        });
+      }, 4000);
+  
+      return Promise.resolve();
+    };
+  
+    RTCPeerConnection.prototype.close = function() {
+      this.transceivers.forEach(function(transceiver) {
+        /* not yet
+        if (transceiver.iceGatherer) {
+          transceiver.iceGatherer.close();
+        }
+        */
+        if (transceiver.iceTransport) {
+          transceiver.iceTransport.stop();
+        }
+        if (transceiver.dtlsTransport) {
+          transceiver.dtlsTransport.stop();
+        }
+        if (transceiver.rtpSender) {
+          transceiver.rtpSender.stop();
+        }
+        if (transceiver.rtpReceiver) {
+          transceiver.rtpReceiver.stop();
+        }
+      });
+      // FIXME: clean up tracks, local streams, remote streams, etc
+      this._isClosed = true;
+      this._updateSignalingState('closed');
+    };
+  
+    // Update the signaling state.
+    RTCPeerConnection.prototype._updateSignalingState = function(newState) {
+      this.signalingState = newState;
+      var event = new Event('signalingstatechange');
+      this._dispatchEvent('signalingstatechange', event);
+    };
+  
+    // Determine whether to fire the negotiationneeded event.
+    RTCPeerConnection.prototype._maybeFireNegotiationNeeded = function() {
+      var pc = this;
+      if (this.signalingState !== 'stable' || this.needNegotiation === true) {
+        return;
+      }
+      this.needNegotiation = true;
+      window.setTimeout(function() {
+        if (pc.needNegotiation) {
+          pc.needNegotiation = false;
+          var event = new Event('negotiationneeded');
+          pc._dispatchEvent('negotiationneeded', event);
+        }
+      }, 0);
+    };
+  
+    // Update the ice connection state.
+    RTCPeerConnection.prototype._updateIceConnectionState = function() {
+      var newState;
+      var states = {
+        'new': 0,
+        closed: 0,
+        checking: 0,
+        connected: 0,
+        completed: 0,
+        disconnected: 0,
+        failed: 0
+      };
+      this.transceivers.forEach(function(transceiver) {
+        if (transceiver.iceTransport && !transceiver.rejected) {
+          states[transceiver.iceTransport.state]++;
+        }
+      });
+  
+      newState = 'new';
+      if (states.failed > 0) {
+        newState = 'failed';
+      } else if (states.checking > 0) {
+        newState = 'checking';
+      } else if (states.disconnected > 0) {
+        newState = 'disconnected';
+      } else if (states.new > 0) {
+        newState = 'new';
+      } else if (states.connected > 0) {
+        newState = 'connected';
+      } else if (states.completed > 0) {
+        newState = 'completed';
+      }
+  
+      if (newState !== this.iceConnectionState) {
+        this.iceConnectionState = newState;
+        var event = new Event('iceconnectionstatechange');
+        this._dispatchEvent('iceconnectionstatechange', event);
+      }
+    };
+  
+    // Update the connection state.
+    RTCPeerConnection.prototype._updateConnectionState = function() {
+      var newState;
+      var states = {
+        'new': 0,
+        closed: 0,
+        connecting: 0,
+        connected: 0,
+        completed: 0,
+        disconnected: 0,
+        failed: 0
+      };
+      this.transceivers.forEach(function(transceiver) {
+        if (transceiver.iceTransport && transceiver.dtlsTransport &&
+            !transceiver.rejected) {
+          states[transceiver.iceTransport.state]++;
+          states[transceiver.dtlsTransport.state]++;
+        }
+      });
+      // ICETransport.completed and connected are the same for this purpose.
+      states.connected += states.completed;
+  
+      newState = 'new';
+      if (states.failed > 0) {
+        newState = 'failed';
+      } else if (states.connecting > 0) {
+        newState = 'connecting';
+      } else if (states.disconnected > 0) {
+        newState = 'disconnected';
+      } else if (states.new > 0) {
+        newState = 'new';
+      } else if (states.connected > 0) {
+        newState = 'connected';
+      }
+  
+      if (newState !== this.connectionState) {
+        this.connectionState = newState;
+        var event = new Event('connectionstatechange');
+        this._dispatchEvent('connectionstatechange', event);
+      }
+    };
+  
+    RTCPeerConnection.prototype.createOffer = function() {
+      var pc = this;
+  
+      if (pc._isClosed) {
+        return Promise.reject(makeError('InvalidStateError',
+            'Can not call createOffer after close'));
+      }
+  
+      var numAudioTracks = pc.transceivers.filter(function(t) {
+        return t.kind === 'audio';
+      }).length;
+      var numVideoTracks = pc.transceivers.filter(function(t) {
+        return t.kind === 'video';
+      }).length;
+  
+      // Determine number of audio and video tracks we need to send/recv.
+      var offerOptions = arguments[0];
+      if (offerOptions) {
+        // Reject Chrome legacy constraints.
+        if (offerOptions.mandatory || offerOptions.optional) {
+          throw new TypeError(
+              'Legacy mandatory/optional constraints not supported.');
+        }
+        if (offerOptions.offerToReceiveAudio !== undefined) {
+          if (offerOptions.offerToReceiveAudio === true) {
+            numAudioTracks = 1;
+          } else if (offerOptions.offerToReceiveAudio === false) {
+            numAudioTracks = 0;
+          } else {
+            numAudioTracks = offerOptions.offerToReceiveAudio;
+          }
+        }
+        if (offerOptions.offerToReceiveVideo !== undefined) {
+          if (offerOptions.offerToReceiveVideo === true) {
+            numVideoTracks = 1;
+          } else if (offerOptions.offerToReceiveVideo === false) {
+            numVideoTracks = 0;
+          } else {
+            numVideoTracks = offerOptions.offerToReceiveVideo;
+          }
+        }
+      }
+  
+      pc.transceivers.forEach(function(transceiver) {
+        if (transceiver.kind === 'audio') {
+          numAudioTracks--;
+          if (numAudioTracks < 0) {
+            transceiver.wantReceive = false;
+          }
+        } else if (transceiver.kind === 'video') {
+          numVideoTracks--;
+          if (numVideoTracks < 0) {
+            transceiver.wantReceive = false;
+          }
+        }
+      });
+  
+      // Create M-lines for recvonly streams.
+      while (numAudioTracks > 0 || numVideoTracks > 0) {
+        if (numAudioTracks > 0) {
+          pc._createTransceiver('audio');
+          numAudioTracks--;
+        }
+        if (numVideoTracks > 0) {
+          pc._createTransceiver('video');
+          numVideoTracks--;
+        }
+      }
+  
+      var sdp = SDPUtils.writeSessionBoilerplate(pc._sdpSessionId,
+          pc._sdpSessionVersion++);
+      pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+        // For each track, create an ice gatherer, ice transport,
+        // dtls transport, potentially rtpsender and rtpreceiver.
+        var track = transceiver.track;
+        var kind = transceiver.kind;
+        var mid = transceiver.mid || SDPUtils.generateIdentifier();
+        transceiver.mid = mid;
+  
+        if (!transceiver.iceGatherer) {
+          transceiver.iceGatherer = pc._createIceGatherer(sdpMLineIndex,
+              pc.usingBundle);
+        }
+  
+        var localCapabilities = window.RTCRtpSender.getCapabilities(kind);
+        // filter RTX until additional stuff needed for RTX is implemented
+        // in adapter.js
+        if (edgeVersion < 15019) {
+          localCapabilities.codecs = localCapabilities.codecs.filter(
+              function(codec) {
+                return codec.name !== 'rtx';
+              });
+        }
+        localCapabilities.codecs.forEach(function(codec) {
+          // work around https://bugs.chromium.org/p/webrtc/issues/detail?id=6552
+          // by adding level-asymmetry-allowed=1
+          if (codec.name === 'H264' &&
+              codec.parameters['level-asymmetry-allowed'] === undefined) {
+            codec.parameters['level-asymmetry-allowed'] = '1';
+          }
+  
+          // for subsequent offers, we might have to re-use the payload
+          // type of the last offer.
+          if (transceiver.remoteCapabilities &&
+              transceiver.remoteCapabilities.codecs) {
+            transceiver.remoteCapabilities.codecs.forEach(function(remoteCodec) {
+              if (codec.name.toLowerCase() === remoteCodec.name.toLowerCase() &&
+                  codec.clockRate === remoteCodec.clockRate) {
+                codec.preferredPayloadType = remoteCodec.payloadType;
+              }
+            });
+          }
+        });
+        localCapabilities.headerExtensions.forEach(function(hdrExt) {
+          var remoteExtensions = transceiver.remoteCapabilities &&
+              transceiver.remoteCapabilities.headerExtensions || [];
+          remoteExtensions.forEach(function(rHdrExt) {
+            if (hdrExt.uri === rHdrExt.uri) {
+              hdrExt.id = rHdrExt.id;
+            }
+          });
+        });
+  
+        // generate an ssrc now, to be used later in rtpSender.send
+        var sendEncodingParameters = transceiver.sendEncodingParameters || [{
+          ssrc: (2 * sdpMLineIndex + 1) * 1001
+        }];
+        if (track) {
+          // add RTX
+          if (edgeVersion >= 15019 && kind === 'video' &&
+              !sendEncodingParameters[0].rtx) {
+            sendEncodingParameters[0].rtx = {
+              ssrc: sendEncodingParameters[0].ssrc + 1
+            };
+          }
+        }
+  
+        if (transceiver.wantReceive) {
+          transceiver.rtpReceiver = new window.RTCRtpReceiver(
+              transceiver.dtlsTransport, kind);
+        }
+  
+        transceiver.localCapabilities = localCapabilities;
+        transceiver.sendEncodingParameters = sendEncodingParameters;
+      });
+  
+      // always offer BUNDLE and dispose on return if not supported.
+      if (pc._config.bundlePolicy !== 'max-compat') {
+        sdp += 'a=group:BUNDLE ' + pc.transceivers.map(function(t) {
+          return t.mid;
+        }).join(' ') + '\r\n';
+      }
+      sdp += 'a=ice-options:trickle\r\n';
+  
+      pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+        sdp += writeMediaSection(transceiver, transceiver.localCapabilities,
+            'offer', transceiver.stream, pc._dtlsRole);
+        sdp += 'a=rtcp-rsize\r\n';
+  
+        if (transceiver.iceGatherer && pc.iceGatheringState !== 'new' &&
+            (sdpMLineIndex === 0 || !pc.usingBundle)) {
+          transceiver.iceGatherer.getLocalCandidates().forEach(function(cand) {
+            cand.component = 1;
+            sdp += 'a=' + SDPUtils.writeCandidate(cand) + '\r\n';
+          });
+  
+          if (transceiver.iceGatherer.state === 'completed') {
+            sdp += 'a=end-of-candidates\r\n';
+          }
+        }
+      });
+  
+      var desc = new window.RTCSessionDescription({
+        type: 'offer',
+        sdp: sdp
+      });
+      return Promise.resolve(desc);
+    };
+  
+    RTCPeerConnection.prototype.createAnswer = function() {
+      var pc = this;
+  
+      if (pc._isClosed) {
+        return Promise.reject(makeError('InvalidStateError',
+            'Can not call createAnswer after close'));
+      }
+  
+      if (!(pc.signalingState === 'have-remote-offer' ||
+          pc.signalingState === 'have-local-pranswer')) {
+        return Promise.reject(makeError('InvalidStateError',
+            'Can not call createAnswer in signalingState ' + pc.signalingState));
+      }
+  
+      var sdp = SDPUtils.writeSessionBoilerplate(pc._sdpSessionId,
+          pc._sdpSessionVersion++);
+      if (pc.usingBundle) {
+        sdp += 'a=group:BUNDLE ' + pc.transceivers.map(function(t) {
+          return t.mid;
+        }).join(' ') + '\r\n';
+      }
+      sdp += 'a=ice-options:trickle\r\n';
+  
+      var mediaSectionsInOffer = SDPUtils.getMediaSections(
+          pc._remoteDescription.sdp).length;
+      pc.transceivers.forEach(function(transceiver, sdpMLineIndex) {
+        if (sdpMLineIndex + 1 > mediaSectionsInOffer) {
+          return;
+        }
+        if (transceiver.rejected) {
+          if (transceiver.kind === 'application') {
+            if (transceiver.protocol === 'DTLS/SCTP') { // legacy fmt
+              sdp += 'm=application 0 DTLS/SCTP 5000\r\n';
+            } else {
+              sdp += 'm=application 0 ' + transceiver.protocol +
+                  ' webrtc-datachannel\r\n';
+            }
+          } else if (transceiver.kind === 'audio') {
+            sdp += 'm=audio 0 UDP/TLS/RTP/SAVPF 0\r\n' +
+                'a=rtpmap:0 PCMU/8000\r\n';
+          } else if (transceiver.kind === 'video') {
+            sdp += 'm=video 0 UDP/TLS/RTP/SAVPF 120\r\n' +
+                'a=rtpmap:120 VP8/90000\r\n';
+          }
+          sdp += 'c=IN IP4 0.0.0.0\r\n' +
+              'a=inactive\r\n' +
+              'a=mid:' + transceiver.mid + '\r\n';
+          return;
+        }
+  
+        // FIXME: look at direction.
+        if (transceiver.stream) {
+          var localTrack;
+          if (transceiver.kind === 'audio') {
+            localTrack = transceiver.stream.getAudioTracks()[0];
+          } else if (transceiver.kind === 'video') {
+            localTrack = transceiver.stream.getVideoTracks()[0];
+          }
+          if (localTrack) {
+            // add RTX
+            if (edgeVersion >= 15019 && transceiver.kind === 'video' &&
+                !transceiver.sendEncodingParameters[0].rtx) {
+              transceiver.sendEncodingParameters[0].rtx = {
+                ssrc: transceiver.sendEncodingParameters[0].ssrc + 1
+              };
+            }
+          }
+        }
+  
+        // Calculate intersection of capabilities.
+        var commonCapabilities = getCommonCapabilities(
+            transceiver.localCapabilities,
+            transceiver.remoteCapabilities);
+  
+        var hasRtx = commonCapabilities.codecs.filter(function(c) {
+          return c.name.toLowerCase() === 'rtx';
+        }).length;
+        if (!hasRtx && transceiver.sendEncodingParameters[0].rtx) {
+          delete transceiver.sendEncodingParameters[0].rtx;
+        }
+  
+        sdp += writeMediaSection(transceiver, commonCapabilities,
+            'answer', transceiver.stream, pc._dtlsRole);
+        if (transceiver.rtcpParameters &&
+            transceiver.rtcpParameters.reducedSize) {
+          sdp += 'a=rtcp-rsize\r\n';
+        }
+      });
+  
+      var desc = new window.RTCSessionDescription({
+        type: 'answer',
+        sdp: sdp
+      });
+      return Promise.resolve(desc);
+    };
+  
+    RTCPeerConnection.prototype.addIceCandidate = function(candidate) {
+      var pc = this;
+      var sections;
+      if (candidate && !(candidate.sdpMLineIndex !== undefined ||
+          candidate.sdpMid)) {
+        return Promise.reject(new TypeError('sdpMLineIndex or sdpMid required'));
+      }
+  
+      // TODO: needs to go into ops queue.
+      return new Promise(function(resolve, reject) {
+        if (!pc._remoteDescription) {
+          return reject(makeError('InvalidStateError',
+              'Can not add ICE candidate without a remote description'));
+        } else if (!candidate || candidate.candidate === '') {
+          for (var j = 0; j < pc.transceivers.length; j++) {
+            if (pc.transceivers[j].rejected) {
+              continue;
+            }
+            pc.transceivers[j].iceTransport.addRemoteCandidate({});
+            sections = SDPUtils.getMediaSections(pc._remoteDescription.sdp);
+            sections[j] += 'a=end-of-candidates\r\n';
+            pc._remoteDescription.sdp =
+                SDPUtils.getDescription(pc._remoteDescription.sdp) +
+                sections.join('');
+            if (pc.usingBundle) {
+              break;
+            }
+          }
+        } else {
+          var sdpMLineIndex = candidate.sdpMLineIndex;
+          if (candidate.sdpMid) {
+            for (var i = 0; i < pc.transceivers.length; i++) {
+              if (pc.transceivers[i].mid === candidate.sdpMid) {
+                sdpMLineIndex = i;
+                break;
+              }
+            }
+          }
+          var transceiver = pc.transceivers[sdpMLineIndex];
+          if (transceiver) {
+            if (transceiver.rejected) {
+              return resolve();
+            }
+            var cand = Object.keys(candidate.candidate).length > 0 ?
+                SDPUtils.parseCandidate(candidate.candidate) : {};
+            // Ignore Chrome's invalid candidates since Edge does not like them.
+            if (cand.protocol === 'tcp' && (cand.port === 0 || cand.port === 9)) {
+              return resolve();
+            }
+            // Ignore RTCP candidates, we assume RTCP-MUX.
+            if (cand.component && cand.component !== 1) {
+              return resolve();
+            }
+            // when using bundle, avoid adding candidates to the wrong
+            // ice transport. And avoid adding candidates added in the SDP.
+            if (sdpMLineIndex === 0 || (sdpMLineIndex > 0 &&
+                transceiver.iceTransport !== pc.transceivers[0].iceTransport)) {
+              if (!maybeAddCandidate(transceiver.iceTransport, cand)) {
+                return reject(makeError('OperationError',
+                    'Can not add ICE candidate'));
+              }
+            }
+  
+            // update the remoteDescription.
+            var candidateString = candidate.candidate.trim();
+            if (candidateString.indexOf('a=') === 0) {
+              candidateString = candidateString.substr(2);
+            }
+            sections = SDPUtils.getMediaSections(pc._remoteDescription.sdp);
+            sections[sdpMLineIndex] += 'a=' +
+                (cand.type ? candidateString : 'end-of-candidates')
+                + '\r\n';
+            pc._remoteDescription.sdp =
+                SDPUtils.getDescription(pc._remoteDescription.sdp) +
+                sections.join('');
+          } else {
+            return reject(makeError('OperationError',
+                'Can not add ICE candidate'));
+          }
+        }
+        resolve();
+      });
+    };
+  
+    RTCPeerConnection.prototype.getStats = function(selector) {
+      if (selector && selector instanceof window.MediaStreamTrack) {
+        var senderOrReceiver = null;
+        this.transceivers.forEach(function(transceiver) {
+          if (transceiver.rtpSender &&
+              transceiver.rtpSender.track === selector) {
+            senderOrReceiver = transceiver.rtpSender;
+          } else if (transceiver.rtpReceiver &&
+              transceiver.rtpReceiver.track === selector) {
+            senderOrReceiver = transceiver.rtpReceiver;
+          }
+        });
+        if (!senderOrReceiver) {
+          throw makeError('InvalidAccessError', 'Invalid selector.');
+        }
+        return senderOrReceiver.getStats();
+      }
+  
+      var promises = [];
+      this.transceivers.forEach(function(transceiver) {
+        ['rtpSender', 'rtpReceiver', 'iceGatherer', 'iceTransport',
+            'dtlsTransport'].forEach(function(method) {
+              if (transceiver[method]) {
+                promises.push(transceiver[method].getStats());
+              }
+            });
+      });
+      return Promise.all(promises).then(function(allStats) {
+        var results = new Map();
+        allStats.forEach(function(stats) {
+          stats.forEach(function(stat) {
+            results.set(stat.id, stat);
+          });
+        });
+        return results;
+      });
+    };
+  
+    // fix low-level stat names and return Map instead of object.
+    var ortcObjects = ['RTCRtpSender', 'RTCRtpReceiver', 'RTCIceGatherer',
+      'RTCIceTransport', 'RTCDtlsTransport'];
+    ortcObjects.forEach(function(ortcObjectName) {
+      var obj = window[ortcObjectName];
+      if (obj && obj.prototype && obj.prototype.getStats) {
+        var nativeGetstats = obj.prototype.getStats;
+        obj.prototype.getStats = function() {
+          return nativeGetstats.apply(this)
+          .then(function(nativeStats) {
+            var mapStats = new Map();
+            Object.keys(nativeStats).forEach(function(id) {
+              nativeStats[id].type = fixStatsType(nativeStats[id]);
+              mapStats.set(id, nativeStats[id]);
+            });
+            return mapStats;
+          });
+        };
+      }
+    });
+  
+    // legacy callback shims. Should be moved to adapter.js some days.
+    var methods = ['createOffer', 'createAnswer'];
+    methods.forEach(function(method) {
+      var nativeMethod = RTCPeerConnection.prototype[method];
+      RTCPeerConnection.prototype[method] = function() {
+        var args = arguments;
+        if (typeof args[0] === 'function' ||
+            typeof args[1] === 'function') { // legacy
+          return nativeMethod.apply(this, [arguments[2]])
+          .then(function(description) {
+            if (typeof args[0] === 'function') {
+              args[0].apply(null, [description]);
+            }
+          }, function(error) {
+            if (typeof args[1] === 'function') {
+              args[1].apply(null, [error]);
+            }
+          });
+        }
+        return nativeMethod.apply(this, arguments);
+      };
+    });
+  
+    methods = ['setLocalDescription', 'setRemoteDescription', 'addIceCandidate'];
+    methods.forEach(function(method) {
+      var nativeMethod = RTCPeerConnection.prototype[method];
+      RTCPeerConnection.prototype[method] = function() {
+        var args = arguments;
+        if (typeof args[1] === 'function' ||
+            typeof args[2] === 'function') { // legacy
+          return nativeMethod.apply(this, arguments)
+          .then(function() {
+            if (typeof args[1] === 'function') {
+              args[1].apply(null);
+            }
+          }, function(error) {
+            if (typeof args[2] === 'function') {
+              args[2].apply(null, [error]);
+            }
+          });
+        }
+        return nativeMethod.apply(this, arguments);
+      };
+    });
+  
+    // getStats is special. It doesn't have a spec legacy method yet we support
+    // getStats(something, cb) without error callbacks.
+    ['getStats'].forEach(function(method) {
+      var nativeMethod = RTCPeerConnection.prototype[method];
+      RTCPeerConnection.prototype[method] = function() {
+        var args = arguments;
+        if (typeof args[1] === 'function') {
+          return nativeMethod.apply(this, arguments)
+          .then(function() {
+            if (typeof args[1] === 'function') {
+              args[1].apply(null);
+            }
+          });
+        }
+        return nativeMethod.apply(this, arguments);
+      };
+    });
+  
+    return RTCPeerConnection;
+  };
+  
+  },{"sdp":17}],17:[function(require,module,exports){
+   /* eslint-env node */
+  'use strict';
+  
+  // SDP helpers.
+  var SDPUtils = {};
+  
+  // Generate an alphanumeric identifier for cname or mids.
+  // TODO: use UUIDs instead? https://gist.github.com/jed/982883
+  SDPUtils.generateIdentifier = function() {
+    return Math.random().toString(36).substr(2, 10);
+  };
+  
+  // The RTCP CNAME used by all peerconnections from the same JS.
+  SDPUtils.localCName = SDPUtils.generateIdentifier();
+  
+  // Splits SDP into lines, dealing with both CRLF and LF.
+  SDPUtils.splitLines = function(blob) {
+    return blob.trim().split('\n').map(function(line) {
+      return line.trim();
+    });
+  };
+  // Splits SDP into sessionpart and mediasections. Ensures CRLF.
+  SDPUtils.splitSections = function(blob) {
+    var parts = blob.split('\nm=');
+    return parts.map(function(part, index) {
+      return (index > 0 ? 'm=' + part : part).trim() + '\r\n';
+    });
+  };
+  
+  // returns the session description.
+  SDPUtils.getDescription = function(blob) {
+    var sections = SDPUtils.splitSections(blob);
+    return sections && sections[0];
+  };
+  
+  // returns the individual media sections.
+  SDPUtils.getMediaSections = function(blob) {
+    var sections = SDPUtils.splitSections(blob);
+    sections.shift();
+    return sections;
+  };
+  
+  // Returns lines that start with a certain prefix.
+  SDPUtils.matchPrefix = function(blob, prefix) {
+    return SDPUtils.splitLines(blob).filter(function(line) {
+      return line.indexOf(prefix) === 0;
+    });
+  };
+  
+  // Parses an ICE candidate line. Sample input:
+  // candidate:702786350 2 udp 41819902 8.8.8.8 60769 typ relay raddr 8.8.8.8
+  // rport 55996"
+  SDPUtils.parseCandidate = function(line) {
+    var parts;
+    // Parse both variants.
+    if (line.indexOf('a=candidate:') === 0) {
+      parts = line.substring(12).split(' ');
+    } else {
+      parts = line.substring(10).split(' ');
+    }
+  
+    var candidate = {
+      foundation: parts[0],
+      component: parseInt(parts[1], 10),
+      protocol: parts[2].toLowerCase(),
+      priority: parseInt(parts[3], 10),
+      ip: parts[4],
+      address: parts[4], // address is an alias for ip.
+      port: parseInt(parts[5], 10),
+      // skip parts[6] == 'typ'
+      type: parts[7]
+    };
+  
+    for (var i = 8; i < parts.length; i += 2) {
+      switch (parts[i]) {
+        case 'raddr':
+          candidate.relatedAddress = parts[i + 1];
+          break;
+        case 'rport':
+          candidate.relatedPort = parseInt(parts[i + 1], 10);
+          break;
+        case 'tcptype':
+          candidate.tcpType = parts[i + 1];
+          break;
+        case 'ufrag':
+          candidate.ufrag = parts[i + 1]; // for backward compability.
+          candidate.usernameFragment = parts[i + 1];
+          break;
+        default: // extension handling, in particular ufrag
+          candidate[parts[i]] = parts[i + 1];
+          break;
+      }
+    }
+    return candidate;
+  };
+  
+  // Translates a candidate object into SDP candidate attribute.
+  SDPUtils.writeCandidate = function(candidate) {
+    var sdp = [];
+    sdp.push(candidate.foundation);
+    sdp.push(candidate.component);
+    sdp.push(candidate.protocol.toUpperCase());
+    sdp.push(candidate.priority);
+    sdp.push(candidate.address || candidate.ip);
+    sdp.push(candidate.port);
+  
+    var type = candidate.type;
+    sdp.push('typ');
+    sdp.push(type);
+    if (type !== 'host' && candidate.relatedAddress &&
+        candidate.relatedPort) {
+      sdp.push('raddr');
+      sdp.push(candidate.relatedAddress);
+      sdp.push('rport');
+      sdp.push(candidate.relatedPort);
+    }
+    if (candidate.tcpType && candidate.protocol.toLowerCase() === 'tcp') {
+      sdp.push('tcptype');
+      sdp.push(candidate.tcpType);
+    }
+    if (candidate.usernameFragment || candidate.ufrag) {
+      sdp.push('ufrag');
+      sdp.push(candidate.usernameFragment || candidate.ufrag);
+    }
+    return 'candidate:' + sdp.join(' ');
+  };
+  
+  // Parses an ice-options line, returns an array of option tags.
+  // a=ice-options:foo bar
+  SDPUtils.parseIceOptions = function(line) {
+    return line.substr(14).split(' ');
+  };
+  
+  // Parses an rtpmap line, returns RTCRtpCoddecParameters. Sample input:
+  // a=rtpmap:111 opus/48000/2
+  SDPUtils.parseRtpMap = function(line) {
+    var parts = line.substr(9).split(' ');
+    var parsed = {
+      payloadType: parseInt(parts.shift(), 10) // was: id
+    };
+  
+    parts = parts[0].split('/');
+  
+    parsed.name = parts[0];
+    parsed.clockRate = parseInt(parts[1], 10); // was: clockrate
+    parsed.channels = parts.length === 3 ? parseInt(parts[2], 10) : 1;
+    // legacy alias, got renamed back to channels in ORTC.
+    parsed.numChannels = parsed.channels;
+    return parsed;
+  };
+  
+  // Generate an a=rtpmap line from RTCRtpCodecCapability or
+  // RTCRtpCodecParameters.
+  SDPUtils.writeRtpMap = function(codec) {
+    var pt = codec.payloadType;
+    if (codec.preferredPayloadType !== undefined) {
+      pt = codec.preferredPayloadType;
+    }
+    var channels = codec.channels || codec.numChannels || 1;
+    return 'a=rtpmap:' + pt + ' ' + codec.name + '/' + codec.clockRate +
+        (channels !== 1 ? '/' + channels : '') + '\r\n';
+  };
+  
+  // Parses an a=extmap line (headerextension from RFC 5285). Sample input:
+  // a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
+  // a=extmap:2/sendonly urn:ietf:params:rtp-hdrext:toffset
+  SDPUtils.parseExtmap = function(line) {
+    var parts = line.substr(9).split(' ');
+    return {
+      id: parseInt(parts[0], 10),
+      direction: parts[0].indexOf('/') > 0 ? parts[0].split('/')[1] : 'sendrecv',
+      uri: parts[1]
+    };
+  };
+  
+  // Generates a=extmap line from RTCRtpHeaderExtensionParameters or
+  // RTCRtpHeaderExtension.
+  SDPUtils.writeExtmap = function(headerExtension) {
+    return 'a=extmap:' + (headerExtension.id || headerExtension.preferredId) +
+        (headerExtension.direction && headerExtension.direction !== 'sendrecv'
+            ? '/' + headerExtension.direction
+            : '') +
+        ' ' + headerExtension.uri + '\r\n';
+  };
+  
+  // Parses an ftmp line, returns dictionary. Sample input:
+  // a=fmtp:96 vbr=on;cng=on
+  // Also deals with vbr=on; cng=on
+  SDPUtils.parseFmtp = function(line) {
+    var parsed = {};
+    var kv;
+    var parts = line.substr(line.indexOf(' ') + 1).split(';');
+    for (var j = 0; j < parts.length; j++) {
+      kv = parts[j].trim().split('=');
+      parsed[kv[0].trim()] = kv[1];
+    }
+    return parsed;
+  };
+  
+  // Generates an a=ftmp line from RTCRtpCodecCapability or RTCRtpCodecParameters.
+  SDPUtils.writeFmtp = function(codec) {
+    var line = '';
+    var pt = codec.payloadType;
+    if (codec.preferredPayloadType !== undefined) {
+      pt = codec.preferredPayloadType;
+    }
+    if (codec.parameters && Object.keys(codec.parameters).length) {
+      var params = [];
+      Object.keys(codec.parameters).forEach(function(param) {
+        if (codec.parameters[param]) {
+          params.push(param + '=' + codec.parameters[param]);
+        } else {
+          params.push(param);
+        }
+      });
+      line += 'a=fmtp:' + pt + ' ' + params.join(';') + '\r\n';
+    }
+    return line;
+  };
+  
+  // Parses an rtcp-fb line, returns RTCPRtcpFeedback object. Sample input:
+  // a=rtcp-fb:98 nack rpsi
+  SDPUtils.parseRtcpFb = function(line) {
+    var parts = line.substr(line.indexOf(' ') + 1).split(' ');
+    return {
+      type: parts.shift(),
+      parameter: parts.join(' ')
+    };
+  };
+  // Generate a=rtcp-fb lines from RTCRtpCodecCapability or RTCRtpCodecParameters.
+  SDPUtils.writeRtcpFb = function(codec) {
+    var lines = '';
+    var pt = codec.payloadType;
+    if (codec.preferredPayloadType !== undefined) {
+      pt = codec.preferredPayloadType;
+    }
+    if (codec.rtcpFeedback && codec.rtcpFeedback.length) {
+      // FIXME: special handling for trr-int?
+      codec.rtcpFeedback.forEach(function(fb) {
+        lines += 'a=rtcp-fb:' + pt + ' ' + fb.type +
+        (fb.parameter && fb.parameter.length ? ' ' + fb.parameter : '') +
+            '\r\n';
+      });
+    }
+    return lines;
+  };
+  
+  // Parses an RFC 5576 ssrc media attribute. Sample input:
+  // a=ssrc:3735928559 cname:something
+  SDPUtils.parseSsrcMedia = function(line) {
+    var sp = line.indexOf(' ');
+    var parts = {
+      ssrc: parseInt(line.substr(7, sp - 7), 10)
+    };
+    var colon = line.indexOf(':', sp);
+    if (colon > -1) {
+      parts.attribute = line.substr(sp + 1, colon - sp - 1);
+      parts.value = line.substr(colon + 1);
+    } else {
+      parts.attribute = line.substr(sp + 1);
+    }
+    return parts;
+  };
+  
+  SDPUtils.parseSsrcGroup = function(line) {
+    var parts = line.substr(13).split(' ');
+    return {
+      semantics: parts.shift(),
+      ssrcs: parts.map(function(ssrc) {
+        return parseInt(ssrc, 10);
+      })
+    };
+  };
+  
+  // Extracts the MID (RFC 5888) from a media section.
+  // returns the MID or undefined if no mid line was found.
+  SDPUtils.getMid = function(mediaSection) {
+    var mid = SDPUtils.matchPrefix(mediaSection, 'a=mid:')[0];
+    if (mid) {
+      return mid.substr(6);
+    }
+  };
+  
+  SDPUtils.parseFingerprint = function(line) {
+    var parts = line.substr(14).split(' ');
+    return {
+      algorithm: parts[0].toLowerCase(), // algorithm is case-sensitive in Edge.
+      value: parts[1]
+    };
+  };
+  
+  // Extracts DTLS parameters from SDP media section or sessionpart.
+  // FIXME: for consistency with other functions this should only
+  //   get the fingerprint line as input. See also getIceParameters.
+  SDPUtils.getDtlsParameters = function(mediaSection, sessionpart) {
+    var lines = SDPUtils.matchPrefix(mediaSection + sessionpart,
+        'a=fingerprint:');
+    // Note: a=setup line is ignored since we use the 'auto' role.
+    // Note2: 'algorithm' is not case sensitive except in Edge.
+    return {
+      role: 'auto',
+      fingerprints: lines.map(SDPUtils.parseFingerprint)
+    };
+  };
+  
+  // Serializes DTLS parameters to SDP.
+  SDPUtils.writeDtlsParameters = function(params, setupType) {
+    var sdp = 'a=setup:' + setupType + '\r\n';
+    params.fingerprints.forEach(function(fp) {
+      sdp += 'a=fingerprint:' + fp.algorithm + ' ' + fp.value + '\r\n';
+    });
+    return sdp;
+  };
+  // Parses ICE information from SDP media section or sessionpart.
+  // FIXME: for consistency with other functions this should only
+  //   get the ice-ufrag and ice-pwd lines as input.
+  SDPUtils.getIceParameters = function(mediaSection, sessionpart) {
+    var lines = SDPUtils.splitLines(mediaSection);
+    // Search in session part, too.
+    lines = lines.concat(SDPUtils.splitLines(sessionpart));
+    var iceParameters = {
+      usernameFragment: lines.filter(function(line) {
+        return line.indexOf('a=ice-ufrag:') === 0;
+      })[0].substr(12),
+      password: lines.filter(function(line) {
+        return line.indexOf('a=ice-pwd:') === 0;
+      })[0].substr(10)
+    };
+    return iceParameters;
+  };
+  
+  // Serializes ICE parameters to SDP.
+  SDPUtils.writeIceParameters = function(params) {
+    return 'a=ice-ufrag:' + params.usernameFragment + '\r\n' +
+        'a=ice-pwd:' + params.password + '\r\n';
+  };
+  
+  // Parses the SDP media section and returns RTCRtpParameters.
+  SDPUtils.parseRtpParameters = function(mediaSection) {
+    var description = {
+      codecs: [],
+      headerExtensions: [],
+      fecMechanisms: [],
+      rtcp: []
+    };
+    var lines = SDPUtils.splitLines(mediaSection);
+    var mline = lines[0].split(' ');
+    for (var i = 3; i < mline.length; i++) { // find all codecs from mline[3..]
+      var pt = mline[i];
+      var rtpmapline = SDPUtils.matchPrefix(
+          mediaSection, 'a=rtpmap:' + pt + ' ')[0];
+      if (rtpmapline) {
+        var codec = SDPUtils.parseRtpMap(rtpmapline);
+        var fmtps = SDPUtils.matchPrefix(
+            mediaSection, 'a=fmtp:' + pt + ' ');
+        // Only the first a=fmtp:<pt> is considered.
+        codec.parameters = fmtps.length ? SDPUtils.parseFmtp(fmtps[0]) : {};
+        codec.rtcpFeedback = SDPUtils.matchPrefix(
+            mediaSection, 'a=rtcp-fb:' + pt + ' ')
+          .map(SDPUtils.parseRtcpFb);
+        description.codecs.push(codec);
+        // parse FEC mechanisms from rtpmap lines.
+        switch (codec.name.toUpperCase()) {
+          case 'RED':
+          case 'ULPFEC':
+            description.fecMechanisms.push(codec.name.toUpperCase());
+            break;
+          default: // only RED and ULPFEC are recognized as FEC mechanisms.
+            break;
+        }
+      }
+    }
+    SDPUtils.matchPrefix(mediaSection, 'a=extmap:').forEach(function(line) {
+      description.headerExtensions.push(SDPUtils.parseExtmap(line));
+    });
+    // FIXME: parse rtcp.
+    return description;
+  };
+  
+  // Generates parts of the SDP media section describing the capabilities /
+  // parameters.
+  SDPUtils.writeRtpDescription = function(kind, caps) {
+    var sdp = '';
+  
+    // Build the mline.
+    sdp += 'm=' + kind + ' ';
+    sdp += caps.codecs.length > 0 ? '9' : '0'; // reject if no codecs.
+    sdp += ' UDP/TLS/RTP/SAVPF ';
+    sdp += caps.codecs.map(function(codec) {
+      if (codec.preferredPayloadType !== undefined) {
+        return codec.preferredPayloadType;
+      }
+      return codec.payloadType;
+    }).join(' ') + '\r\n';
+  
+    sdp += 'c=IN IP4 0.0.0.0\r\n';
+    sdp += 'a=rtcp:9 IN IP4 0.0.0.0\r\n';
+  
+    // Add a=rtpmap lines for each codec. Also fmtp and rtcp-fb.
+    caps.codecs.forEach(function(codec) {
+      sdp += SDPUtils.writeRtpMap(codec);
+      sdp += SDPUtils.writeFmtp(codec);
+      sdp += SDPUtils.writeRtcpFb(codec);
+    });
+    var maxptime = 0;
+    caps.codecs.forEach(function(codec) {
+      if (codec.maxptime > maxptime) {
+        maxptime = codec.maxptime;
+      }
+    });
+    if (maxptime > 0) {
+      sdp += 'a=maxptime:' + maxptime + '\r\n';
+    }
+    sdp += 'a=rtcp-mux\r\n';
+  
+    if (caps.headerExtensions) {
+      caps.headerExtensions.forEach(function(extension) {
+        sdp += SDPUtils.writeExtmap(extension);
+      });
+    }
+    // FIXME: write fecMechanisms.
+    return sdp;
+  };
+  
+  // Parses the SDP media section and returns an array of
+  // RTCRtpEncodingParameters.
+  SDPUtils.parseRtpEncodingParameters = function(mediaSection) {
+    var encodingParameters = [];
+    var description = SDPUtils.parseRtpParameters(mediaSection);
+    var hasRed = description.fecMechanisms.indexOf('RED') !== -1;
+    var hasUlpfec = description.fecMechanisms.indexOf('ULPFEC') !== -1;
+  
+    // filter a=ssrc:... cname:, ignore PlanB-msid
+    var ssrcs = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
+    .map(function(line) {
+      return SDPUtils.parseSsrcMedia(line);
+    })
+    .filter(function(parts) {
+      return parts.attribute === 'cname';
+    });
+    var primarySsrc = ssrcs.length > 0 && ssrcs[0].ssrc;
+    var secondarySsrc;
+  
+    var flows = SDPUtils.matchPrefix(mediaSection, 'a=ssrc-group:FID')
+    .map(function(line) {
+      var parts = line.substr(17).split(' ');
+      return parts.map(function(part) {
+        return parseInt(part, 10);
+      });
+    });
+    if (flows.length > 0 && flows[0].length > 1 && flows[0][0] === primarySsrc) {
+      secondarySsrc = flows[0][1];
+    }
+  
+    description.codecs.forEach(function(codec) {
+      if (codec.name.toUpperCase() === 'RTX' && codec.parameters.apt) {
+        var encParam = {
+          ssrc: primarySsrc,
+          codecPayloadType: parseInt(codec.parameters.apt, 10)
+        };
+        if (primarySsrc && secondarySsrc) {
+          encParam.rtx = {ssrc: secondarySsrc};
+        }
+        encodingParameters.push(encParam);
+        if (hasRed) {
+          encParam = JSON.parse(JSON.stringify(encParam));
+          encParam.fec = {
+            ssrc: primarySsrc,
+            mechanism: hasUlpfec ? 'red+ulpfec' : 'red'
+          };
+          encodingParameters.push(encParam);
+        }
+      }
+    });
+    if (encodingParameters.length === 0 && primarySsrc) {
+      encodingParameters.push({
+        ssrc: primarySsrc
+      });
+    }
+  
+    // we support both b=AS and b=TIAS but interpret AS as TIAS.
+    var bandwidth = SDPUtils.matchPrefix(mediaSection, 'b=');
+    if (bandwidth.length) {
+      if (bandwidth[0].indexOf('b=TIAS:') === 0) {
+        bandwidth = parseInt(bandwidth[0].substr(7), 10);
+      } else if (bandwidth[0].indexOf('b=AS:') === 0) {
+        // use formula from JSEP to convert b=AS to TIAS value.
+        bandwidth = parseInt(bandwidth[0].substr(5), 10) * 1000 * 0.95
+            - (50 * 40 * 8);
+      } else {
+        bandwidth = undefined;
+      }
+      encodingParameters.forEach(function(params) {
+        params.maxBitrate = bandwidth;
+      });
+    }
+    return encodingParameters;
+  };
+  
+  // parses http://draft.ortc.org/#rtcrtcpparameters*
+  SDPUtils.parseRtcpParameters = function(mediaSection) {
+    var rtcpParameters = {};
+  
+    // Gets the first SSRC. Note tha with RTX there might be multiple
+    // SSRCs.
+    var remoteSsrc = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
+        .map(function(line) {
+          return SDPUtils.parseSsrcMedia(line);
+        })
+        .filter(function(obj) {
+          return obj.attribute === 'cname';
+        })[0];
+    if (remoteSsrc) {
+      rtcpParameters.cname = remoteSsrc.value;
+      rtcpParameters.ssrc = remoteSsrc.ssrc;
+    }
+  
+    // Edge uses the compound attribute instead of reducedSize
+    // compound is !reducedSize
+    var rsize = SDPUtils.matchPrefix(mediaSection, 'a=rtcp-rsize');
+    rtcpParameters.reducedSize = rsize.length > 0;
+    rtcpParameters.compound = rsize.length === 0;
+  
+    // parses the rtcp-mux attrіbute.
+    // Note that Edge does not support unmuxed RTCP.
+    var mux = SDPUtils.matchPrefix(mediaSection, 'a=rtcp-mux');
+    rtcpParameters.mux = mux.length > 0;
+  
+    return rtcpParameters;
+  };
+  
+  // parses either a=msid: or a=ssrc:... msid lines and returns
+  // the id of the MediaStream and MediaStreamTrack.
+  SDPUtils.parseMsid = function(mediaSection) {
+    var parts;
+    var spec = SDPUtils.matchPrefix(mediaSection, 'a=msid:');
+    if (spec.length === 1) {
+      parts = spec[0].substr(7).split(' ');
+      return {stream: parts[0], track: parts[1]};
+    }
+    var planB = SDPUtils.matchPrefix(mediaSection, 'a=ssrc:')
+    .map(function(line) {
+      return SDPUtils.parseSsrcMedia(line);
+    })
+    .filter(function(msidParts) {
+      return msidParts.attribute === 'msid';
+    });
+    if (planB.length > 0) {
+      parts = planB[0].value.split(' ');
+      return {stream: parts[0], track: parts[1]};
+    }
+  };
+  
+  // Generate a session ID for SDP.
+  // https://tools.ietf.org/html/draft-ietf-rtcweb-jsep-20#section-5.2.1
+  // recommends using a cryptographically random +ve 64-bit value
+  // but right now this should be acceptable and within the right range
+  SDPUtils.generateSessionId = function() {
+    return Math.random().toString().substr(2, 21);
+  };
+  
+  // Write boilder plate for start of SDP
+  // sessId argument is optional - if not supplied it will
+  // be generated randomly
+  // sessVersion is optional and defaults to 2
+  // sessUser is optional and defaults to 'thisisadapterortc'
+  SDPUtils.writeSessionBoilerplate = function(sessId, sessVer, sessUser) {
+    var sessionId;
+    var version = sessVer !== undefined ? sessVer : 2;
+    if (sessId) {
+      sessionId = sessId;
+    } else {
+      sessionId = SDPUtils.generateSessionId();
+    }
+    var user = sessUser || 'thisisadapterortc';
+    // FIXME: sess-id should be an NTP timestamp.
+    return 'v=0\r\n' +
+        'o=' + user + ' ' + sessionId + ' ' + version +
+          ' IN IP4 127.0.0.1\r\n' +
+        's=-\r\n' +
+        't=0 0\r\n';
+  };
+  
+  SDPUtils.writeMediaSection = function(transceiver, caps, type, stream) {
+    var sdp = SDPUtils.writeRtpDescription(transceiver.kind, caps);
+  
+    // Map ICE parameters (ufrag, pwd) to SDP.
+    sdp += SDPUtils.writeIceParameters(
+        transceiver.iceGatherer.getLocalParameters());
+  
+    // Map DTLS parameters to SDP.
+    sdp += SDPUtils.writeDtlsParameters(
+        transceiver.dtlsTransport.getLocalParameters(),
+        type === 'offer' ? 'actpass' : 'active');
+  
+    sdp += 'a=mid:' + transceiver.mid + '\r\n';
+  
+    if (transceiver.direction) {
+      sdp += 'a=' + transceiver.direction + '\r\n';
+    } else if (transceiver.rtpSender && transceiver.rtpReceiver) {
+      sdp += 'a=sendrecv\r\n';
+    } else if (transceiver.rtpSender) {
+      sdp += 'a=sendonly\r\n';
+    } else if (transceiver.rtpReceiver) {
+      sdp += 'a=recvonly\r\n';
+    } else {
+      sdp += 'a=inactive\r\n';
+    }
+  
+    if (transceiver.rtpSender) {
+      // spec.
+      var msid = 'msid:' + stream.id + ' ' +
+          transceiver.rtpSender.track.id + '\r\n';
+      sdp += 'a=' + msid;
+  
+      // for Chrome.
+      sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
+          ' ' + msid;
+      if (transceiver.sendEncodingParameters[0].rtx) {
+        sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
+            ' ' + msid;
+        sdp += 'a=ssrc-group:FID ' +
+            transceiver.sendEncodingParameters[0].ssrc + ' ' +
+            transceiver.sendEncodingParameters[0].rtx.ssrc +
+            '\r\n';
+      }
+    }
+    // FIXME: this should be written by writeRtpDescription.
+    sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].ssrc +
+        ' cname:' + SDPUtils.localCName + '\r\n';
+    if (transceiver.rtpSender && transceiver.sendEncodingParameters[0].rtx) {
+      sdp += 'a=ssrc:' + transceiver.sendEncodingParameters[0].rtx.ssrc +
+          ' cname:' + SDPUtils.localCName + '\r\n';
+    }
+    return sdp;
+  };
+  
+  // Gets the direction from the mediaSection or the sessionpart.
+  SDPUtils.getDirection = function(mediaSection, sessionpart) {
+    // Look for sendrecv, sendonly, recvonly, inactive, default to sendrecv.
+    var lines = SDPUtils.splitLines(mediaSection);
+    for (var i = 0; i < lines.length; i++) {
+      switch (lines[i]) {
+        case 'a=sendrecv':
+        case 'a=sendonly':
+        case 'a=recvonly':
+        case 'a=inactive':
+          return lines[i].substr(2);
+        default:
+          // FIXME: What should happen here?
+      }
+    }
+    if (sessionpart) {
+      return SDPUtils.getDirection(sessionpart);
+    }
+    return 'sendrecv';
+  };
+  
+  SDPUtils.getKind = function(mediaSection) {
+    var lines = SDPUtils.splitLines(mediaSection);
+    var mline = lines[0].split(' ');
+    return mline[0].substr(2);
+  };
+  
+  SDPUtils.isRejected = function(mediaSection) {
+    return mediaSection.split(' ', 2)[1] === '0';
+  };
+  
+  SDPUtils.parseMLine = function(mediaSection) {
+    var lines = SDPUtils.splitLines(mediaSection);
+    var parts = lines[0].substr(2).split(' ');
+    return {
+      kind: parts[0],
+      port: parseInt(parts[1], 10),
+      protocol: parts[2],
+      fmt: parts.slice(3).join(' ')
+    };
+  };
+  
+  SDPUtils.parseOLine = function(mediaSection) {
+    var line = SDPUtils.matchPrefix(mediaSection, 'o=')[0];
+    var parts = line.substr(2).split(' ');
+    return {
+      username: parts[0],
+      sessionId: parts[1],
+      sessionVersion: parseInt(parts[2], 10),
+      netType: parts[3],
+      addressType: parts[4],
+      address: parts[5]
+    };
+  };
+  
+  // a very naive interpretation of a valid SDP.
+  SDPUtils.isValidSDP = function(blob) {
+    if (typeof blob !== 'string' || blob.length === 0) {
+      return false;
+    }
+    var lines = SDPUtils.splitLines(blob);
+    for (var i = 0; i < lines.length; i++) {
+      if (lines[i].length < 2 || lines[i].charAt(1) !== '=') {
+        return false;
+      }
+      // TODO: check the modifier a bit more.
+    }
+    return true;
+  };
+  
+  // Expose public methods.
+  if (typeof module === 'object') {
+    module.exports = SDPUtils;
+  }
+  
+  },{}]},{},[1])(1)
+  });
\ No newline at end of file
diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 47113af383..6c7492068c 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -14,6 +14,13 @@ const CALL_HANGUP_MAX_RETRIES = MEDIA.callHangupMaximumRetries;
 const CONNECTION_TERMINATED_EVENTS = ['iceConnectionFailed', 'iceConnectionClosed'];
 const CALL_CONNECT_NOTIFICATION_TIMEOUT = 500;
 
+const logConnector = (level, category, label, content) => {
+  if (level === 'log')
+    level = "info";
+
+  logger[level]({logCode: 'sipjs_log'}, '[' + category + '] ' + content);
+};
+
 export default class SIPBridge extends BaseAudioBridge {
   constructor(userData) {
     super(userData);
@@ -199,6 +206,7 @@ export default class SIPBridge extends BaseAudioBridge {
         wsServers: `${(protocol === 'https:' ? 'wss://' : 'ws://')}${hostname}/ws`,
         log: {
           builtinEnabled: false,
+          connector: logConnector
         },
         displayName: callerIdName,
         register: false,

From 6ef4f39903e24fb5c0537de3e75e30c07f92cda8 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Fri, 25 Jan 2019 18:19:54 +0000
Subject: [PATCH 151/163] Localize "No locale selected; fix locales fetch

---
 .../components/closed-captions/component.jsx  | 33 ++++++++++++++-----
 .../ui/components/closed-captions/service.js  |  2 +-
 .../ui/components/settings/component.jsx      |  8 +++--
 .../submenus/closed-captions/component.jsx    |  8 ++---
 bigbluebutton-html5/private/locales/en.json   |  1 +
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx b/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx
index 1a5952544e..31d7219095 100644
--- a/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/closed-captions/component.jsx
@@ -1,9 +1,17 @@
-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
 import injectWbResizeEvent from '/imports/ui/components/presentation/resize-wrapper/component';
 import { styles } from './styles.scss';
 
-class ClosedCaptions extends Component {
+const intlMessages = defineMessages({
+  noLocaleSelected: {
+    id: 'app.submenu.closedCaptions.noLocaleSelected',
+    description: 'label for selected language for closed captions',
+  },
+});
+
+class ClosedCaptions extends React.PureComponent {
   constructor(props) {
     super(props);
 
@@ -25,13 +33,14 @@ class ClosedCaptions extends Component {
   }
 
   renderCaptions(caption) {
+    const { fontFamily, fontSize, fontColor } = this.props;
     const text = caption.captions;
     const captionStyles = {
       whiteSpace: 'pre-wrap',
       wordWrap: 'break-word',
-      fontFamily: this.props.fontFamily,
-      fontSize: this.props.fontSize,
-      color: this.props.fontColor,
+      fontFamily,
+      fontSize,
+      color: fontColor,
     };
 
     return (
@@ -48,12 +57,15 @@ class ClosedCaptions extends Component {
       locale,
       captions,
       backgroundColor,
+      intl,
     } = this.props;
 
     return (
       <div disabled className={styles.ccbox}>
         <div className={styles.title}>
-          <p> {locale} </p>
+          <p>
+            { locale || intl.formatMessage(intlMessages.noLocaleSelected) }
+          </p>
         </div>
         <div
           ref={(ref) => { this.refCCScrollArea = ref; }}
@@ -69,7 +81,7 @@ class ClosedCaptions extends Component {
   }
 }
 
-export default injectWbResizeEvent(ClosedCaptions);
+export default injectIntl(injectWbResizeEvent(ClosedCaptions));
 
 ClosedCaptions.propTypes = {
   backgroundColor: PropTypes.string.isRequired,
@@ -83,12 +95,15 @@ ClosedCaptions.propTypes = {
       ).isRequired,
     }).isRequired,
   ).isRequired,
-  locale: PropTypes.string.isRequired,
+  locale: PropTypes.string,
   fontColor: PropTypes.string.isRequired,
   fontSize: PropTypes.string.isRequired,
   fontFamily: PropTypes.string.isRequired,
+  intl: PropTypes.shape({
+    formatMessage: PropTypes.func.isRequired,
+  }).isRequired,
 };
 
 ClosedCaptions.defaultProps = {
-  locale: 'Locale is not selected',
+  locale: undefined,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/closed-captions/service.js b/bigbluebutton-html5/imports/ui/components/closed-captions/service.js
index da2e0e10fc..d2bd523381 100644
--- a/bigbluebutton-html5/imports/ui/components/closed-captions/service.js
+++ b/bigbluebutton-html5/imports/ui/components/closed-captions/service.js
@@ -4,7 +4,7 @@ import Settings from '/imports/ui/services/settings';
 import _ from 'lodash';
 
 const getCCData = () => {
-  const meetingID = Auth.meetingID;
+  const { meetingID } = Auth;
 
   const ccSettings = Settings.cc;
 
diff --git a/bigbluebutton-html5/imports/ui/components/settings/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/component.jsx
index fd0dc75ec8..8aeda4d68d 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/component.jsx
@@ -148,13 +148,17 @@ class Settings extends Component {
   }
 
   renderModalContent() {
-    const { intl } = this.props;
+    const {
+      intl,
+      locales,
+    } = this.props;
+
     const {
       selectedTab,
       availableLocales,
       current,
-      locales,
     } = this.state;
+
     return (
       <Tabs
         className={styles.tabs}
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/component.jsx
index 12f4f34be1..c227d044f4 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/closed-captions/component.jsx
@@ -198,15 +198,15 @@ class ClosedCaptionsMenu extends BaseMenu {
                       <select
                         defaultValue={locales ? locales.indexOf(this.state.settings.locale) : -1}
                         className={styles.select}
-                        onChange={this.handleSelectChange.bind(this, 'locale', this.props.locales)}
+                        onChange={this.handleSelectChange.bind(this, 'locale', locales)}
                       >
                         <option>
-                          { this.props.locales
-                          && this.props.locales.length
+                          { locales
+                          && locales.length
                             ? intl.formatMessage(intlMessages.localeOptionLabel)
                             : intl.formatMessage(intlMessages.noLocaleOptionLabel) }
                         </option>
-                        {this.props.locales ? this.props.locales.map((locale, index) => (
+                        {locales ? locales.map((locale, index) => (
                           <option key={index} value={index}>
                             {locale}
                           </option>
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 376930fbb0..ffd6c38f1f 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -199,6 +199,7 @@
     "app.submenu.closedCaptions.fontSizeOptionLabel": "Choose Font size",
     "app.submenu.closedCaptions.backgroundColorLabel": "Background color",
     "app.submenu.closedCaptions.fontColorLabel": "Font color",
+    "app.submenu.closedCaptions.noLocaleSelected": "Locale is not selected",
     "app.submenu.participants.muteAllLabel": "Mute all except the presenter",
     "app.submenu.participants.lockAllLabel": "Lock all participants",
     "app.submenu.participants.lockItemLabel": "Participants {0}",

From 5d4918218f81f3dbc64700649e254c42f3d8f479 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Fri, 25 Jan 2019 18:04:40 -0200
Subject: [PATCH 152/163] Brings the fullscreen button upfront

---
 .../ui/components/video-provider/fullscreen-button/styles.scss   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
index 5411403cb6..b4e3790062 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
@@ -12,6 +12,7 @@
   background-color: var(--color-transparent);
   cursor: pointer;
   border: none !important;
+  z-index: 2;
 }
 
 .button {

From 202d89643667d0d497f79a3e2ed999b9ae2669fe Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Fri, 25 Jan 2019 21:42:55 +0000
Subject: [PATCH 153/163] Fixed Chrome extension-based screensharing with the
 newest adapter on HTML5

---
 .../client/compatibility/kurento-extension.js         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/client/compatibility/kurento-extension.js b/bigbluebutton-html5/client/compatibility/kurento-extension.js
index 66e34642ad..0a181e56cf 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-extension.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-extension.js
@@ -700,9 +700,14 @@ window.getScreenConstraints = function (sendSource, callback) {
 
         kurentoManager.kurentoScreenshare.extensionInstalled = true;
 
-        // this statement sets gets 'sourceId" and sets "chromeMediaSourceId"
-        screenConstraints.video.chromeMediaSource = { exact: [sendSource] };
-        screenConstraints.video.chromeMediaSourceId = sourceId;
+        // Re-wrap the video constraints into the mandatory object (latest adapter)
+        screenConstraints.video = {}
+        screenConstraints.video.mandatory = {};
+        screenConstraints.video.mandatory.maxFrameRate = 10;
+        screenConstraints.video.mandatory.maxHeight = kurentoManager.kurentoScreenshare.vid_max_height;
+        screenConstraints.video.mandatory.maxWidth = kurentoManager.kurentoScreenshare.vid_max_width;
+        screenConstraints.video.mandatory.chromeMediaSource = sendSource;
+        screenConstraints.video.mandatory.chromeMediaSourceId = sourceId;
         screenConstraints.optional = optionalConstraints;
 
         console.log('getScreenConstraints for Chrome returns => ', screenConstraints);

From 5b760b46ef18ecbee4d900081a343092bda3e353 Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Mon, 28 Jan 2019 11:21:29 -0200
Subject: [PATCH 154/163] Fixed share video button for locked users

---
 .../ui/components/actions-bar/component.jsx   |  2 +-
 .../presentation-options/component.jsx        |  8 +--
 .../component.jsx                             | 44 ++++++++-------
 .../video-provider/video-button/container.jsx | 31 +++++++++++
 .../{video-menu => video-button}/service.js   |  3 --
 .../{video-menu => video-button}/styles.scss  |  0
 .../video-provider/video-menu/container.jsx   | 54 -------------------
 bigbluebutton-html5/private/locales/en.json   |  2 +
 8 files changed, 62 insertions(+), 82 deletions(-)
 rename bigbluebutton-html5/imports/ui/components/video-provider/{video-menu => video-button}/component.jsx (51%)
 create mode 100755 bigbluebutton-html5/imports/ui/components/video-provider/video-button/container.jsx
 rename bigbluebutton-html5/imports/ui/components/video-provider/{video-menu => video-button}/service.js (86%)
 rename bigbluebutton-html5/imports/ui/components/video-provider/{video-menu => video-button}/styles.scss (100%)
 delete mode 100755 bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index 04cc8c5cb3..b92c2a9a28 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -4,7 +4,7 @@ import { styles } from './styles.scss';
 import DesktopShare from './desktop-share/component';
 import ActionsDropdown from './actions-dropdown/component';
 import AudioControlsContainer from '../audio/audio-controls/container';
-import JoinVideoOptionsContainer from '../video-provider/video-menu/container';
+import JoinVideoOptionsContainer from '../video-provider/video-button/container';
 
 import PresentationOptionsContainer from './presentation-options/component';
 
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
index bbe37dbc33..f46adc2b4b 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/presentation-options/component.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import Button from '/imports/ui/components/button/component';
-import cx from 'classnames';
 import { styles } from '../styles';
 
 const propTypes = {
@@ -21,12 +20,9 @@ const intlMessages = defineMessages({
   },
 });
 
-const PresentationOptionsContainer = ({
-  intl,
-  toggleSwapLayout,
-}) => (
+const PresentationOptionsContainer = ({ intl, toggleSwapLayout }) => (
   <Button
-    className={cx(styles.button, styles.presentationButton)}
+    className={styles.button}
     icon="presentation"
     label={intl.formatMessage(intlMessages.restorePresentationLabel)}
     description={intl.formatMessage(intlMessages.restorePresentationDesc)}
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx
similarity index 51%
rename from bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
rename to bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx
index 4fa900f54b..f56bad50e5 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx
@@ -7,17 +7,21 @@ import { defineMessages, injectIntl, intlShape } from 'react-intl';
 import { styles } from './styles';
 
 const intlMessages = defineMessages({
-  videoMenu: {
-    id: 'app.video.videoMenu',
-    description: 'video menu label',
+  joinVideo: {
+    id: 'app.video.joinVideo',
+    description: 'Join video button label',
   },
-  videoMenuDesc: {
-    id: 'app.video.videoMenuDesc',
-    description: 'video menu description',
+  leaveVideo: {
+    id: 'app.video.leaveVideo',
+    description: 'Leave video button label',
   },
-  videoMenuDisabled: {
-    id: 'app.video.videoMenuDisabled',
-    description: 'video menu label',
+  videoButtonDesc: {
+    id: 'app.video.videoButtonDesc',
+    description: 'video button description',
+  },
+  videoDisabled: {
+    id: 'app.video.videoDisabled',
+    description: 'video disabled label',
   },
 });
 
@@ -27,33 +31,37 @@ const propTypes = {
   isSharingVideo: PropTypes.bool.isRequired,
 };
 
-const JoinVideoOptions = ({
+const JoinVideoButton = ({
   intl,
   isSharingVideo,
-  videoShareAllowed,
+  isDisabled,
   handleJoinVideo,
   handleCloseVideo,
 }) => {
 
   return (
     <Button
-      label={!videoShareAllowed ?
-        intl.formatMessage(intlMessages.videoMenuDisabled)
+      label={isDisabled ?
+        intl.formatMessage(intlMessages.videoDisabled)
         :
-        intl.formatMessage(intlMessages.videoMenu)
+        (isSharingVideo ?
+          intl.formatMessage(intlMessages.leaveVideo)
+          :
+          intl.formatMessage(intlMessages.joinVideo)
+        )
       }
       className={cx(styles.button, isSharingVideo || styles.ghostButton)}
       onClick={isSharingVideo ? handleCloseVideo : handleJoinVideo}
       hideLabel
-      aria-label={intl.formatMessage(intlMessages.videoMenuDesc)}
+      aria-label={intl.formatMessage(intlMessages.videoButtonDesc)}
       color={isSharingVideo ? 'primary' : 'default'}
       icon={isSharingVideo ? 'video' : 'video_off'}
       ghost={!isSharingVideo}
       size="lg"
       circle
-      disabled={!videoShareAllowed}
+      disabled={isDisabled}
     />
   );
 };
-JoinVideoOptions.propTypes = propTypes;
-export default injectIntl(JoinVideoOptions);
+JoinVideoButton.propTypes = propTypes;
+export default injectIntl(JoinVideoButton);
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-button/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/container.jsx
new file mode 100755
index 0000000000..b21d680e1f
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/container.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import { injectIntl } from 'react-intl';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import VideoPreviewContainer from '/imports/ui/components/video-preview/container';
+import JoinVideoButton from './component';
+import VideoButtonService from './service';
+
+const JoinVideoOptionsContainer = (props) => {
+  const {
+    isSharingVideo,
+    isDisabled,
+    handleJoinVideo,
+    handleCloseVideo,
+    baseName,
+    intl,
+    mountModal,
+    ...restProps
+  } = props;
+
+  const mountPreview = () => { mountModal(<VideoPreviewContainer />); };
+
+  return <JoinVideoButton {...{ handleJoinVideo: mountPreview, handleCloseVideo, isSharingVideo, isDisabled, ...restProps }} />;
+};
+
+export default withModalMounter(injectIntl(withTracker(() => ({
+  baseName: VideoButtonService.baseName,
+  isSharingVideo: VideoButtonService.isSharingVideo(),
+  isDisabled: VideoButtonService.isDisabled(),
+  videoShareAllowed: VideoButtonService.videoShareAllowed(),
+}))(JoinVideoOptionsContainer)));
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/service.js
similarity index 86%
rename from bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js
rename to bigbluebutton-html5/imports/ui/components/video-provider/video-button/service.js
index f17126feb0..a25e62ccf4 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/service.js
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/service.js
@@ -2,7 +2,6 @@ import Settings from '/imports/ui/services/settings';
 import mapUser from '/imports/ui/services/user/mapUser';
 import Auth from '/imports/ui/services/auth';
 import Users from '/imports/api/users/';
-import MediaService from '/imports/ui/components/media/service';
 import VideoService from '../service';
 
 const baseName = Meteor.settings.public.app.basename;
@@ -37,7 +36,5 @@ export default {
   isSharingVideo,
   isDisabled,
   baseName,
-  toggleSwapLayout: MediaService.toggleSwapLayout,
-  swapLayoutAllowed: MediaService.shouldEnableSwapLayout,
   videoShareAllowed,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/styles.scss
similarity index 100%
rename from bigbluebutton-html5/imports/ui/components/video-provider/video-menu/styles.scss
rename to bigbluebutton-html5/imports/ui/components/video-provider/video-button/styles.scss
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
deleted file mode 100755
index a20da734f6..0000000000
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-menu/container.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react';
-import { withTracker } from 'meteor/react-meteor-data';
-import { defineMessages, injectIntl } from 'react-intl';
-import { withModalMounter } from '/imports/ui/components/modal/service';
-import VideoPreviewContainer from '/imports/ui/components/video-preview/container';
-import JoinVideoOptions from './component';
-import VideoMenuService from './service';
-
-const intlMessages = defineMessages({
-  joinVideo: {
-    id: 'app.video.joinVideo',
-    description: 'Join video button label',
-  },
-  leaveVideo: {
-    id: 'app.video.leaveVideo',
-    description: 'Leave video button label',
-  },
-  swapCam: {
-    id: 'app.video.swapCam',
-    description: 'Swap cam button label',
-  },
-  swapCamDesc: {
-    id: 'app.video.swapCamDesc',
-    description: 'Swap cam button description',
-  },
-});
-
-const JoinVideoOptionsContainer = (props) => {
-  const {
-    isSharingVideo,
-    isDisabled,
-    handleJoinVideo,
-    handleCloseVideo,
-    toggleSwapLayout,
-    swapLayoutAllowed,
-    baseName,
-    intl,
-    mountModal,
-    ...restProps
-  } = props;
-
-  const mountPreview = () => { mountModal(<VideoPreviewContainer />); };
-
-  return <JoinVideoOptions {...{ handleJoinVideo: mountPreview, handleCloseVideo, isSharingVideo, ...restProps }} />;
-};
-
-export default withModalMounter(injectIntl(withTracker(() => ({
-  baseName: VideoMenuService.baseName,
-  isSharingVideo: VideoMenuService.isSharingVideo(),
-  isDisabled: VideoMenuService.isDisabled(),
-  videoShareAllowed: VideoMenuService.videoShareAllowed(),
-  toggleSwapLayout: VideoMenuService.toggleSwapLayout,
-  swapLayoutAllowed: VideoMenuService.swapLayoutAllowed(),
-}))(JoinVideoOptionsContainer)));
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 7d75a68fd1..7e945e261c 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -407,6 +407,8 @@
     "app.video.mediaFlowTimeout1020": "Error 1020: media could not reach the server",
     "app.video.swapCam": "Swap",
     "app.video.swapCamDesc": "swap the direction of webcams",
+    "app.video.videoDisabled": "Webcam is disabled",
+    "app.video.videoButtonDesc": "Join video button",
     "app.video.videoMenu": "Video menu",
     "app.video.videoMenuDisabled": "Video menu Webcam is disabled in Settings",
     "app.video.videoMenuDesc": "Open video menu dropdown",

From f1221b89e953cf5560c76d938eac587e03eb762b Mon Sep 17 00:00:00 2001
From: Tainan Felipe <tainanfelipe214@gmail.com>
Date: Mon, 28 Jan 2019 15:04:32 -0200
Subject: [PATCH 155/163] Allow start breakout rooms without users on rooms

---
 .../components/actions-bar/create-breakout-room/component.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
index 22276a9600..3eef45cf9e 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
@@ -155,7 +155,7 @@ class BreakoutRoom extends Component {
       freeJoin,
     } = this.state;
 
-    if (users.length === this.getUserByRoom(0).length) {
+    if (users.length === this.getUserByRoom(0).length && !freeJoin) {
       this.setState({ valid: false });
       return;
     }

From 07b36d8e27c312b6fe94b77b1af7e9e2e9deb63b Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Mon, 28 Jan 2019 15:56:03 -0200
Subject: [PATCH 156/163] Fixed video fullscreen position

---
 .../components/video-provider/fullscreen-button/styles.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
index b4e3790062..644ed81a28 100644
--- a/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/fullscreen-button/styles.scss
@@ -7,12 +7,10 @@
 
 .wrapper {
   position: absolute;
-  bottom: 0;
   right: 0;
   background-color: var(--color-transparent);
   cursor: pointer;
   border: none !important;
-  z-index: 2;
 }
 
 .button {
@@ -27,6 +25,10 @@
   }
 }
 
+.dark {
+  bottom: 0;
+}
+
 .dark .button span i {
   color: var(--color-black);
 }

From 4172a15a36736b625236b6f53d16b3846bd01304 Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Mon, 28 Jan 2019 18:48:06 +0000
Subject: [PATCH 157/163] Check if the mediaDevices scope existes before
 checking for gDM availability

---
 bigbluebutton-client/resources/prod/lib/kurento-extension.js  | 2 +-
 bigbluebutton-client/resources/prod/lib/kurento-utils.js      | 2 +-
 bigbluebutton-html5/client/compatibility/kurento-extension.js | 2 +-
 bigbluebutton-html5/client/compatibility/kurento-utils.js     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/kurento-extension.js b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
index 9f48f5710b..f52b06bc24 100755
--- a/bigbluebutton-client/resources/prod/lib/kurento-extension.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-extension.js
@@ -3,7 +3,7 @@ const isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
 const isChrome = !!window.chrome && !isOpera;
 const isSafari = navigator.userAgent.indexOf('Safari') >= 0 && !isChrome;
 const hasDisplayMedia = (typeof navigator.getDisplayMedia === 'function'
-  || typeof navigator.mediaDevices.getDisplayMedia === 'function');
+  || (navigator.mediaDevices && typeof navigator.mediaDevices.getDisplayMedia === 'function'));
 const kurentoHandler = null;
 const SEND_ROLE = "send";
 const RECV_ROLE = "recv";
diff --git a/bigbluebutton-client/resources/prod/lib/kurento-utils.js b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
index 2a8bfab960..22d8087010 100644
--- a/bigbluebutton-client/resources/prod/lib/kurento-utils.js
+++ b/bigbluebutton-client/resources/prod/lib/kurento-utils.js
@@ -424,7 +424,7 @@ function WebRtcPeer(mode, options, callback) {
                     navigator.getDisplayMedia(recursive.apply(undefined, constraints))
                         .then(gDMCallback)
                         .catch(callback);
-                } else if (typeof navigator.mediaDevices.getDisplayMedia === 'function') {
+                } else if (navigator.mediaDevices && typeof navigator.mediaDevices.getDisplayMedia === 'function') {
                     navigator.mediaDevices.getDisplayMedia(recursive.apply(undefined, constraints))
                         .then(gDMCallback)
                         .catch(callback);
diff --git a/bigbluebutton-html5/client/compatibility/kurento-extension.js b/bigbluebutton-html5/client/compatibility/kurento-extension.js
index 0a181e56cf..8c167fbb79 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-extension.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-extension.js
@@ -4,7 +4,7 @@ const isChrome = !!window.chrome && !isOpera;
 const isSafari = navigator.userAgent.indexOf('Safari') >= 0 && !isChrome;
 const isElectron = navigator.userAgent.toLowerCase().indexOf(' electron/') > -1;
 const hasDisplayMedia = (typeof navigator.getDisplayMedia === 'function'
-  || typeof navigator.mediaDevices.getDisplayMedia === 'function');
+  || (navigator.mediaDevices && typeof navigator.mediaDevices.getDisplayMedia === 'function'));
 const kurentoHandler = null;
 
 Kurento = function (
diff --git a/bigbluebutton-html5/client/compatibility/kurento-utils.js b/bigbluebutton-html5/client/compatibility/kurento-utils.js
index 7e118d2d9d..bf621aff2c 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-utils.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-utils.js
@@ -475,7 +475,7 @@ function WebRtcPeer(mode, options, callback) {
                     navigator.getDisplayMedia(recursive.apply(undefined, constraints))
                         .then(gDMCallback)
                         .catch(callback);
-                } else if (typeof navigator.mediaDevices.getDisplayMedia === 'function') {
+                } else if (navigator.mediaDevices && typeof navigator.mediaDevices.getDisplayMedia === 'function') {
                     navigator.mediaDevices.getDisplayMedia(recursive.apply(undefined, constraints))
                         .then(gDMCallback)
                         .catch(callback);

From ba198e82c6ebb623ff1d19389e2d140ff8b62736 Mon Sep 17 00:00:00 2001
From: Joao Siebel <joaos_desenv@imdt.com.br>
Date: Tue, 29 Jan 2019 13:17:09 -0200
Subject: [PATCH 158/163] add unlock/lock individual attendee when the meeting
 is locked. close #6661

---
 .../imports/api/users/server/eventHandlers.js |  1 -
 .../imports/api/users/server/methods.js       |  2 +
 .../users/server/methods/toggleUserLock.js    | 29 ++++++++++++
 .../ui/components/user-list/component.jsx     |  3 ++
 .../ui/components/user-list/container.jsx     |  2 +
 .../ui/components/user-list/service.js        | 45 +++++++++++--------
 .../user-list/user-list-content/component.jsx |  3 ++
 .../user-participants/component.jsx           |  3 ++
 .../user-participants/container.jsx           |  2 +-
 .../user-list-item/component.jsx              |  3 ++
 .../user-dropdown/component.jsx               | 25 ++++++++++-
 bigbluebutton-html5/private/locales/en.json   |  2 +
 12 files changed, 98 insertions(+), 22 deletions(-)
 create mode 100644 bigbluebutton-html5/imports/api/users/server/methods/toggleUserLock.js

diff --git a/bigbluebutton-html5/imports/api/users/server/eventHandlers.js b/bigbluebutton-html5/imports/api/users/server/eventHandlers.js
index 5d9f55fb0e..de7a3e4d78 100644
--- a/bigbluebutton-html5/imports/api/users/server/eventHandlers.js
+++ b/bigbluebutton-html5/imports/api/users/server/eventHandlers.js
@@ -20,4 +20,3 @@ RedisPubSub.on('GuestsWaitingForApprovalEvtMsg', handleGuestsWaitingForApproval)
 RedisPubSub.on('GuestsWaitingApprovedEvtMsg', handleGuestApproved);
 RedisPubSub.on('UserEjectedFromMeetingEvtMsg', handleUserEjected);
 RedisPubSub.on('UserRoleChangedEvtMsg', handleChangeRole);
-
diff --git a/bigbluebutton-html5/imports/api/users/server/methods.js b/bigbluebutton-html5/imports/api/users/server/methods.js
index 739c8d1dbf..6736d3a1ba 100644
--- a/bigbluebutton-html5/imports/api/users/server/methods.js
+++ b/bigbluebutton-html5/imports/api/users/server/methods.js
@@ -4,6 +4,7 @@ import setEmojiStatus from './methods/setEmojiStatus';
 import assignPresenter from './methods/assignPresenter';
 import changeRole from './methods/changeRole';
 import removeUser from './methods/removeUser';
+import toggleUserLock from './methods/toggleUserLock';
 
 Meteor.methods({
   setEmojiStatus,
@@ -11,4 +12,5 @@ Meteor.methods({
   changeRole,
   removeUser,
   validateAuthToken,
+  toggleUserLock,
 });
diff --git a/bigbluebutton-html5/imports/api/users/server/methods/toggleUserLock.js b/bigbluebutton-html5/imports/api/users/server/methods/toggleUserLock.js
new file mode 100644
index 0000000000..0919194b92
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/users/server/methods/toggleUserLock.js
@@ -0,0 +1,29 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import RedisPubSub from '/imports/startup/server/redis';
+import Logger from '/imports/startup/server/logger';
+
+export default function toggleUserLock(credentials, userId, lock) {
+  const REDIS_CONFIG = Meteor.settings.private.redis;
+  const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
+  const EVENT_NAME = 'LockUserInMeetingCmdMsg';
+
+  const { meetingId, requesterUserId: lockedBy } = credentials;
+
+  check(meetingId, String);
+  check(lockedBy, String);
+  check(userId, String);
+  check(lock, Boolean);
+
+  const payload = {
+    lockedBy,
+    userId,
+    lock,
+  };
+
+  Logger.verbose(`User ${lockedBy} updated lock status from ${userId} to ${lock}
+  in meeting ${meetingId}`);
+
+
+  return RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, lockedBy, payload);
+}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
index 1a00e4a275..04e126d05a 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
@@ -31,6 +31,7 @@ const propTypes = {
   roving: PropTypes.func.isRequired,
   getGroupChatPrivate: PropTypes.func.isRequired,
   showBranding: PropTypes.bool.isRequired,
+  toggleUserLock: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
@@ -67,6 +68,7 @@ class UserList extends PureComponent {
       hasBreakoutRoom,
       getUsersId,
       hasPrivateChatBetweenUsers,
+      toggleUserLock,
     } = this.props;
 
     return (
@@ -103,6 +105,7 @@ class UserList extends PureComponent {
             hasBreakoutRoom,
             getUsersId,
             hasPrivateChatBetweenUsers,
+            toggleUserLock,
           }
           }
         />}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
index c2cf35d53f..8fcc687aae 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/container.jsx
@@ -24,6 +24,7 @@ const propTypes = {
   changeRole: PropTypes.func.isRequired,
   roving: PropTypes.func.isRequired,
   getGroupChatPrivate: PropTypes.func.isRequired,
+  toggleUserLock: PropTypes.func.isRequired,
 };
 
 const UserListContainer = props => <UserList {...props} />;
@@ -56,4 +57,5 @@ export default withTracker(({ chatID, compact }) => ({
   getEmoji: Service.getEmoji(),
   showBranding: getFromUserSettings('displayBrandingArea', Meteor.settings.public.app.branding.displayBrandingArea),
   hasPrivateChatBetweenUsers: Service.hasPrivateChatBetweenUsers,
+  toggleUserLock: Service.toggleUserLock,
 }))(UserListContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index 17fde8ed15..487997f5a3 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -260,6 +260,24 @@ const getActiveChats = (chatID) => {
 
 const isVoiceOnlyUser = userId => userId.toString().startsWith('v_');
 
+const isMeetingLocked = (id) => {
+  const meeting = Meetings.findOne({ meetingId: id });
+  let isLocked = false;
+
+  if (meeting.lockSettingsProp !== undefined) {
+    const lockSettings = meeting.lockSettingsProp;
+
+    if (lockSettings.disableCam
+      || lockSettings.disableMic
+      || lockSettings.disablePrivChat
+      || lockSettings.disablePubChat) {
+      isLocked = true;
+    }
+  }
+
+  return isLocked;
+};
+
 const getAvailableActions = (currentUser, user, isBreakoutRoom) => {
   const isDialInUser = isVoiceOnlyUser(user.id) || user.isPhoneUser;
 
@@ -301,6 +319,9 @@ const getAvailableActions = (currentUser, user, isBreakoutRoom) => {
 
   const allowedToChangeStatus = user.isCurrent;
 
+  const allowedToChangeUserLockStatus = currentUser.isModerator
+    && !user.isModerator && isMeetingLocked(Auth.meetingID);
+
   return {
     allowedToChatPrivately,
     allowedToMuteAudio,
@@ -311,6 +332,7 @@ const getAvailableActions = (currentUser, user, isBreakoutRoom) => {
     allowedToPromote,
     allowedToDemote,
     allowedToChangeStatus,
+    allowedToChangeUserLockStatus,
   };
 };
 
@@ -325,24 +347,6 @@ const normalizeEmojiName = emoji => (
   emoji in EMOJI_STATUSES ? EMOJI_STATUSES[emoji] : emoji
 );
 
-const isMeetingLocked = (id) => {
-  const meeting = Meetings.findOne({ meetingId: id });
-  let isLocked = false;
-
-  if (meeting.lockSettingsProp !== undefined) {
-    const lockSettings = meeting.lockSettingsProp;
-
-    if (lockSettings.disableCam
-      || lockSettings.disableMic
-      || lockSettings.disablePrivChat
-      || lockSettings.disablePubChat) {
-      isLocked = true;
-    }
-  }
-
-  return isLocked;
-};
-
 const setEmojiStatus = (data) => {
   const statusAvailable = (Object.keys(EMOJI_STATUSES).includes(data));
 
@@ -448,6 +452,10 @@ const isUserModerator = (userId) => {
   return u ? u.moderator : false;
 };
 
+const toggleUserLock = (userId, lockStatus) => {
+  makeCall('toggleUserLock', userId, lockStatus);
+};
+
 export default {
   setEmojiStatus,
   assignPresenter,
@@ -473,4 +481,5 @@ export default {
   getEmojiList: () => EMOJI_STATUSES,
   getEmoji: () => Users.findOne({ userId: Auth.userID }).emoji,
   hasPrivateChatBetweenUsers,
+  toggleUserLock,
 };
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
index 9a12a07195..2332e2d825 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
@@ -32,6 +32,7 @@ const propTypes = {
   getUsersId: PropTypes.func.isRequired,
   pollIsOpen: PropTypes.bool.isRequired,
   forcePollOpen: PropTypes.bool.isRequired,
+  toggleUserLock: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
@@ -68,6 +69,7 @@ class UserContent extends PureComponent {
       hasBreakoutRoom,
       getUsersId,
       hasPrivateChatBetweenUsers,
+      toggleUserLock,
     } = this.props;
 
     return (
@@ -121,6 +123,7 @@ class UserContent extends PureComponent {
             getGroupChatPrivate,
             getUsersId,
             hasPrivateChatBetweenUsers,
+            toggleUserLock,
           }}
         />
       </div>
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
index aa2276dad5..aa336b5849 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
@@ -31,6 +31,7 @@ const propTypes = {
   normalizeEmojiName: PropTypes.func.isRequired,
   isMeetingLocked: PropTypes.func.isRequired,
   roving: PropTypes.func.isRequired,
+  toggleUserLock: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
@@ -126,6 +127,7 @@ class UserParticipants extends Component {
       getEmoji,
       users,
       hasPrivateChatBetweenUsers,
+      toggleUserLock,
     } = this.props;
 
     let index = -1;
@@ -161,6 +163,7 @@ class UserParticipants extends Component {
               changeRole,
               getGroupChatPrivate,
               hasPrivateChatBetweenUsers,
+              toggleUserLock,
             }}
             userId={u}
             getScrollContainerRef={this.getScrollContainerRef}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/container.jsx
index b5ef848a0d..2ccb85ca97 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/container.jsx
@@ -3,7 +3,7 @@ import { withTracker } from 'meteor/react-meteor-data';
 import Meetings from '/imports/api/meetings';
 import UserParticipants from './component';
 
-const UserParticipantsContainer = ({ ...props }) => <UserParticipants {...props} />;
+const UserParticipantsContainer = props => <UserParticipants {...props} />;
 
 export default withTracker(({ getUsersId }) => ({
   meeting: Meetings.findOne({}),
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
index 701d0d6168..2ffad3e01a 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
@@ -18,6 +18,7 @@ const propTypes = {
   isMeetingLocked: PropTypes.func.isRequired,
   normalizeEmojiName: PropTypes.func.isRequired,
   getScrollContainerRef: PropTypes.func.isRequired,
+  toggleUserLock: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
@@ -47,6 +48,7 @@ class UserListItem extends PureComponent {
       setEmojiStatus,
       toggleVoice,
       hasPrivateChatBetweenUsers,
+      toggleUserLock,
     } = this.props;
 
     const { meetingId, lockSettingsProp } = meeting;
@@ -75,6 +77,7 @@ class UserListItem extends PureComponent {
           toggleVoice,
           user,
           hasPrivateChatBetweenUsers,
+          toggleUserLock,
         }}
       />
     );
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index c5f5422c63..7ab54c5fa6 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -81,6 +81,14 @@ const messages = defineMessages({
     id: 'app.userList.menu.demoteUser.label',
     description: 'Forcefully demote this moderator to a viewer',
   },
+  UnlockUserLabel: {
+    id: 'app.userList.menu.unlockUser.label',
+    description: 'Unlock individual user',
+  },
+  LockUserLabel: {
+    id: 'app.userList.menu.lockUser.label',
+    description: 'Lock a unlocked user',
+  },
 });
 
 const propTypes = {
@@ -92,6 +100,7 @@ const propTypes = {
   normalizeEmojiName: PropTypes.func.isRequired,
   isMeetingLocked: PropTypes.func.isRequired,
   getScrollContainerRef: PropTypes.func.isRequired,
+  toggleUserLock: PropTypes.func.isRequired,
 };
 
 class UserDropdown extends PureComponent {
@@ -196,6 +205,7 @@ class UserDropdown extends PureComponent {
       changeRole,
       lockSettingsProp,
       hasPrivateChatBetweenUsers,
+      toggleUserLock,
     } = this.props;
 
     const { showNestedOptions } = this.state;
@@ -213,6 +223,7 @@ class UserDropdown extends PureComponent {
       allowedToPromote,
       allowedToDemote,
       allowedToChangeStatus,
+      allowedToChangeUserLockStatus,
     } = actionPermissions;
 
     const { disablePrivChat } = lockSettingsProp;
@@ -331,6 +342,16 @@ class UserDropdown extends PureComponent {
       ));
     }
 
+    if (allowedToChangeUserLockStatus) {
+      actions.push(this.makeDropdownItem(
+        'unlockUser',
+        user.isLocked ? intl.formatMessage(messages.UnlockUserLabel, { 0: user.name })
+          : intl.formatMessage(messages.LockUserLabel, { 0: user.name }),
+        () => this.onActionsHide(toggleUserLock(user.id, !user.isLocked)),
+        user.isLocked ? 'unlock' : 'lock',
+      ));
+    }
+
     return actions;
   }
 
@@ -438,7 +459,7 @@ class UserDropdown extends PureComponent {
         voice={user.isVoiceUser}
         color={user.color}
       >
-        {isVoiceOnly ? iconVoiceOnlyUser : iconUser }
+        {isVoiceOnly ? iconVoiceOnlyUser : iconUser}
       </UserAvatar>
     );
   }
@@ -491,7 +512,7 @@ class UserDropdown extends PureComponent {
       >
         <div className={styles.userItemContents}>
           <div className={styles.userAvatar}>
-            { this.renderUserAvatar() }
+            {this.renderUserAvatar()}
           </div>
           {<UserName
             {...{
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 2c8f37bfd5..55b9807da9 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -43,6 +43,8 @@
     "app.userList.userAriaLabel": "{0} {1} {2}  Status {3}",
     "app.userList.menu.promoteUser.label": "Promote to moderator",
     "app.userList.menu.demoteUser.label": "Demote to viewer",
+    "app.userList.menu.unlockUser.label": "Unlock {0}",
+    "app.userList.menu.lockUser.label": "Lock {0}",
     "app.userList.userOptions.manageUsersLabel": "Manage users",
     "app.userList.userOptions.muteAllLabel": "Mute all users",
     "app.userList.userOptions.muteAllDesc": "Mutes all users in the meeting",

From 615ed6658cd894f100033dfaaa9b312a8907b1ca Mon Sep 17 00:00:00 2001
From: Joao Siebel <joaos_desenv@imdt.com.br>
Date: Tue, 29 Jan 2019 15:16:07 -0200
Subject: [PATCH 159/163] change manage users visibility for attendees. close
 #6675

---
 .../user-participants/component.jsx           | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
index aa336b5849..d77c8e349f 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
@@ -203,20 +203,24 @@ class UserParticipants extends Component {
               <div className={styles.container}>
                 <h2 className={styles.smallTitle}>
                   {intl.formatMessage(intlMessages.usersTitle)}
-                &nbsp;(
+                  &nbsp;(
                   {users.length}
-)
-
+                  )
                 </h2>
-                <UserOptionsContainer {...{
-                  users,
-                  muteAllUsers,
-                  muteAllExceptPresenter,
-                  setEmojiStatus,
-                  meeting,
-                  currentUser,
-                }}
-                />
+                {currentUser.isModerator
+                  ? (
+                    <UserOptionsContainer {...{
+                      users,
+                      muteAllUsers,
+                      muteAllExceptPresenter,
+                      setEmojiStatus,
+                      meeting,
+                      currentUser,
+                    }}
+                    />
+                  ) : null
+                }
+
               </div>
             )
             : <hr className={styles.separator} />

From 76bf828a0294cd0a04deeec0d4cf7c3f1bbf70ff Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Tue, 29 Jan 2019 21:15:10 +0000
Subject: [PATCH 160/163] pulled latest HTML5 client locales from Transifex

---
 .../imports/startup/client/intl.jsx           |   2 +
 bigbluebutton-html5/private/locales/de.json   | 100 +++++-
 bigbluebutton-html5/private/locales/es.json   | 297 ++++++++++++++++++
 .../private/locales/pl_PL.json                |  41 +++
 4 files changed, 439 insertions(+), 1 deletion(-)
 create mode 100644 bigbluebutton-html5/private/locales/es.json
 create mode 100644 bigbluebutton-html5/private/locales/pl_PL.json

diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index b400dc9894..ec31ea1683 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -21,6 +21,7 @@ import id from 'react-intl/locale-data/id';
 import el from 'react-intl/locale-data/el';
 import it from 'react-intl/locale-data/it';
 import bg from 'react-intl/locale-data/bg';
+import pl from 'react-intl/locale-data/pl';
 
 
 addLocaleData([
@@ -40,6 +41,7 @@ addLocaleData([
   ...el,
   ...it,
   ...bg,
+  ...pl,
 ]);
 
 const propTypes = {
diff --git a/bigbluebutton-html5/private/locales/de.json b/bigbluebutton-html5/private/locales/de.json
index ba68eac7d1..5e074a700f 100644
--- a/bigbluebutton-html5/private/locales/de.json
+++ b/bigbluebutton-html5/private/locales/de.json
@@ -18,9 +18,13 @@
     "app.chat.label": "Chat",
     "app.chat.emptyLogLabel": "Chat-Log ist leer",
     "app.chat.clearPublicChatMessage": "Der öffentliche Chatverlauf wurde durch einen Moderator gelöscht",
+    "app.note.title": "Geteilte Notizen",
+    "app.note.label": "Notiz",
+    "app.note.hideNoteLabel": "Notiz verbergen",
     "app.userList.usersTitle": "Teilnehmer",
     "app.userList.participantsTitle": "Teilnehmer",
     "app.userList.messagesTitle": "Nachrichten",
+    "app.userList.notesTitle": "Notizen",
     "app.userList.presenter": "Präsentator",
     "app.userList.you": "Sie",
     "app.userList.locked": "Gesperrt",
@@ -39,6 +43,17 @@
     "app.userList.userAriaLabel": "{0} {1} {2}  Status {3}",
     "app.userList.menu.promoteUser.label": "Zum Moderator befördern",
     "app.userList.menu.demoteUser.label": "Zum Zuschauer zurückstufen",
+    "app.userList.userOptions.manageUsersLabel": "Teilnehmer verwalten",
+    "app.userList.userOptions.muteAllLabel": "Alle Teilnehmer stummschalten",
+    "app.userList.userOptions.muteAllDesc": "Schaltet alle Teilnehmer der Konferenz stumm",
+    "app.userList.userOptions.clearAllLabel": "Lösche alle Statusicons",
+    "app.userList.userOptions.clearAllDesc": "Löscht alle Statusicons der Teilnehmer",
+    "app.userList.userOptions.muteAllExceptPresenterLabel": "Schalte alle Teilnehmer außer den Präsentator stumm",
+    "app.userList.userOptions.muteAllExceptPresenterDesc": "Schaltet alle Teilnehmer außer den Präsentator stumm",
+    "app.userList.userOptions.unmuteAllLabel": "Konferenz-Stummschaltung aufheben",
+    "app.userList.userOptions.unmuteAllDesc": "Hebt die Konferenz-Stummschaltung auf",
+    "app.userList.userOptions.lockViewersLabel": "Zuschauerrechte einschränken",
+    "app.userList.userOptions.lockViewersDesc": "Schränkt bestimmte Funktionen der Konferenzteilnehmer ein",
     "app.media.label": "Media",
     "app.media.screenshare.start": "Bildschirmfreigabe wurde gestartet",
     "app.media.screenshare.end": "Bildschirmfreigabe wurde gestoppt",
@@ -57,6 +72,11 @@
     "app.presentation.presentationToolbar.fitScreenDesc": "Gesamte Folie darstellen",
     "app.presentation.presentationToolbar.zoomLabel": "Vergrößerungsgrad",
     "app.presentation.presentationToolbar.zoomDesc": "Vergrößerungsstufe der Präsentation ändern",
+    "app.presentation.presentationToolbar.zoomInLabel": "Reinzoomen",
+    "app.presentation.presentationToolbar.zoomInDesc": "In die Präsentation hinein zoomen",
+    "app.presentation.presentationToolbar.zoomOutLabel": "Rauszoomen",
+    "app.presentation.presentationToolbar.zoomOutDesc": "Aus der Präsentation heraus zoomen",
+    "app.presentation.presentationToolbar.zoomIndicator": "Zoomstufe anzeigen",
     "app.presentation.presentationToolbar.fitToWidth": "An Breite anpassen",
     "app.presentation.presentationToolbar.goToSlide": "Folie {0}",
     "app.presentationUploder.title": "Präsentation",
@@ -66,10 +86,13 @@
     "app.presentationUploder.dismissLabel": "Abbrechen",
     "app.presentationUploder.dismissDesc": "Fenster schließen und Änderungen verwerfen",
     "app.presentationUploder.dropzoneLabel": "Hochzuladende Dateien hier hin ziehen",
+    "app.presentationUploder.dropzoneImagesLabel": "Bilder hier hinziehen, um sie hochzuladen",
     "app.presentationUploder.browseFilesLabel": "oder nach Dateien suchen",
+    "app.presentationUploder.browseImagesLabel": "oder auf der Festplatte nach Bildern suchen",
     "app.presentationUploder.fileToUpload": "Hochzuladende Datei...",
     "app.presentationUploder.currentBadge": "Aktuell",
     "app.presentationUploder.genericError": "Ups, irgendwas ist schief gelaufen",
+    "app.presentationUploder.rejectedError": "Einige der ausgewählten Dateien wurden zurückgewiesen. Bitte prüfen Sie die Datei-Mime-Typen",
     "app.presentationUploder.upload.progress": "Hochladen ({0}%)",
     "app.presentationUploder.upload.413": "Die Datei ist zu groß",
     "app.presentationUploder.conversion.conversionProcessingSlides": "Verarbeite Seite {0} von {1}",
@@ -79,8 +102,25 @@
     "app.presentationUploder.conversion.generatingSvg": "Erzeuge SVG Bilder...",
     "app.presentationUploder.conversion.pageCountExceeded": "Ups, die Seitenanzahl überschreitet das Limit",
     "app.presentationUploder.conversion.timeout": "Ups, die Konvertierung dauert zu lange",
+    "app.poll.pollPaneTitle": "Umfrage",
+    "app.poll.hidePollDesc": "Versteckt das Umfragemenü",
+    "app.poll.customPollInstruction": "Um selbst erstellte Umfrage zu erstellen, klicken Sie die untenstehende Schaltfläche und geben Sie Ihre Optionen ein",
+    "app.poll.quickPollInstruction": "Wählen Sie eine Schnellumfrageoption aus und starten Sie die Umfrage.",
+    "app.poll.customPollLabel": "Selbst erstellte Umfrage",
+    "app.poll.startCustomLabel": "Selbst erstellte Umfrage starten",
+    "app.poll.activePollInstruction": "Lassen Sie dieses Fenster solange geöffnet, bis alle Antworten abgegeben wurden. Wählen Sie 'Umfrage veröffentlichen' oder navigieren Sie einen Schritt zurück, um die Umfrage zu beenden.",
+    "app.poll.publishLabel": "Umfrage veröffentlichen",
+    "app.poll.backLabel": "Zurück zu den Umfrageoptionen",
     "app.poll.closeLabel": "Schließen",
+    "app.poll.customPlaceholder": "Umfrageoption hinzufügen",
+    "app.poll.tf": "Richtig / Falsch",
+    "app.poll.yn": "Ja / Nein",
+    "app.poll.a2": "A / B",
+    "app.poll.a3": "A / B / C",
+    "app.poll.a4": "A / B / C / D",
+    "app.poll.a5": "A / B / C / D / E",
     "app.poll.liveResult.usersTitle": "Teilnehmer",
+    "app.poll.liveResult.responsesTitle": "Antwort",
     "app.polling.pollingTitle": "Umfrage Optionen",
     "app.polling.pollAnswerLabel": "Umfrageantwort {0}",
     "app.polling.pollAnswerDesc": "Diese Option auswählen für Umfrage {0}",
@@ -102,6 +142,8 @@
     "app.navBar.settingsDropdown.hotkeysDesc": "Liste verfügbarer Tastaturkürzel",
     "app.navBar.settingsDropdown.helpLabel": "Hilfe",
     "app.navBar.settingsDropdown.helpDesc": "Verlinkt zu den Videoanleitungen",
+    "app.navBar.settingsDropdown.endMeetingDesc": "Beendet die aktuelle Konferenz",
+    "app.navBar.settingsDropdown.endMeetingLabel": "Beende Konferenz",
     "app.navBar.userListToggleBtnLabel": "Teilnehmerliste umschalten",
     "app.navBar.toggleUserList.ariaLabel": "Teilnehmer/Nachrichten-Umschalter",
     "app.navBar.toggleUserList.newMessages": "mit Benachrichtigung für neue Nachrichten",
@@ -110,6 +152,8 @@
     "app.navBar.recording.off": "Keine Aufnahme",
     "app.leaveConfirmation.confirmLabel": "Verlassen",
     "app.leaveConfirmation.confirmDesc": "Hiermit verlassen Sie Konferenz",
+    "app.endMeeting.title": "Beende Konferenz",
+    "app.endMeeting.description": "Sind Sie sicher, dass Sie die Konferenz beenden wollen?",
     "app.endMeeting.yesLabel": "Ja",
     "app.endMeeting.noLabel": "Nein",
     "app.about.title": "Versionsinfo",
@@ -198,6 +242,12 @@
     "app.actionsBar.actionsDropdown.initPollDesc": "Eine Umfrage starten",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "Ihren Bildschirm mit anderen teilen",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Bildschirmfreigabe beenden mit",
+    "app.actionsBar.actionsDropdown.pollBtnLabel": "Umfrage starten",
+    "app.actionsBar.actionsDropdown.pollBtnDesc": "Umschalten des Umfragemenüs",
+    "app.actionsBar.actionsDropdown.createBreakoutRoom": "Breakout-Räume erstellen",
+    "app.actionsBar.actionsDropdown.createBreakoutRoomDesc": "ermöglicht die aktuelle Konferenz in mehrere Räume aufzuteilen",
+    "app.actionsBar.actionsDropdown.takePresenter": "Rolle des Präsentators übernehmen",
+    "app.actionsBar.actionsDropdown.takePresenterDesc": "Sich selber zum neuen Präsentator machen",
     "app.actionsBar.emojiMenu.statusTriggerLabel": "Status setzen",
     "app.actionsBar.emojiMenu.awayLabel": "Abwesend",
     "app.actionsBar.emojiMenu.awayDesc": "Ihren Status auf abwesend setzen",
@@ -293,6 +343,7 @@
     "app.error.404": "Nicht gefunden",
     "app.error.401": "Nicht erlaubt",
     "app.error.403": "Verboten",
+    "app.error.400": "Ungültige Anfrage",
     "app.error.leaveLabel": "Erneut einloggen",
     "app.guest.waiting": "Warte auf Erlaubnis zur Konferenzteilnahme",
     "app.toast.breakoutRoomEnded": "Breakout Raum wurde beendet. Bitte klicken Sie aufs Mikrofon-Icon um wieder der Audiokonferenz im Hauptraum beizutreten",
@@ -315,13 +366,28 @@
     "app.shortcut-help.closePrivateChat": "Privaten Chat schließen",
     "app.shortcut-help.openActions": "Aktionsmenü öffnen",
     "app.shortcut-help.openStatus": "Statusmenü öffnen",
+    "app.lock-viewers.title": "Zuschauerfunktionen einschränken",
+    "app.lock-viewers.description": "Diese Optionen erlauben es Ihnen, bestimmte den Zuschauern zur Verfügung stehende Funktionen einzuschränken - so kann beispielsweise der private Chat unterbunden werden (Diese Einschränkungen gelten nicht für Moderatoren)",
+    "app.lock-viewers.featuresLable": "Funktion",
+    "app.lock-viewers.lockStatusLabel": "Aktiviert",
     "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.otherViewersWebcamLabel": "Nur Moderatoren sehen Webcams",
     "app.lock-viewers.microphoneLable": "Mit Mikrofon",
     "app.lock-viewers.PublicChatLabel": "Öffentlicher Chat",
     "app.lock-viewers.PrivateChatLable": "Privater Chat",
     "app.lock-viewers.Layout": "Layout",
+    "app.recording.startTitle": "Aufzeichnung starten",
+    "app.recording.stopTitle": "Aufzeichnung stoppen",
+    "app.recording.startDescription": "Klicken Sie erneut auf das Icon um die Aufzeichnung zu beenden.",
+    "app.recording.stopDescription": "Sind Sie sicher, dass Sie die Aufzeichnung der Konferenz beenden wollen? Sie können die Aufzeichnung jederzeit durch erneutes Klicken auf das Icon fortsetzen.",
+    "app.videoPreview.cameraLabel": "Kamera",
     "app.videoPreview.cancelLabel": "Abbrechen",
     "app.videoPreview.closeLabel": "Schließen",
+    "app.videoPreview.startSharingLabel": "Kamerafreigabe starten",
+    "app.videoPreview.webcamOptionLabel": "Webcam auswählen",
+    "app.videoPreview.webcamPreviewLabel": "Webcamvorschau",
+    "app.videoPreview.webcamSettingsTitle": "Webcam-Einstellungen",
+    "app.videoPreview.webcamNotFoundLabel": "Keine Webcam gefunden",
     "app.video.joinVideo": "Webcam freigeben",
     "app.video.leaveVideo": "Webcam stoppen",
     "app.video.iceCandidateError": "Fehler beim Hinzufügen vom ice candidate",
@@ -332,6 +398,7 @@
     "app.video.notAllowed": "Freigabeerlaubnis für die Webcam nicht erteilt, prüfen Sie Ihre Browerberechtigungen",
     "app.video.notSupportedError": "Webcam kann nur über sichere Verbindung freigegeben werden, stellen Sie sicher, dass das SSL-Zertifikat gültig ist",
     "app.video.notReadableError": "Konnte nicht auf die Webcam zugreifen. Stellen Sie sicher, dass kein anderes Programm auf die Webcam zugreift",
+    "app.video.mediaFlowTimeout1020": "Fehler 1020: Medienverbindung zum Server konnte nicht hergestellt werden",
     "app.video.swapCam": "Wechseln",
     "app.video.swapCamDesc": "Ausrichtung der Webcams wechseln",
     "app.video.videoMenu": "Videomenü",
@@ -359,10 +426,12 @@
     "app.sfu.mediaServerRequestTimeout2003": "Fehler 2003: Zeitüberschreitung bei Anfragen an den Mediaserver",
     "app.sfu.serverIceGatheringFailed2021": "Fehler 2021: Mediaserver kann ICE Kandidaten nicht erfassen",
     "app.sfu.serverIceGatheringFailed2022": "Fehler 2022: Mediaserver ICE Verbindung fehlgeschlagen",
+    "app.sfu.mediaGenericError2200": "Fehler 2200: Medienserver konnte die Anfrage nicht verarbeiten",
     "app.sfu.invalidSdp2202":"Fehler 2202: Client hat ungültigen SDP generiert",
     "app.sfu.noAvailableCodec2203": "Fehler 2203: Server konnte keinen passenden Codec finden",
     "app.meeting.endNotification.ok.label": "OK",
     "app.whiteboard.toolbar.tools": "Werkzeuge",
+    "app.whiteboard.toolbar.tools.hand": "Verschieben",
     "app.whiteboard.toolbar.tools.pencil": "Stift",
     "app.whiteboard.toolbar.tools.rectangle": "Rechteck",
     "app.whiteboard.toolbar.tools.triangle": "Dreieck",
@@ -399,8 +468,37 @@
     "app.videoDock.webcamFocusDesc": "Ausgewählte Webcam vergrößern",
     "app.videoDock.webcamUnfocusLabel": "Normalgröße",
     "app.videoDock.webcamUnfocusDesc": "Ausgewählte Webcam auf Normalgröße verkleinern",
+    "app.invitation.title": "Breakoutraum-Einladung",
+    "app.invitation.confirm": "Einladen",
+    "app.createBreakoutRoom.title": "Breakout-Räume",
+    "app.createBreakoutRoom.breakoutRoomLabel": "Breakout-Räume {0}",
+    "app.createBreakoutRoom.generatingURL": "Erzeuge URL",
+    "app.createBreakoutRoom.generatedURL": "Erzeugt",
+    "app.createBreakoutRoom.duration": "Dauer {0}",
+    "app.createBreakoutRoom.room": "Raum {0}",
+    "app.createBreakoutRoom.notAssigned": "Nicht zugewiesen ({0})",
+    "app.createBreakoutRoom.join": "Raum beitreten",
     "app.createBreakoutRoom.joinAudio": "Audio starten",
-    "app.externalVideo.close": "Schließen"
+    "app.createBreakoutRoom.returnAudio": "Return audio",
+    "app.createBreakoutRoom.confirm": "Erstellen",
+    "app.createBreakoutRoom.numberOfRooms": "Anzahl der Räume",
+    "app.createBreakoutRoom.durationInMinutes": "Dauer (Minuten)",
+    "app.createBreakoutRoom.randomlyAssign": "Zufällige Raumzuweisung",
+    "app.createBreakoutRoom.endAllBreakouts": "Alle Breakout-Räume beenden",
+    "app.createBreakoutRoom.roomName": "{0} (Raum - {1})",
+    "app.createBreakoutRoom.doneLabel": "Fertig",
+    "app.createBreakoutRoom.nextLabel": "Nächster",
+    "app.createBreakoutRoom.addParticipantLabel": "+ Teilnehmer hinzufügen",
+    "app.createBreakoutRoom.freeJoin": "Den Teilnehmern erlauben, sich selber einen Breakout-Raum auszusuchen.",
+    "app.createBreakoutRoom.leastOneWarnBreakout": "Jedem Breakout-Raum muss wenigstens ein Teilnehmer zugeordnet sein.",
+    "app.createBreakoutRoom.modalDesc": "Vervollständigen Sie die folgenden Schritte um Breakout-Räume zu erzeugen. Verteilen Sie die Teilnehmer auf die Räume.",
+    "app.externalVideo.start": "Neues Video teilen",
+    "app.externalVideo.stop": "Teilen des Videos beenden",
+    "app.externalVideo.title": "Youtube-Video teilen",
+    "app.externalVideo.input": "Youtube-Video URL",
+    "app.externalVideo.urlError": "Dies ist kein gültiges Youtube-Video",
+    "app.externalVideo.close": "Schließen",
+    "app.actionsBar.actionsDropdown.shareExternalVideo": "Youtube-Video teilen"
 
 }
 
diff --git a/bigbluebutton-html5/private/locales/es.json b/bigbluebutton-html5/private/locales/es.json
new file mode 100644
index 0000000000..35e0cfa99c
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/es.json
@@ -0,0 +1,297 @@
+{
+    "app.home.greeting": "¡Bienvenido {0}! Tu presentación iniciará en breve...",
+    "app.chat.submitLabel": "Enviar mensaje",
+    "app.chat.errorMinMessageLength": "El mensaje es {0} caracteres mas corto de lo esperado",
+    "app.chat.errorMaxMessageLength": "El mensaje es {0} caracteres mas largo de lo esperado",
+    "app.chat.inputLabel": "Entrada de mensaje para chat {0}",
+    "app.chat.inputPlaceholder": "Mensaje {0}",
+    "app.chat.titlePublic": "Chat público",
+    "app.chat.titlePrivate": "Chat privado con {0}",
+    "app.chat.partnerDisconnected": "{0} ha abandonado la reunión",
+    "app.chat.closeChatLabel": "Cerrar {0}",
+    "app.chat.hideChatLabel": "Ocultar  {0}",
+    "app.chat.moreMessages": "Más mensajes abajo",
+    "app.chat.dropdown.options": "Opciones de chat",
+    "app.chat.dropdown.clear": "Limpiar",
+    "app.chat.dropdown.copy": "Copiar",
+    "app.chat.dropdown.save": "Guardar",
+    "app.chat.label": "Chat",
+    "app.chat.emptyLogLabel": "Registro de chat vacío",
+    "app.chat.clearPublicChatMessage": "El chat publico fue borrado por un moderador",
+    "app.note.title": "Notas compartidas",
+    "app.note.label": "Nota",
+    "app.note.hideNoteLabel": "Ocultar nota",
+    "app.userList.usersTitle": "Usuarios",
+    "app.userList.participantsTitle": "Participantes",
+    "app.userList.messagesTitle": "Mensajes",
+    "app.userList.notesTitle": "Notas",
+    "app.userList.presenter": "Presentador",
+    "app.userList.you": "Tu",
+    "app.userList.locked": "Bloqueado",
+    "app.userList.label": "Lista de usuarios",
+    "app.userList.toggleCompactView.label": "Cambiar a modo de vista compacta",
+    "app.userList.guest": "Huesped",
+    "app.userList.menuTitleContext": "Opciones disponibles",
+    "app.userList.chatListItem.unreadSingular": "{0} Nuevo Mensaje",
+    "app.userList.chatListItem.unreadPlural": "{0} Nuevos mensajes",
+    "app.userList.menu.chat.label": "Chat",
+    "app.userList.menu.clearStatus.label": "Limpiar estátus",
+    "app.userList.menu.makePresenter.label": "Hacer presentador",
+    "app.userList.menu.removeUser.label": "Eliminar usuario",
+    "app.userList.menu.muteUserAudio.label": "Silenciar usuario",
+    "app.userList.menu.unmuteUserAudio.label": "Activar sonido de usuario",
+    "app.userList.userAriaLabel": "{0} {1} {2} estado {3}",
+    "app.userList.menu.promoteUser.label": "Promover a moderador",
+    "app.userList.menu.demoteUser.label": "Degradar a espectador",
+    "app.userList.userOptions.manageUsersLabel": "Manejar usuarios",
+    "app.userList.userOptions.muteAllLabel": "Deshabilitar audio a todos los usuarios",
+    "app.userList.userOptions.muteAllDesc": "Deshabilitar audio a todos los usuarios en la sesión",
+    "app.userList.userOptions.clearAllLabel": "Borrar todos los iconos de estado",
+    "app.userList.userOptions.clearAllDesc": "Borrar todos los iconos de estado de usuarios",
+    "app.userList.userOptions.muteAllExceptPresenterLabel": "Silenciar a todos los usuarios excepto a presentador",
+    "app.userList.userOptions.muteAllExceptPresenterDesc": "Silenciar a todos los usuarios en la sesión excepto a presentador",
+    "app.userList.userOptions.unmuteAllLabel": "Desactivar función de silenciar",
+    "app.userList.userOptions.unmuteAllDesc": "Habilitar audio en la sesión",
+    "app.userList.userOptions.lockViewersLabel": "Bloquear espectadores",
+    "app.media.label": "Media",
+    "app.media.screenshare.start": "Compartir pantalla ha iniciado",
+    "app.media.screenshare.end": "Compartir pantalla ha finalizado",
+    "app.media.screenshare.safariNotSupported": "Compartir pantalla actualmente no es soportada por Safari. Por favor usilize Firefox o Google Chrome.",
+    "app.meeting.ended": "La sesión ha finalizado",
+    "app.meeting.endedMessage": "Serás enviado a la pantalla de inicio.",
+    "app.presentation.presentationToolbar.prevSlideLabel": "Diapositiva anterior",
+    "app.presentation.presentationToolbar.prevSlideDesc": "Cambiar presentación a diapositiva anterior",
+    "app.presentation.presentationToolbar.nextSlideLabel": "Siguiente diapositiva",
+    "app.presentation.presentationToolbar.nextSlideDesc": "Cambiar presentación a diapositiva siguiente",
+    "app.presentation.presentationToolbar.skipSlideLabel": "Brincar diapositiva",
+    "app.presentation.presentationToolbar.skipSlideDesc": "Cambiar presentación a diapositiva específica",
+    "app.presentation.presentationToolbar.fitWidthLabel": "Ajustar a lo ancho",
+    "app.presentation.presentationToolbar.fitWidthDesc": "Mostrar diapositiva a todo lo ancho",
+    "app.presentation.presentationToolbar.fitScreenLabel": "Ajustar a la pantalla",
+    "app.presentation.presentationToolbar.fitScreenDesc": "Mostrar toda la diapositiva",
+    "app.presentation.presentationToolbar.zoomLabel": "Zoom",
+    "app.presentation.presentationToolbar.zoomDesc": "Cambiar el nivel de Zoom de la presentación",
+    "app.presentation.presentationToolbar.zoomInLabel": "Acercarse",
+    "app.presentation.presentationToolbar.zoomInDesc": "Acercarse en presentación",
+    "app.presentation.presentationToolbar.zoomOutLabel": "Alejarse",
+    "app.presentation.presentationToolbar.zoomOutDesc": "Alejarse en presentación",
+    "app.presentation.presentationToolbar.zoomIndicator": "Mostrar el porcentaje de acercamiento",
+    "app.presentation.presentationToolbar.fitToWidth": "Ajustar a lo ancho",
+    "app.presentation.presentationToolbar.goToSlide": "Diapositiva {0}",
+    "app.presentationUploder.title": "Presentación",
+    "app.presentationUploder.confirmLabel": "Iniciar",
+    "app.presentationUploder.confirmDesc": "Grardar los cambios e iniciar la presentación",
+    "app.presentationUploder.dismissLabel": "Cancelar",
+    "app.presentationUploder.dismissDesc": "Cerrar la ventana modal y descartar cambios.",
+    "app.presentationUploder.dropzoneLabel": "Arrastrar archivo aqui para cargarlo",
+    "app.presentationUploder.dropzoneImagesLabel": "Arrastrar imagenes aqui para cargarlas",
+    "app.presentationUploder.browseFilesLabel": "o buscar archivos",
+    "app.presentationUploder.browseImagesLabel": "o buscar imagenes",
+    "app.presentationUploder.fileToUpload": "Esperando ser cargado...",
+    "app.presentationUploder.currentBadge": "Acual",
+    "app.presentationUploder.genericError": "Ups, algo salio mal",
+    "app.presentationUploder.rejectedError": "Algunos de los archivos seleccionados fueron rechazados. Por favor verifique el mime type de los archivo",
+    "app.presentationUploder.upload.progress": "Cargando ({0}%)",
+    "app.presentationUploder.upload.413": "Erchivo demasiado grande",
+    "app.presentationUploder.conversion.conversionProcessingSlides": "Procesando página {0} de {1}",
+    "app.presentationUploder.conversion.genericConversionStatus": "Convirtiendo archivo...",
+    "app.presentationUploder.conversion.generatingThumbnail": "Generando miniaturas...",
+    "app.presentationUploder.conversion.generatedSlides": "Diapositivas generadas...",
+    "app.presentationUploder.conversion.generatingSvg": "Generando imágenes SVG...",
+    "app.poll.startCustomLabel": "Iniciar encuesta personalizada",
+    "app.poll.publishLabel": "Publicar encuesta",
+    "app.poll.closeLabel": "Cerrar",
+    "app.poll.tf": "Verdadero / Falseo",
+    "app.poll.yn": "Si / No",
+    "app.poll.a2": "A / B",
+    "app.poll.a3": "A / B / C",
+    "app.poll.a4": "A / B / C / D",
+    "app.poll.a5": "A / B / C / D / E",
+    "app.poll.liveResult.usersTitle": "Usuarios",
+    "app.poll.liveResult.responsesTitle": "Respuesta",
+    "app.polling.pollingTitle": "Respuestas de encuesta",
+    "app.polling.pollAnswerLabel": "Respuesta de encuesta {0}",
+    "app.polling.pollAnswerDesc": "Seleccione esta opcion para responder {0}",
+    "app.failedMessage": "Disculpas, problemas conectando al servidor.",
+    "app.connectingMessage": "Conectando...",
+    "app.waitingMessage": "Desconectado. Intentando reconectar en {0} segundos...",
+    "app.navBar.settingsDropdown.optionsLabel": "Opciones",
+    "app.navBar.settingsDropdown.fullscreenLabel": "Desplegar a pantalla completa",
+    "app.navBar.settingsDropdown.settingsLabel": "Abrir configuración",
+    "app.navBar.settingsDropdown.aboutLabel": "Acerca de",
+    "app.navBar.settingsDropdown.leaveSessionLabel": "Cerrar sesión",
+    "app.navBar.settingsDropdown.exitFullscreenLabel": "Salir de pantalla completa",
+    "app.navBar.settingsDropdown.fullscreenDesc": "Hacer el menú de configuración a pantalla completa",
+    "app.navBar.settingsDropdown.settingsDesc": "Cambiar la configuración general",
+    "app.navBar.settingsDropdown.aboutDesc": "Mostrar información acerca del cliente",
+    "app.navBar.settingsDropdown.leaveSessionDesc": "Abandonar la reunión",
+    "app.navBar.settingsDropdown.exitFullscreenDesc": "Salir del modo de pantalla completa",
+    "app.navBar.settingsDropdown.hotkeysLabel": "Acceso rápido",
+    "app.navBar.settingsDropdown.hotkeysDesc": "Lista de accesos rápidos",
+    "app.navBar.settingsDropdown.helpLabel": "Ayuda",
+    "app.navBar.settingsDropdown.helpDesc": "Enlaces a videos tutoriales",
+    "app.navBar.userListToggleBtnLabel": "Alternar lista de usuarios",
+    "app.navBar.toggleUserList.newMessages": "con nueva notificación de mensaje ",
+    "app.leaveConfirmation.confirmLabel": "Salir",
+    "app.leaveConfirmation.confirmDesc": "Te desconecta de la reunión",
+    "app.about.title": "Acerca de",
+    "app.about.version": "Construcción del cliente:",
+    "app.about.copyright": "Derechos de autor:",
+    "app.about.confirmLabel": "OK",
+    "app.about.confirmDesc": "OK",
+    "app.about.dismissLabel": "Cancelar",
+    "app.about.dismissDesc": "Cerrar información acerca del cliente",
+    "app.actionsBar.changeStatusLabel": "Cambiar estátus",
+    "app.actionsBar.muteLabel": "Silenciar",
+    "app.actionsBar.unmuteLabel": "De-silenciar",
+    "app.actionsBar.camOffLabel": "Cámara Apagada",
+    "app.actionsBar.raiseLabel": "Alzar",
+    "app.actionsBar.label": "Barra de acciones",
+    "app.submenu.application.applicationSectionTitle": "Aplicación",
+    "app.submenu.application.fontSizeControlLabel": "Tamaño de fuente",
+    "app.submenu.application.increaseFontBtnLabel": "Incrementar tamaño de fuente",
+    "app.submenu.application.decreaseFontBtnLabel": "Reducir tamaño de fuente",
+    "app.submenu.application.languageLabel": "Lenguaje de aplicación",
+    "app.submenu.application.ariaLanguageLabel": "Cambiar lenguaje de aplicación",
+    "app.submenu.application.languageOptionLabel": "Seleccionar lenguaje",
+    "app.submenu.application.noLocaleOptionLabel": "No hay locales activos",
+    "app.submenu.audio.micSourceLabel": "Fuente de micrófono",
+    "app.submenu.audio.speakerSourceLabel": "Fuente de altavoces",
+    "app.submenu.audio.streamVolumeLabel": "Volumen del flujo de audio",
+    "app.submenu.video.title": "Video",
+    "app.submenu.video.videoSourceLabel": "Fuente del video",
+    "app.submenu.video.videoOptionLabel": "Escoger ver fuente",
+    "app.submenu.video.videoQualityLabel": "Calidad del Video",
+    "app.submenu.video.qualityOptionLabel": "Escoger calidad del video",
+    "app.submenu.video.participantsCamLabel": "Viendo webcams de participantes",
+    "app.submenu.closedCaptions.closedCaptionsLabel": "Subtítulos",
+    "app.submenu.closedCaptions.takeOwnershipLabel": "Tomar el control",
+    "app.submenu.closedCaptions.languageLabel": "Lenguaje",
+    "app.submenu.closedCaptions.localeOptionLabel": "Seleccionar lenguaje",
+    "app.submenu.closedCaptions.noLocaleOptionLabel": "No hay locales activos",
+    "app.submenu.closedCaptions.fontFamilyLabel": "Familia de fuente",
+    "app.submenu.closedCaptions.fontFamilyOptionLabel": "Seleccionar familia de fuente",
+    "app.submenu.closedCaptions.fontSizeLabel": "Tamaño de fuente",
+    "app.submenu.closedCaptions.fontSizeOptionLabel": "Seleccionar tamaño de fuente",
+    "app.submenu.closedCaptions.backgroundColorLabel": "Color de fondo",
+    "app.submenu.closedCaptions.fontColorLabel": "Color de fuente",
+    "app.submenu.participants.muteAllLabel": "Silenciar a todos menos al presentador",
+    "app.submenu.participants.lockAllLabel": "Bloquear a todos los participantes",
+    "app.submenu.participants.lockItemLabel": "Participantes {0}",
+    "app.submenu.participants.lockMicDesc": "Deshabilita micrófono a todos los participantes bloqueados",
+    "app.submenu.participants.lockCamDesc": "Deshabilita el webcam a todos los participantes bloqueados",
+    "app.submenu.participants.lockPublicChatDesc": "Deshabilita el chat público a todos los usuarios bloqueados",
+    "app.submenu.participants.lockPrivateChatDesc": "Deshabilita el chat privado a todos los usuarios bloqueados",
+    "app.submenu.participants.lockLayoutDesc": "Bloquea el diseño a todos los usuarios bloqueados",
+    "app.submenu.participants.lockMicAriaLabel": "Bloquea micrófono",
+    "app.submenu.participants.lockCamAriaLabel": "Bloquea webcam",
+    "app.submenu.participants.lockPublicChatAriaLabel": "Bloquea el chat público",
+    "app.submenu.participants.lockPrivateChatAriaLabel": "Bloquea el chat privado",
+    "app.submenu.participants.lockLayoutAriaLabel": "Bloquea el diseño",
+    "app.submenu.participants.lockMicLabel": "Micrófono",
+    "app.submenu.participants.lockCamLabel": "Webcam",
+    "app.submenu.participants.lockPublicChatLabel": "Chat público",
+    "app.submenu.participants.lockPrivateChatLabel": "Chat privado",
+    "app.submenu.participants.lockLayoutLabel": "Diseño",
+    "app.settings.applicationTab.label": "Aplicación",
+    "app.settings.audioTab.label": "Audio",
+    "app.settings.videoTab.label": "Video",
+    "app.settings.closedcaptionTab.label": "Subtítulos",
+    "app.settings.usersTab.label": "Participantes",
+    "app.settings.main.label": "Configuración",
+    "app.settings.main.cancel.label": "Cancela",
+    "app.settings.main.cancel.label.description": "Deshecha los cambios y cierra el menú de configuración",
+    "app.settings.main.save.label": "Guardar",
+    "app.settings.main.save.label.description": "Gurada cambios y cierra el menú de configuración",
+    "app.actionsBar.actionsDropdown.actionsLabel": "Acciones",
+    "app.actionsBar.actionsDropdown.presentationLabel": "Subir una presentación",
+    "app.actionsBar.actionsDropdown.initPollLabel": "Iniciar una encuesta",
+    "app.actionsBar.actionsDropdown.desktopShareLabel": "Compartir tu pantalla",
+    "app.actionsBar.actionsDropdown.presentationDesc": "Subir tu presentación",
+    "app.actionsBar.actionsDropdown.initPollDesc": "Iniciar una encuesta",
+    "app.actionsBar.actionsDropdown.desktopShareDesc": "Compartir tu pantalla con otros",
+    "app.actionsBar.emojiMenu.awayLabel": "Ausente",
+    "app.actionsBar.emojiMenu.awayDesc": "Cambiar tu estatus a ausente",
+    "app.actionsBar.emojiMenu.raiseHandLabel": "Alzar",
+    "app.actionsBar.emojiMenu.raiseHandDesc": "Alzar la mano para preguntar",
+    "app.actionsBar.emojiMenu.neutralLabel": "Indeciso",
+    "app.actionsBar.emojiMenu.neutralDesc": "Cambiar tu estatus a indeciso",
+    "app.actionsBar.emojiMenu.confusedLabel": "Confundido",
+    "app.actionsBar.emojiMenu.confusedDesc": "Cambiar tu estatus a confundido",
+    "app.actionsBar.emojiMenu.sadLabel": "Triste",
+    "app.actionsBar.emojiMenu.sadDesc": "Cambiar tu estatus a triste",
+    "app.actionsBar.emojiMenu.happyLabel": "Feliz",
+    "app.actionsBar.emojiMenu.happyDesc": "Cambiar tu estatus a feliz",
+    "app.actionsBar.emojiMenu.noneLabel": "Limpiar estátus",
+    "app.actionsBar.emojiMenu.noneDesc": "Limpia tu estatus",
+    "app.actionsBar.emojiMenu.applauseLabel": "Aplausos",
+    "app.actionsBar.emojiMenu.applauseDesc": "Cambiar tu estatus a aplausos",
+    "app.actionsBar.emojiMenu.thumbsUpLabel": "Señal de aprobación",
+    "app.actionsBar.emojiMenu.thumbsUpDesc": "Cambiar tu estatus a señal de aprobación",
+    "app.actionsBar.emojiMenu.thumbsDownLabel": "Señal de desaprobación",
+    "app.actionsBar.emojiMenu.thumbsDownDesc": "Cambia tu estatus a señal de desaprobación",
+    "app.actionsBar.currentStatusDesc": "estatus actual {0}",
+    "app.audioNotification.audioFailedError1001": "Error 1001: WebSocket desconectado",
+    "app.audioNotification.audioFailedError1002": "Error 1002: No puede establecerse conexión de WebSocket",
+    "app.audioNotification.audioFailedError1003": "Error 1003: Versión de navegador no soportado ",
+    "app.audioNotification.audioFailedError1004": "Error 1004: Falla en llamada",
+    "app.audioNotification.audioFailedError1005": "Error 1005: La llamada terminó inesperadamente",
+    "app.audioNotification.audioFailedError1006": "Error 1006: Tiempo de espera de llamada agotado",
+    "app.audioNotification.audioFailedError1007": "Error 1007: Fallo de negociación ICE",
+    "app.audioNotification.audioFailedError1008": "Error 1008: Fallo de transferencia",
+    "app.audioNotification.audioFailedError1009": "Error 1009: No se pudo obtener información de servidor STUN/TURN",
+    "app.audioNotification.audioFailedError1010": "Error 1010: Se acabó tiempo de negociación ICE  ",
+    "app.audioNotification.audioFailedError1011": "Error 1011: Se acabó tiempo recolectando ICE",
+    "app.audioNotification.audioFailedMessage": "Tu conexión de audio falló en conectarse",
+    "app.audioNotification.mediaFailedMessage": "getUserMicMedia falló, Solo orígenes seguros son admitidos",
+    "app.audioNotification.closeLabel": "Cerrar",
+    "app.breakoutJoinConfirmation.title": "Unirse a una sala de grupo",
+    "app.breakoutJoinConfirmation.message": "Quieres unirte",
+    "app.breakoutJoinConfirmation.confirmLabel": "Unirte",
+    "app.breakoutJoinConfirmation.confirmDesc": "Unirte a sala de grupo",
+    "app.breakoutJoinConfirmation.dismissLabel": "Cancelar",
+    "app.breakoutJoinConfirmation.dismissDesc": "Cierra y rechaza Unirse a Sala de Grupo",
+    "app.breakoutTimeRemainingMessage": "Tiempo restante en Sala de Grupo",
+    "app.breakoutWillCloseMessage": "Tiempo transcurrido. Sala de Grupo de cerrará en breve.",
+    "app.calculatingBreakoutTimeRemaining": "Calculando tiempo restante...",
+    "app.audioModal.microphoneLabel": "Micrófono",
+    "app.audioModal.listenOnlyLabel": "Solo escuchar",
+    "app.audioModal.audioChoiceLabel": "¿Como quieres unirte al audio?",
+    "app.audioModal.audioChoiceDesc": "Selecciona como unirse al audio en esta reunión",
+    "app.audioModal.closeLabel": "Cerrar",
+    "app.audio.joinAudio": "Unirse al audio",
+    "app.audio.leaveAudio": "Abandonar audio",
+    "app.audio.enterSessionLabel": "Entrar a la sesión",
+    "app.audio.playSoundLabel": "Reproducir sonido",
+    "app.audio.backLabel": "Atrás",
+    "app.audio.audioSettings.titleLabel": "Seleccionar tu configuración de audio",
+    "app.audio.audioSettings.descriptionLabel": "Ten en cuenta que aparecerá un cuadro de diálogo en tu navegador, que te pide a aceptar compartir tu micrófono.",
+    "app.audio.audioSettings.microphoneSourceLabel": "Fuente del micrófono",
+    "app.audio.audioSettings.speakerSourceLabel": "Fuente de altavoz",
+    "app.audio.audioSettings.microphoneStreamLabel": "Tu volúmen del flujo de audio",
+    "app.audio.listenOnly.backLabel": "Atrás",
+    "app.audio.listenOnly.closeLabel": "Cerrar",
+    "app.error.meeting.ended": "Haz salido de la conferencia",
+    "app.dropdown.close": "Cerrar",
+    "app.error.500": "Ups, algo salio mal",
+    "app.error.404": "No se encontró",
+    "app.error.401": "No autorizado",
+    "app.error.403": "Prohibido",
+    "app.error.leaveLabel": "Ingresa de nuevo",
+    "app.guest.waiting": "Esperando aprobación para unirse",
+    "app.shortcut-help.title": "Atajos",
+    "app.shortcut-help.closeLabel": "Cerrar",
+    "app.lock-viewers.webcamLabel": "Webcam",
+    "app.lock-viewers.microphoneLable": "Micrófono",
+    "app.lock-viewers.PublicChatLabel": "Chat público",
+    "app.lock-viewers.PrivateChatLable": "Chat privado",
+    "app.lock-viewers.Layout": "Diseño",
+    "app.videoPreview.cancelLabel": "Cancelar",
+    "app.videoPreview.closeLabel": "Cerrar",
+    "app.meeting.endNotification.ok.label": "OK",
+    "app.feedback.title": "Haz salido de la conferencia",
+    "app.createBreakoutRoom.joinAudio": "Unirse al audio",
+    "app.externalVideo.close": "Cerrar"
+
+}
+
diff --git a/bigbluebutton-html5/private/locales/pl_PL.json b/bigbluebutton-html5/private/locales/pl_PL.json
new file mode 100644
index 0000000000..794aafd2d8
--- /dev/null
+++ b/bigbluebutton-html5/private/locales/pl_PL.json
@@ -0,0 +1,41 @@
+{
+    "app.chat.submitLabel": "Wyślij wiadomość",
+    "app.chat.titlePrivate": "Czat prywatny z {0}",
+    "app.chat.closeChatLabel": "Zamknij {0}",
+    "app.chat.hideChatLabel": "Ukryj {0}",
+    "app.chat.dropdown.options": "Opcje Czatu",
+    "app.chat.dropdown.clear": "Wyczyść",
+    "app.chat.dropdown.copy": "Kopiuj",
+    "app.chat.dropdown.save": "Zapisz",
+    "app.chat.label": "Czat",
+    "app.note.title": "Udostępnione notatki",
+    "app.note.label": "Notatka",
+    "app.note.hideNoteLabel": "Ukryj notatkę",
+    "app.userList.usersTitle": "Użytkownicy",
+    "app.userList.participantsTitle": "Uczestnicy",
+    "app.userList.messagesTitle": "Wiadomości",
+    "app.userList.notesTitle": "Notatki",
+    "app.userList.presenter": "Prezenter",
+    "app.userList.you": "Ty",
+    "app.userList.label": "Lista użytkowników",
+    "app.userList.guest": "Gość",
+    "app.userList.menuTitleContext": "Dostępne opcje",
+    "app.userList.chatListItem.unreadSingular": "{0} Nowa Wiadomość",
+    "app.userList.menu.chat.label": "Czat",
+    "app.userList.menu.clearStatus.label": "Wyczyść status",
+    "app.userList.menu.removeUser.label": "Usuń użytkownika",
+    "app.poll.closeLabel": "Zamknij",
+    "app.poll.liveResult.usersTitle": "Użytkownicy",
+    "app.settings.usersTab.label": "Uczestincy",
+    "app.settings.main.save.label": "Zapisz",
+    "app.actionsBar.emojiMenu.noneLabel": "Wyczyść status",
+    "app.audioNotification.closeLabel": "Zamknij",
+    "app.audioModal.closeLabel": "Zamknij",
+    "app.audio.listenOnly.closeLabel": "Zamknij",
+    "app.dropdown.close": "Zamknij",
+    "app.shortcut-help.closeLabel": "Zamknij",
+    "app.videoPreview.closeLabel": "Zamknij",
+    "app.externalVideo.close": "Zamknij"
+
+}
+

From 11f5f3dd69bd861de7b0a736d194cd53386a92cb Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Tue, 29 Jan 2019 21:38:40 +0000
Subject: [PATCH 161/163] sort language related imports to match order of
 locales

---
 .../imports/startup/client/intl.jsx           | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index ec31ea1683..a1407f8d2b 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -5,43 +5,43 @@ import Settings from '/imports/ui/services/settings';
 import LoadingScreen from '/imports/ui/components/loading-screen/component';
 
 // currently supported locales.
-import en from 'react-intl/locale-data/en';
-import uk from 'react-intl/locale-data/uk';
-import zh from 'react-intl/locale-data/zh';
-import ru from 'react-intl/locale-data/ru';
+import bg from 'react-intl/locale-data/bg';
 import de from 'react-intl/locale-data/de';
-import fr from 'react-intl/locale-data/fr';
-import pt from 'react-intl/locale-data/pt';
+import el from 'react-intl/locale-data/el';
+import en from 'react-intl/locale-data/en';
+import es from 'react-intl/locale-data/es';
 import fa from 'react-intl/locale-data/fa';
-import tr from 'react-intl/locale-data/tr';
+import fr from 'react-intl/locale-data/fr';
+import id from 'react-intl/locale-data/id';
+import it from 'react-intl/locale-data/it';
 import ja from 'react-intl/locale-data/ja';
 import km from 'react-intl/locale-data/km';
-import es from 'react-intl/locale-data/es';
-import id from 'react-intl/locale-data/id';
-import el from 'react-intl/locale-data/el';
-import it from 'react-intl/locale-data/it';
-import bg from 'react-intl/locale-data/bg';
 import pl from 'react-intl/locale-data/pl';
+import pt from 'react-intl/locale-data/pt';
+import ru from 'react-intl/locale-data/ru';
+import tr from 'react-intl/locale-data/tr';
+import uk from 'react-intl/locale-data/uk';
+import zh from 'react-intl/locale-data/zh';
 
 
 addLocaleData([
-  ...en,
-  ...uk,
-  ...zh,
-  ...ru,
+  ...bg,
   ...de,
-  ...fr,
-  ...pt,
+  ...el,
+  ...en,
+  ...es,
   ...fa,
-  ...tr,
+  ...fr,
+  ...id,
+  ...it,
   ...ja,
   ...km,
-  ...es,
-  ...id,
-  ...el,
-  ...it,
-  ...bg,
   ...pl,
+  ...pt,
+  ...ru,
+  ...tr,
+  ...uk,
+  ...zh,
 ]);
 
 const propTypes = {

From 1dda32bf0a15240d7b874af6eabc11b9347a7539 Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Tue, 29 Jan 2019 16:09:57 -0800
Subject: [PATCH 162/163] remove the unused bbb_webrtc_bridge_sip.js from the
 HTML5 client

---
 .../compatibility/bbb_webrtc_bridge_sip.js    | 601 ------------------
 1 file changed, 601 deletions(-)
 delete mode 100644 bigbluebutton-html5/client/compatibility/bbb_webrtc_bridge_sip.js

diff --git a/bigbluebutton-html5/client/compatibility/bbb_webrtc_bridge_sip.js b/bigbluebutton-html5/client/compatibility/bbb_webrtc_bridge_sip.js
deleted file mode 100644
index a29923966f..0000000000
--- a/bigbluebutton-html5/client/compatibility/bbb_webrtc_bridge_sip.js
+++ /dev/null
@@ -1,601 +0,0 @@
-
-var userID, callerIdName=null, conferenceVoiceBridge, userAgent=null, userMicMedia, userWebcamMedia, currentSession=null, callTimeout, callActive, callICEConnected, iceConnectedTimeout, callFailCounter, callPurposefullyEnded, uaConnected, transferTimeout, iceGatheringTimeout;
-var inEchoTest = true;
-var html5StunTurn = null;
-
-function webRTCCallback(message) {
-	switch (message.status) {
-		case 'succeded':
-			BBB.webRTCCallSucceeded();
-			break;
-		case 'failed':
-			if (message.errorcode !== 1004) {
-				message.cause = null;
-			}
-			monitorTracksStop();
-			BBB.webRTCCallFailed(inEchoTest, message.errorcode, message.cause);
-			break;
-		case 'ended':
-			monitorTracksStop();
-			BBB.webRTCCallEnded(inEchoTest);
-			break;
-		case 'started':
-			monitorTracksStart();
-			BBB.webRTCCallStarted(inEchoTest);
-			break;
-		case 'connecting':
-			BBB.webRTCCallConnecting(inEchoTest);
-			break;
-		case 'waitingforice':
-			BBB.webRTCCallWaitingForICE(inEchoTest);
-			break;
-		case 'transferring':
-			BBB.webRTCCallTransferring(inEchoTest);
-			break;
-		case 'mediarequest':
-			BBB.webRTCMediaRequest();
-			break;
-		case 'mediasuccess':
-			BBB.webRTCMediaSuccess();
-			break;
-		case 'mediafail':
-			BBB.webRTCMediaFail();
-			break;
-	}
-}
-
-function callIntoConference(voiceBridge, callback, isListenOnly, stunTurn = null) {
-	// root of the call initiation process from the html5 client
-	// Flash will not pass in the listen only field. For html5 it is optional. Assume NOT listen only if no state passed
-	if (isListenOnly == null) {
-		isListenOnly = false;
-	}
-
-	// if additional stun configuration is passed, store the information
-	if (stunTurn != null) {
-		html5StunTurn = {
-			stunServers: stunTurn.stun,
-			turnServers: stunTurn.turn,
-		};
-	}
-
-	// reset callerIdName
-	callerIdName = null;
-	if (!callerIdName) {
-		BBB.getMyUserInfo(function(userInfo) {
-			console.log("User info callback [myUserID=" + userInfo.myUserID
-				+ ",myUsername=" + userInfo.myUsername + ",myAvatarURL=" + userInfo.myAvatarURL
-				+ ",myRole=" + userInfo.myRole + ",amIPresenter=" + userInfo.amIPresenter
-				+ ",dialNumber=" + userInfo.dialNumber + ",voiceBridge=" + userInfo.voiceBridge
-				+ ",isListenOnly=" + isListenOnly + "].");
-			userID = userInfo.myUserID;
-			callerIdName = userInfo.myUserID + "-bbbID-" + userInfo.myUsername;
-			if (isListenOnly) {
-				//prepend the callerIdName so it is recognized as a global audio user
-				callerIdName = "GLOBAL_AUDIO_" + callerIdName;
-			}
-			conferenceVoiceBridge = userInfo.voiceBridge
-			if (voiceBridge === "9196") {
-				voiceBridge = voiceBridge + conferenceVoiceBridge;
-			} else {
-				voiceBridge = conferenceVoiceBridge;
-			}
-			console.log(callerIdName);
-			webrtc_call(callerIdName, voiceBridge, callback, isListenOnly);
-		});
-	} else {
-		if (voiceBridge === "9196") {
-			voiceBridge = voiceBridge + conferenceVoiceBridge;
-		} else {
-			voiceBridge = conferenceVoiceBridge;
-		}
-		webrtc_call(callerIdName, voiceBridge, callback, isListenOnly);
-	}
-}
-
-function joinWebRTCVoiceConference() {
-	console.log("Joining to the voice conference directly");
-	inEchoTest = false;
-	// set proper callbacks to previously created user agent
-	if(userAgent) {
-		setUserAgentListeners(webRTCCallback);
-	}
-	callIntoConference(conferenceVoiceBridge, webRTCCallback);
-}
-
-function leaveWebRTCVoiceConference() {
-	console.log("Leaving the voice conference");
-	
-	webrtc_hangup();
-}
-
-function startWebRTCAudioTest(){
-	console.log("Joining the audio test first");
-	inEchoTest = true;
-	callIntoConference("9196", webRTCCallback);
-}
-
-function stopWebRTCAudioTest(){
-	console.log("Stopping webrtc audio test");
-	
-	webrtc_hangup();
-}
-
-function stopWebRTCAudioTestJoinConference(){
-	console.log("Transferring from audio test to conference");
-	
-	webRTCCallback({'status': 'transferring'});
-	
-	transferTimeout = setTimeout( function() {
-		console.log("Call transfer failed. No response after 3 seconds");
-		webRTCCallback({'status': 'failed', 'errorcode': 1008});
-		releaseUserMedia();
-		currentSession = null;
-		if (userAgent != null) {
-			var userAgentTemp = userAgent;
-			userAgent = null;
-			userAgentTemp.stop();
-		}
-	}, 5000);
-	
-	BBB.listen("UserJoinedVoiceEvent", userJoinedVoiceHandler);
-	
-	currentSession.dtmf(1);
-	inEchoTest = false;
-}
-
-function userJoinedVoiceHandler(event) {
-	console.log("UserJoinedVoiceHandler - " + event);
-	if (inEchoTest === false && userID === event.userID) {
-		BBB.unlisten("UserJoinedVoiceEvent", userJoinedVoiceHandler);
-		clearTimeout(transferTimeout);
-		webRTCCallback({'status': 'started'});
-	}
-}
-
-function createUA(username, server, callback, makeCallFunc) {
-	if (userAgent) {
-		console.log("User agent already created");
-		return;
-	}
-
-	console.log("Fetching STUN/TURN server info for user agent");
-
-	console.log(html5StunTurn);
-	if (html5StunTurn != null) {
-		createUAWithStuns(username, server, callback, html5StunTurn, makeCallFunc);
-		return;
-	}
-
-  BBB.getSessionToken(function(sessionToken) {
-  	$.ajax({
-  		dataType: 'json',
-  		url: '/bigbluebutton/api/stuns',
-  		data: {sessionToken:sessionToken}
-  	}).done(function(data) {
-  		var stunsConfig = {};
-  		stunsConfig['stunServers'] = ( data['stunServers'] ? data['stunServers'].map(function(data) {
-  			return data['url'];
-  		}) : [] );
-  		stunsConfig['turnServers'] = ( data['turnServers'] ? data['turnServers'].map(function(data) {
-  			return {
-  				'urls': data['url'],
-  				'username': data['username'],
-  				'password': data['password']
-  			};
-  		}) : [] );
-		//stunsConfig['remoteIceCandidates'] = ( data['remoteIceCandidates'] ? data['remoteIceCandidates'].map(function(data) {
-		//	return data['ip'];
-		//}) : [] );
-  		createUAWithStuns(username, server, callback, stunsConfig, makeCallFunc);
-  	}).fail(function(data, textStatus, errorThrown) {
-  		BBBLog.error("Could not fetch stun/turn servers", {error: textStatus, user: callerIdName, voiceBridge: conferenceVoiceBridge});
-  		callback({'status':'failed', 'errorcode': 1009});
-  	});
-  });
-}
-
-function createUAWithStuns(username, server, callback, stunsConfig, makeCallFunc) {
-	console.log("Creating new user agent");
-
-	/* VERY IMPORTANT 
-	 *	- You must escape the username because spaces will cause the connection to fail
-	 *	- We are connecting to the websocket through an nginx redirect instead of directly to 5066
-	 */
-	var configuration = {
-		uri: 'sip:' + encodeURIComponent(username) + '@' + server,
-		wsServers: ('https:' == document.location.protocol ? 'wss://' : 'ws://')  + server + '/ws',
-		displayName: username,
-		register: false,
-		traceSip: true,
-		autostart: false,
-		userAgentString: "BigBlueButton",
-		stunServers: stunsConfig['stunServers'],
-		turnServers: stunsConfig['turnServers'],
-		//artificialRemoteIceCandidates: stunsConfig['remoteIceCandidates']
-	};
-	
-	uaConnected = false;
-	
-	userAgent = new SIP.UA(configuration);
-	setUserAgentListeners(callback, makeCallFunc);
-	userAgent.start();
-};
-
-function setUserAgentListeners(callback, makeCallFunc) {
-	console.log("resetting UA callbacks");
-	userAgent.removeAllListeners('connected');
-	userAgent.on('connected', function() {
-		uaConnected = true;
-		callback({'status':'succeded'});
-		makeCallFunc();
-	});
-	userAgent.removeAllListeners('disconnected');
-	userAgent.on('disconnected', function() {
-		if (userAgent) {
-			if (userAgent != null) {
-				var userAgentTemp = userAgent;
-				userAgent = null;
-				userAgentTemp.stop();
-			}
-			
-			if (uaConnected) {
-				callback({'status':'failed', 'errorcode': 1001}); // WebSocket disconnected
-			} else {
-				callback({'status':'failed', 'errorcode': 1002}); // Could not make a WebSocket connection
-			}
-		}
-	});
-};
-
-function getUserMicMedia(getUserMicMediaSuccess, getUserMicMediaFailure) {
-	if (userMicMedia == undefined) {
-		if (SIP.WebRTC.isSupported()) {
-			SIP.WebRTC.getUserMedia({audio:true, video:false}, getUserMicMediaSuccess, getUserMicMediaFailure);
-		} else {
-			console.log("getUserMicMedia: webrtc not supported");
-			getUserMicMediaFailure("WebRTC is not supported");
-		}
-	} else {
-		console.log("getUserMicMedia: mic already set");
-		getUserMicMediaSuccess(userMicMedia);
-	}
-};
-
-function webrtc_call(username, voiceBridge, callback, isListenOnly) {
-	if (!isWebRTCAvailable()) {
-		callback({'status': 'failed', 'errorcode': 1003}); // Browser version not supported
-		return;
-	}
-	if (isListenOnly == null) { // assume NOT listen only unless otherwise stated
-		isListenOnly = false;
-	}
-
-	var server = window.document.location.hostname;
-	console.log("user " + username + " calling to " +  voiceBridge);
-
-	var makeCallFunc = function() {
-		// only make the call when both microphone and useragent have been created
-		// for listen only, stating listen only is a viable substitute for acquiring user media control
-		if ((isListenOnly||userMicMedia) && userAgent)
-			make_call(username, voiceBridge, server, callback, false, isListenOnly);
-	};
-
-	// Reset userAgent so we can successfully switch between listenOnly and listen+speak modes
-	userAgent = null;
-	if (!userAgent) {
-		createUA(username, server, callback, makeCallFunc);
-	}
-	// if the user requests to proceed as listen only (does not require media) or media is already acquired,
-	// proceed with making the call
-	if (isListenOnly || userMicMedia != null) {
-		makeCallFunc();
-	} else {
-		callback({'status':'mediarequest'});
-		getUserMicMedia(function(stream) {
-				console.log("getUserMicMedia: success");
-				userMicMedia = stream;
-				callback({'status':'mediasuccess'});
-				makeCallFunc();
-			}, function(e) {
-				console.error("getUserMicMedia: failure - " + e);
-				callback({'status':'mediafail', 'cause': e});
-			}
-		);
-	}
-}
-
-function make_call(username, voiceBridge, server, callback, recall, isListenOnly) {
-	if (isListenOnly == null) {
-		isListenOnly = false;
-	}
-
-	if (userAgent == null) {
-		console.log("userAgent is still null. Delaying call");
-		var callDelayTimeout = setTimeout( function() {
-			make_call(username, voiceBridge, server, callback, recall, isListenOnly);
-		}, 100);
-		return;
-	}
-
-	if (!userAgent.isConnected()) {
-		console.log("Trying to make call, but UserAgent hasn't connected yet. Delaying call");
-		userAgent.once('connected', function() {
-			console.log("UserAgent has now connected, retrying the call");
-			make_call(username, voiceBridge, server, callback, recall, isListenOnly);
-		});
-		return;
-	}
-
-	if (currentSession) {
-		console.log('Active call detected ignoring second make_call');
-		return;
-	}
-
-	// Make an audio/video call:
-	console.log("Setting options.. ");
-
-	var options = {};
-	if (isListenOnly) {
-		// create necessary options for a listen only stream
-		var stream = null;
-		// handle the web browser
-		// create a stream object through the browser separated from user media
-		if (typeof webkitMediaStream !== 'undefined') {
-			// Google Chrome
-			stream = new webkitMediaStream;
-		} else {
-			// Firefox
-			audioContext = new window.AudioContext;
-			stream = audioContext.createMediaStreamDestination().stream;
-		}
-
-		options = {
-			media: {
-				stream: stream, // use the stream created above
-				constraints: {
-					audio: true,
-					video: false
-				},
-				render: {
-					remote: document.getElementById('remote-media')
-				}
-			},
-			// a list of our RTC Connection constraints
-			RTCConstraints: {
-				// our constraints are mandatory. We must received audio and must not receive audio
-				mandatory: {
-					OfferToReceiveAudio: true,
-					OfferToReceiveVideo: false
-				}
-			}
-		};
-	} else {
-		options = {
-			media: {
-				stream: userMicMedia,
-				constraints: {
-					audio: true,
-					video: false
-				},
-				render: {
-					remote: document.getElementById('remote-media')
-				}
-			}
-		};
-	}
-	
-	callTimeout = setTimeout(function() {
-		console.log('Ten seconds without updates sending timeout code');
-		callback({'status':'failed', 'errorcode': 1006}); // Failure on call
-		releaseUserMedia();
-		currentSession = null;
-		if (userAgent != null) {
-			var userAgentTemp = userAgent;
-			userAgent = null;
-			userAgentTemp.stop();
-		}
-	}, 10000);
-	
-	callActive = false;
-	callICEConnected = false;
-	callPurposefullyEnded = false;
-	callFailCounter = 0;
-	console.log("Calling to " + voiceBridge + "....");
-	currentSession = userAgent.invite('sip:' + voiceBridge + '@' + server, options); 
-	
-	// Only send the callback if it's the first try
-	if (recall === false) {
-		console.log('call connecting');
-		callback({'status':'connecting'});
-	} else {
-		console.log('call connecting again');
-	}
-	
-	/*
-	iceGatheringTimeout = setTimeout(function() {
-		console.log('Thirty seconds without ICE gathering finishing');
-		callback({'status':'failed', 'errorcode': 1011}); // ICE Gathering Failed
-		releaseUserMedia();
-		currentSession = null;
-		if (userAgent != null) {
-			var userAgentTemp = userAgent;
-			userAgent = null;
-			userAgentTemp.stop();
-		}
-	}, 30000);
-	*/
-	
-	currentSession.mediaHandler.on('iceGatheringComplete', function() {
-		clearTimeout(iceGatheringTimeout);
-	});
-	
-	// The connecting event fires before the listener can be added
-	currentSession.on('connecting', function(){
-		clearTimeout(callTimeout);
-	});
-	currentSession.on('progress', function(response){
-		console.log('call progress: ' + response);
-		clearTimeout(callTimeout);
-	});
-	currentSession.on('failed', function(response, cause){
-		console.log('call failed with cause: '+ cause);
-		
-		if (currentSession) {
-			releaseUserMedia();
-			if (callActive === false) {
-				callback({'status':'failed', 'errorcode': 1004, 'cause': cause}); // Failure on call
-				currentSession = null;
-				if (userAgent != null) {
-					var userAgentTemp = userAgent;
-					userAgent = null;
-					userAgentTemp.stop();
-				}
-			} else {
-				callActive = false;
-				//currentSession.bye();
-				currentSession = null;
-				if (userAgent != null) {
-					userAgent.stop();
-				}
-			}
-		}
-		clearTimeout(callTimeout);
-	});
-	currentSession.on('bye', function(request){
-		callActive = false;
-		
-		if (currentSession) {
-			console.log('call ended ' + currentSession.endTime);
-			releaseUserMedia();
-			if (callPurposefullyEnded === true) {
-				callback({'status':'ended'});
-			} else {
-				callback({'status':'failed', 'errorcode': 1005}); // Call ended unexpectedly
-			}
-			clearTimeout(callTimeout);
-			currentSession = null;
-		} else {
-			console.log('bye event already received');
-		}
-	});
-	currentSession.on('cancel', function(request) {
-		callActive = false;
-
-		if (currentSession) {
-			console.log('call canceled');
-			releaseUserMedia();
-			clearTimeout(callTimeout);
-			currentSession = null;
-		} else {
-			console.log('cancel event already received');
-		}
-	});
-	currentSession.on('accepted', function(data){
-		callActive = true;
-		console.log('BigBlueButton call accepted');
-		
-		if (callICEConnected === true) {
-			callback({'status':'started'});
-		} else {
-			callback({'status':'waitingforice'});
-			console.log('Waiting for ICE negotiation');
-			iceConnectedTimeout = setTimeout(function() {
-				console.log('5 seconds without ICE finishing');
-				callback({'status':'failed', 'errorcode': 1010}); // ICE negotiation timeout
-				releaseUserMedia();
-				currentSession = null;
-				if (userAgent != null) {
-					var userAgentTemp = userAgent;
-					userAgent = null;
-					userAgentTemp.stop();
-				}
-			}, 5000);
-		}
-		clearTimeout(callTimeout);
-	});
-	currentSession.mediaHandler.on('iceConnectionFailed', function() {
-		console.log('received ice negotiation failed');
-		callback({'status':'failed', 'errorcode': 1007}); // Failure on call
-		releaseUserMedia();
-		currentSession = null;
-		clearTimeout(iceConnectedTimeout);
-		if (userAgent != null) {
-			var userAgentTemp = userAgent;
-			userAgent = null;
-			userAgentTemp.stop();
-		}
-		
-		clearTimeout(callTimeout);
-	});
-	
-	// Some browsers use status of 'connected', others use 'completed', and a couple use both
-	
-	currentSession.mediaHandler.on('iceConnectionConnected', function() {
-		console.log('Received ICE status changed to connected');
-		if (callICEConnected === false) {
-			callICEConnected = true;
-			clearTimeout(iceConnectedTimeout);
-			if (callActive === true) {
-				callback({'status':'started'});
-			}
-			clearTimeout(callTimeout);
-		}
-	});
-	
-	currentSession.mediaHandler.on('iceConnectionCompleted', function() {
-		console.log('Received ICE status changed to completed');
-		if (callICEConnected === false) {
-			callICEConnected = true;
-			clearTimeout(iceConnectedTimeout);
-			if (callActive === true) {
-				callback({'status':'started'});
-			}
-			clearTimeout(callTimeout);
-		}
-	});
-}
-
-function webrtc_hangup(callback) {
-	callPurposefullyEnded = true;
-
-	console.log("Hanging up current session");
-	if (callback) {
-	  currentSession.on('bye', callback);
-	}
-	try {
-		currentSession.bye();
-	} catch (err) {
-		console.log("Forcing to cancel current session");
-		currentSession.cancel();
-	}
-}
-
-function releaseUserMedia() {
-	if (!!userMicMedia) {
-		console.log("Releasing media tracks");
-	
-		userMicMedia.getAudioTracks().forEach(function(track) {
-			track.stop();
-		});
-
-		userMicMedia.getVideoTracks().forEach(function(track) {
-			track.stop();
-		});
-		
-		userMicMedia = null;
-	}
-}
-
-function isWebRTCAvailable() {
-	if (bowser.msedge) {
-		return false;
-	} else {
-		return SIP.WebRTC.isSupported();
-	}
-}
-
-function getCallStatus() {
-	return currentSession;
-}
-

From d5189549bfb172cdfd53a8395ad810b82436184e Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Tue, 29 Jan 2019 16:11:20 -0800
Subject: [PATCH 163/163] webrtc call is ready in Edge when ICE completed not
 connected

---
 .../resources/prod/lib/bbb_webrtc_bridge_sip.js     | 13 ++++++++-----
 .../imports/api/audio/client/bridge/sip.js          | 11 +++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index bb17ee6a32..765bae598d 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -534,12 +534,15 @@ function make_call(username, voiceBridge, server, callback, recall, isListenOnly
 	currentSession.mediaHandler.on('iceConnectionConnected', function() {
 		console.log('Received ICE status changed to connected');
 		if (callICEConnected === false) {
-			callICEConnected = true;
-			clearTimeout(iceConnectedTimeout);
-			if (callActive === true) {
-				callback({'status':'started'});
+			// Edge is only ready once the status is 'completed' so we need to skip this step
+			if (!bowser.msedge) {
+				callICEConnected = true;
+				clearTimeout(iceConnectedTimeout);
+				if (callActive === true) {
+					callback({'status':'started'});
+				}
+				clearTimeout(callTimeout);
 			}
-			clearTimeout(callTimeout);
 		}
 	});
 	
diff --git a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
index 6c7492068c..2892e50581 100755
--- a/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
+++ b/bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
@@ -4,7 +4,7 @@ import { Tracker } from 'meteor/tracker';
 import BaseAudioBridge from './base';
 import logger from '/imports/startup/client/logger';
 import { fetchStunTurnServers } from '/imports/utils/fetchStunTurnServers';
-
+import browser from 'browser-detect';
 
 const MEDIA = Meteor.settings.public.media;
 const MEDIA_TAG = MEDIA.mediaTag;
@@ -279,7 +279,14 @@ export default class SIPBridge extends BaseAudioBridge {
     return new Promise((resolve) => {
       const { mediaHandler } = currentSession;
 
-      const connectionCompletedEvents = ['iceConnectionCompleted', 'iceConnectionConnected'];
+      let connectionCompletedEvents = ['iceConnectionCompleted', 'iceConnectionConnected'];
+      // Edge sends a connected first and then a completed, but the call isn't ready until
+      // the completed comes in. Due to the way that we have the listeners set up, the only
+      // way to ignore one status is to not listen for it.
+      if (browser().name === 'edge') {
+        connectionCompletedEvents  = ['iceConnectionCompleted'];
+      }
+
       const handleConnectionCompleted = () => {
         connectionCompletedEvents.forEach(e => mediaHandler.off(e, handleConnectionCompleted));
         // We have to delay notifying that the call is connected because it is sometimes not