Adds a comment about how FF handles the video.src attribute.

Adds support for FF/multistream.
Removes unnecessary error dialog when desktop sharing is started before the conference.
2026-01-01 04:12:27 +00:00 · 2015-03-05 11:26:44 +01:00 · 2015-03-04 21:33:06 +01:00 · 2015-03-04 13:58:07 +01:00 · 2015-03-04 12:59:52 +02:00 · 2015-03-04 09:37:19 +00:00
59 changed files with 4330 additions and 1549 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.bundle.js -text -diff
--- a/chromeonly.html
+++ b/chromeonly.html
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>Jitsi Meet: Unsupported Browser</title>
-<link rel="stylesheet" type="text/css" media="screen" href="css/chromeonly.css" />
-</head>
-
-<body>
-<!-- wrap starts here -->
-<div id="wrap"> 
-<a href="http://google.com/chrome"><div id="left"></div></a>
-<div id="middle"></div>
-<div id="text">
-    <p>This application is currently only supported by <a href="http://google.com/chrome">Chrome</a>, <a href="http://www.chromium.org/">Chromium</a> and <a href="http://www.opera.com">Opera</a></p>
-    <p><a href="http://google.com/chrome">Download Chrome</a></p>
-    <p class="firefox">We are hoping that <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=977864">multistream support</a> for Firefox would not be long so that we could all use this application with our favorite browser.</p>
-</div>
-<!-- wrap ends here -->
-</div>		
-</body>
-</html>
--- a/config.js
+++ b/config.js
@@ -20,8 +20,9 @@ var config = {
    chromeExtensionId: 'diibjkoicjeejcmhdnailmkgecihlobk', // Id of desktop streamer Chrome extension
    desktopSharingSources: ['screen', 'window'],
    minChromeExtVersion: '0.1', // Required version of Chrome extension
-    enableRtpStats: true, // Enables RTP stats processing
    openSctp: true, // Toggle to enable/disable SCTP channels
+    disableStats: false,
+    disableAudioLevels: false,
    channelLastN: -1, // The default value of the channel attribute last-n.
    adaptiveLastN: false,
    adaptiveSimulcast: false,
--- a/css/chromeonly.css
+++ b/css/chromeonly.css
@@ -1,54 +0,0 @@
-body {
-    width:100%;
-    height:100%;
-    background-color: white;
-    color: #424242;
-    font-family:'YanoneKaffeesatzLight',Verdana,Tahoma,Arial;
-    margin:0;
-    padding:0;
-}
-#wrap{
-    display: block;
-    position: absolute;
-    width:900px;
-    height: 262px;
-    overflow:hidden;
-    text-align: center;
-    margin: auto;
-    top: 0; left: 0; bottom: 0; right: 0;
-}
-#left{
-    display:inline-block;
-    background-image:url(../images/chromelogo.png);
-    background-repeat:no-repeat;
-    width:246px;
-    height:262px;
-    float: left;
-}
-.firefox{
-    font-size: 11pt;
-    color: #c8c8c8;
-}
-#middle{
-    display:inline-block;
-    background-image:url(../images/chromepointer.png);
-    background-repeat:no-repeat;
-    width:53px;
-    height:262px;
-    float: left;
-}
-#text{
-    display:inline-block;
-    font-size: 18pt;
-    width: 560px;
-    vertical-align:middle;
-    padding-top: 30px;
-}
-
-a {
-    color: #087dba;
-    text-decoration:none;
-}
-  
-   
-   
--- a/css/login_menu.css
+++ b/css/login_menu.css
@@ -0,0 +1,61 @@
+/*Initialize*/
+ul.loginmenu {
+    display:none;
+    position: absolute;
+    margin: 0;
+    padding: 5px;
+    padding-bottom: 7px;
+    top: 45px;
+    left: -5px;
+    background-color: rgba(0,0,0,0.9);
+    border: 1px solid rgba(256, 256, 256, 0.2);
+    border-radius:8px;
+}
+
+ul.loginmenu li {
+    list-style-type: none;
+    padding: 7px;
+}
+
+ul.loginmenu li.identity {
+    color: #fff;
+    font-size: 11pt;
+    cursor: default;
+}
+
+ul.loginmenu:after {
+    content: url('../images/dropdownPointer.png');
+    display: block;
+    position: absolute;
+    top: -7px;
+    left: 18px;
+}
+
+li a.authButton{
+    background-color: #06a5df;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    padding-left: 29px;
+    padding-right: 29px;
+    border-radius: 4px;
+    color: #fff;
+    font-size: 11pt;
+    cursor: pointer;
+}
+
+span.authentication:hover ul.loginmenu, ul.loginmenu:hover {
+    display:block !important;
+}
+
+a.disabled {
+    color: gray !important;
+    pointer-events: none;
+}
+
+.loginmenuPadding {
+    width: 50px;
+    height: 30px;
+    position: absolute;
+    top: -30px;
+    left: 0px;
+}
--- a/css/unsupported_browser.css
+++ b/css/unsupported_browser.css
@@ -0,0 +1,111 @@
+body {
+    width:100%;
+    height:100%;
+    background-color: white;
+    color: #424242;
+    font-family:Helvetica,'YanoneKaffeesatzLight',Verdana,Tahoma,Arial;
+    font-size: 28px;
+    margin:0;
+    padding:0;
+}
+#wrap{
+    display: block;
+    position: absolute;
+    width:900px;
+    height: 365px;
+    overflow:hidden;
+    text-align: center;
+    margin: auto;
+    top: 0; left: 0; bottom: 0; right: 0;
+}
+.firefox{
+    font-size: 11pt;
+    color: #c8c8c8;
+    width: 468px;
+    text-align: center;
+    margin: 30px auto 0px auto;
+    padding-left: 15px;
+}
+#text{
+    display:inline-block;
+    font-size: 28px;
+    width: 568px;
+    vertical-align:middle;
+    padding-top: 25px;
+}
+
+a {
+    color: #087dba;
+    text-decoration:none;
+}
+
+.browser {
+    width: 138px;
+    height: 163px;
+    margin-top: 5px;
+    background-color: #e8e8e8;
+    border: 1px solid #cfcfcf;
+    border-radius: 10px;
+}
+
+.browser_wrapper
+{
+    width: 138px;
+    height: 188px;
+    vertical-align: middle;
+    color: #929391;
+    font-size: 20px;
+    float: left;
+    margin-left: 15px;
+}
+
+.supported_browsers
+{
+    margin: 0px auto 0px auto;
+    width: 460px;
+}
+
+.clear
+{
+    clear: both;
+}
+
+.button
+{
+    background-color: #62c82a;
+    border: 1px solid #3c8117;
+    border-radius: 10px;
+    color: #FFFFFF;
+    font-size: 12px;
+    text-align: center;
+    width: 115px;
+    height: 26px;
+    padding-top: 13px;
+    margin: 15px auto 0px auto;
+}
+
+.logo
+{
+    margin: 20px auto 0px auto;
+}
+
+#chrome_logo
+{
+    width: 78px;
+    height: 78px;
+    background-image: url('/images/chrome.png');
+}
+#chromium_logo
+{
+    width: 77px;
+    height: 79px;
+    background-image: url('/images/chromium.png');
+}
+#opera_logo
+{
+    width: 73px;
+    height: 78px;
+    background-image: url('/images/opera.png');
+}
+   
+   
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -62,7 +62,7 @@ case "$1" in
        if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "VirtualHost \"auth.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG; then
            echo -e "\nVirtualHost \"auth.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
            echo -e "        authentication = \"internal_plain\"\n" >> $PROSODY_HOST_CONFIG
-            echo -e "admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\" }\n" >> $PROSODY_HOST_CONFIG
+            sed -i "s/Component \"conference.$JVB_HOSTNAME\" \"muc\"/Component \"conference.$JVB_HOSTNAME\" \"muc\"\nadmins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\" }\n/g" $PROSODY_HOST_CONFIG
            echo -e "Component \"focus.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
            echo -e "    component_secret=\"$JICOFO_SECRET\"\n" >> $PROSODY_HOST_CONFIG
            PROSODY_CREATE_JICOFO_USER="true"
--- a/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
+++ b/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
@@ -16,6 +16,7 @@ VirtualHost "jitmeet.example.com"
        }

 Component "conference.jitmeet.example.com" "muc"
+admins = { "focusUser@auth.jitmeet.example.com" }

 Component "jitsi-videobridge.jitmeet.example.com"
    component_secret = "jitmeetSecret"
@@ -23,7 +24,5 @@ Component "jitsi-videobridge.jitmeet.example.com"
 VirtualHost "auth.jitmeet.example.com"
        authentication = "internal_plain"

-admins = { "focusUser@auth.jitmeet.example.com" }
-
 Component "focus.jitmeet.example.com"
    component_secret = "focusSecret"
--- a/images/chrome.png
+++ b/images/chrome.png
--- a/images/chromelogo.png
+++ b/images/chromelogo.png
--- a/images/chromepointer.png
+++ b/images/chromepointer.png
--- a/images/chromium.png
+++ b/images/chromium.png
--- a/images/dropdownPointer.png
+++ b/images/dropdownPointer.png
--- a/images/firefox.png
+++ b/images/firefox.png
--- a/images/opera.png
+++ b/images/opera.png
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
    <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
    <meta itemprop="image" content="/images/jitsilogo.png"/>
    <script src="libs/jquery-2.1.1.min.js"></script>
-    <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
+    <script src="config.js?v=6"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
    <script src="libs/strophe/strophe.min.js?v=1"></script>
    <script src="libs/strophe/strophe.disco.min.js?v=1"></script>
    <script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>
@@ -19,8 +19,7 @@
    <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
    <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
    <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=7"></script>
-
+    <script src="libs/app.bundle.js?v=28"></script>
    <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
    <link rel="stylesheet" href="css/font.css?v=6"/>
    <link rel="stylesheet" href="css/toastr.css?v=1">
@@ -30,6 +29,7 @@
    <link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
    <link rel="stylesheet" href="css/modaldialog.css?v=3">
    <link rel="stylesheet" href="css/popup_menu.css?v=4">
+    <link rel="stylesheet" href="css/login_menu.css?v=1">
    <link rel="stylesheet" href="css/popover.css?v=2">
    <link rel="stylesheet" href="css/jitsi_popover.css?v=2">
    <link rel="stylesheet" href="css/contact_list.css?v=4">
@@ -121,6 +121,22 @@
        <div style="position: relative;" id="header_container">
            <div id="header">
                <span id="toolbar">
+                    <span id="authentication" class="authentication" style="display: none">
+                        <a class="button" id="toolbar_button_authentication" >
+                            <i id="authButton" class="icon-avatar"></i>
+                        </a>
+                        <ul class="loginmenu">
+                            <span class="loginmenuPadding"></span>
+                            <li id="toolbar_auth_identity" class="identity"></li>
+                            <li id="toolbar_button_login">
+                                <a class="authButton" data-i18n="toolbar.login"></a>
+                            </li>
+                            <li id="toolbar_button_logout">
+                                <a class="authButton" data-i18n="toolbar.logout"></a>
+                            </li>
+                        </ul>
+                        <div class="header_button_separator"></div>
+                    </span>
                    <a class="button" id="toolbar_button_mute" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="mutePopover" data-i18n="[content]toolbar.mute" content="Mute / Unmute">
                        <i id="mute" class="icon-microphone"></i>
                    </a>
@@ -128,12 +144,6 @@
                    <a class="button" id="toolbar_button_camera" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="toggleVideoPopover" data-i18n="[content]toolbar.videomute" content="Start / stop camera">
                        <i id="video" class="icon-camera"></i>
                    </a>
-                    <span id="authentication" style="display: none">
-                        <div class="header_button_separator"></div>
-                        <a class="button" id="toolbar_button_authentication" data-container="body" data-toggle="popover" data-placement="bottom" data-i18n="[content]toolbar.authenticate" content="Authenticate">
-                            <i id="authButton" class="icon-avatar"></i>
-                        </a>
-                    </span>
                    <span id="recording" style="display: none">
                        <div class="header_button_separator"></div>
                        <a class="button" id="toolbar_button_record" data-container="body" data-toggle="popover" data-placement="bottom" data-i18n="[content]toolbar.record" content="Record">
--- a/lang/languages-bg.json
+++ b/lang/languages-bg.json
@@ -0,0 +1 @@
+{}
--- a/lang/languages-de.json
+++ b/lang/languages-de.json
@@ -0,0 +1,5 @@
+{
+    "en": "Englisch",
+    "bg": "Bulgarisch",
+    "de": "Deutsch"
+}
--- a/lang/languages.json
+++ b/lang/languages.json
@@ -1,4 +1,5 @@
 {
    "en": "English",
-    "bg": "Bulgarian"
+    "bg": "Bulgarian",
+    "de": "German"
 }
--- a/lang/main-bg.json
+++ b/lang/main-bg.json
@@ -0,0 +1,170 @@
+{
+    "contactlist": "СПИСЪК С КОНТАКТИ",
+    "connectionsettings": "Настройки на връзката",
+    "poweredby": "",
+    "downloadlogs": "",
+    "welcomepage": {
+        "go": "",
+        "roomname": "",
+        "disable": "",
+        "feature1": {
+            "title": "",
+            "content": ""
+        },
+        "feature2": {
+            "title": "",
+            "content": ""
+        },
+        "feature3": {
+            "title": "",
+            "content": ""
+        },
+        "feature4": {
+            "title": "",
+            "content": ""
+        },
+        "feature5": {
+            "title": "",
+            "content": ""
+        },
+        "feature6": {
+            "title": "",
+            "content": ""
+        },
+        "feature7": {
+            "title": "",
+            "content": ""
+        },
+        "feature8": {
+            "title": "",
+            "content": ""
+        }
+    },
+    "toolbar": {
+        "mute": "",
+        "videomute": "",
+        "authenticate": "",
+        "record": "",
+        "lock": "",
+        "invite": "",
+        "chat": "",
+        "prezi": "",
+        "etherpad": "",
+        "sharescreen": "",
+        "fullscreen": "",
+        "sip": "",
+        "Settings": "",
+        "hangup": "",
+        "login": "",
+        "logout": ""
+    },
+    "bottomtoolbar": {
+        "chat": "",
+        "filmstrip": "",
+        "contactlist": ""
+    },
+    "chat": {
+        "nickname": {
+            "title": "",
+            "popover": ""
+        },
+        "messagebox": ""
+    },
+    "settings": {
+        "title": "НАСТРОЙКИ",
+        "update": "",
+        "name": ""
+    },
+    "videothumbnail": {
+        "editnickname": "",
+        "moderator": "",
+        "videomute": "",
+        "mute": "",
+        "kick": "",
+        "muted": "",
+        "domute": ""
+    },
+    "connectionindicator": {
+        "bitrate": "",
+        "packetloss": "",
+        "resolution": "",
+        "less": "",
+        "more": "",
+        "address": "",
+        "remoteports": "",
+        "localports": "",
+        "remoteport": "",
+        "localport": "",
+        "localaddress": "",
+        "localaddresses": "",
+        "remoteaddress": "",
+        "remoteaddresses": "",
+        "transport": "",
+        "bandwidth": "",
+        "na": ""
+    },
+    "notify": {
+        "disconnected": "",
+        "moderator": "",
+        "connected": "",
+        "somebody": "",
+        "me": "",
+        "focus": "",
+        "focusFail": "",
+        "grantedTo": "",
+        "grantedToUnknown": ""
+    },
+    "dialog": {
+        "kickMessage": "",
+        "popupError": "",
+        "passwordError": "",
+        "passwordError2": "",
+        "joinError": "",
+        "connectError": "",
+        "error": "",
+        "detectext": "",
+        "failtoinstall": "",
+        "failedpermissions": "",
+        "bridgeUnavailable": "",
+        "lockTitle": "",
+        "lockMessage": "",
+        "warning": "",
+        "passwordNotSupported": "",
+        "sorry": "",
+        "internalError": "",
+        "unableToSwitch": "",
+        "SLDFailure": "",
+        "SRDFailure": "",
+        "oops": "",
+        "defaultError": "",
+        "passwordRequired": "",
+        "Ok": "",
+        "removePreziTitle": "",
+        "removePreziMsg": "",
+        "sharePreziTitle": "",
+        "sharePreziMsg": "",
+        "Remove": "",
+        "Stop": "",
+        "AuthMsg": "",
+        "Authenticate": "",
+        "Cancel": "",
+        "sessTerminated": "",
+        "hungUp": "",
+        "joinAgain": "",
+        "Share": "",
+        "preziLinkError": "",
+        "Save": "",
+        "recordingToken": "",
+        "Dial": "",
+        "sipMsg": "",
+        "passwordCheck": "",
+        "passwordMsg": "",
+        "Invite": "",
+        "shareLink": "",
+        "settings1": "",
+        "settings2": "",
+        "settings3": "",
+        "yourPassword": "",
+        "Back": ""
+    }
+}
--- a/lang/main-de.json
+++ b/lang/main-de.json
@@ -0,0 +1,177 @@
+{
+    "contactlist": "Kontaktliste",
+    "connectionsettings": "Verbindungseinstellungen",
+    "poweredby": "Betrieben von",
+    "downloadlogs": "Log herunterladen",
+    "welcomepage": {
+        "go": "Los",
+        "roomname": "Raumnamen eingeben",
+        "disable": "Diese Seite beim nächsten Betreten nicht mehr anzeigen",
+        "feature1": {
+            "title": "Einfach zu benutzen",
+            "content": "Kein Download nötig. __app__ läuft direkt im Browser. Einfach die Konferenzadresse teilen und los geht's."
+        },
+        "feature2": {
+            "title": "Niedrige Bandbreite",
+            "content": "Videokonferenzen mit mehreren Teilnehmen mit weniger als 128Kpbs. Bildschirmfreigaben und Telefonkonferenzen kommen sogar mit noch weniger Bandbreite aus."
+        },
+        "feature3": {
+            "title": "Open Source",
+            "content": "__app__ steht unter der MIT Lizenz. __app__ kann gemäss der Lizenz heruntergeladen, verwendet, verändert und weitergegeben werden."
+        },
+        "feature4": {
+            "title": "Unbegrenzte Anzahl Benutzer",
+            "content": "Es gibt keine künstliche Beschränkung der Anzahl der Benutzer oder Konferenzteilnehmer. Die Leistung des Servers und die Bandbreite sind die einzigen limitierenden Faktoren."
+        },
+        "feature5": {
+            "title": "Bildschirmfreigabe",
+            "content": "Es ist ganz einfach den Bildschirm zu teilen. __app__ ist ideal für Online-Präsentationen, Vorlesungen und Fernwartungsanfragen."
+        },
+        "feature6": {
+            "title": "Sichere Konferenzen",
+            "content": "Privatsphäre gewünscht? __app__ Konferenzen können mit einem Passwort geschützt werden um ungebetene Gäste fernzuhalten und Unterbrechungen zu vermeiden."
+        },
+        "feature7": {
+            "title": "Freigegebene Notizen",
+            "content": "__app__ verwendent Etherpad, ein Editor zur kollaborativen Bearbeitung von Texten."
+        },
+        "feature8": {
+            "title": "Benutzungsstatistiken",
+            "content": "Die Verwendung kann durch die Integration mit Piwik, Google Analytics und anderen Überwachungs- und Statistikprogrammen protokolliert werden."
+        }
+    },
+    "toolbar": {
+        "mute": "Stummschaltung aktivieren / deaktivieren",
+        "videomute": "Kamera starten / stoppen",
+        "authenticate": "Anmelden",
+        "record": "Aufnehmen",
+        "lock": "Raum sperren / entsperren",
+        "invite": "Andere einladen",
+        "chat": "Chat öffnen / schliessen",
+        "prezi": "Prezi freigeben",
+        "etherpad": "Geteiltes Dokument",
+        "sharescreen": "Bildschirm freigeben",
+        "fullscreen": "Vollbildmodus aktivieren / deaktivieren",
+        "sip": "SIP Nummer anrufen",
+        "Settings": "Einstellungen",
+        "hangup": "Auflegen",
+        "login": "Anmelden",
+        "logout": "Abmelden"
+    },
+    "bottomtoolbar": {
+        "chat": "Chat öffnen / schliessen",
+        "filmstrip": "Kontaktliste öffnen / schliessen",
+        "contactlist": "Videovorschauen anzeigen / verstecken"
+    },
+    "chat": {
+        "nickname": {
+            "title": "Nickname im Eingabefeld eingeben",
+            "popover": "Einen Namen auswählen"
+        },
+        "messagebox": "Text eingeben..."
+    },
+    "settings": {
+        "title": "Einstellungen",
+        "update": "Aktualisieren",
+        "name": "Name"
+    },
+    "videothumbnail": {
+        "editnickname": "Klicken um den Anzeigenamen zu bearbeiten",
+        "moderator": "Der Besitzer dieser Konferenz",
+        "videomute": "Teilnehmer hat die Kamera pausiert.",
+        "mute": "Teilnehmer ist stumm geschaltet",
+        "kick": "Hinauswerfen",
+        "muted": "Stummgeschaltet",
+        "domute": "Stummschalten"
+    },
+    "connectionindicator": {
+        "bitrate": "Bitrate:",
+        "packetloss": "Paketverlust:",
+        "resolution": "Auflösung:",
+        "less": "Weniger anzeigen",
+        "more": "Mehr anzeigen",
+        "address": "Adresse:",
+        "remoteport": "Entfernter Port:",
+        "remoteport_plural": "Entfernte Ports:",
+        "localport": "Lokaler Port:",
+        "localport_plural": "Lokale Ports:",
+        "localaddress": "Lokale Adresse:",
+        "localaddress_plural": "Lokale Adressen:",
+        "remoteaddress": "Entfernte Adresse:",
+        "remoteaddress_plural": "Entfernte Adressen:",
+        "transport": "Protokoll:",
+        "bandwidth": "Geschätzte Bandbreite:",
+        "na": "Verbindungsdaten erneut anzeigen wenn die Konferenz begonnen hat"
+    },
+    "notify": {
+        "disconnected": "getrennt",
+        "moderator": "Moderatorenrechte vergeben",
+        "connected": "verbunden",
+        "somebody": "Jemand",
+        "me": "Ich",
+        "focus": "Konferenz-Organisator",
+        "focusFail": "__component__ ist im Moment nicht verfügbar - wiederholen in __ms__ Sekunden",
+        "grantedTo": "Moderatorenrechte an __to__ vergeben.",
+        "grantedToUnknown": "Moderatorenrechte an $t(somebody) vergeben."
+    },
+    "dialog": {
+        "kickMessage": "Oh! Sie wurden aus der Konferenz ausgeschlossen.",
+        "popupError": "Ihr Browser blockiert Popups von dieser Webseite. Bitte erlauben Sie Popups in den Sicherheitseinstellungen und versuchen Sie es erneut.",
+        "passwordError": "Diese Konferenz ist mit einem Paswort geschützt. Nur der Besitzer der Konferenz kann ein Passwort vergeben.",
+        "passwordError2": "Diese Konferenzt ist nicht mit einem Passwort geschützt. Nur der Besitzer der Konferenz kann ein Passwort vergeben.",
+        "joinError": "Oh! Der Konferenz konnte nicht beigetreten werden. Diese könnte ein Problem mit den Sicherheitseinstellungen sein. Bitte kontaktieren Sie den Administrator des Dienstes.",
+        "connectError": "Oh! Es hat etwas nicht geklappt und der Konferenz konnte nicht beigetreten werden.",
+        "error": "Fehler",
+        "detectext": "Fehler bei der Erkennung der Bildschirmfreigabeerweiterung.",
+        "failtoinstall": "Die Bildschirmfreigabeerweiterung konnte nicht installiert werden.",
+        "failedpermissions": "Die Zugriffsberechtigungen auf das Mikrofon und/oder die Kamera konnte nicht eingeholt werden.",
+        "bridgeUnavailable": "Die Jitsi Videobridge ist momentan nicht erreichbar. Bitte versuchen Sie es später noch einmal.",
+        "lockTitle": "Sperren fehlgeschlagen",
+        "lockMessage": "Die Konferenz konnte nicht gesperrt werden.",
+        "warning": "Warnung",
+        "passwordNotSupported": "Passwörter für Räume werden nicht unterstützt.",
+        "sorry": "Entschuldigung",
+        "internalError": "Interner Anwendungsfehler [setRemoteDescription]",
+        "unableToSwitch": "Der Videodatenstrom kann nicht gewechselt werden.",
+        "SLDFailure": "Oh! Die Stummschaltung konnte nicht aktiviert werden. (SLD Fehler)",
+        "SRDFailure": "Oh! Das Video konnte nicht gestoppt werden. (SRD Fehler)",
+        "oops": "Oh!",
+        "defaultError": "Es ist ein Fehler aufgetreten",
+        "passwordRequired": "Passwort erforderlich",
+        "Ok": "OK",
+        "removePreziTitle": "Prezi entfernen",
+        "removePreziMsg": "Sind Sie sich sicher dass sie Prezi entfernen möchten?",
+        "sharePreziTitle": "Ein Prezi teilen",
+        "sharePreziMsg": "Ein anderer Teilnehmer teilt bereits ein Prezi. Diese Konferenz kann nur eine Prezi auf einmal anzeigen.",
+        "Remove": "Entfernen",
+        "Stop": "Stopp",
+        "AuthMsg": "Für die Erstellung des Raums ist eine Authentifizierung erforderlich. <br/><b>__room__</b><br/>Sie können sich entweder anmelden oder warten bis jemand anderes die Authentifizierung vornimmt.",
+        "Authenticate": "Anmelden",
+        "Cancel": "Abbrechen",
+        "logoutTitle": "Abmelden",
+        "logoutQuestion": "Sind Sie sicher dass Sie sich abmelden und die Konferenz verlassen möchten?",
+        "sessTerminated": "Sitzung beendet",
+        "hungUp": "Anruf beendet",
+        "joinAgain": "Erneut beitreten",
+        "Share": "Teilen",
+        "preziLinkError": "Bitte einen gültigen Prezi-Link angeben.",
+        "Save": "Speichern",
+        "recordingToken": "Aufnahme-Token eingeben",
+        "Dial": "Wählen",
+        "sipMsg": "Geben Sie eine SIP Nummer ein",
+        "passwordCheck": "Sind Sie sicher dass Sie das Passwort entfernen möchten?",
+        "passwordMsg": "Passwort setzen um den Raum zu sperren",
+        "Invite": "Einladen",
+        "shareLink": "Teilen Sie diesen Link mit jedem den Sie einladen möchten",
+        "settings1": "Konferenz einrichten",
+        "settings2": "Teilnehmer treten stummgeschaltet bei",
+        "settings3": "Nickname erforderlich<br/><br/>Setzen Sie ein Passwort um den Raum zu sperren:",
+        "yourPassword": "Ihr Passwort",
+        "Back": "Zurück",
+        "serviceUnavailable": "Dienst nicht verfügbar",
+        "gracefulShutdown": "Der Dienst steht momentan wegen Wartungsarbeiten nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
+        "Yes": "Ja",
+        "reservationError": "Fehler im Reservationssystem",
+        "reservationErrorMsg": "Fehler, Nummer: __code__, Nachricht: __msg__"
+    }
+}
--- a/lang/main.json
+++ b/lang/main.json
@@ -54,7 +54,9 @@
        "fullscreen": "Enter / Exit Full Screen",
        "sip": "Call SIP number",
        "Settings": "Settings",
-        "hangup": "Hang Up"
+        "hangup": "Hang Up",
+        "login": "Login",
+        "logout": "Logout"
    },
    "bottomtoolbar": {
        "chat": "Open / close chat",
@@ -88,33 +90,98 @@
    "connectionindicator":
    {
        "bitrate": "Bitrate:",
-        "packetloss": "Packet loss: ",
+        "packetloss": "Packet loss:",
        "resolution": "Resolution:",
        "less": "Show less",
        "more": "Show more",
        "address": "Address:",
-        "remoteports": "Remote ports:",
-        "localports": "Local ports:",
+        "remoteport_plural": "Remote ports:",
+        "localport_plural": "Local ports:",
        "remoteport": "Remote port:",
        "localport": "Local port:",
-        "localaddress": "Local address: ",
-        "localaddresses": "Local addresses: ",
-        "remoteaddress": "Remote address: ",
-        "remoteaddresses": "Remote addresses: ",
-        "transport": "Transport: ",
+        "localaddress": "Local address:",
+        "localaddress_plural": "Local addresses:",
+        "remoteaddress": "Remote address:",
+        "remoteaddress_plural": "Remote addresses:",
+        "transport": "Transport:",
        "bandwidth": "Estimated bandwidth:",
        "na": "Come back here for connection information once the conference starts"
    },
    "notify": {
        "disconnected": "disconnected",
-        "moderator": "Moderator rights granted !",
-        "connected": "connected"
+        "moderator": "Moderator rights granted!",
+        "connected": "connected",
+        "somebody": "Somebody",
+        "me": "Me",
+        "focus": "Conference focus",
+        "focusFail": "__component__ not available - retry in __ms__ sec",
+        "grantedTo": "Moderator rights granted to __to__!",
+        "grantedToUnknown": "Moderator rights granted to $t(somebody)!"
+
+    },
+    "dialog": {
+        "kickMessage": "Ouch! You have been kicked out of the meet!",
+        "popupError": "Your browser is blocking popup windows from this site. Please enable popups in your browser security settings and try again.",
+        "passwordError": "This conversation is currently protected by a password. Only the owner of the conference could set a password.",
+        "passwordError2": "This conversation isn't currently protected by a password. Only the owner of the conference could set a password.",
+        "joinError": "Oops! We couldn't join the conference. There might be some problem with security configuration. Please contact service administrator.",
+        "connectError": "Oops! Something went wrong and we couldn't connect to the conference.",
+        "error": "Error",
+        "detectext": "Error when trying to detect desktopsharing extension.",
+        "failtoinstall": "Failed to install desktop sharing extension",
+        "failedpermissions": "Failed to obtain permissions to use the local microphone and/or camera.",
+        "bridgeUnavailable": "Jitsi Videobridge is currently unavailable. Please try again later!",
+        "lockTitle": "Lock failed",
+        "lockMessage": "Failed to lock conference.",
+        "warning": "Warning",
+        "passwordNotSupported": "Room passwords are currently not supported.",
+        "sorry": "Sorry",
+        "internalError": "Internal application error [setRemoteDescription]",
+        "unableToSwitch": "Unable to switch video stream.",
+        "SLDFailure": "Oops! Something went wrong and we failed to mute! (SLD Failure)",
+        "SRDFailure": "Oops! Something went wrong and we failed to stop video! (SRD Failure)",
+        "oops": "Oops!",
+        "defaultError": "There was some kind of error",
+        "passwordRequired": "Password required",
+        "Ok": "Ok",
+        "removePreziTitle": "Remove Prezi",
+        "removePreziMsg": "Are you sure you would like to remove your Prezi?",
+        "sharePreziTitle": "Share a Prezi",
+        "sharePreziMsg": "Another participant is already sharing a Prezi.This conference allows only one Prezi at a time.",
+        "Remove": "Remove",
+        "Stop": "Stop",
+        "AuthMsg": "Authentication is required to create room:<br/><b>__room__ </b></br> You can either authenticate to create the room or just wait for someone else to do so.",
+        "Authenticate": "Authenticate",
+        "Cancel": "Cancel",
+        "logoutTitle" : "Logout",
+        "logoutQuestion" : "Are you sure you want to logout and stop the conference?",
+        "sessTerminated": "Session Terminated",
+        "hungUp": "You hung up the call",
+        "joinAgain": "Join again",
+        "Share": "Share",
+        "preziLinkError": "Please provide a correct prezi link.",
+        "Save": "Save",
+        "recordingToken": "Enter recording token",
+        "Dial": "Dial",
+        "sipMsg": "Enter SIP number",
+        "passwordCheck": "Are you sure you would like to remove your password?",
+        "Remove": "Remove",
+        "passwordMsg": "Set a password to lock your room",
+        "Invite": "Invite",
+        "shareLink": "Share this link with everyone you want to invite",
+        "settings1": "Configure your conference",
+        "settings2": "Participants join muted",
+        "settings3": "Require nicknames<br/><br/>Set a password to lock your room:",
+        "yourPassword": "your password",
+        "Back": "Back",
+        "serviceUnavailable": "Service unavailable",
+        "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
+        "Yes": "Yes",
+        "reservationError": "Reservation system error",
+        "reservationErrorMsg": "Error code: __code__, message: __msg__",
+        "password": "password",
+        "userPassword": "user password",
+        "token": "token"

    }
-
-
-
-
-
-
-}
+}
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
--- a/modules/RTC/DataChannels.js
+++ b/modules/RTC/DataChannels.js
@@ -36,7 +36,7 @@ var DataChannels =
            // selections so that it can do adaptive simulcast,
            // we want the notification to trigger even if userJid is undefined,
            // or null.
-            var userJid = APP.UI.getLargeVideoState().userJid;
+            var userJid = APP.UI.getLargeVideoState().userResourceJid;
            // we want the notification to trigger even if userJid is undefined,
            // or null.
            onSelectedEndpointChanged(userJid);
@@ -194,6 +194,8 @@ function onSelectedEndpointChanged(userResource)
        _dataChannels.some(function (dataChannel) {
            if (dataChannel.readyState == 'open')
            {
+                console.log('sending selected endpoint changed ' 
+                    + 'notification to the bridge: ', userResource);
                dataChannel.send(JSON.stringify({
                    'colibriClass': 'SelectedEndpointChangedEvent',
                    'selectedEndpoint':
--- a/modules/RTC/MediaStream.js
+++ b/modules/RTC/MediaStream.js
@@ -33,13 +33,6 @@ function MediaStream(data, sid, ssrc, browser) {
        MediaStreamType.VIDEO_TYPE : MediaStreamType.AUDIO_TYPE;
    this.videoType = null;
    this.muted = false;
-    if(browser == RTCBrowserType.RTC_BROWSER_FIREFOX)
-    {
-        if (!this.getVideoTracks)
-            this.getVideoTracks = function () { return []; };
-        if (!this.getAudioTracks)
-            this.getAudioTracks = function () { return []; };
-    }
 }


--- a/modules/RTC/RTCUtils.js
+++ b/modules/RTC/RTCUtils.js
@@ -1,60 +1,52 @@
 var RTCBrowserType = require("../../service/RTC/RTCBrowserType.js");
+var Resolutions = require("../../service/RTC/Resolutions");
+
+var currentResolution = null;
+
+function getPreviousResolution(resolution) {
+    if(!Resolutions[resolution])
+        return null;
+    var order = Resolutions[resolution].order;
+    var res = null;
+    var resName = null;
+    for(var i in Resolutions)
+    {
+        var tmp = Resolutions[i];
+        if(res == null || (res.order < tmp.order && tmp.order < order))
+        {
+            resName = i;
+            res = tmp;
+        }
+    }
+    return resName;
+}

 function setResolutionConstraints(constraints, resolution, isAndroid)
 {
    if (resolution && !constraints.video || isAndroid) {
        constraints.video = { mandatory: {}, optional: [] };// same behaviour as true
    }
-    // see https://code.google.com/p/chromium/issues/detail?id=143631#c9 for list of supported resolutions
-    switch (resolution) {
-        // 16:9 first
-        case '1080':
-        case 'fullhd':
-            constraints.video.mandatory.minWidth = 1920;
-            constraints.video.mandatory.minHeight = 1080;
-            break;
-        case '720':
-        case 'hd':
-            constraints.video.mandatory.minWidth = 1280;
-            constraints.video.mandatory.minHeight = 720;
-            break;
-        case '360':
-            constraints.video.mandatory.minWidth = 640;
-            constraints.video.mandatory.minHeight = 360;
-            break;
-        case '180':
-            constraints.video.mandatory.minWidth = 320;
-            constraints.video.mandatory.minHeight = 180;
-            break;
-        // 4:3
-        case '960':
-            constraints.video.mandatory.minWidth = 960;
-            constraints.video.mandatory.minHeight = 720;
-            break;
-        case '640':
-        case 'vga':
-            constraints.video.mandatory.minWidth = 640;
-            constraints.video.mandatory.minHeight = 480;
-            break;
-        case '320':
+
+    if(Resolutions[resolution])
+    {
+        constraints.video.mandatory.minWidth = Resolutions[resolution].width;
+        constraints.video.mandatory.minHeight = Resolutions[resolution].height;
+    }
+    else
+    {
+        if (isAndroid) {
            constraints.video.mandatory.minWidth = 320;
            constraints.video.mandatory.minHeight = 240;
-            break;
-        default:
-            if (isAndroid) {
-                constraints.video.mandatory.minWidth = 320;
-                constraints.video.mandatory.minHeight = 240;
-                constraints.video.mandatory.maxFrameRate = 15;
-            }
-            break;
+            constraints.video.mandatory.maxFrameRate = 15;
+        }
    }
+
    if (constraints.video.mandatory.minWidth)
        constraints.video.mandatory.maxWidth = constraints.video.mandatory.minWidth;
    if (constraints.video.mandatory.minHeight)
        constraints.video.mandatory.maxHeight = constraints.video.mandatory.minHeight;
 }

-
 function getConstraints(um, resolution, bandwidth, fps, desktopStream, isAndroid)
 {
    var constraints = {audio: false, video: false};
@@ -144,6 +136,13 @@ function RTCUtils(RTCService)
            this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
            this.pc_constraints = {};
            this.attachMediaStream =  function (element, stream) {
+                //  srcObject is being standardized and FF will eventually
+                //  support that unprefixed. FF also supports the
+                //  "element.src = URL.createObjectURL(...)" combo, but that
+                //  will be deprecated in favour of srcObject.
+                //
+                // https://groups.google.com/forum/#!topic/mozilla.dev.media/pKOiioXonJg
+                // https://github.com/webrtc/samples/issues/302
                element[0].mozSrcObject = stream;
                element[0].play();
            };
@@ -203,13 +202,13 @@ function RTCUtils(RTCService)
    {
        try { console.log('Browser does not appear to be WebRTC-capable'); } catch (e) { }

-        window.location.href = 'webrtcrequired.html';
+        window.location.href = 'unsupported_browser.html';
        return;
    }

    if (this.browser !== RTCBrowserType.RTC_BROWSER_CHROME &&
        config.enableFirefoxSupport !== true) {
-        window.location.href = 'chromeonly.html';
+        window.location.href = 'unsupported_browser.html';
        return;
    }

@@ -220,6 +219,7 @@ RTCUtils.prototype.getUserMediaWithConstraints = function(
    um, success_callback, failure_callback, resolution,bandwidth, fps,
    desktopStream)
 {
+    currentResolution = resolution;
    // Check if we are running on Android device
    var isAndroid = navigator.userAgent.indexOf('Android') != -1;

@@ -278,28 +278,58 @@ RTCUtils.prototype.getUserMediaWithConstraints = function(
 RTCUtils.prototype.obtainAudioAndVideoPermissions = function() {
    var self = this;
    // Get AV
-    var cb = function (stream) {
-        console.log('got', stream, stream.getAudioTracks().length, stream.getVideoTracks().length);
-        self.handleLocalStream(stream);
-    };
-    var self = this;
+
    this.getUserMediaWithConstraints(
        ['audio', 'video'],
-        cb,
-        function (error) {
-            console.error('failed to obtain audio/video stream - trying audio only', error);
-            self.getUserMediaWithConstraints(
-                ['audio'],
-                cb,
-                function (error) {
-                    console.error('failed to obtain audio/video stream - stop', error);
-                    APP.UI.messageHandler.showError("Error",
-                            "Failed to obtain permissions to use the local microphone" +
-                            "and/or camera.");
-                }
-            );
+        function (stream) {
+            self.successCallback(stream);
        },
-            config.resolution || '360');
+        function (error) {
+            self.errorCallback(error);
+        },
+        config.resolution || '360');
+}
+
+RTCUtils.prototype.successCallback = function (stream) {
+    console.log('got', stream, stream.getAudioTracks().length,
+        stream.getVideoTracks().length);
+    this.handleLocalStream(stream);
+};
+
+RTCUtils.prototype.errorCallback = function (error) {
+    var self = this;
+    console.error('failed to obtain audio/video stream - trying audio only', error);
+    var resolution = getPreviousResolution(currentResolution);
+    if(typeof error == "object" && error.constraintName && error.name
+        && (error.name == "ConstraintNotSatisfiedError" ||
+            error.name == "OverconstrainedError") &&
+        (error.constraintName == "minWidth" || error.constraintName == "maxWidth" ||
+            error.constraintName == "minHeight" || error.constraintName == "maxHeight")
+        && resolution != null)
+    {
+        self.getUserMediaWithConstraints(['audio', 'video'],
+            function (stream) {
+                return self.successCallback(stream);
+            }, function (error) {
+                return self.errorCallback(error);
+            }, resolution);
+    }
+    else
+    {
+        self.getUserMediaWithConstraints(
+            ['audio'],
+            function (stream) {
+                return self.successCallback(stream);
+            },
+            function (error) {
+                console.error('failed to obtain audio/video stream - stop',
+                    error);
+                APP.UI.messageHandler.showError("dialog.error",
+                    "dialog.failedpermissions");
+            }
+        );
+    }
+
 }

 RTCUtils.prototype.handleLocalStream = function(stream)
@@ -332,4 +362,4 @@ RTCUtils.prototype.handleLocalStream = function(stream)



-module.exports = RTCUtils;
+module.exports = RTCUtils;
--- a/modules/RTC/package.json
+++ b/modules/RTC/package.json
@@ -1,8 +0,0 @@
-{
-    "name": "RTC",
-    "version": "0.0.1",
-    "main": "RTC.js",
-    "description": "Provedes media streams and data channels utilities for Jitsi Meet",
-    "dependencies": {
-    }
-}
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -12,7 +12,7 @@ var ContactList = require("./side_pannels/contactlist/ContactList");
 var Avatar = require("./avatar/Avatar");
 var EventEmitter = require("events");
 var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
-var Settings = require("./side_pannels/settings/Settings");
+var Settings = require("./../settings/Settings");
 var PanelToggler = require("./side_pannels/SidePanelToggler");
 var RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
 UI.messageHandler = require("./util/MessageHandler");
@@ -102,7 +102,6 @@ function registerListeners() {
        function (endpointSimulcastLayers) {
            VideoLayout.onSimulcastLayersChanging(endpointSimulcastLayers);
        });
-    VideoLayout.init(eventEmitter);

    APP.statistics.addAudioLevelListener(function(jid, audioLevel)
    {
@@ -136,13 +135,46 @@ function registerListeners() {
    APP.connectionquality.addListener(CQEvents.STOP,
        VideoLayout.onStatsStop);
    APP.xmpp.addListener(XMPPEvents.DISPOSE_CONFERENCE, onDisposeConference);
+    APP.xmpp.addListener(XMPPEvents.GRACEFUL_SHUTDOWN, function () {
+        messageHandler.openMessageDialog(
+            'dialog.serviceUnavailable',
+            'dialog.gracefulShutdown'
+        );
+    });
+    APP.xmpp.addListener(XMPPEvents.RESERVATION_ERROR, function (code, msg) {
+        var title = APP.translation.generateTranslatonHTML(
+            "dialog.reservationError");
+        var message = APP.translation.generateTranslatonHTML(
+            "dialog.reservationErrorMsg", {code: code, msg: msg});
+        messageHandler.openDialog(
+            title,
+            message,
+            true, {},
+            function (event, value, message, formVals)
+            {
+                return false;
+            }
+        );
+    });
    APP.xmpp.addListener(XMPPEvents.KICKED, function () {
-        messageHandler.openMessageDialog("Session Terminated",
-            "Ouch! You have been kicked out of the meet!");
+        messageHandler.openMessageDialog("dialog.sessTerminated",
+            "dialog.kickMessage");
+    });
+    APP.xmpp.addListener(XMPPEvents.MUC_DESTROYED, function (reason) {
+        //FIXME: use Session Terminated from translation, but
+        // 'reason' text comes from XMPP packet and is not translated
+        var title = APP.translation.generateTranslatonHTML("dialog.sessTerminated");
+        messageHandler.openDialog(
+            title, reason, true, {},
+            function (event, value, message, formVals)
+            {
+                return false;
+            }
+        );
    });
    APP.xmpp.addListener(XMPPEvents.BRIDGE_DOWN, function () {
-        messageHandler.showError("Error",
-            "Jitsi Videobridge is currently unavailable. Please try again later!");
+        messageHandler.showError("dialog.error",
+            "dialog.bridgeUnavailable");
    });
    APP.xmpp.addListener(XMPPEvents.USER_ID_CHANGED, function (from, id) {
        Avatar.setUserAvatar(from, id);
@@ -277,7 +309,8 @@ UI.start = function (init) {
    // Set the defaults for prompt dialogs.
    jQuery.prompt.setDefaults({persistent: false});

-
+    VideoLayout.init(eventEmitter);
+    AudioLevels.init();
    NicknameHandler.init(eventEmitter);
    registerListeners();
    bindEvents();
@@ -371,10 +404,6 @@ function onMucJoined(jid, info) {
    // Once we've joined the muc show the toolbar
    ToolbarToggler.showToolbar();

-    // Show authenticate button if needed
-    Toolbar.showAuthenticateButton(
-            APP.xmpp.isExternalAuthEnabled() && !APP.xmpp.isModerator());
-
    var displayName = !config.displayJids
        ? info.displayName : Strophe.getResourceFromJid(jid);

@@ -390,9 +419,9 @@ function onMucLeft(jid) {
    console.log('left.muc', jid);
    var displayName = $('#participant_' + Strophe.getResourceFromJid(jid) +
        '>.displayname').html();
-    messageHandler.notify(displayName || 'Somebody',
+    messageHandler.notify(displayName,'notify.somebody',
        'disconnected',
-        'disconnected');
+        'notify.disconnected');
    // Need to call this with a slight delay, otherwise the element couldn't be
    // found for some reason.
    // XXX(gp) it works fine without the timeout for me (with Chrome 38).
@@ -413,19 +442,17 @@ function onMucLeft(jid) {
 };


-function onLocalRoleChange(jid, info, pres, isModerator, isExternalAuthEnabled)
+function onLocalRoleChange(jid, info, pres, isModerator)
 {

    console.info("My role changed, new role: " + info.role);
    onModeratorStatusChanged(isModerator);
    VideoLayout.showModeratorIndicator();
-    Toolbar.showAuthenticateButton(
-            isExternalAuthEnabled && !isModerator);

    if (isModerator) {
        Authentication.closeAuthenticationWindow();
-        messageHandler.notify(
-            'Me', 'connected', 'Moderator rights granted !');
+        messageHandler.notify(null, "notify.me",
+            'connected', "notify.moderator");
    }
 }

@@ -447,12 +474,18 @@ function onModeratorStatusChanged(isModerator) {
 function onPasswordReqiured(callback) {
    // password is required
    Toolbar.lockLockButton();
+    var message = '<h2 data-i18n="dialog.passwordRequired">';
+    message += APP.translation.translateString(
+        "dialog.passwordRequired");
+    message += '</h2>' +
+        '<input id="lockKey" type="text" data-i18n=' +
+        '"[placeholder]dialog.password" placeholder="' +
+        APP.translation.translateString("dialog.password") +
+        '" autofocus>';

-    messageHandler.openTwoButtonDialog(null,
-            '<h2>Password required</h2>' +
-            '<input id="lockKey" type="text" placeholder="password" autofocus>',
+    messageHandler.openTwoButtonDialog(null, null, null, message,
        true,
-        "Ok",
+        "dialog.Ok",
        function (e, v, m, f) {},
        function (event) {
            document.getElementById('lockKey').focus();
@@ -469,9 +502,9 @@ function onPasswordReqiured(callback) {
    );
 }
 function onMucEntered(jid, id, displayName) {
-    messageHandler.notify(displayName || 'Somebody',
+    messageHandler.notify(displayName,'notify.somebody',
        'connected',
-        'connected');
+        'notify.connected');

    // Add Peer's container
    VideoLayout.ensurePeerContainerExists(jid,id);
@@ -486,14 +519,19 @@ function onMucRoleChanged(role, displayName) {
    VideoLayout.showModeratorIndicator();

    if (role === 'moderator') {
-        var displayName = displayName;
+        var messageKey, messageOptions = {};
        if (!displayName) {
-            displayName = 'Somebody';
+            messageKey = "notify.grantedToUnknown";
+        }
+        else
+        {
+            messageKey = "notify.grantedTo";
+            messageOptions = {to: displayName};
        }
        messageHandler.notify(
-            displayName,
-            'connected',
-                'Moderator rights granted to ' + displayName + '!');
+            displayName,'notify.somebody',
+            'connected', messageKey,
+            messageOptions);
    }
 }

@@ -602,13 +640,18 @@ UI.disableConnect = function () {
 UI.showLoginPopup = function(callback)
 {
    console.log('password is required');
-
-    UI.messageHandler.openTwoButtonDialog(null,
-            '<h2>Password required</h2>' +
-            '<input id="passwordrequired.username" type="text" placeholder="user@domain.net" autofocus>' +
-            '<input id="passwordrequired.password" type="password" placeholder="user password">',
+    var message = '<h2 data-i18n="dialog.passwordRequired">';
+    message += APP.translation.translateString(
+        "dialog.passwordRequired");
+    message += '</h2>' +
+        '<input id="passwordrequired.username" type="text" ' +
+        'placeholder="user@domain.net" autofocus>' +
+        '<input id="passwordrequired.password" ' +
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
+        ' placeholder="user password">';
+    UI.messageHandler.openTwoButtonDialog(null, null, null, message,
        true,
-        "Ok",
+        "dialog.Ok",
        function (e, v, m, f) {
            if (v) {
                var username = document.getElementById('passwordrequired.username');
--- a/modules/UI/audio_levels/AudioLevels.js
+++ b/modules/UI/audio_levels/AudioLevels.js
@@ -1,5 +1,20 @@
 var CanvasUtil = require("./CanvasUtils");

+var ASDrawContext = $('#activeSpeakerAudioLevel')[0].getContext('2d');
+
+function initActiveSpeakerAudioLevels() {
+    var ASRadius = interfaceConfig.ACTIVE_SPEAKER_AVATAR_SIZE / 2;
+    var ASCenter = (interfaceConfig.ACTIVE_SPEAKER_AVATAR_SIZE + ASRadius) / 2;
+
+// Draw a circle.
+    ASDrawContext.arc(ASCenter, ASCenter, ASRadius, 0, 2 * Math.PI);
+
+// Add a shadow around the circle
+    ASDrawContext.shadowColor = interfaceConfig.SHADOW_COLOR;
+    ASDrawContext.shadowOffsetX = 0;
+    ASDrawContext.shadowOffsetY = 0;
+}
+
 /**
 * The audio Levels plugin.
 */
@@ -8,6 +23,10 @@ var AudioLevels = (function(my) {

    my.LOCAL_LEVEL = 'local';

+    my.init = function () {
+        initActiveSpeakerAudioLevels();
+    }
+
    /**
     * Updates the audio level canvas for the given peerJid. If the canvas
     * didn't exist we create it.
@@ -94,44 +113,26 @@ var AudioLevels = (function(my) {
        }

        if(resourceJid  === largeVideoResourceJid) {
-            AudioLevels.updateActiveSpeakerAudioLevel(audioLevel);
+            window.requestAnimationFrame(function () {
+                AudioLevels.updateActiveSpeakerAudioLevel(audioLevel);
+            });
        }
    };

    my.updateActiveSpeakerAudioLevel = function(audioLevel) {
-        var drawContext = $('#activeSpeakerAudioLevel')[0].getContext('2d');
-        var r = interfaceConfig.ACTIVE_SPEAKER_AVATAR_SIZE / 2;
-        var center = (interfaceConfig.ACTIVE_SPEAKER_AVATAR_SIZE + r) / 2;
+        if($("#activeSpeaker").css("visibility") == "hidden")
+            return;

-        // Save the previous state of the context.
-        drawContext.save();

-        drawContext.clearRect(0, 0, 300, 300);
+        ASDrawContext.clearRect(0, 0, 300, 300);
+        if(audioLevel == 0)
+            return;

-        // Draw a circle.
-        drawContext.arc(center, center, r, 0, 2 * Math.PI);
+        ASDrawContext.shadowBlur = getShadowLevel(audioLevel);

-        // Add a shadow around the circle
-        drawContext.shadowColor = interfaceConfig.SHADOW_COLOR;
-        drawContext.shadowBlur = getShadowLevel(audioLevel);
-        drawContext.shadowOffsetX = 0;
-        drawContext.shadowOffsetY = 0;

        // Fill the shape.
-        drawContext.fill();
-
-        drawContext.save();
-
-        drawContext.restore();
-
-
-        drawContext.arc(center, center, r, 0, 2 * Math.PI);
-
-        drawContext.clip();
-        drawContext.clearRect(0, 0, 277, 200);
-
-        // Restore the previous context state.
-        drawContext.restore();
+        ASDrawContext.fill();
    };

    /**
--- a/modules/UI/authentication/Authentication.js
+++ b/modules/UI/authentication/Authentication.js
@@ -16,15 +16,19 @@ var Authentication = {
        // extract room name from 'room@muc.server.net'
        var room = roomName.substr(0, roomName.indexOf('@'));

-        authDialog = messageHandler.openDialog(
-            'Stop',
-                'Authentication is required to create room:<br/><b>' + room +
-                '</b></br> You can either authenticate to create the room or ' +
-                'just wait for someone else to do so.',
+        var title = APP.translation.generateTranslatonHTML("dialog.Stop");
+        var msg = APP.translation.generateTranslatonHTML("dialog.AuthMsg",
+            {room: room});
+        var button = APP.translation.generateTranslatonHTML(
+            "dialog.Authenticate");
+        var buttons = {};
+        buttons.authenticate = {title: button, value: "authNow"};
+
+        authDialog = APP.UI.messageHandler.openDialog(
+            title,
+            msg,
            true,
-            {
-                Authenticate: 'authNow'
-            },
+            buttons,
            function (onSubmitEvent, submitValue) {

                // Do not close the dialog yet
@@ -58,7 +62,7 @@ var Authentication = {
        }
    },
    createAuthenticationWindow: function (callback, url) {
-        authenticationWindow = messageHandler.openCenteredPopup(
+        authenticationWindow = APP.UI.messageHandler.openCenteredPopup(
            url, 910, 660,
            // On closed
            function () {
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -1,4 +1,4 @@
-var Settings = require("../side_pannels/settings/Settings");
+var Settings = require("../../settings/Settings");
 var MediaStreamType = require("../../../service/RTC/MediaStreamTypes");

 var users = {};
--- a/modules/UI/prezi/Prezi.js
+++ b/modules/UI/prezi/Prezi.js
@@ -33,10 +33,12 @@ var Prezi = {
    openPreziDialog: function() {
        var myprezi = APP.xmpp.getPrezi();
        if (myprezi) {
-            messageHandler.openTwoButtonDialog("Remove Prezi",
-                "Are you sure you would like to remove your Prezi?",
+            messageHandler.openTwoButtonDialog("dialog.removePreziTitle",
+                null,
+                "dialog.removePreziMsg",
+                null,
                false,
-                "Remove",
+                "dialog.Remove",
                function(e,v,m,f) {
                    if(v) {
                        APP.xmpp.removePreziFromPresence();
@@ -45,25 +47,40 @@ var Prezi = {
            );
        }
        else if (preziPlayer != null) {
-            messageHandler.openTwoButtonDialog("Share a Prezi",
-                "Another participant is already sharing a Prezi." +
-                    "This conference allows only one Prezi at a time.",
+            messageHandler.openTwoButtonDialog("dialog.sharePreziTitle",
+                null, "dialog.sharePreziMsg",
+                null,
                false,
-                "Ok",
+                "dialog.Ok",
                function(e,v,m,f) {
                    $.prompt.close();
                }
            );
        }
        else {
+            var html = APP.translation.generateTranslatonHTML(
+                "dialog.sharePreziTitle");
+            var cancelButton = APP.translation.generateTranslatonHTML(
+                "dialog.Cancel");
+            var shareButton = APP.translation.generateTranslatonHTML(
+                "dialog.Share");
+            var backButton = APP.translation.generateTranslatonHTML(
+                "dialog.Back");
+            var buttons = {};
+            var buttons1 = {};
+            buttons1.button1 = buttons.button1 = {title: cancelButton, value: false};
+            buttons.button2 = {title: shareButton, value: true};
+            buttons1.button2 = {title: backButton, value: true};
+            var linkError = APP.translation.generateTranslatonHTML(
+                "dialog.preziLinkError");
            var openPreziState = {
                state0: {
-                    html:   '<h2>Share a Prezi</h2>' +
+                    html:   '<h2>' + html + '</h2>' +
                            '<input id="preziUrl" type="text" ' +
                            'placeholder="e.g. ' +
                            'http://prezi.com/wz7vhjycl7e6/my-prezi" autofocus>',
                    persistent: false,
-                    buttons: { "Share": true , "Cancel": false},
+                    buttons: buttons,
                    defaultButton: 1,
                    submit: function(e,v,m,f){
                        e.preventDefault();
@@ -102,10 +119,10 @@ var Prezi = {
                    }
                },
                state1: {
-                    html:   '<h2>Share a Prezi</h2>' +
-                            'Please provide a correct prezi link.',
+                    html:   '<h2>' + html + '</h2>' +
+                            linkError,
                    persistent: false,
-                    buttons: { "Back": true, "Cancel": false },
+                    buttons: buttons1,
                    defaultButton: 1,
                    submit:function(e,v,m,f) {
                        e.preventDefault();
--- a/modules/UI/prezi/PreziPlayer.js
+++ b/modules/UI/prezi/PreziPlayer.js
@@ -33,21 +33,22 @@
            var message, item, player;
            try {
                message = JSON.parse(event.data);
-            } catch (e) {}
-            if (message.id && (player = PreziPlayer.players[message.id])){
-                if (player.options.debug === true) {
-                    if (console && console.log) console.log('received', message);
-                }
-                if (message.type === "changes"){
-                    player.changesHandler(message);
-                }
-                for (var i=0; i<player.callbacks.length; i++) {
-                    item = player.callbacks[i];
-                    if (item && message.type === item.event){
-                        item.callback(message);
+                if (message.id && (player = PreziPlayer.players[message.id])) {
+                    if (player.options.debug === true) {
+                        if (console && console.log)
+                            console.log('received', message);
+                    }
+                    if (message.type === "changes") {
+                        player.changesHandler(message);
+                    }
+                    for (var i = 0; i < player.callbacks.length; i++) {
+                        item = player.callbacks[i];
+                        if (item && message.type === item.event) {
+                            item.callback(message);
+                        }
                    }
                }
-            }
+            } catch (e) { }
        };

        function PreziPlayer(id, options) {
--- a/modules/UI/side_pannels/SidePanelToggler.js
+++ b/modules/UI/side_pannels/SidePanelToggler.js
@@ -1,6 +1,6 @@
 var Chat = require("./chat/Chat");
 var ContactList = require("./contactlist/ContactList");
-var Settings = require("./settings/Settings");
+var Settings = require("./../../settings/Settings");
 var SettingsMenu = require("./settings/SettingsMenu");
 var VideoLayout = require("../videolayout/VideoLayout");
 var ToolbarToggler = require("../toolbars/ToolbarToggler");
--- a/modules/UI/side_pannels/settings/SettingsMenu.js
+++ b/modules/UI/side_pannels/settings/SettingsMenu.js
@@ -1,5 +1,5 @@
 var Avatar = require("../../avatar/Avatar");
-var Settings = require("./Settings");
+var Settings = require("./../../../settings/Settings");
 var UIUtil = require("../../util/UIUtil");
 var languages = require("../../../../service/translation/languages");

@@ -27,6 +27,7 @@ var SettingsMenu = {

    init: function () {
        $("#updateSettings").before(generateLanguagesSelectBox());
+        APP.translation.translateElement($("#languages_selectbox"));
        $('#settingsmenu>input').keyup(function(event){
            if(event.keyCode === 13) {//enter
                SettingsMenu.update();
@@ -47,7 +48,9 @@ var SettingsMenu = {
            APP.xmpp.addToPresence("displayName", displayName, true);
        }

-        APP.translation.setLanguage($("#languages_selectbox").val());
+        var language = $("#languages_selectbox").val();
+        APP.translation.setLanguage(language);
+        Settings.setLanguage(language);

        APP.xmpp.addToPresence("email", newEmail);
        var email = Settings.setEmail(newEmail);
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -1,4 +1,4 @@
-/* global $, buttonClick, config, lockRoom,
+/* global APP,$, buttonClick, config, lockRoom,
   setSharedKey, Util */
 var messageHandler = require("../util/MessageHandler");
 var BottomToolbar = require("./BottomToolbar");
@@ -7,6 +7,8 @@ var Etherpad = require("../etherpad/Etherpad");
 var PanelToggler = require("../side_pannels/SidePanelToggler");
 var Authentication = require("../authentication/Authentication");
 var UIUtil = require("../util/UIUtil");
+var AuthenticationEvents
+    = require("../../../service/authentication/AuthenticationEvents");

 var roomUrl = null;
 var sharedKey = '';
@@ -20,9 +22,9 @@ var buttonHandlers =
    "toolbar_button_camera": function () {
        return APP.UI.toggleVideo();
    },
-    "toolbar_button_authentication": function () {
+    /*"toolbar_button_authentication": function () {
        return Toolbar.authenticateClicked();
-    },
+    },*/
    "toolbar_button_record": function () {
        return toggleRecording();
    },
@@ -57,6 +59,30 @@ var buttonHandlers =
    },
    "toolbar_button_hangup": function () {
        return hangup();
+    },
+    "toolbar_button_login": function () {
+        Toolbar.authenticateClicked();
+    },
+    "toolbar_button_logout": function () {
+        // Ask for confirmation
+        messageHandler.openTwoButtonDialog(
+            "dialog.logoutTitle",
+            null,
+            "dialog.logoutQuestion",
+            null,
+            false,
+            "dialog.Yes",
+            function (evt, yes) {
+                if (yes) {
+                    APP.xmpp.logout(function (url) {
+                        if (url) {
+                            window.location.href = url;
+                        } else {
+                            hangup();
+                        }
+                    });
+                }
+            });
    }
 };

@@ -72,11 +98,20 @@ function hangup() {

    }

+    var title = APP.translation.generateTranslatonHTML(
+        "dialog.sessTerminated");
+    var msg = APP.translation.generateTranslatonHTML(
+        "dialog.hungUp");
+    var button = APP.translation.generateTranslatonHTML(
+        "dialog.joinAgain");
+    var buttons = {};
+    buttons.joinAgain = {title: button, value: true};
+
    UI.messageHandler.openDialog(
-        "Session Terminated",
-        "You hung up the call",
+        title,
+        msg,
        true,
-        { "Join again": true },
+        buttons,
        function(event, value, message, formVals)
        {
            window.location.reload();
@@ -91,12 +126,16 @@ function hangup() {

 function toggleRecording() {
    APP.xmpp.toggleRecording(function (callback) {
-        APP.UI.messageHandler.openTwoButtonDialog(null,
-                '<h2>Enter recording token</h2>' +
+        var msg = APP.translation.generateTranslatonHTML(
+            "dialog.recordingToken");
+        var token = APP.translation.translateString("dialog.token");
+        APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
+                '<h2>' + msg + '</h2>' +
                '<input id="recordingToken" type="text" ' +
-                'placeholder="token" autofocus>',
+                ' data-i18n="[placeholder]dialog.token" ' +
+                'placeholder="' + token + '" autofocus>',
            false,
-            "Save",
+            "dialog.Save",
            function (e, v, m, f) {
                if (v) {
                    var token = document.getElementById('recordingToken');
@@ -137,14 +176,13 @@ function lockRoom(lock) {
        }
    }, function (err) {
        console.warn('setting password failed', err);
-        messageHandler.showError('Lock failed',
-            'Failed to lock conference.',
-            err);
+        messageHandler.showError("dialog.lockTitle",
+            "dialog.lockMessage");
        Toolbar.setSharedKey('');
    }, function () {
        console.warn('room passwords not supported');
-        messageHandler.showError('Warning',
-            'Room passwords are currently not supported.');
+        messageHandler.showError("dialog.warning",
+            "dialog.passwordNotSupported");
        Toolbar.setSharedKey('');
    });
 };
@@ -195,12 +233,14 @@ function callSipButtonClicked()
    var defaultNumber
        = config.defaultSipNumber ? config.defaultSipNumber : '';

-    messageHandler.openTwoButtonDialog(null,
-        '<h2>Enter SIP number</h2>' +
+    var sipMsg = APP.translation.generateTranslatonHTML(
+        "dialog.sipMsg");
+    messageHandler.openTwoButtonDialog(null, null, null,
+        '<h2>' + sipMsg + '</h2>' +
        '<input id="sipNumber" type="text"' +
        ' value="' + defaultNumber + '" autofocus>',
        false,
-        "Dial",
+        "dialog.Dial",
        function (e, v, m, f) {
            if (v) {
                var numberInput = document.getElementById('sipNumber');
@@ -222,7 +262,33 @@ var Toolbar = (function (my) {
        for(var k in buttonHandlers)
            $("#" + k).click(buttonHandlers[k]);
        UI = ui;
-    }
+        // Update login info
+        APP.xmpp.addListener(
+            AuthenticationEvents.IDENTITY_UPDATED,
+            function (authenticationEnabled, userIdentity) {
+
+                var loggedIn = false;
+                if (userIdentity) {
+                    loggedIn = true;
+                }
+
+                //FIXME: XMPP authentication need improvements for "live" login
+                if (!APP.xmpp.isExternalAuthEnabled() && !loggedIn)
+                {
+                    authenticationEnabled = false;
+                }
+
+                Toolbar.showAuthenticateButton(authenticationEnabled);
+
+                if (authenticationEnabled) {
+                    Toolbar.setAuthenticatedIdentity(userIdentity);
+
+                    Toolbar.showLoginButton(!loggedIn);
+                    Toolbar.showLogoutButton(loggedIn);
+                }
+            }
+        );
+    },

    /**
     * Sets shared key
@@ -235,20 +301,28 @@ var Toolbar = (function (my) {
    my.authenticateClicked = function () {
        Authentication.focusAuthenticationWindow();
        // Get authentication URL
-        APP.xmpp.getAuthUrl(APP.UI.getRoomName(), function (url) {
-            // Open popup with authentication URL
-            var authenticationWindow = Authentication.createAuthenticationWindow(function () {
-                // On popup closed - retry room allocation
-                APP.xmpp.allocateConferenceFocus(APP.UI.getRoomName(), APP.UI.checkForNicknameAndJoin);
-            }, url);
-            if (!authenticationWindow) {
-                Toolbar.showAuthenticateButton(true);
-                messageHandler.openMessageDialog(
-                    null, "Your browser is blocking popup windows from this site." +
-                        " Please enable popups in your browser security settings" +
-                        " and try again.");
-            }
-        });
+        if (!APP.xmpp.getMUCJoined()) {
+            APP.xmpp.getLoginUrl(UI.getRoomName(), function (url) {
+                // If conference has not been started yet - redirect to login page
+                window.location.href = url;
+            });
+        } else {
+            APP.xmpp.getPopupLoginUrl(UI.getRoomName(), function (url) {
+                // Otherwise - open popup with authentication URL
+                var authenticationWindow = Authentication.createAuthenticationWindow(
+                    function () {
+                        // On popup closed - retry room allocation
+                        APP.xmpp.allocateConferenceFocus(
+                            APP.UI.getRoomName(),
+                            function () { console.info("AUTH DONE"); }
+                        );
+                    }, url);
+                if (!authenticationWindow) {
+                    messageHandler.openMessageDialog(
+                        null, "dialog.popupError");
+                }
+            });
+        }
    };

    /**
@@ -284,25 +358,17 @@ var Toolbar = (function (my) {
        if (!APP.xmpp.isModerator()) {
            if (sharedKey) {
                messageHandler.openMessageDialog(null,
-                        "This conversation is currently protected by" +
-                        " a password. Only the owner of the conference" +
-                        " could set a password.",
-                    false,
-                    "Password");
+                    "dialog.passwordError");
            } else {
-                messageHandler.openMessageDialog(null,
-                    "This conversation isn't currently protected by" +
-                        " a password. Only the owner of the conference" +
-                        " could set a password.",
-                    false,
-                    "Password");
+                messageHandler.openMessageDialog(null, "dialog.passwordError2");
            }
        } else {
            if (sharedKey) {
-                messageHandler.openTwoButtonDialog(null,
-                    "Are you sure you would like to remove your password?",
+                messageHandler.openTwoButtonDialog(null, null,
+                    "dialog.passwordCheck",
+                    null,
                    false,
-                    "Remove",
+                    "dialog.Remove",
                    function (e, v) {
                        if (v) {
                            Toolbar.setSharedKey('');
@@ -310,12 +376,17 @@ var Toolbar = (function (my) {
                        }
                    });
            } else {
-                messageHandler.openTwoButtonDialog(null,
-                    '<h2>Set a password to lock your room</h2>' +
+                var msg = APP.translation.generateTranslatonHTML(
+                    "dialog.passwordMsg");
+                var yourPassword = APP.translation.translateString(
+                    "dialog.yourPassword");
+                messageHandler.openTwoButtonDialog(null, null, null,
+                    '<h2>' + msg + '</h2>' +
                        '<input id="lockKey" type="text"' +
-                        'placeholder="your password" autofocus>',
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
+                        'placeholder="' + yourPassword + '" autofocus>',
                    false,
-                    "Save",
+                    "dialog.Save",
                    function (e, v) {
                        if (v) {
                            var lockKey = document.getElementById('lockKey');
@@ -344,12 +415,12 @@ var Toolbar = (function (my) {
        } else {
            inviteLink = encodeURI(roomUrl);
        }
-        messageHandler.openTwoButtonDialog(
-            "Share this link with everyone you want to invite",
+        messageHandler.openTwoButtonDialog("dialog.shareLink",
+            null, null,
            '<input id="inviteLinkRef" type="text" value="' +
                inviteLink + '" onclick="this.select();" readonly>',
            false,
-            "Invite",
+            "dialog.Invite",
            function (e, v) {
                if (v) {
                    if (roomUrl) {
@@ -372,18 +443,28 @@ var Toolbar = (function (my) {
     * Opens the settings dialog.
     */
    my.openSettingsDialog = function () {
-        messageHandler.openTwoButtonDialog(
-            '<h2>Configure your conference</h2>' +
+        var settings1 = APP.translation.generateTranslatonHTML(
+            "dialog.settings1");
+        var settings2 = APP.translation.generateTranslatonHTML(
+            "dialog.settings2");
+        var settings3 = APP.translation.generateTranslatonHTML(
+            "dialog.settings3");
+
+        var yourPassword = APP.translation.translateString(
+            "dialog.yourPassword");
+
+        messageHandler.openTwoButtonDialog(null,
+            '<h2>' + settings1 + '</h2>' +
                '<input type="checkbox" id="initMuted">' +
-                'Participants join muted<br/>' +
+                settings2 + '<br/>' +
                '<input type="checkbox" id="requireNicknames">' +
-                'Require nicknames<br/><br/>' +
-                'Set a password to lock your room:' +
-                '<input id="lockKey" type="text" placeholder="your password"' +
-                'autofocus>',
+                 settings3 +
+                '<input id="lockKey" type="text" placeholder="' + yourPassword +
+                '" data-i18n="[placeholder]dialog.yourPassword" autofocus>',
+            null,
            null,
            false,
-            "Save",
+            "dialog.Save",
            function () {
                document.getElementById('lockKey').focus();
            },
@@ -489,12 +570,49 @@ var Toolbar = (function (my) {
    // Shows or hides SIP calls button
    my.showSipCallButton = function (show) {
        if (APP.xmpp.isSipGatewayEnabled() && show) {
-            $('#sipCallButton').css({display: "inline"});
+            $('#sipCallButton').css({display: "inline-block"});
        } else {
            $('#sipCallButton').css({display: "none"});
        }
    };

+    /**
+     * Displays user authenticated identity name(login).
+     * @param authIdentity identity name to be displayed.
+     */
+    my.setAuthenticatedIdentity = function (authIdentity) {
+        if (authIdentity) {
+            $('#toolbar_auth_identity').css({display: "list-item"});
+            $('#toolbar_auth_identity').text(authIdentity);
+        } else {
+            $('#toolbar_auth_identity').css({display: "none"});
+        }
+    };
+
+    /**
+     * Shows/hides login button.
+     * @param show <tt>true</tt> to show
+     */
+    my.showLoginButton = function (show) {
+        if (show) {
+            $('#toolbar_button_login').css({display: "list-item"});
+        } else {
+            $('#toolbar_button_login').css({display: "none"});
+        }
+    };
+
+    /**
+     * Shows/hides logout button.
+     * @param show <tt>true</tt> to show
+     */
+    my.showLogoutButton = function (show) {
+        if (show) {
+            $('#toolbar_button_logout').css({display: "list-item"});
+        } else {
+            $('#toolbar_button_logout').css({display: "none"});
+        }
+    };
+
    /**
     * Sets the state of the button. The button has blue glow if desktop
     * streaming is active.
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -7,10 +7,16 @@ var messageHandler = (function(my) {
     * @param titleString the title of the message
     * @param messageString the text of the message
     */
-    my.openMessageDialog = function(titleString, messageString) {
-        $.prompt(messageString,
+    my.openMessageDialog = function(titleKey, messageKey) {
+        var title = null;
+        if(titleKey)
+        {
+            title = APP.translation.generateTranslatonHTML(titleKey);
+        }
+        var message = APP.translation.generateTranslatonHTML(messageKey);
+        $.prompt(message,
            {
-                title: titleString,
+                title: title,
                persistent: false
            }
        );
@@ -27,13 +33,25 @@ var messageHandler = (function(my) {
     * @param loadedFunction function to be called after the prompt is fully loaded
     * @param closeFunction function to be called after the prompt is closed
     */
-    my.openTwoButtonDialog = function(titleString, msgString, persistent, leftButton,
-                                      submitFunction, loadedFunction, closeFunction) {
+    my.openTwoButtonDialog = function(titleKey, titleString, msgKey, msgString,
+        persistent, leftButtonKey, submitFunction, loadedFunction,
+        closeFunction)
+    {
+        var leftButton = APP.translation.generateTranslatonHTML(leftButtonKey);
        var buttons = {};
-        buttons[leftButton] = true;
-        buttons.Cancel = false;
-        $.prompt(msgString, {
-            title: titleString,
+        buttons.button1 = {title: leftButton, value: true};
+        var cancelButton = APP.translation.generateTranslatonHTML("dialog.Cancel");
+        buttons.button2 = {title: cancelButton, value: false};
+        var message = msgString, title = titleString;
+        if(titleKey)
+        {
+            title = APP.translation.generateTranslatonHTML(titleKey);
+        }
+        if(msgKey) {
+            message = APP.translation.generateTranslatonHTML(msgKey);
+        }
+        $.prompt(message, {
+            title: title,
            persistent: false,
            buttons: buttons,
            defaultButton: 1,
@@ -54,7 +72,7 @@ var messageHandler = (function(my) {
     * @param submitFunction function to be called on submit
     * @param loadedFunction function to be called after the prompt is fully loaded
     */
-    my.openDialog = function (titleString,    msgString, persistent, buttons,
+    my.openDialog = function (titleString, msgString, persistent, buttons,
                              submitFunction, loadedFunction) {
        var args = {
            title: titleString,
@@ -130,8 +148,8 @@ var messageHandler = (function(my) {
     * @param msgString the text of the message
     * @param error the error that is being reported
     */
-    my.openReportDialog = function(titleString, msgString, error) {
-        my.openMessageDialog(titleString, msgString);
+    my.openReportDialog = function(titleKey, msgKey, error) {
+        my.openMessageDialog(titleKey, msgKey);
        console.log(error);
        //FIXME send the error to the server
    };
@@ -141,21 +159,39 @@ var messageHandler = (function(my) {
     * @param title the title of the message
     * @param message the text of the messafe
     */
-    my.showError = function(title, message) {
-        if(!(title || message)) {
-            title = title || "Oops!";
-            message = message || "There was some kind of error";
+    my.showError = function(titleKey, msgKey) {
+
+        if(!titleKey) {
+            titleKey = "dialog.oops";
        }
-        messageHandler.openMessageDialog(title, message);
+        if(!msgKey)
+        {
+            msgKey = "dialog.defaultError";
+        }
+        messageHandler.openMessageDialog(titleKey, msgKey);
    };

-    my.notify = function(displayName, cls, message) {
+    my.notify = function(displayName, displayNameKey,
+                         cls, messageKey, messageArguments) {
+        var displayNameSpan = '<span class="nickname" ';
+        if(displayName)
+        {
+            displayNameSpan += ">" + displayName;
+        }
+        else
+        {
+            displayNameSpan += "data-i18n='" + displayNameKey +
+                "'>" + APP.translation.translateString(displayNameKey);
+        }
+        displayNameSpan += "</span>";
        toastr.info(
-            '<span class="nickname">' +
-                displayName +
-            '</span><br>' +
-            '<span class=' + cls + '>' +
-                message +
+            displayNameSpan + '<br>' +
+            '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
+                (messageArguments?
+                    " data-i18n-options='" + JSON.stringify(messageArguments) + "'"
+                    : "") + ">" +
+            APP.translation.translateString(messageKey,
+                messageArguments) +
            '</span>');
    };

--- a/modules/UI/videolayout/ConnectionIndicator.js
+++ b/modules/UI/videolayout/ConnectionIndicator.js
@@ -229,47 +229,43 @@ ConnectionIndicator.prototype.generateText = function () {

            }

-            var local_address_key = "connectionindicator." +
-                (data.localIP.length > 1? "localaddresses" : "localaddress");
-            var remote_address_key = "connectionindicator." +
-                (data.remoteIP.length > 1? "remoteaddresses" : "remoteaddress");
+            var local_address_key = "connectionindicator.localaddress";
+            var remote_address_key = "connectionindicator.remoteaddress";
            var localTransport =
                "<tr><td><span class='jitsipopover_blue' data-i18n='" +
-                local_address_key +"'>" +
-                    translate(local_address_key) + "</span></td><td> " +
+                local_address_key +"' data-i18n-options='" +
+                    JSON.stringify({count: data.localIP.length}) + "'>" +
+                    translate(local_address_key, {count: data.localIP.length}) +
+                    "</span></td><td> " +
                ConnectionIndicator.getStringFromArray(data.localIP) +
                "</td></tr>";
            transport =
                "<tr><td><span class='jitsipopover_blue' data-i18n='" +
-                remote_address_key + "'>" +
-                    translate(remote_address_key) + "</span></td><td> " +
+                remote_address_key + "' data-i18n-options='" +
+                    JSON.stringify({count: data.remoteIP.length}) + "'>" +
+                    translate(remote_address_key,
+                        {count: data.remoteIP.length}) +
+                    "</span></td><td> " +
                ConnectionIndicator.getStringFromArray(data.remoteIP) +
                "</td></tr>";

-            var key_remote = "connectionindicator.",
-                key_local = "connectionindicator.";
-
-            if(this.transport.length > 1)
-            {
-                key_remote += "remoteports";
-                key_local += "localports";
-            }
-            else
-            {
-                key_remote += "remoteport";
-                key_local += "localport";
-            }
+            var key_remote = "connectionindicator.remoteport",
+                key_local = "connectionindicator.localport";

            transport += "<tr>" +
                "<td>" +
                "<span class='jitsipopover_blue' data-i18n='" + key_remote +
-                "'>" +
-                translate(key_remote) + "</span></td><td>";
+                "' data-i18n-options='" +
+                JSON.stringify({count: this.transport.length}) + "'>" +
+                translate(key_remote, {count: this.transport.length}) +
+                "</span></td><td>";
            localTransport += "<tr>" +
                "<td>" +
                "<span class='jitsipopover_blue' data-i18n='" + key_local +
-                "'>" +
-                translate(key_local) + "</span></td><td>";
+                "' data-i18n-options='" +
+                JSON.stringify({count: this.transport.length}) + "'>" +
+                translate(key_local, {count: this.transport.length}) +
+                "</span></td><td>";

            transport +=
                ConnectionIndicator.getStringFromArray(data.remotePort);
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -1422,7 +1422,7 @@ var VideoLayout = (function (my) {
                    "top");
                videoMutedSpan.appendChild(mutedIndicator);
                //translate texts for muted indicator
-                APP.translation.translateElement($('#' + videoSpanId  + " > i"));
+                APP.translation.translateElement($('#' + videoSpanId  + " > span > i"));
            }

            VideoLayout.updateMutePosition(videoSpanId);
--- a/modules/desktopsharing/desktopsharing.js
+++ b/modules/desktopsharing/desktopsharing.js
@@ -92,8 +92,8 @@ function isUpdateRequired(minVersion, extVersion)
    catch (e)
    {
        console.error("Failed to parse extension version", e);
-        APP.UI.messageHandler.showError('Error',
-            'Error when trying to detect desktopsharing extension.');
+        APP.UI.messageHandler.showError("dialog.error",
+            "dialog.detectext");
        return true;
    }
 }
@@ -174,8 +174,8 @@ function obtainScreenFromExtension(streamCallback, failCallback) {
                    function (arg) {
                        console.log("Failed to install the extension", arg);
                        failCallback(arg);
-                        APP.UI.messageHandler.showError('Error',
-                            'Failed to install desktop sharing extension');
+                        APP.UI.messageHandler.showError("dialog.error",
+                            "dialog.failtoinstall");
                    }
                );
            }
--- a/modules/UI/side_pannels/settings/Settings.js
+++ b/modules/UI/side_pannels/settings/Settings.js
@@ -1,6 +1,7 @@
 var email = '';
 var displayName = '';
 var userId;
+var language = null;


 function supportsLocalStorage() {
@@ -15,19 +16,20 @@ function supportsLocalStorage() {

 function generateUniqueId() {
    function _p8() {
-        return (Math.random().toString(16)+"000000000").substr(2,8);
+        return (Math.random().toString(16) + "000000000").substr(2, 8);
    }
    return _p8() + _p8() + _p8() + _p8();
 }

-if(supportsLocalStorage()) {
-    if(!window.localStorage.jitsiMeetId) {
+if (supportsLocalStorage()) {
+    if (!window.localStorage.jitsiMeetId) {
        window.localStorage.jitsiMeetId = generateUniqueId();
        console.log("generated id", window.localStorage.jitsiMeetId);
    }
    userId = window.localStorage.jitsiMeetId || '';
    email = window.localStorage.email || '';
    displayName = window.localStorage.displayname || '';
+    language = window.localStorage.language;
 } else {
    console.log("local storage is not supported");
    userId = generateUniqueId();
@@ -40,7 +42,7 @@ var Settings =
        window.localStorage.displayname = displayName;
        return displayName;
    },
-    setEmail: function(newEmail)
+    setEmail: function (newEmail)
    {
        email = newEmail;
        window.localStorage.email = newEmail;
@@ -50,8 +52,13 @@ var Settings =
        return {
            email: email,
            displayName: displayName,
-            uid: userId
+            uid: userId,
+            language: language
        };
+    },
+    setLanguage: function (lang) {
+        language = lang;
+        window.localStorage.language = lang;
    }
 };

--- a/modules/statistics/LocalStatsCollector.js
+++ b/modules/statistics/LocalStatsCollector.js
@@ -84,7 +84,7 @@ function LocalStatsCollector(stream, interval, statisticsService, eventEmitter)
 * Starts the collecting the statistics.
 */
 LocalStatsCollector.prototype.start = function () {
-    if (!window.AudioContext)
+    if (config.disableAudioLevels || !window.AudioContext)
        return;

    var context = new AudioContext();
--- a/modules/statistics/RTPStatsCollector.js
+++ b/modules/statistics/RTPStatsCollector.js
@@ -111,9 +111,13 @@ PeerStats.prototype.setSsrcBitrate = function (ssrc, bitrate)
 PeerStats.prototype.setSsrcAudioLevel = function (ssrc, audioLevel)
 {
    // Range limit 0 - 1
-    this.ssrc2AudioLevel[ssrc] = Math.min(Math.max(audioLevel, 0), 1);
+    this.ssrc2AudioLevel[ssrc] = formatAudioLevel(audioLevel);
 };

+function formatAudioLevel(audioLevel) {
+    return Math.min(Math.max(audioLevel, 0), 1);
+}
+
 /**
 * Array with the transport information.
 * @type {Array}
@@ -147,7 +151,7 @@ function StatsCollector(peerconnection, audioLevelsInterval, statsInterval, even
    /**
     * Gather PeerConnection stats once every this many milliseconds.
     */
-    this.GATHER_INTERVAL = 10000;
+    this.GATHER_INTERVAL = 15000;

    /**
     * Log stats via the focus once every this many milliseconds.
@@ -188,16 +192,26 @@ module.exports = StatsCollector;
 /**
 * Stops stats updates.
 */
-StatsCollector.prototype.stop = function ()
-{
-    if (this.audioLevelsIntervalId)
-    {
+StatsCollector.prototype.stop = function () {
+    if (this.audioLevelsIntervalId) {
        clearInterval(this.audioLevelsIntervalId);
        this.audioLevelsIntervalId = null;
+    }
+
+    if (this.statsIntervalId)
+    {
        clearInterval(this.statsIntervalId);
        this.statsIntervalId = null;
+    }
+
+    if(this.logStatsIntervalId)
+    {
        clearInterval(this.logStatsIntervalId);
        this.logStatsIntervalId = null;
+    }
+
+    if(this.gatherStatsIntervalId)
+    {
        clearInterval(this.gatherStatsIntervalId);
        this.gatherStatsIntervalId = null;
    }
@@ -219,69 +233,68 @@ StatsCollector.prototype.errorCallback = function (error)
 StatsCollector.prototype.start = function ()
 {
    var self = this;
-    this.audioLevelsIntervalId = setInterval(
-        function ()
-        {
-            // Interval updates
-            self.peerconnection.getStats(
-                function (report)
-                {
-                    var results = null;
-                    if(!report || !report.result || typeof report.result != 'function')
-                    {
-                        results = report;
-                    }
-                    else
-                    {
-                        results = report.result();
-                    }
-                    //console.error("Got interval report", results);
-                    self.currentAudioLevelsReport = results;
-                    self.processAudioLevelReport();
-                    self.baselineAudioLevelsReport =
-                        self.currentAudioLevelsReport;
-                },
-                self.errorCallback
-            );
-        },
-        self.audioLevelsIntervalMilis
-    );
+    if(!config.disableAudioLevels) {
+        console.debug("set audio levels interval");
+        this.audioLevelsIntervalId = setInterval(
+            function () {
+                // Interval updates
+                self.peerconnection.getStats(
+                    function (report) {
+                        var results = null;
+                        if (!report || !report.result ||
+                            typeof report.result != 'function') {
+                            results = report;
+                        }
+                        else {
+                            results = report.result();
+                        }
+                        //console.error("Got interval report", results);
+                        self.currentAudioLevelsReport = results;
+                        self.processAudioLevelReport();
+                        self.baselineAudioLevelsReport =
+                            self.currentAudioLevelsReport;
+                    },
+                    self.errorCallback
+                );
+            },
+            self.audioLevelsIntervalMilis
+        );
+    }

-    this.statsIntervalId = setInterval(
-        function () {
-            // Interval updates
-            self.peerconnection.getStats(
-                function (report)
-                {
-                    var results = null;
-                    if(!report || !report.result || typeof report.result != 'function')
-                    {
-                        //firefox
-                        results = report;
-                    }
-                    else
-                    {
-                        //chrome
-                        results = report.result();
-                    }
-                    //console.error("Got interval report", results);
-                    self.currentStatsReport = results;
-                    try
-                    {
-                        self.processStatsReport();
-                    }
-                    catch (e)
-                    {
-                        console.error("Unsupported key:" + e, e);
-                    }
+    if(!config.disableStats) {
+        console.debug("set stats interval");
+        this.statsIntervalId = setInterval(
+            function () {
+                // Interval updates
+                self.peerconnection.getStats(
+                    function (report) {
+                        var results = null;
+                        if (!report || !report.result ||
+                            typeof report.result != 'function') {
+                            //firefox
+                            results = report;
+                        }
+                        else {
+                            //chrome
+                            results = report.result();
+                        }
+                        //console.error("Got interval report", results);
+                        self.currentStatsReport = results;
+                        try {
+                            self.processStatsReport();
+                        }
+                        catch (e) {
+                            console.error("Unsupported key:" + e, e);
+                        }

-                    self.baselineStatsReport = self.currentStatsReport;
-                },
-                self.errorCallback
-            );
-        },
-        self.statsIntervalMilis
-    );
+                        self.baselineStatsReport = self.currentStatsReport;
+                    },
+                    self.errorCallback
+                );
+            },
+            self.statsIntervalMilis
+        );
+    }

    if (config.logStats) {
        this.gatherStatsIntervalId = setInterval(
@@ -303,6 +316,38 @@ StatsCollector.prototype.start = function ()
    }
 };

+/**
+ * Checks whether a certain record should be included in the logged statistics.
+ */
+function acceptStat(reportId, reportType, statName) {
+    if (reportType == "googCandidatePair" && statName == "googChannelId")
+        return false;
+
+    if (reportType == "ssrc") {
+        if (statName == "googTrackId" ||
+            statName == "transportId" ||
+            statName == "ssrc")
+            return false;
+    }
+
+    return true;
+}
+
+/**
+ * Checks whether a certain record should be included in the logged statistics.
+ */
+function acceptReport(id, type) {
+    if (id.substring(0, 15) == "googCertificate" ||
+        id.substring(0, 9) == "googTrack" ||
+        id.substring(0, 20) == "googLibjingleSession")
+        return false;
+
+    if (type == "googComponent")
+        return false;
+
+    return true;
+}
+
 /**
 * Converts the stats to the format used for logging, and saves the data in
 * this.statsToBeLogged.
@@ -313,12 +358,16 @@ StatsCollector.prototype.addStatsToBeLogged = function (reports) {
    var num_records = this.statsToBeLogged.timestamps.length;
    this.statsToBeLogged.timestamps.push(new Date().getTime());
    reports.map(function (report) {
+        if (!acceptReport(report.id, report.type))
+            return;
        var stat = self.statsToBeLogged.stats[report.id];
        if (!stat) {
            stat = self.statsToBeLogged.stats[report.id] = {};
        }
        stat.type = report.type;
        report.names().map(function (name) {
+            if (!acceptStat(report.id, report.type, name))
+                return;
            var values = stat[name];
            if (!values) {
                values = stat[name] = [];
@@ -689,4 +738,4 @@ StatsCollector.prototype.processAudioLevelReport = function ()
    }


-};
+};
--- a/modules/statistics/package.json
+++ b/modules/statistics/package.json
@@ -1,8 +0,0 @@
-{
-    "name": "statistics",
-    "version": "0.0.1",
-    "main": "statistics.js",
-    "description": "Statistics module for Jitsi Meet",
-    "dependencies": {
-    }
-}
--- a/modules/statistics/statistics.js
+++ b/modules/statistics/statistics.js
@@ -33,18 +33,14 @@ function stopRemote()
 }

 function startRemoteStats (peerconnection) {
-    if (config.enableRtpStats)
+    if(rtpStats)
    {
-        if(rtpStats)
-        {
-            rtpStats.stop();
-            rtpStats = null;
-        }
-
-        rtpStats = new RTPStats(peerconnection, 200, 2000, eventEmitter);
-        rtpStats.start();
+        rtpStats.stop();
+        rtpStats = null;
    }

+    rtpStats = new RTPStats(peerconnection, 200, 2000, eventEmitter);
+    rtpStats.start();
 }

 function onStreamCreated(stream)
@@ -52,7 +48,7 @@ function onStreamCreated(stream)
    if(stream.getOriginalStream().getAudioTracks().length === 0)
        return;

-    localStats = new LocalStats(stream.getOriginalStream(), 100, statistics,
+    localStats = new LocalStats(stream.getOriginalStream(), 200, statistics,
        eventEmitter);
    localStats.start();
 }
--- a/modules/translation/translation.js
+++ b/modules/translation/translation.js
@@ -1,8 +1,7 @@
 var i18n = require("i18next-client");
 var languages = require("../../service/translation/languages");
+var Settings = require("../settings/Settings");
 var DEFAULT_LANG = languages.EN;
-var initialized = false;
-var waitingForInit = [];

 i18n.addPostProcessor("resolveAppName", function(value, key, options) {
    return value.replace("__app__", interfaceConfig.APP_NAME);
@@ -22,15 +21,17 @@ var defaultOptions = {
    },
    lngWhitelist : languages.getLanguages(),
    fallbackOnNull: true,
+    fallbackOnEmpty: true,
    useDataAttrOptions: true,
+    defaultValueFromContent: false,
    app: interfaceConfig.APP_NAME,
-    getAsync: true,
+    getAsync: false,
+    defaultValueFromContent: false,
    customLoad: function(lng, ns, options, done) {
        var resPath = "lang/__ns__-__lng__.json";
        if(lng === languages.EN)
            resPath = "lang/__ns__.json";
        var url = i18n.functions.applyReplacement(resPath, { lng: lng, ns: ns });
-        initialized = false;
        i18n.functions.ajax({
            url: url,
            success: function(data, status, xhr) {
@@ -64,39 +65,48 @@ var defaultOptions = {

 function initCompleted(t)
 {
-    initialized = true;
    $("[data-i18n]").i18n();
-    for(var i = 0; i < waitingForInit.length; i++)
-    {
-        var obj = waitingForInit[i];
-        obj.callback(i18n.t(obj.key));
+}
+
+function checkForParameter() {
+    var query = window.location.search.substring(1);
+    var vars = query.split("&");
+    for (var i=0;i<vars.length;i++) {
+        var pair = vars[i].split("=");
+        if(pair[0] == "lang")
+        {
+            return pair[1];
+        }
    }
-    waitingForInit = [];
+    return null;
 }

 module.exports = {
    init: function (lang) {
-        initialized = false;
        var options = defaultOptions;
-        if(lang)
+
+
+        if(!lang)
+        {
+            lang = checkForParameter();
+            if(!lang)
+            {
+                var settings = Settings.getSettings();
+                if(settings)
+                    lang = settings.language;
+            }
+        }
+
+        if(lang) {
            options.lng = lang;
+        }
+
        i18n.init(options, initCompleted);
    },
-    translateString: function (key, cb) {
-        if(!cb)
-            return i18n.t(key);
-
-        if(initialized)
-        {
-            cb(i18n.t(key));
-        }
-        else
-        {
-            waitingForInit.push({"callback": cb, "key": key});
-        }
+    translateString: function (key, options) {
+        return i18n.t(key, options);
    },
    setLanguage: function (lang) {
-        initialized = false;
        if(!lang)
            lang = DEFAULT_LANG;
        i18n.setLng(lang, defaultOptions, initCompleted);
@@ -106,5 +116,17 @@ module.exports = {
    },
    translateElement: function (selector) {
        selector.i18n();
+    },
+    generateTranslatonHTML: function (key, options) {
+        var str = "<span data-i18n=\"" + key + "\"";
+        if(options)
+        {
+            str += " data-i18n-options=\"" + JSON.stringify(options) + "\"";
+        }
+        str += ">";
+        str += this.translateString(key, options);
+        str += "</span>";
+        return str;
+
    }
 };
--- a/modules/xmpp/JingleSession.js
+++ b/modules/xmpp/JingleSession.js
@@ -736,7 +736,7 @@ JingleSession.prototype.addSource = function (elem, fromJid) {
    $(elem).each(function (idx, content) {
        var name = $(content).attr('name');
        var lines = '';
-        tmp = $(content).find('ssrc-group[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]').each(function() {
+        $(content).find('ssrc-group[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]').each(function() {
            var semantics = this.getAttribute('semantics');
            var ssrcs = $(this).find('>source').map(function () {
                return this.getAttribute('ssrc');
@@ -746,7 +746,7 @@ JingleSession.prototype.addSource = function (elem, fromJid) {
                lines += 'a=ssrc-group:' + semantics + ' ' + ssrcs.join(' ') + '\r\n';
            }
        });
-        tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
+        var tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
        tmp.each(function () {
            var ssrc = $(this).attr('ssrc');
            if(mySdp.containsSSRC(ssrc)){
@@ -801,7 +801,7 @@ JingleSession.prototype.removeSource = function (elem, fromJid) {
    $(elem).each(function (idx, content) {
        var name = $(content).attr('name');
        var lines = '';
-        tmp = $(content).find('ssrc-group[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]').each(function() {
+        $(content).find('ssrc-group[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]').each(function() {
            var semantics = this.getAttribute('semantics');
            var ssrcs = $(this).find('>source').map(function () {
                return this.getAttribute('ssrc');
@@ -811,7 +811,7 @@ JingleSession.prototype.removeSource = function (elem, fromJid) {
                lines += 'a=ssrc-group:' + semantics + ' ' + ssrcs.join(' ') + '\r\n';
            }
        });
-        tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
+        var tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
        tmp.each(function () {
            var ssrc = $(this).attr('ssrc');
            // This should never happen, but can be useful for bug detection
@@ -1226,8 +1226,8 @@ JingleSession.onJingleFatalError = function (session, error)
 {
    this.service.sessionTerminated = true;
    this.connection.emuc.doLeave();
-    APP.UI.messageHandler.showError(  "Sorry",
-        "Internal application error[setRemoteDescription]");
+    APP.UI.messageHandler.showError("dialog.sorry",
+        "dialog.internalError");
 }

 JingleSession.prototype.setLocalDescription = function () {
@@ -1310,7 +1310,7 @@ function sendKeyframe(pc) {
 }


-JingleSession.prototype.remoteStreamAdded = function (data) {
+JingleSession.prototype.remoteStreamAdded = function (data, times) {
    var self = this;
    var thessrc;
    var ssrc2jid = this.connection.emuc.ssrc2jid;
@@ -1339,12 +1339,24 @@ JingleSession.prototype.remoteStreamAdded = function (data) {
            // presence to arrive.

            if (!ssrc2jid[thessrc]) {
-                // TODO(gp) limit wait duration to 1 sec.
-                setTimeout(function(d) {
-                    return function() {
-                        self.remoteStreamAdded(d);
-                    }
-                }(data), 250);
+
+                if (typeof times === 'undefined')
+                {
+                    times = 0;
+                }
+
+                if (times > 10)
+                {
+                    console.warning('Waiting for jid timed out', thessrc);
+                }
+                else
+                {
+                    setTimeout(function(d) {
+                        return function() {
+                            self.remoteStreamAdded(d, times++);
+                        }
+                    }(data), 250);
+                }
                return;
            }

@@ -1356,27 +1368,6 @@ JingleSession.prototype.remoteStreamAdded = function (data) {
        }
    }

-    //TODO: this code should be removed when firefox implement multistream support
-    if(APP.RTC.getBrowserType() == RTCBrowserType.RTC_BROWSER_FIREFOX)
-    {
-        if((JingleSession.notReceivedSSRCs.length == 0) ||
-            !ssrc2jid[JingleSession.notReceivedSSRCs[JingleSession.notReceivedSSRCs.length - 1]])
-        {
-            // TODO(gp) limit wait duration to 1 sec.
-            setTimeout(function(d) {
-                return function() {
-                    self.remoteStreamAdded(d);
-                }
-            }(data), 250);
-            return;
-        }
-
-        thessrc = JingleSession.notReceivedSSRCs.pop();
-        if (ssrc2jid[thessrc]) {
-            data.peerjid = ssrc2jid[thessrc];
-        }
-    }
-
    APP.RTC.createRemoteStream(data, this.sid, thessrc);

    var isVideo = data.stream.getVideoTracks().length > 0;
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -6,6 +6,8 @@ function TraceablePeerConnection(ice_config, constraints) {
    this.stats = {};
    this.statsinterval = null;
    this.maxstats = 0; // limit to 300 values, i.e. 5 minutes; set to 0 to disable
+    var Interop = require('sdp-interop').Interop;
+    this.interop = new Interop();

    // override as desired
    this.trace = function (what, info) {
@@ -98,19 +100,39 @@ function TraceablePeerConnection(ice_config, constraints) {
 };

 dumpSDP = function(description) {
+    if (typeof description === 'undefined' || description == null) {
+        return '';
+    }
+
    return 'type: ' + description.type + '\r\n' + description.sdp;
-}
+};

 if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
    TraceablePeerConnection.prototype.__defineGetter__('signalingState', function() { return this.peerconnection.signalingState; });
    TraceablePeerConnection.prototype.__defineGetter__('iceConnectionState', function() { return this.peerconnection.iceConnectionState; });
    TraceablePeerConnection.prototype.__defineGetter__('localDescription', function() {
-        var publicLocalDescription = APP.simulcast.reverseTransformLocalDescription(this.peerconnection.localDescription);
-        return publicLocalDescription;
+        this.trace('getLocalDescription::preTransform (Plan A)', dumpSDP(this.peerconnection.localDescription));
+        // if we're running on FF, transform to Plan B first.
+        var desc = this.peerconnection.localDescription;
+        if (navigator.mozGetUserMedia) {
+            desc = this.interop.toPlanB(desc);
+        } else {
+            desc = APP.simulcast.reverseTransformLocalDescription(this.peerconnection.localDescription);
+        }
+        this.trace('getLocalDescription::postTransform (Plan B)', dumpSDP(desc));
+        return desc;
    });
    TraceablePeerConnection.prototype.__defineGetter__('remoteDescription', function() {
-        var publicRemoteDescription = APP.simulcast.reverseTransformRemoteDescription(this.peerconnection.remoteDescription);
-        return publicRemoteDescription;
+        this.trace('getRemoteDescription::preTransform (Plan A)', dumpSDP(this.peerconnection.remoteDescription));
+        // if we're running on FF, transform to Plan B first.
+        var desc = this.peerconnection.remoteDescription;
+        if (navigator.mozGetUserMedia) {
+            desc = this.interop.toPlanB(desc);
+        } else {
+            desc = APP.simulcast.reverseTransformRemoteDescription(this.peerconnection.remoteDescription);
+        }
+        this.trace('getRemoteDescription::postTransform (Plan B)', dumpSDP(desc));
+        return desc;
    });
 }

@@ -148,9 +170,15 @@ TraceablePeerConnection.prototype.createDataChannel = function (label, opts) {
 };

 TraceablePeerConnection.prototype.setLocalDescription = function (description, successCallback, failureCallback) {
+    this.trace('setLocalDescription::preTransform (Plan B)', dumpSDP(description));
+    // if we're running on FF, transform to Plan A first.
+    if (navigator.mozGetUserMedia) {
+        description = this.interop.toPlanA(description);
+    } else {
+        description = APP.simulcast.transformLocalDescription(description);
+    }
+    this.trace('setLocalDescription::postTransform (Plan A)', dumpSDP(description));
    var self = this;
-    description = APP.simulcast.transformLocalDescription(description);
-    this.trace('setLocalDescription', dumpSDP(description));
    this.peerconnection.setLocalDescription(description,
        function () {
            self.trace('setLocalDescriptionOnSuccess');
@@ -169,9 +197,16 @@ TraceablePeerConnection.prototype.setLocalDescription = function (description, s
 };

 TraceablePeerConnection.prototype.setRemoteDescription = function (description, successCallback, failureCallback) {
+    this.trace('setRemoteDescription::preTransform (Plan B)', dumpSDP(description));
+    // if we're running on FF, transform to Plan A first.
+    if (navigator.mozGetUserMedia) {
+        description = this.interop.toPlanA(description);
+    }
+    else {
+        description = APP.simulcast.transformRemoteDescription(description);
+    }
+    this.trace('setRemoteDescription::postTransform (Plan A)', dumpSDP(description));
    var self = this;
-    description = APP.simulcast.transformRemoteDescription(description);
-    this.trace('setRemoteDescription', dumpSDP(description));
    this.peerconnection.setRemoteDescription(description,
        function () {
            self.trace('setRemoteDescriptionOnSuccess');
@@ -203,7 +238,12 @@ TraceablePeerConnection.prototype.createOffer = function (successCallback, failu
    this.trace('createOffer', JSON.stringify(constraints, null, ' '));
    this.peerconnection.createOffer(
        function (offer) {
-            self.trace('createOfferOnSuccess', dumpSDP(offer));
+            self.trace('createOfferOnSuccess::preTransform (Plan A)', dumpSDP(offer));
+            // if we're running on FF, transform to Plan B first.
+            if (navigator.mozGetUserMedia) {
+                offer = self.interop.toPlanB(offer);
+            }
+            self.trace('createOfferOnSuccess::postTransform (Plan B)', dumpSDP(offer));
            successCallback(offer);
        },
        function(err) {
@@ -219,8 +259,14 @@ TraceablePeerConnection.prototype.createAnswer = function (successCallback, fail
    this.trace('createAnswer', JSON.stringify(constraints, null, ' '));
    this.peerconnection.createAnswer(
        function (answer) {
-            answer = APP.simulcast.transformAnswer(answer);
-            self.trace('createAnswerOnSuccess', dumpSDP(answer));
+            self.trace('createAnswerOnSuccess::preTransfom (Plan A)', dumpSDP(answer));
+            // if we're running on FF, transform to Plan A first.
+            if (navigator.mozGetUserMedia) {
+                answer = self.interop.toPlanB(answer);
+            } else {
+                answer = APP.simulcast.transformAnswer(answer);
+            }
+            self.trace('createAnswerOnSuccess::postTransfom (Plan B)', dumpSDP(answer));
            successCallback(answer);
        },
        function(err) {
--- a/modules/xmpp/moderator.js
+++ b/modules/xmpp/moderator.js
@@ -1,6 +1,10 @@
-/* global $, $iq, config, connection, UI, messageHandler,
+/* global $, $iq, APP, config, connection, UI, messageHandler,
 roomName, sessionTerminated, Strophe, Util */
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
+var Settings = require("../settings/Settings");
+
+var AuthenticationEvents
+    = require("../../service/authentication/AuthenticationEvents");

 /**
 * Contains logic responsible for enabling/disabling functionality available
@@ -60,6 +64,25 @@ var Moderator = {
    init: function (xmpp, emitter) {
        this.xmppService = xmpp;
        eventEmitter = emitter;
+
+        // Message listener that talks to POPUP window
+        function listener(event) {
+            if (event.data && event.data.sessionId) {
+                if (event.origin !== window.location.origin) {
+                    console.warn(
+                        "Ignoring sessionId from different origin: " + event.origin);
+                    return;
+                }
+                localStorage.setItem('sessionId', event.data.sessionId);
+                // After popup is closed we will authenticate
+            }
+        }
+        // Register
+        if (window.addEventListener) {
+            window.addEventListener("message", listener, false);
+        } else {
+            window.attachEvent("onmessage", listener);
+        }
    },

    onMucLeft: function (jid) {
@@ -99,10 +122,24 @@ var Moderator = {
    createConferenceIq: function (roomName) {
        // Generate create conference IQ
        var elem = $iq({to: Moderator.getFocusComponent(), type: 'set'});
+
+        // Session Id used for authentication
+        var sessionId = localStorage.getItem('sessionId');
+        var machineUID = Settings.getSettings().uid;
+
+        console.info(
+            "Session ID: " + sessionId + " machine UID: " + machineUID);
+
        elem.c('conference', {
            xmlns: 'http://jitsi.org/protocol/focus',
-            room: roomName
+            room: roomName,
+            'machine-uid': machineUID
        });
+
+        if (sessionId) {
+            elem.attrs({ 'session-id': sessionId});
+        }
+
        if (config.hosts.bridge !== undefined) {
            elem.c(
                'property',
@@ -152,22 +189,44 @@ var Moderator = {
    },

    parseConfigOptions: function (resultIq) {
-    
+
        Moderator.setFocusUserJid(
            $(resultIq).find('conference').attr('focusjid'));
-    
-        var extAuthParam
-            = $(resultIq).find('>conference>property[name=\'externalAuth\']');
-        if (extAuthParam.length) {
-            externalAuthEnabled = extAuthParam.attr('value') === 'true';
+
+        var authenticationEnabled
+            = $(resultIq).find(
+                '>conference>property' +
+                '[name=\'authentication\'][value=\'true\']').length > 0;
+
+        console.info("Authentication enabled: " + authenticationEnabled);
+
+        externalAuthEnabled
+            = $(resultIq).find(
+                '>conference>property' +
+                '[name=\'externalAuth\'][value=\'true\']').length > 0;
+
+        console.info('External authentication enabled: ' + externalAuthEnabled);
+
+        if (!externalAuthEnabled) {
+            // We expect to receive sessionId in 'internal' authentication mode
+            var sessionId
+                = $(resultIq).find('conference').attr('session-id');
+            if (sessionId) {
+                console.info('Received sessionId: ' + sessionId);
+                localStorage.setItem('sessionId', sessionId);
+            }
        }
-    
-        console.info("External authentication enabled: " + externalAuthEnabled);
+
+        var authIdentity = $(resultIq).find('>conference').attr('identity');
+
+        eventEmitter.emit(AuthenticationEvents.IDENTITY_UPDATED,
+            authenticationEnabled, authIdentity);
    
        // Check if focus has auto-detected Jigasi component(this will be also
        // included if we have passed our host from the config)
        if ($(resultIq).find(
-            '>conference>property[name=\'sipGatewayEnabled\']').length) {
+            '>conference>property' +
+            '[name=\'sipGatewayEnabled\'][value=\'true\']').length) {
            sipGatewayEnabled = true;
        }
    
@@ -185,12 +244,14 @@ var Moderator = {
        connection.sendIQ(
            iq,
            function (result) {
+
+                // Setup config options
+                Moderator.parseConfigOptions(result);
+
                if ('true' === $(result).find('conference').attr('ready')) {
                    // Reset both timers
                    getNextTimeout(true);
                    getNextErrorTimeout(true);
-                    // Setup config options
-                    Moderator.parseConfigOptions(result);
                    // Exec callback
                    callback();
                } else {
@@ -206,36 +267,66 @@ var Moderator = {
                }
            },
            function (error) {
+                // Invalid session ? remove and try again
+                // without session ID to get a new one
+                var invalidSession
+                    = $(error).find('>error>session-invalid').length;
+                if (invalidSession) {
+                    console.info("Session expired! - removing");
+                    localStorage.removeItem("sessionId");
+                }
+                if ($(error).find('>error>graceful-shutdown').length) {
+                    eventEmitter.emit(XMPPEvents.GRACEFUL_SHUTDOWN);
+                    return;
+                }
+                // Check for error returned by the reservation system
+                var reservationErr = $(error).find('>error>reservation-error');
+                if (reservationErr.length) {
+                    // Trigger error event
+                    var errorCode = reservationErr.attr('error-code');
+                    var errorMsg;
+                    if ($(error).find('>error>text')) {
+                        errorMsg = $(error).find('>error>text').text();
+                    }
+                    eventEmitter.emit(
+                        XMPPEvents.RESERVATION_ERROR, errorCode, errorMsg);
+                    return;
+                }
                // Not authorized to create new room
                if ($(error).find('>error>not-authorized').length) {
-                    console.warn("Unauthorized to start the conference");
+                    console.warn("Unauthorized to start the conference", error);
                    var toDomain
                        = Strophe.getDomainFromJid(error.getAttribute('to'));
                    if (toDomain === config.hosts.anonymousdomain) {
                        // we are connected with anonymous domain and
                        // only non anonymous users can create rooms
                        // we must authorize the user
-
                        self.xmppService.promptLogin();
                    } else {
-
-                        eventEmitter.emit(XMPPEvents.AUTHENTICATION_REQUIRED, // External authentication mode
+                        // External authentication mode
+                        eventEmitter.emit(
+                            XMPPEvents.AUTHENTICATION_REQUIRED,
                            function () {
                                Moderator.allocateConferenceFocus(
                                    roomName, callback);
                            });
-
                    }
                    return;
                }
                var waitMs = getNextErrorTimeout();
                console.error("Focus error, retry after " + waitMs, error);
                // Show message
-                APP.UI.messageHandler.notify(
-                    'Conference focus', 'disconnected',
-                        Moderator.getFocusComponent() +
-                        ' not available - retry in ' +
-                        (waitMs / 1000) + ' sec');
+                var focusComponent = Moderator.getFocusComponent();
+                var retrySec = waitMs / 1000;
+                // FIXME: message is duplicated ?
+                // Do not show in case of session invalid
+                // which means just a retry
+                if (!invalidSession) {
+                    APP.UI.messageHandler.notify(
+                        null, "notify.focus",
+                        'disconnected', "notify.focusFail",
+                        {component: focusComponent, ms: retrySec});
+                }
                // Reset response timeout
                getNextTimeout(true);
                window.setTimeout(
@@ -246,28 +337,83 @@ var Moderator = {
        );
    },

-    getAuthUrl: function (roomName, urlCallback) {
+    getLoginUrl: function (roomName, urlCallback) {
        var iq = $iq({to: Moderator.getFocusComponent(), type: 'get'});
-        iq.c('auth-url', {
+        iq.c('login-url', {
            xmlns: 'http://jitsi.org/protocol/focus',
-            room: roomName
+            room: roomName,
+            'machine-uid': Settings.getSettings().uid
        });
        connection.sendIQ(
            iq,
            function (result) {
-                var url = $(result).find('auth-url').attr('url');
+                var url = $(result).find('login-url').attr('url');
+                url = url = decodeURIComponent(url);
                if (url) {
                    console.info("Got auth url: " + url);
                    urlCallback(url);
                } else {
                    console.error(
-                        "Failed to get auth url fro mthe focus", result);
+                        "Failed to get auth url from the focus", result);
                }
            },
            function (error) {
                console.error("Get auth url error", error);
            }
        );
+    },
+    getPopupLoginUrl: function (roomName, urlCallback) {
+        var iq = $iq({to: Moderator.getFocusComponent(), type: 'get'});
+        iq.c('login-url', {
+            xmlns: 'http://jitsi.org/protocol/focus',
+            room: roomName,
+            'machine-uid': Settings.getSettings().uid,
+            popup: true
+        });
+        connection.sendIQ(
+            iq,
+            function (result) {
+                var url = $(result).find('login-url').attr('url');
+                url = url = decodeURIComponent(url);
+                if (url) {
+                    console.info("Got POPUP auth url: " + url);
+                    urlCallback(url);
+                } else {
+                    console.error(
+                        "Failed to get POPUP auth url from the focus", result);
+                }
+            },
+            function (error) {
+                console.error('Get POPUP auth url error', error);
+            }
+        );
+    },
+    logout: function (callback) {
+        var iq = $iq({to: Moderator.getFocusComponent(), type: 'set'});
+        var sessionId = localStorage.getItem('sessionId');
+        if (!sessionId) {
+            callback();
+            return;
+        }
+        iq.c('logout', {
+            xmlns: 'http://jitsi.org/protocol/focus',
+            'session-id': sessionId
+        });
+        connection.sendIQ(
+            iq,
+            function (result) {
+                var logoutUrl = $(result).find('logout').attr('logout-url');
+                if (logoutUrl) {
+                    logoutUrl = decodeURIComponent(logoutUrl);
+                }
+                console.info("Log out OK, url: " + logoutUrl, result);
+                localStorage.removeItem('sessionId');
+                callback(logoutUrl);
+            },
+            function (error) {
+                console.error("Logout error", error);
+            }
+        );
    }
 };

--- a/modules/xmpp/recording.js
+++ b/modules/xmpp/recording.js
@@ -108,7 +108,8 @@ var Recording = {
        if (!recordingToken && !useJirecon) {
            tokenEmptyCallback(function (value) {
                setRecordingToken(value);
-                self.toggleRecording();
+                self.toggleRecording(tokenEmptyCallback,
+                    startingCallback, startedCallback, connection);
            });

            return;
--- a/modules/xmpp/strophe.emuc.js
+++ b/modules/xmpp/strophe.emuc.js
@@ -183,8 +183,7 @@ module.exports = function(XMPP, eventEmitter) {
                    this.role = member.role;

                    eventEmitter.emit(XMPPEvents.LOCALROLE_CHANGED,
-                        from, member, pres, Moderator.isModerator(),
-                        Moderator.isExternalAuthEnabled());
+                        from, member, pres, Moderator.isModerator());
                }
                if (!this.joined) {
                    this.joined = true;
@@ -230,6 +229,20 @@ module.exports = function(XMPP, eventEmitter) {
        },
        onPresenceUnavailable: function (pres) {
            var from = pres.getAttribute('from');
+            // room destroyed ?
+            if ($(pres).find('>x[xmlns="http://jabber.org/protocol/muc#user"]' +
+                             '>destroy').length) {
+                var reason;
+                var reasonSelect = $(pres).find(
+                    '>x[xmlns="http://jabber.org/protocol/muc#user"]' +
+                    '>destroy>reason');
+                if (reasonSelect.length) {
+                    reason = reasonSelect.text();
+                }
+                XMPP.disposeConference(false);
+                eventEmitter.emit(XMPPEvents.MUC_DESTROYED, reason);
+                return true;
+            }
            // Status code 110 indicates that this notification is "self-presence".
            if (!$(pres).find('>x[xmlns="http://jabber.org/protocol/muc#user"]>status[code="110"]').length) {
                delete this.members[from];
@@ -273,20 +286,17 @@ module.exports = function(XMPP, eventEmitter) {
                    // domains or something is wrong.
 //                    XMPP.promptLogin();
                    APP.UI.messageHandler.openReportDialog(null,
-                        'Oops ! We couldn`t join the conference.' +
-                        ' There might be some problem with security' +
-                        ' configuration. Please contact service' +
-                        ' administrator.', pres);
+                        "dialog.joinError", pres);
                } else {
                    console.warn('onPresError ', pres);
                    APP.UI.messageHandler.openReportDialog(null,
-                        'Oops! Something went wrong and we couldn`t connect to the conference.',
+                        "dialog.connectError",
                        pres);
                }
            } else {
                console.warn('onPresError ', pres);
                APP.UI.messageHandler.openReportDialog(null,
-                    'Oops! Something went wrong and we couldn`t connect to the conference.',
+                    "dialog.connectError",
                    pres);
            }
            return true;
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -230,6 +230,12 @@ var XMPP = {
    allocateConferenceFocus: function(roomName, callback) {
        Moderator.allocateConferenceFocus(roomName, callback);
    },
+    getLoginUrl: function (roomName, callback) {
+        Moderator.getLoginUrl(roomName, callback);
+    },
+    getPopupLoginUrl: function (roomName, callback) {
+        Moderator.getPopupLoginUrl(roomName, callback);
+    },
    isModerator: function () {
        return Moderator.isModerator();
    },
@@ -245,9 +251,7 @@ var XMPP = {
            connection.jingle.activecall.switchStreams(stream, oldStream, callback);
        } else {
            // We are done immediately
-            console.error("No conference handler");
-            APP.UI.messageHandler.showError('Error',
-                'Unable to switch video stream.');
+            console.warn("No conference handler or conference not started yet");
            callback();
        }
    },
@@ -308,9 +312,8 @@ var XMPP = {
                            },
                            function (error) {
                                console.log('mute SLD error');
-                                APP.UI.messageHandler.showError('Error',
-                                        'Oops! Something went wrong and we failed to ' +
-                                        'mute! (SLD Failure)');
+                                APP.UI.messageHandler.showError("dialog.error",
+                                    "dialog.SLDFailure");
                            }
                        );
                    },
@@ -322,9 +325,8 @@ var XMPP = {
            },
            function (error) {
                console.log('muteVideo SRD error');
-                APP.UI.messageHandler.showError('Error',
-                        'Oops! Something went wrong and we failed to stop video!' +
-                        '(SRD Failure)');
+                APP.UI.messageHandler.showError("dialog.error",
+                    "dialog.SRDFailure");

            }
        );
@@ -361,9 +363,15 @@ var XMPP = {
        if(!dontSend)
            connection.emuc.sendPresence();
    },
+    /**
+     * Sends 'data' as a log message to the focus. Returns true iff a message
+     * was sent.
+     * @param data
+     * @returns {boolean} true iff a message was sent.
+     */
    sendLogs: function (data) {
        if(!connection.emuc.focusMucJid)
-            return;
+            return false;

        var deflate = true;

@@ -383,6 +391,7 @@ var XMPP = {
        message.up();

        connection.send(message);
+        return true;
    },
    populateData: function () {
        var data = {};
@@ -421,6 +430,9 @@ var XMPP = {
    eject: function (jid) {
        connection.moderate.eject(jid);
    },
+    logout: function (callback) {
+        Moderator.logout(callback);
+    },
    findJidFromResource: function (resource) {
        return connection.emuc.findJidFromResource(resource);
    },
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
  "dependencies": {
      "events": "*",
      "pako": "*",
-      "i18next-client": "*"
+      "i18next-client": "*",
+      "sdp-interop": "https://github.com/jitsi/sdp-interop/tarball/master"
  },
  "devDependencies": {
  },
--- a/service/RTC/Resolutions.js
+++ b/service/RTC/Resolutions.js
@@ -0,0 +1,53 @@
+var Resolutions = {
+    "1080": {
+        width: 1920,
+        height: 1080,
+        order: 7
+    },
+    "fullhd": {
+        width: 1920,
+        height: 1080,
+        order: 7
+    },
+    "720": {
+        width: 1280,
+        height: 720,
+        order: 6
+    },
+    "hd": {
+        width: 1280,
+        height: 720,
+        order: 6
+    },
+    "960": {
+        width: 960,
+        height: 720,
+        order: 5
+    },
+    "640": {
+        width: 640,
+        height: 480,
+        order: 4
+    },
+    "vga": {
+        width: 640,
+        height: 480,
+        order: 4
+    },
+    "360": {
+        width: 640,
+        height: 360,
+        order: 3
+    },
+    "320": {
+        width: 320,
+        height: 240,
+        order: 2
+    },
+    "180": {
+        width: 320,
+        height: 180,
+        order: 1
+    }
+};
+module.exports = Resolutions;
--- a/service/authentication/AuthenticationEvents.js
+++ b/service/authentication/AuthenticationEvents.js
@@ -0,0 +1,12 @@
+var AuthenticationEvents = {
+    /**
+     * Event callback arguments:
+     * function(authenticationEnabled, userIdentity)
+     * authenticationEnabled - indicates whether authentication has been enabled
+     *                         in this session
+     * userIdentity - if user has been logged in then it contains user name. If
+     *                contains 'null' or 'undefined' then user is not logged in.
+     */
+    IDENTITY_UPDATED: "authentication.identity_updated"
+};
+module.exports = AuthenticationEvents;
--- a/service/translation/languages.js
+++ b/service/translation/languages.js
@@ -8,5 +8,7 @@ module.exports = {
        }
        return languages;
    },
-    EN: "en"
+    EN: "en",
+    BG: "bg",
+    DE: "de"
 }
--- a/service/xmpp/XMPPEvents.js
+++ b/service/xmpp/XMPPEvents.js
@@ -3,6 +3,7 @@ var XMPPEvents = {
    CALL_TERMINATED: "xmpp.callterminated.jingle",
    CALL_INCOMING: "xmpp.callincoming.jingle",
    DISPOSE_CONFERENCE: "xmpp.dispoce_confernce",
+    GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown",
    KICKED: "xmpp.kicked",
    BRIDGE_DOWN: "xmpp.bridge_down",
    USER_ID_CHANGED: "xmpp.user_id_changed",
@@ -11,10 +12,12 @@ var XMPPEvents = {
    MUC_ENTER: "xmpp.muc_enter",
    MUC_ROLE_CHANGED: "xmpp.muc_role_changed",
    MUC_LEFT: "xmpp.muc_left",
+    MUC_DESTROYED: "xmpp.muc_destroyed",
    DISPLAY_NAME_CHANGED: "xmpp.display_name_changed",
    REMOTE_STATS: "xmpp.remote_stats",
    LOCALROLE_CHANGED: "xmpp.localrole_changed",
    PRESENCE_STATUS: "xmpp.presence_status",
+    RESERVATION_ERROR: "xmpp.room_reservation_error",
    SUBJECT_CHANGED: "xmpp.subject_changed",
    MESSAGE_RECEIVED: "xmpp.message_received",
    SENDING_CHAT_MESSAGE: "xmpp.sending_chat_message",
--- a/unsupported_browser.html
+++ b/unsupported_browser.html
@@ -0,0 +1,42 @@
+<html>
+<head>
+<title>Jitsi Meet: Unsupported Browser</title>
+<link rel="stylesheet" type="text/css" media="screen" href="css/unsupported_browser.css" />
+</head>
+
+<body>
+<!-- wrap starts here -->
+<div id="wrap"> 
+<div id="text">
+    <p>This application is currently only supported by</p>
+
+    <div class="supported_browsers">
+        <div class="browser_wrapper">
+            Chrome
+            <div class="browser">
+                <div class="logo" id="chrome_logo"></div>
+                <a href="http://google.com/chrome"><div class="button">DOWNLOAD</div></a>
+            </div>
+        </div>
+        <div class="browser_wrapper">
+            Chromium
+            <div class="browser">
+                <div class="logo" id="chromium_logo"></div>
+                <a href="http://www.chromium.org/"><div class="button">DOWNLOAD</div></a>
+            </div>
+        </div>
+        <div class="browser_wrapper">
+            Opera
+            <div class="browser">
+                <div class="logo" id="opera_logo"></div>
+                <a href="http://www.opera.com"><div class="button">DOWNLOAD</div></a>
+            </div>
+        </div>
+    </div>
+    <div class="clear"></div>
+    <div class="firefox">We are hoping that multistream support for Firefox would not be long so that we could all use this application with our favorite browser.</div>
+</div>
+<!-- wrap ends here -->
+</div>		
+</body>
+</html>
--- a/webrtcrequired.html
+++ b/webrtcrequired.html
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>Jitsi Meet: Unsupported Browser</title>
-<link rel="stylesheet" type="text/css" media="screen" href="css/chromeonly.css" />
-</head>
-
-<body>
-<!-- wrap starts here -->
-<div id="wrap"> 
-<a href="http://google.com/chrome"><div id="left"></div></a>
-<div id="middle"></div>
-<div id="text">
-    <p>This application is currently only supported by <a href="http://google.com/chrome">Chrome</a>, <a href="http://www.chromium.org/">Chromium</a> and <a href="http://www.opera.com">Opera</a></p>
-    <p><a href="http://google.com/chrome">Download Chrome</a></p>
-    <p class="firefox">We are hoping that <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=977864">multistream support</a> for Firefox would not be long so that we could all use this application with our favorite browser.</p>
-</div>
-<!-- wrap ends here -->
-</div>		
-</body>
-</html>
Author	SHA1	Message	Date
George Politis	d9f7b8b6cc	Adds a comment about how FF handles the video.src attribute.	2015-03-05 11:26:44 +01:00
George Politis	05bbfda5bb	Adds support for FF/multistream.	2015-03-04 21:33:06 +01:00
paweldomas	e465b3ed90	Removes unnecessary error dialog when desktop sharing is started before the conference.	2015-03-04 13:58:07 +01:00
hristoterezov	1825f47ef2	Adds translation support for placeholder attributes.	2015-03-04 12:59:52 +02:00
ibauersachs	169d613ac4	Commit from translate.jitsi.org by user ibauersachs.: 135 of 135 strings translated (0 fuzzy).	2015-03-04 09:37:19 +00:00
Ingo Bauersachs	3dac5eeff5	Fix punctuation spacing	2015-03-04 10:27:44 +01:00
hristoterezov	f79651f806	Merge branch 'translation'	2015-03-04 11:06:02 +02:00
hristoterezov	6048d0a325	Fixes the html attributes for translation options.	2015-02-27 20:05:32 +02:00
hristoterezov	6f12446c99	Fixes translation of plurals.	2015-02-27 19:58:05 +02:00
hristoterezov	af682f8727	Changes the configuration of translation module to retrieve the resources synchronous. Removes the default values.	2015-02-26 17:35:35 +02:00
paweldomas	9123923818	Displays reservation system error if one is returned by the focus.	2015-02-26 14:59:01 +01:00
Boris Grozev	aee7a8e1bd	Fix a bug with stats accumulating. Fix a typo.	2015-02-26 10:12:06 +01:00
paweldomas	5b44edb3cc	Handles graceful-shutdown focus error response.	2015-02-25 16:55:22 +01:00
Boris Grozev	806d4ea443	Filters some statistics from the logs. Increases the interval for logged statistics.	2015-02-25 11:38:04 +01:00
hristoterezov	1e35ca5e4d	Removes the firefox issue link.	2015-02-25 12:06:32 +02:00
hristoterezov	d4f00d76ab	Removes webrtcrequired.html.	2015-02-25 11:07:33 +02:00
hristoterezov	37282e63b3	Fixes the references with chromeonly page.	2015-02-24 18:24:39 +02:00
hristoterezov	4b218499ae	Redesigns the supported browsers page.	2015-02-24 18:08:24 +02:00
hristoterezov	f16a1cdf44	Changes the implementation to store the language in local storage. Adds new languages.	2015-02-24 12:49:46 +02:00
hristoterezov	702f02568d	Fixes issue with the buttons in the message handler.	2015-02-24 10:57:41 +02:00
paweldomas	b6808d87bc	Updates app.bundle.js.	2015-02-23 16:15:42 +01:00
paweldomas	8042bd2aa6	Handles MUC destroyed event.	2015-02-23 16:13:38 +01:00
paweldomas	053b2d5af2	Fixes logout confirmation dialog.	2015-02-23 16:13:26 +01:00
Ingo Bauersachs	222164333b	Fix some typos and punctuation spacing.	2015-02-23 13:35:16 +01:00
ibauersachs	db50810e4b	Commit from translate.jitsi.org by user ibauersachs.: 130 of 130 strings translated (0 fuzzy).	2015-02-23 12:33:29 +00:00
hristo	720851dcb9	Commit from translate.jitsi.org by user hristo.: 3 of 130 strings translated (0 fuzzy).	2015-02-23 11:44:51 +00:00
jitsi-pootle	d7203b8b1a	New files added from translate.jitsi.org based on templates	2015-02-23 11:42:53 +00:00
jitsi-pootle	204ca29ed7	New files added from translate.jitsi.org based on templates	2015-02-23 11:42:33 +00:00
hristoterezov	fdada53a4a	Fixes issue with the recording.	2015-02-23 12:06:42 +02:00
hristoterezov	81eb3754a0	Fixes "focus not available" notifications.	2015-02-23 11:20:35 +02:00
hristoterezov	d260f1db61	Removes unused package.son files.	2015-02-20 18:21:58 +02:00
hristoterezov	74f078f166	Adds multi language support for message handlers.	2015-02-20 18:17:46 +02:00
paweldomas	e16cee4187	Delete old session ID and retry on 'session-invalid' response. Updates app.bundle.js.	2015-02-19 13:56:04 +01:00
paweldomas	a904e35c67	Adds auto-sign in feature and login/logout toolbar menu.	2015-02-19 13:49:51 +01:00
paweldomas	b87cd9f842	Moves Settings module out from the UI.	2015-02-19 13:49:41 +01:00
paweldomas	fed34e7671	Fixes PreziPlayer crash when invalid message is received.	2015-02-19 13:49:41 +01:00
George Politis	ed57f72117	Adds extra logging.	2015-02-19 13:27:44 +01:00
hristoterezov	4d39d4ccc3	Fixes issue with selected user resource jid variable.	2015-02-19 11:23:55 +02:00
hristoterezov	79cdd94833	Adds multi language support for notifications.	2015-02-13 18:28:35 +02:00
hristoterezov	e0645b41d3	Moves some function calls in UI service	2015-02-13 11:31:25 +02:00
hristoterezov	aa7f0c8a0b	Merge branch 'master' of github.com:jitsi/jitsi-meet	2015-02-12 16:44:24 +02:00
hristoterezov	2362770cce	Changes getUserMedia implementation to try lower resolution if the configured one is not supported.	2015-02-12 16:42:08 +02:00
Damian Minkov	8334036cf4	Moves admins definition as it seems on some distributions after latest lua updates, causes trouble for prosody.	2015-02-12 15:39:56 +02:00
Damian Minkov	eec513e9e3	Adds admins line after muc component.	2015-02-12 13:50:21 +02:00
hristoterezov	f2a7a43ba7	Fixes audio level performance issue on avatar.	2015-02-11 18:29:20 +02:00
hristoterezov	61bbbaf6eb	Adds gitattributes file that marks the generated files as binary files.	2015-02-09 15:50:49 +02:00
hristoterezov	3519a6ec7b	Fixes the generated file.	2015-02-09 15:03:23 +02:00
hristoterezov	d21f994eee	Removes rtp stats option and adds options for disabling/enabling stats and audio levels.	2015-02-09 14:51:25 +02:00