Commit from translate.jitsi.org by user hristo.: 11 of 149 strings translated (0 fuzzy).

Changes the format of email text in the language resource files.
Moves supported browser list from the email message to the JS
2026-01-02 21:02:28 +00:00 · 2015-03-11 17:50:42 +00:00 · 2015-03-11 18:54:43 +02:00 · 2015-03-11 10:53:39 +02:00 · 2015-03-11 08:51:16 +00:00 · 2015-03-11 10:29:21 +02:00
59 changed files with 2699 additions and 840 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 node_modules
+*.swp
+.idea/
+*.iml
--- a/4
+++ b/4
@@ -1,3 +1,4 @@
+NPM = npm
 BROWSERIFY = browserify
 GLOBAL_FLAGS = -x jquery -e
 OUTPUT_DIR = .
@@ -14,11 +15,10 @@ compile-debug:FLAGS = -d $(GLOBAL_FLAGS)
 compile-debug: app

 app:
-	$(BROWSERIFY) $(FLAGS) app.js -s APP -o $(OUTPUT_DIR)/app.bundle.js
+	$(NPM) update && $(BROWSERIFY) $(FLAGS) app.js -s APP -o $(OUTPUT_DIR)/app.bundle.js

 clean:
 	@rm -f $(OUTPUT_DIR)/*.bundle.js

 deploy:
 	@mkdir -p $(DEPLOY_DIR) && cp $(OUTPUT_DIR)/*.bundle.js $(DEPLOY_DIR)
-	
--- a/app.js
+++ b/app.js
@@ -14,6 +14,7 @@ var APP =
        this.xmpp = require("./modules/xmpp/xmpp");
        this.keyboardshortcut = require("./modules/keyboardshortcut/keyboardshortcut");
        this.translation = require("./modules/translation/translation");
+        this.settings = require("./modules/settings/Settings");
    }
 };

--- 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/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/jitsi_popover.css
+++ b/css/jitsi_popover.css
@@ -99,5 +99,7 @@
    width: 90px;
    height: 16px;
    padding-top: 4px;
+    padding-left: 10px;
+    padding-right: 10px;
    margin: 15px auto 0px auto;
 }
--- a/css/settingsmenu.css
+++ b/css/settingsmenu.css
@@ -27,8 +27,8 @@
 }

 #settingsmenu button {
-    width: 36%;
-    left: 32%;
+    width: 45%;
+    left: 26%;
    padding: 0;
    margin-top: 10px;
 }
--- 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.postinst
+++ b/debian/jitsi-meet.postinst
@@ -37,10 +37,6 @@ case "$1" in
            sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/nginx/sites-available/$JVB_HOSTNAME.conf
        fi

-        if grep "# server_names_hash_bucket_size 64" /etc/nginx/nginx.conf > /dev/null; then
-            sed -i "s/#\ server_names_hash_bucket_size\ 64/\ server_names_hash_bucket_size\ 64/" /etc/nginx/nginx.conf
-        fi
-
        # SSL for nginx
        db_get jitsi-meet/cert-choice
        CERT_CHOICE="$RET"
--- a/debian/patches/missing-source/libs/strophe/sha1.js
+++ b/debian/patches/missing-source/libs/strophe/sha1.js
--- a/debian/patches/missing-source/libs/strophe/strophe.caps.jsonly.js
+++ b/debian/patches/missing-source/libs/strophe/strophe.caps.jsonly.js
--- a/debian/patches/missing-source/libs/strophe/strophe.disco.js
+++ b/debian/patches/missing-source/libs/strophe/strophe.disco.js
--- a/debian/patches/jquery-package
+++ b/debian/patches/jquery-package
@@ -2,21 +2,18 @@ Index: jitsi-meet/index.html
 ===================================================================
 --- jitsi-meet.orig/index.html
 +++ jitsi-meet/index.html
-@@ -9,7 +9,7 @@
+@@ -9,12 +9,12 @@
     <meta itemprop="name" content="Jitsi Meet"/>
     <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="libs/jquery.min.js"></script>
-     <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
-     <script src="simulcast.js?v=5"></script><!-- simulcast handling -->
-     <script src="libs/strophe/strophe.jingle.adapter.js?v=2"></script><!-- strophe.jingle bundles -->
-@@ -24,7 +24,7 @@
-     <script src="libs/strophe/strophe.util.js"></script>
-     <script src="libs/colibri/colibri.focus.js?v=10"></script><!-- colibri focus implementation -->
-     <script src="libs/colibri/colibri.session.js?v=1"></script>
+     <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>
 -    <script src="libs/jquery-ui.js"></script>
 +    <script src="libs/jquery-ui.min.js"></script>
-     <script src="libs/rayo.js?v=1"></script>
     <script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
+     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.

 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -19,7 +13,7 @@ override_dh_install:
 	dh_installdirs
 	dh_install -X/config.js
 	yui-compressor -o debian/jitsi-meet/usr/share/jitsi-meet/libs/strophe/strophe.caps.jsonly.min.js \
-		debian/patches/missing-source/libs/strophe/strophe.caps.jsonly.js
+		debian/missing-source/libs/strophe/strophe.caps.jsonly.js
 	yui-compressor -o debian/jitsi-meet/usr/share/jitsi-meet/libs/strophe/strophe.disco.min.js \
-		debian/patches/missing-source/libs/strophe/sha1.js \
-		debian/patches/missing-source/libs/strophe/strophe.disco.js
+		debian/missing-source/libs/strophe/sha1.js \
+		debian/missing-source/libs/strophe/strophe.disco.js
--- a/debian/watch
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/jitsi/jitsi-meet/releases/ /jitsi/jitsi-meet/archive/(\S+)\.tar\.gz
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -1,3 +1,5 @@
+server_names_hash_bucket_size 64;
+
 server {
    listen 80;
    server_name jitsi-meet.example.com;
--- a/doc/influxdb.md
+++ b/doc/influxdb.md
@@ -0,0 +1,26 @@
+# Overview
+Jitsi Meet supports logging to an [InfluxDB](http://influxdb.com/) database.
+
+# Configuration
+The following needs to be done to enable this functionality.
+
+## Install InfluxDB
+The details are outside the scope of the document, see http://influxdb.com/download/ .
+
+## Enable logging for Jitsi Videobridge
+Add the following properties to <code>/usr/share/jitsi-videobridge/.sip-communicator/sip-communicator.properties</code>.
+
+- org.jitsi.videobridge.log.INFLUX_DB_ENABLED=true
+- org.jitsi.videobridge.log.INFLUX_URL_BASE=http://influxdb.example.com:8086
+- org.jitsi.videobridge.log.INFLUX_DATABASE=jitsi_database
+- org.jitsi.videobridge.log.INFLUX_USER=user
+- org.jitsi.videobridge.log.INFLUX_PASS=pass
+
+## Enable logging for Jicofo
+Add the same properties as above to <code>/usr/share/jitsi-videobridge/.sip-communicator/sip-communicator.properties</code>.
+
+## Enable logging for Jitsi Meet itself
+Change "logStats" to "true" in <code>/etc/jitsi/meet/you-domain.config.js</code> or the <code>config.js</code> file used in your installation.
+
+# User interface
+You can explore the database using the [Jiloin](https://github.com/jitsi/jiloin) web interface.
--- 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/firefox.png
+++ b/images/firefox.png
--- a/images/opera.png
+++ b/images/opera.png
--- a/index.html
+++ b/index.html
@@ -19,7 +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=16"></script>
+    <script src="libs/app.bundle.js?v=34"></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">
--- a/interface_config.js
+++ b/interface_config.js
@@ -5,7 +5,7 @@ var interfaceConfig = {
    INITIAL_TOOLBAR_TIMEOUT: 20000,
    TOOLBAR_TIMEOUT: 4000,
    DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
-    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker",
+    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "speaker",
    DEFAULT_LOCAL_DISPLAY_NAME: "me",
    SHOW_JITSI_WATERMARK: true,
    JITSI_WATERMARK_LINK: "http://jitsi.org",
--- a/lang/languages-bg.json
+++ b/lang/languages-bg.json
@@ -1 +1,6 @@
-{}
+{
+    "en": "Английски",
+    "bg": "Български",
+    "de": "Немски",
+    "tr": "Турски"
+}
--- a/lang/languages-de.json
+++ b/lang/languages-de.json
@@ -1 +1,6 @@
-{}
+{
+    "en": "Englisch",
+    "bg": "Bulgarisch",
+    "de": "Deutsch",
+    "tr": "Türkisch"
+}
--- a/lang/languages-tr.json
+++ b/lang/languages-tr.json
@@ -0,0 +1,5 @@
+{
+    "en": "İngilizce",
+    "bg": "Bulgarca",
+    "de": "Almanca"
+}
--- a/lang/languages.json
+++ b/lang/languages.json
@@ -1,4 +1,6 @@
 {
    "en": "English",
-    "bg": "Bulgarian"
+    "bg": "Bulgarian",
+    "de": "German",
+    "tr": "Turkish"
 }
--- a/lang/main-bg.json
+++ b/lang/main-bg.json
@@ -3,9 +3,15 @@
    "connectionsettings": "Настройки на връзката",
    "poweredby": "",
    "downloadlogs": "",
+    "roomUrlDefaultMsg": "",
+    "participant": "Участник",
+    "me": "аз",
+    "speaker": "",
+    "defaultNickname": "",
+    "defaultPreziLink": "",
    "welcomepage": {
        "go": "",
-        "roomname": "",
+        "roomname": "Въведете име на стаята",
        "disable": "",
        "feature1": {
            "title": "",
@@ -91,14 +97,14 @@
        "less": "",
        "more": "",
        "address": "",
-        "remoteports": "",
-        "localports": "",
        "remoteport": "",
+        "remoteport_plural": "",
        "localport": "",
+        "localport_plural": "",
        "localaddress": "",
-        "localaddresses": "",
+        "localaddress_plural": "",
        "remoteaddress": "",
-        "remoteaddresses": "",
+        "remoteaddress_plural": "",
        "transport": "",
        "bandwidth": "",
        "na": ""
@@ -148,6 +154,8 @@
        "AuthMsg": "",
        "Authenticate": "",
        "Cancel": "",
+        "logoutTitle": "",
+        "logoutQuestion": "",
        "sessTerminated": "",
        "hungUp": "",
        "joinAgain": "",
@@ -165,6 +173,32 @@
        "settings2": "",
        "settings3": "",
        "yourPassword": "",
-        "Back": ""
+        "Back": "",
+        "serviceUnavailable": "",
+        "gracefulShutdown": "",
+        "Yes": "",
+        "reservationError": "",
+        "reservationErrorMsg": "",
+        "password": "",
+        "userPassword": "",
+        "token": ""
+    },
+    "email": {
+        "sharedKeyThis conference is password protected. Please use the following pin when joining:\n\n\n__sharedKey__\n\n": "",
+        "subject": "",
+        "bodyHey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.\n\n\nPlease click on the following link in order to join the conference.\n\n\n__roomUrl__\n\n\n__sharedKeyText__\n Note that __appName__ is currently only supported by __supportedBrowsers__, so you need to be using one of these browsers.\n\n\nTalk to you in a sec!": [
+            "Здравей, Бих искал да те поканя в една __appName__ конференция, която създадох.",
+            "",
+            "",
+            "Кликни на следния линк за да се присъединиш в конференцията.",
+            "",
+            "",
+            "__sharedKeyText__",
+            "__appName__ поддържа __supportedBrowsers__, така че трябва да използваш един от тези браузъри.",
+            "",
+            "",
+            "Ще се видим след секунда!"
+        ],
+        "and": ""
    }
 }
--- a/lang/main-de.json
+++ b/lang/main-de.json
@@ -0,0 +1,207 @@
+{
+    "contactlist": "Kontaktliste",
+    "connectionsettings": "Verbindungseinstellungen",
+    "poweredby": "Betrieben von",
+    "downloadlogs": "Log herunterladen",
+    "roomUrlDefaultMsg": "Die Konferenz wird erstellt...",
+    "participant": "Teilnehmer",
+    "me": "ich",
+    "speaker": "Sprecher",
+    "defaultNickname": "Bsp.: __name__",
+    "defaultPreziLink": "Bsp.: __url__",
+    "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 schützen / Schutz aufheben",
+        "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": "Videovorschauen anzeigen / verstecken",
+        "contactlist": "Kontaktliste öffnen / schliessen"
+    },
+    "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": "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 schützen",
+        "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 schützen:",
+        "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__",
+        "password": "Passwort",
+        "userPassword": "Benutzerpasswort",
+        "token": "Token"
+    },
+    "email": {
+        "sharedKeyThis conference is password protected. Please use the following pin when joining:\n\n __sharedKey__ \n\n": [
+            "Diese Konferenz ist Passwortgeschützt. Bitte verwenden Sie diesen PIN zum Beitreten:",
+            "",
+            " __sharedKey__",
+            "",
+            "",
+            ""
+        ],
+        "subject": "Einladung zu einer __appName__ (__conferenceName__)",
+        "bodyHey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.\n\nPlease click on the following link in order to join the conference.\n\n __roomUrl__\n\n__sharedKeyText__ Note that __appName__ is currently only supported by Chromium, Google Chrome and Opera, so you need to be using one of these browsers.\n\nTalk to you in a sec!": [
+            "Hallo!",
+            "Ich möchte dich zu einer eben erstellten __appName__-Konferenz einladen.",
+            "",
+            "Bitte klicke auf den folgenden Link um der Konferenz ebenfalls beizutreten:\\",
+            " __roomUrl__",
+            "__sharedKeyText__ Bitte beachte, dass __appName__ momentan nur mit einem der Browser Chromium, Google und Opera verwendet werden kann.",
+            "",
+            "Bis gleich!"
+        ]
+    }
+}
--- a/lang/main-tr.json
+++ b/lang/main-tr.json
@@ -0,0 +1,173 @@
+{
+    "contactlist": "KİŞİ LİSTESİ",
+    "connectionsettings": "Bağlantı Ayarları",
+    "poweredby": "Gücünün kaynağı",
+    "downloadlogs": "Günlükleri indir",
+    "welcomepage": {
+        "go": "GİT",
+        "roomname": "Oda adı girin",
+        "disable": "Sonraki girişimde bu sayfayı gösterme",
+        "feature1": {
+            "title": "Kullanımı kolay",
+            "content": "İndirmeye gerek yok. __app__ tarayıcınızda doğrudan çalışır. Başlamak için görüşme bağlantısını URL diğerleri ile paylaşın."
+        },
+        "feature2": {
+            "title": "Düşük bant genişliği ihtiyacı",
+            "content": "Ekran paylaşımı ve sadece ses ile çok katılımcılı video görüşmeleri, 128Kbps bağlantı ile mümkündür."
+        },
+        "feature3": {
+            "title": "Açık kaynak kodlu",
+            "content": "__app__ MIT ile lisanslanmıştır. Bu lisansa uygun olarak indirmek, kullanmak, değiştirmek ve paylaşmakta özgürsün."
+        },
+        "feature4": {
+            "title": "Sınırsız sayıda kullanıcı",
+            "content": "Kullanıcılar veya konferans katılımcılarının sayısında hiçbir yapay kısıtlama yoktur. Sadece sunucun güç ve bant genişliği, sınırlayıcı unsurdur."
+        },
+        "feature5": {
+            "title": "Ekran paylaşımı",
+            "content": "Diğerlerinle ekranınızı kolayca paylaşın. __app__ çevrimiçi sunumlar, dersler ve teknik destek oturumları için idealdir."
+        },
+        "feature6": {
+            "title": "Güvenli odalar",
+            "content": "Biraz gizliliğe ihtiyacınız var? __app__ görüşme odaları, istemeyen misafirleri uzak tutmak ve kesinleri önlemek için bir parola ile güvence altına alınabilir."
+        },
+        "feature7": {
+            "title": "Paylaşımlı notlar",
+            "content": "__app__ Etherpad içerir, gerçek zamanlı bir ortak çalışma metin düzenleyicisidir. Görüşme tutanakları, makale yazımı ve daha fazlası için biçilmiş kaftandır."
+        },
+        "feature8": {
+            "title": "Kullanım istatistikleri",
+            "content": "Piwik, Google Analytics ve diğer kullanım izleme ve istatistik sistemleri ile kolay tümleştirmeyle kullanıcılar hakkında bilgi edinin."
+        }
+    },
+    "toolbar": {
+        "mute": "Sessiz / Sesli",
+        "videomute": "Kamera başlat / durdur",
+        "authenticate": "",
+        "record": "Kaydet",
+        "lock": "Odayı kilitle / kilit aç",
+        "invite": "Arkadaşlarını davet et",
+        "chat": "",
+        "prezi": "Prezi paylaş",
+        "etherpad": "Paylaşımlı belge",
+        "sharescreen": "Ekran paylaş",
+        "fullscreen": "Tam Ekrana Gir / Çık",
+        "sip": "SIP numara ara",
+        "Settings": "Ayarlar",
+        "hangup": "Kapat",
+        "login": "Oturum aç",
+        "logout": ""
+    },
+    "bottomtoolbar": {
+        "chat": "Sohbeti aç / kapa",
+        "filmstrip": "Kişi listesi aç / kapa",
+        "contactlist": "Film şeridini göster / gizle"
+    },
+    "chat": {
+        "nickname": {
+            "title": "Aşağıdaki kutuya bir takma ad girin",
+            "popover": "Bir takma ad seçin"
+        },
+        "messagebox": "Metin girin..."
+    },
+    "settings": {
+        "title": "AYARLAR",
+        "update": "Güncelle",
+        "name": "Ad"
+    },
+    "videothumbnail": {
+        "editnickname": "Görünür adınızı değiştirmek<br/>için tıkla",
+        "moderator": "Bu görüşmenin<br/>sahibi",
+        "videomute": "Katılımcı<br/>kamera durdurdu.",
+        "mute": "Katılımcı sessiz",
+        "kick": "Kovuldu",
+        "muted": "Sessiz",
+        "domute": "Sustur"
+    },
+    "connectionindicator": {
+        "bitrate": "Bit hızı:",
+        "packetloss": "Paket kaybı:",
+        "resolution": "Çözünürlük:",
+        "less": "Daha az göster",
+        "more": "Daha fazla göster",
+        "address": "Adres:",
+        "remoteport": "Uzak port:Uzak portlar:",
+        "localport": "Yerel port:Yerel portlar:",
+        "localaddress": "Yerel adres:Yerel adresler:",
+        "remoteaddress": "Uzak adres:Uzak adresler:",
+        "transport": "Transport:",
+        "bandwidth": "Tahmini bant genişliği:",
+        "na": "Görüşme başladıktan sonra bağlantı bilgileri için buraya gel"
+    },
+    "notify": {
+        "disconnected": "bağlantı kesildi",
+        "moderator": "Görüşme yöneticisi hakları verildi!",
+        "connected": "bağlandı",
+        "somebody": "Birisi",
+        "me": "Bana",
+        "focus": "Görüşme odağı",
+        "focusFail": "__component__ uygun değil - __ms__ saniye içinde tekrar deneyin",
+        "grantedTo": "__to__, görüşme yöneticisi hakları verildi!",
+        "grantedToUnknown": "$t(somebody), görüşme yöneticisi hakları verildi!"
+    },
+    "dialog": {
+        "kickMessage": "Ahhh! Görüşmeden, kavuldun!",
+        "popupError": "Tarayıcınız bu siteden açılır pencereleri engelliyor. Lütfen, tarayıcınızın güvenlik ayarlarında pop-up etkinleştirin ve tekrar deneyin.",
+        "passwordError": "Bu görüşme şu anda bir parola ile korunmaktadır. Sadece görüşmenin sahibi bir parola ayarlayabilir.",
+        "passwordError2": "Bu görüşme şu anda bir parola ile korunmamaktadır. Sadece görüşmenin sahibi bir parola ayarlayabilir.",
+        "joinError": "Amanin boo! Görüşmeye katılamadık. Güvenlik yapılandırması ile ilgili bir sorun olabilir. Hizmet yöneticisi ile bağlantı kurun.",
+        "connectError": "Amanin boo! Birşeyler ters gitti ve görüşmeye bağlanamadık.",
+        "error": "Hata",
+        "detectext": "Ekran paylaşımı eklentisi tespit edilirken hata.",
+        "failtoinstall": "Masaüstü paylaşım eklentisi yüklenemedi",
+        "failedpermissions": "Yerel mikrofon ve/veya kamerayı kullanmak için izinler alınamadı.",
+        "bridgeUnavailable": "Jitsi Videobridge şu anda kullanılamıyor. Daha sonra tekrar deneyiniz!",
+        "lockTitle": "Kilitlenemedi",
+        "lockMessage": "Görüşme kilitlenemedi.",
+        "warning": "Uyarı",
+        "passwordNotSupported": "Oda parolaları şu anda desteklenmemekte.",
+        "sorry": "Üzgünüz",
+        "internalError": "İç uygulama hatası [setRemoteDescription]",
+        "unableToSwitch": "Video akışı açılamıyor.",
+        "SLDFailure": "Amanin boo! Birşeyler ters gitti ve sessize alamadık! (SLD Başarısız)",
+        "SRDFailure": "Amanin boo! Birşeyler ters gitti ve videoyu durduramadık! (SRD Başarısız)",
+        "oops": "Amanin boo!",
+        "defaultError": "Bir tür hata var",
+        "passwordRequired": "Parola gerekli",
+        "Ok": "Tamam",
+        "removePreziTitle": "Prezi kaldır",
+        "removePreziMsg": "Prezi kaldırmak istediğinizden emin misiniz?",
+        "sharePreziTitle": "Bir Prezi paylaşın",
+        "sharePreziMsg": "Diğer katılımcı hala bir Prezi paylaşıyor.Bu görüşme aynı zamanda sadece bir Prezi izin verir.",
+        "Remove": "Kaldır",
+        "Stop": "Durdur",
+        "AuthMsg": "Oda oluşturmak için kimlik doğrulama gerekli:<br/><b>__room__ </b></br> Oda oluşturmak için ya kimlik doğrulamalı ya da bunu yapması için bir başkasını beklemelisiniz.",
+        "Authenticate": "Kimlik doğrula",
+        "Cancel": "İptal",
+        "logoutTitle": "Oturum kapat",
+        "logoutQuestion": "Oturumu ve görüşmeyi sonlandırmak istediğinizden emin misiniz?",
+        "sessTerminated": "Oturum sonlandırıldı",
+        "hungUp": "Görüşmeyi bitirdiniz",
+        "joinAgain": "Yeniden katıl",
+        "Share": "Paylaş",
+        "preziLinkError": "Lütfen doğru prezi bağlantısı verin.",
+        "Save": "Kaydet",
+        "recordingToken": "Kayıt jetonu girin",
+        "Dial": "Ara",
+        "sipMsg": "SIP numarası gir",
+        "passwordCheck": "Parolanızı kaldırmak istediğinizden emin misiniz?",
+        "passwordMsg": "Odanızı kilitlemek için bir parola koyun",
+        "Invite": "Davet et",
+        "shareLink": "Davet etmek istediğiniz herkesle bu bağlantıyı paylaşın",
+        "settings1": "Görüşmenizi yapılandır",
+        "settings2": "Katılımcılar sessiz katılsın",
+        "settings3": "Takma adlar gerekli<br/><br/>Odanızı kitlemek için bir parola ayarlayın:",
+        "yourPassword": "parolanız",
+        "Back": "Geri",
+        "serviceUnavailable": "Hizmet kullanım dışı",
+        "gracefulShutdown": "Hizmetimiz bakıp için durduruldu. Daha sonra tekrar deneyiniz.",
+        "Yes": "Evet",
+        "reservationError": "Rezervasyon sistemi hatası",
+        "reservationErrorMsg": "Hata kodu: __code__, mesaj: __msg__"
+    }
+}
--- a/lang/main.json
+++ b/lang/main.json
@@ -3,6 +3,12 @@
    "connectionsettings": "Connection Settings",
    "poweredby": "powered by",
    "downloadlogs": "Download logs",
+    "roomUrlDefaultMsg": "Your conference is currently being created...",
+    "participant": "Participant",
+    "me": "me",
+    "speaker": "Speaker",
+    "defaultNickname": "ex. __name__",
+    "defaultPreziLink": "e.g. __url__",
    "welcomepage":{
        "go": "GO",
        "roomname": "Enter room name",
@@ -60,8 +66,8 @@
    },
    "bottomtoolbar": {
        "chat": "Open / close chat",
-        "filmstrip": "Open / close contact list",
-        "contactlist": "Show / hide film strip"
+        "filmstrip": "Show / hide film strip",
+        "contactlist": "Open / close contact list"
    },
    "chat":{
        "nickname": {
@@ -90,26 +96,26 @@
    "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 !",
+        "moderator": "Moderator rights granted!",
        "connected": "connected",
        "somebody": "Somebody",
        "me": "Me",
@@ -124,8 +130,8 @@
        "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.",
+        "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",
@@ -136,10 +142,10 @@
        "warning": "Warning",
        "passwordNotSupported": "Room passwords are currently not supported.",
        "sorry": "Sorry",
-        "internalError": "Internal application error[setRemoteDescription]",
+        "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)",
+        "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",
@@ -153,6 +159,8 @@
        "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",
@@ -171,6 +179,42 @@
        "settings2": "Participants join muted",
        "settings3": "Require nicknames<br/><br/>Set a password to lock your room:",
        "yourPassword": "your password",
-        "Back": "Back"
+        "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"
+    },
+    "email":
+    {
+        "sharedKey": [
+            "This conference is password protected. Please use the following pin when joining:",
+            "",
+            "",
+            "__sharedKey__",
+            "",
+            ""],
+        "subject": "Invitation to a __appName__ (__conferenceName__)",
+        "body": [
+            "Hey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.",
+            "",
+            "",
+            "Please click on the following link in order to join the conference.",
+            "",
+            "",
+            "__roomUrl__",
+            "",
+            "",
+            "__sharedKeyText__",
+            " Note that __appName__ is currently only supported by __supportedBrowsers__, so you need to be using one of these browsers.",
+            "",
+            "",
+            "Talk to you in a sec!"
+        ],
+        "and": "and"
    }
 }
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
--- 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
@@ -136,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();
            };
@@ -195,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;
    }

@@ -317,10 +324,8 @@ RTCUtils.prototype.errorCallback = function (error) {
            function (error) {
                console.error('failed to obtain audio/video stream - stop',
                    error);
-                APP.UI.messageHandler.showError("dialog.error", "Error",
-                    "dialog.failedpermissions",
-                    "Failed to obtain permissions to use the local microphone " +
-                    "and/or camera.");
+                APP.UI.messageHandler.showError("dialog.error",
+                    "dialog.failedpermissions");
            }
        );
    }
@@ -357,4 +362,4 @@ RTCUtils.prototype.handleLocalStream = function(stream)



-module.exports = RTCUtils;
+module.exports = RTCUtils;
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -135,14 +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("dialog.sessTerminated", "Session Terminated",
-            "dialog.kickMessage", "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("dialog.error","Error",
-            "dialog.bridgeUnavailable",
-            "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);
@@ -361,9 +393,8 @@ function updateChatConversation(from, displayName, message) {

 function onMucJoined(jid, info) {
    Toolbar.updateRoomUrl(window.location.href);
-    document.getElementById('localNick').appendChild(
-        document.createTextNode(Strophe.getResourceFromJid(jid) + ' (me)')
-    );
+    var meHTML = APP.translation.generateTranslatonHTML("me");
+    $("#localNick").html(Strophe.getResourceFromJid(jid) + " (" + meHTML + ")");

    var settings = Settings.getSettings();
    // Add myself to the contact list.
@@ -376,7 +407,7 @@ function onMucJoined(jid, info) {
        ? info.displayName : Strophe.getResourceFromJid(jid);

    if (displayName)
-        onDisplayNameChanged('localVideoContainer', displayName + ' (me)');
+        onDisplayNameChanged('localVideoContainer', displayName);
 }

 function initEtherpad(name) {
@@ -387,9 +418,9 @@ function onMucLeft(jid) {
    console.log('left.muc', jid);
    var displayName = $('#participant_' + Strophe.getResourceFromJid(jid) +
        '>.displayname').html();
-    messageHandler.notify(displayName,'notify.somebody', "Somebody",
+    messageHandler.notify(displayName,'notify.somebody',
        'disconnected',
-        'notify.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).
@@ -420,8 +451,7 @@ function onLocalRoleChange(jid, info, pres, isModerator)
    if (isModerator) {
        Authentication.closeAuthenticationWindow();
        messageHandler.notify(null, "notify.me",
-            'Me', 'connected', "notify.moderator",
-            'Moderator rights granted !');
+            'connected', "notify.moderator");
    }
 }

@@ -445,9 +475,12 @@ function onPasswordReqiured(callback) {
    Toolbar.lockLockButton();
    var message = '<h2 data-i18n="dialog.passwordRequired">';
    message += APP.translation.translateString(
-        "dialog.passwordRequired", null, "Password required");
+        "dialog.passwordRequired");
    message += '</h2>' +
-        '<input id="lockKey" type="text" placeholder="password" autofocus>';
+        '<input id="lockKey" type="text" data-i18n=' +
+        '"[placeholder]dialog.password" placeholder="' +
+        APP.translation.translateString("dialog.password") +
+        '" autofocus>';

    messageHandler.openTwoButtonDialog(null, null, null, message,
        true,
@@ -468,9 +501,9 @@ function onPasswordReqiured(callback) {
    );
 }
 function onMucEntered(jid, id, displayName) {
-    messageHandler.notify(displayName,'notify.somebody', "Somebody",
+    messageHandler.notify(displayName,'notify.somebody',
        'connected',
-        'notify.connected', "connected");
+        'notify.connected');

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

    if (role === 'moderator') {
        var messageKey, messageOptions = {};
-        var lDisplayName = displayName;
-        if (!lDisplayName) {
-            lDisplayName = 'Somebody';
+        if (!displayName) {
            messageKey = "notify.grantedToUnknown";
        }
        else
@@ -497,9 +528,8 @@ function onMucRoleChanged(role, displayName) {
            messageOptions = {to: displayName};
        }
        messageHandler.notify(
-            displayName,'notify.somebody', "Somebody",
+            displayName,'notify.somebody',
            'connected', messageKey,
-            'Moderator rights granted to ' + lDisplayName + '!',
            messageOptions);
    }
 }
@@ -611,12 +641,13 @@ UI.showLoginPopup = function(callback)
    console.log('password is required');
    var message = '<h2 data-i18n="dialog.passwordRequired">';
    message += APP.translation.translateString(
-        "dialog.passwordRequired", null, "Password required");
+        "dialog.passwordRequired");
    message += '</h2>' +
        '<input id="passwordrequired.username" type="text" ' +
        'placeholder="user@domain.net" autofocus>' +
        '<input id="passwordrequired.password" ' +
-        'type="password" placeholder="user password">';
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
+        ' placeholder="user password">';
    UI.messageHandler.openTwoButtonDialog(null, null, null, message,
        true,
        "dialog.Ok",
--- a/modules/UI/authentication/Authentication.js
+++ b/modules/UI/authentication/Authentication.js
@@ -16,16 +16,11 @@ var Authentication = {
        // extract room name from 'room@muc.server.net'
        var room = roomName.substr(0, roomName.indexOf('@'));

-        var title = APP.translation.generateTranslatonHTML("dialog.Stop",
-            "Stop");
-        var defMsg = '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",
-            defMsg, {room: room});
+            {room: room});
        var button = APP.translation.generateTranslatonHTML(
-            "dialog.Authenticate", "Authenticate");
+            "dialog.Authenticate");
        var buttons = {};
        buttons.authenticate = {title: button, value: "authNow"};

--- a/modules/UI/prezi/Prezi.js
+++ b/modules/UI/prezi/Prezi.js
@@ -34,8 +34,9 @@ var Prezi = {
        var myprezi = APP.xmpp.getPrezi();
        if (myprezi) {
            messageHandler.openTwoButtonDialog("dialog.removePreziTitle",
-                "Remove Prezi", "dialog.removePreziMsg",
-                "Are you sure you would like to remove your Prezi?",
+                null,
+                "dialog.removePreziMsg",
+                null,
                false,
                "dialog.Remove",
                function(e,v,m,f) {
@@ -47,9 +48,8 @@ var Prezi = {
        }
        else if (preziPlayer != null) {
            messageHandler.openTwoButtonDialog("dialog.sharePreziTitle",
-                "Share a Prezi", "dialog.sharePreziMsg",
-                "Another participant is already sharing a Prezi." +
-                    "This conference allows only one Prezi at a time.",
+                null, "dialog.sharePreziMsg",
+                null,
                false,
                "dialog.Ok",
                function(e,v,m,f) {
@@ -59,26 +59,29 @@ var Prezi = {
        }
        else {
            var html = APP.translation.generateTranslatonHTML(
-                "dialog.sharePreziTitle", "Share a Prezi");
+                "dialog.sharePreziTitle");
            var cancelButton = APP.translation.generateTranslatonHTML(
-                "dialog.Cancel", "Cancel");
+                "dialog.Cancel");
            var shareButton = APP.translation.generateTranslatonHTML(
-                "dialog.Share", "Share");
+                "dialog.Share");
            var backButton = APP.translation.generateTranslatonHTML(
-                "dialog.Back", "Back");
+                "dialog.Back");
            var buttons = {};
            var buttons1 = {};
-            buttons1.Cancel = buttons.Cancel = {title: cancelButton, value: false};
-            buttons.share = {title: shareButton, value: true};
-            buttons1.Back = {title: backButton, value: true};
+            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", "Please provide a correct prezi link.")
+                "dialog.preziLinkError");
+            var defaultUrl = APP.translation.translateString("defaultPreziLink",
+                {url: "http://prezi.com/wz7vhjycl7e6/my-prezi"});
            var openPreziState = {
                state0: {
                    html:   '<h2>' + html + '</h2>' +
                            '<input id="preziUrl" type="text" ' +
-                            'placeholder="e.g. ' +
-                            'http://prezi.com/wz7vhjycl7e6/my-prezi" autofocus>',
+                            'data-i18n="[placeholder]defaultPreziLink" data-i18n-options=\'' +
+                            JSON.stringify({"url": "http://prezi.com/wz7vhjycl7e6/my-prezi"}) +
+                            '\' placeholder="' + defaultUrl + '" autofocus>',
                    persistent: false,
                    buttons: buttons,
                    defaultButton: 1,
--- a/modules/UI/side_pannels/contactlist/ContactList.js
+++ b/modules/UI/side_pannels/contactlist/ContactList.js
@@ -38,9 +38,15 @@ function createAvatar(id) {
 *
 * @param displayName the display name to set
 */
-function createDisplayNameParagraph(displayName) {
+function createDisplayNameParagraph(key, displayName) {
    var p = document.createElement('p');
-    p.innerText = displayName;
+    if(displayName)
+        p.innerText = displayName;
+    else if(key)
+    {
+        p.setAttribute("data-i18n",key);
+        p.innerText = APP.translation.translateString(key);
+    }

    return p;
 }
@@ -106,7 +112,7 @@ var ContactList = {
        };

        newContact.appendChild(createAvatar(id));
-        newContact.appendChild(createDisplayNameParagraph("Participant"));
+        newContact.appendChild(createDisplayNameParagraph("participant"));

        var clElement = contactlist.get(0);

--- a/modules/UI/side_pannels/settings/SettingsMenu.js
+++ b/modules/UI/side_pannels/settings/SettingsMenu.js
@@ -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
@@ -66,9 +66,12 @@ var buttonHandlers =
    "toolbar_button_logout": function () {
        // Ask for confirmation
        messageHandler.openTwoButtonDialog(
-            "Logout",
-            "Are you sure you want to logout and stop the conference ?",
-            false, "Yes",
+            "dialog.logoutTitle",
+            null,
+            "dialog.logoutQuestion",
+            null,
+            false,
+            "dialog.Yes",
            function (evt, yes) {
                if (yes) {
                    APP.xmpp.logout(function (url) {
@@ -96,11 +99,11 @@ function hangup() {
    }

    var title = APP.translation.generateTranslatonHTML(
-        "dialog.sessTerminated", "Session Terminated");
+        "dialog.sessTerminated");
    var msg = APP.translation.generateTranslatonHTML(
-        "dialog.hungUp","You hung up the call");
+        "dialog.hungUp");
    var button = APP.translation.generateTranslatonHTML(
-        "dialog.joinAgain", "Join again");
+        "dialog.joinAgain");
    var buttons = {};
    buttons.joinAgain = {title: button, value: true};

@@ -124,11 +127,13 @@ function hangup() {
 function toggleRecording() {
    APP.xmpp.toggleRecording(function (callback) {
        var msg = APP.translation.generateTranslatonHTML(
-            "dialog.recordingToken", "Enter recording token");
+            "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,
            "dialog.Save",
            function (e, v, m, f) {
@@ -171,16 +176,13 @@ function lockRoom(lock) {
        }
    }, function (err) {
        console.warn('setting password failed', err);
-        messageHandler.showError("dialog.lockTitle", 'Lock failed',
-            "dialog.lockMessage",
-            'Failed to lock conference.',
-            err);
+        messageHandler.showError("dialog.lockTitle",
+            "dialog.lockMessage");
        Toolbar.setSharedKey('');
    }, function () {
        console.warn('room passwords not supported');
-        messageHandler.showError("dialog.warning", 'Warning',
-            "dialog.passwordNotSupported",
-            'Room passwords are currently not supported.');
+        messageHandler.showError("dialog.warning",
+            "dialog.passwordNotSupported");
        Toolbar.setSharedKey('');
    });
 };
@@ -195,25 +197,20 @@ function inviteParticipants() {
    var sharedKeyText = "";
    if (sharedKey && sharedKey.length > 0) {
        sharedKeyText =
-            "This conference is password protected. Please use the " +
-            "following pin when joining:%0D%0A%0D%0A" +
-            sharedKey + "%0D%0A%0D%0A";
+            APP.translation.translateString("email.sharedKey",
+                {sharedKey: sharedKey});
+        sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
    }

+    var supportedBrowsers = "Chromium, Google Chrome " +
+        APP.translation.translateString("email.and") + " Opera";
    var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
-    var subject = "Invitation to a " + interfaceConfig.APP_NAME + " (" + conferenceName + ")";
-    var body = "Hey there, I%27d like to invite you to a " + interfaceConfig.APP_NAME +
-        " conference I%27ve just set up.%0D%0A%0D%0A" +
-        "Please click on the following link in order" +
-        " to join the conference.%0D%0A%0D%0A" +
-        roomUrl +
-        "%0D%0A%0D%0A" +
-        sharedKeyText +
-        "Note that " + interfaceConfig.APP_NAME + " is currently" +
-        " only supported by Chromium," +
-        " Google Chrome and Opera, so you need" +
-        " to be using one of these browsers.%0D%0A%0D%0A" +
-        "Talk to you in a sec!";
+    var subject = APP.translation.translateString("email.subject",
+        {appName:interfaceConfig.APP_NAME, conferenceName: conferenceName});
+    var body = APP.translation.translateString("email.body",
+        {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
+            roomUrl: roomUrl, supportedBrowsers: supportedBrowsers});
+    body = body.replace(/\n/g, "%0D%0A");

    if (window.localStorage.displayname) {
        body += "%0D%0A%0D%0A" + window.localStorage.displayname;
@@ -232,7 +229,7 @@ function callSipButtonClicked()
        = config.defaultSipNumber ? config.defaultSipNumber : '';

    var sipMsg = APP.translation.generateTranslatonHTML(
-        "dialog.sipMsg", "Enter SIP number");
+        "dialog.sipMsg");
    messageHandler.openTwoButtonDialog(null, null, null,
        '<h2>' + sipMsg + '</h2>' +
        '<input id="sipNumber" type="text"' +
@@ -317,10 +314,7 @@ var Toolbar = (function (my) {
                    }, url);
                if (!authenticationWindow) {
                    messageHandler.openMessageDialog(
-                        null, null, "dialog.popupError",
-                        "Your browser is blocking popup windows from this site." +
-                        " Please enable popups in your browser security settings" +
-                        " and try again.");
+                        null, "dialog.popupError");
                }
            });
        }
@@ -358,26 +352,16 @@ var Toolbar = (function (my) {
        // Only the focus is able to set a shared key.
        if (!APP.xmpp.isModerator()) {
            if (sharedKey) {
-                messageHandler.openMessageDialog(null, null,
-                    "dialog.passwordError",
-                        "This conversation is currently protected by" +
-                        " a password. Only the owner of the conference" +
-                        " could set a password.",
-                    false,
-                    "Password");
+                messageHandler.openMessageDialog(null,
+                    "dialog.passwordError");
            } else {
-                messageHandler.openMessageDialog(null, null, "dialog.passwordError2",
-                    "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, null,
                    "dialog.passwordCheck",
-                    "Are you sure you would like to remove your password?",
+                    null,
                    false,
                    "dialog.Remove",
                    function (e, v) {
@@ -388,12 +372,13 @@ var Toolbar = (function (my) {
                    });
            } else {
                var msg = APP.translation.generateTranslatonHTML(
-                    "dialog.passwordMsg", "Set a password to lock your room");
+                    "dialog.passwordMsg");
                var yourPassword = APP.translation.translateString(
-                    "dialog.yourPassword", null, "your password");
+                    "dialog.yourPassword");
                messageHandler.openTwoButtonDialog(null, null, null,
                    '<h2>' + msg + '</h2>' +
                        '<input id="lockKey" type="text"' +
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
                        'placeholder="' + yourPassword + '" autofocus>',
                    false,
                    "dialog.Save",
@@ -419,16 +404,18 @@ var Toolbar = (function (my) {
     * Opens the invite link dialog.
     */
    my.openLinkDialog = function () {
-        var inviteLink;
+        var inviteAttreibutes;
+
        if (roomUrl === null) {
-            inviteLink = "Your conference is currently being created...";
+            inviteAttreibutes = 'data-i18n="[value]roomUrlDefaultMsg" value="' +
+            APP.translation.translateString("roomUrlDefaultMsg") + '"';
        } else {
-            inviteLink = encodeURI(roomUrl);
+            inviteAttreibutes = "value=\"" + encodeURI(roomUrl) + "\"";
        }
        messageHandler.openTwoButtonDialog("dialog.shareLink",
-            "Share this link with everyone you want to invite", null,
-            '<input id="inviteLinkRef" type="text" value="' +
-                inviteLink + '" onclick="this.select();" readonly>',
+            null, null,
+            '<input id="inviteLinkRef" type="text" ' +
+                inviteAttreibutes + ' onclick="this.select();" readonly>',
            false,
            "dialog.Invite",
            function (e, v) {
@@ -454,15 +441,14 @@ var Toolbar = (function (my) {
     */
    my.openSettingsDialog = function () {
        var settings1 = APP.translation.generateTranslatonHTML(
-            "dialog.settings1", "Configure your conference");
+            "dialog.settings1");
        var settings2 = APP.translation.generateTranslatonHTML(
-            "dialog.settings2", "Participants join muted");
+            "dialog.settings2");
        var settings3 = APP.translation.generateTranslatonHTML(
-            "dialog.settings3", "Require nicknames<br/><br/>" +
-                "Set a password to lock your room:");
+            "dialog.settings3");

        var yourPassword = APP.translation.translateString(
-            "dialog.yourPassword", null, "your password");
+            "dialog.yourPassword");

        messageHandler.openTwoButtonDialog(null,
            '<h2>' + settings1 + '</h2>' +
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -7,16 +7,13 @@ var messageHandler = (function(my) {
     * @param titleString the title of the message
     * @param messageString the text of the message
     */
-    my.openMessageDialog = function(titleKey, titleString,
-                                    messageKey, messageString) {
+    my.openMessageDialog = function(titleKey, messageKey) {
        var title = null;
        if(titleKey)
        {
-            title = APP.translation.generateTranslatonHTML(titleKey,
-                titleString);
+            title = APP.translation.generateTranslatonHTML(titleKey);
        }
-        var message = APP.translation.generateTranslatonHTML(messageKey,
-            messageString);
+        var message = APP.translation.generateTranslatonHTML(messageKey);
        $.prompt(message,
            {
                title: title,
@@ -42,17 +39,16 @@ var messageHandler = (function(my) {
    {
        var leftButton = APP.translation.generateTranslatonHTML(leftButtonKey);
        var buttons = {};
-        buttons.leftButton = {title: leftButton, value: true};
-        var cancelButton = APP.translation.generateTranslatonHTML("dialog.Cancel",
-            "Cancel");
-        buttons.Cancel = {title: cancelButton, value: false};
+        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, titleString);
+            title = APP.translation.generateTranslatonHTML(titleKey);
        }
        if(msgKey) {
-            message = APP.translation.generateTranslatonHTML(msgKey, msgString);
+            message = APP.translation.generateTranslatonHTML(msgKey);
        }
        $.prompt(message, {
            title: title,
@@ -76,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,
@@ -152,9 +148,8 @@ var messageHandler = (function(my) {
     * @param msgString the text of the message
     * @param error the error that is being reported
     */
-    my.openReportDialog = function(titleKey, titleString, msgKey,
-                                   msgString, error) {
-        my.openMessageDialog(titleKey, titleString, msgKey, msgString);
+    my.openReportDialog = function(titleKey, msgKey, error) {
+        my.openMessageDialog(titleKey, msgKey);
        console.log(error);
        //FIXME send the error to the server
    };
@@ -164,22 +159,20 @@ var messageHandler = (function(my) {
     * @param title the title of the message
     * @param message the text of the messafe
     */
-    my.showError = function(titleKey, title, msgKey, message) {
+    my.showError = function(titleKey, msgKey) {

        if(!titleKey) {
-            title = "Oops!";
            titleKey = "dialog.oops";
        }
        if(!msgKey)
        {
-            message = "There was some kind of error";
            msgKey = "dialog.defaultError";
        }
-        messageHandler.openMessageDialog(titleKey, title, msgKey, message);
+        messageHandler.openMessageDialog(titleKey, msgKey);
    };

-    my.notify = function(displayName, displayNameKey, displayNameDefault,
-                         cls, messageKey, messageDefault, messageArguments) {
+    my.notify = function(displayName, displayNameKey,
+                         cls, messageKey, messageArguments) {
        var displayNameSpan = '<span class="nickname" ';
        if(displayName)
        {
@@ -188,22 +181,17 @@ var messageHandler = (function(my) {
        else
        {
            displayNameSpan += "data-i18n='" + displayNameKey +
-                "'>" + APP.translation.translateString(displayNameKey, null,
-                {defaultValue: displayNameDefault});
+                "'>" + APP.translation.translateString(displayNameKey);
        }
        displayNameSpan += "</span>";
-        var lMessageArguments = messageArguments;
-        if(!messageArguments)
-            lMessageArguments = {};
-        lMessageArguments.defaultValue = messageDefault;
        toastr.info(
            displayNameSpan + '<br>' +
            '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
                (messageArguments?
-                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
+                    " data-i18n-options='" + JSON.stringify(messageArguments) + "'"
                    : "") + ">" +
-            APP.translation.translateString(messageKey, null,
-                lMessageArguments) +
+            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
@@ -191,9 +191,10 @@ function getCameraVideoSize(videoWidth,
 /**
 * Sets the display name for the given video span id.
 */
-function setDisplayName(videoSpanId, displayName) {
+function setDisplayName(videoSpanId, displayName, key) {
    var nameSpan = $('#' + videoSpanId + '>span.displayname');
-    var defaultLocalDisplayName = interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME;
+    var defaultLocalDisplayName = APP.translation.generateTranslatonHTML(
+        interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);

    // If we already have a display name for this video.
    if (nameSpan.length > 0) {
@@ -202,14 +203,25 @@ function setDisplayName(videoSpanId, displayName) {
        if (nameSpanElement.id === 'localDisplayName' &&
            $('#localDisplayName').text() !== displayName) {
            if (displayName && displayName.length > 0)
-                $('#localDisplayName').html(displayName + ' (me)');
+            {
+                var meHTML = APP.translation.generateTranslatonHTML("me");
+                $('#localDisplayName').html(displayName + ' (' + meHTML + ')');
+            }
            else
-                $('#localDisplayName').text(defaultLocalDisplayName);
+                $('#localDisplayName').html(defaultLocalDisplayName);
        } else {
            if (displayName && displayName.length > 0)
+            {
                $('#' + videoSpanId + '_name').html(displayName);
+            }
+            else if (key && key.length > 0)
+            {
+                var nameHtml = APP.translation.generateTranslatonHTML(key);
+                $('#' + videoSpanId + '_name').html(nameHtml);
+            }
            else
-                $('#' + videoSpanId + '_name').text(interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME);
+                $('#' + videoSpanId + '_name').text(
+                    interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME);
        }
    } else {
        var editButton = null;
@@ -220,15 +232,22 @@ function setDisplayName(videoSpanId, displayName) {

        if (videoSpanId === 'localVideoContainer') {
            editButton = createEditDisplayNameButton();
-            nameSpan.innerText = defaultLocalDisplayName;
+            if (displayName && displayName.length > 0) {
+                var meHTML = APP.translation.generateTranslatonHTML("me");
+                nameSpan.innerHTML = displayName + meHTML;
+            }
+            else
+                nameSpan.innerHTML = defaultLocalDisplayName;
        }
        else {
-            nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
+            if (displayName && displayName.length > 0) {
+
+                nameSpan.innerText = displayName;
+            }
+            else
+                nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
        }

-        if (displayName && displayName.length > 0) {
-            nameSpan.innerText = displayName;
-        }

        if (!editButton) {
            nameSpan.id = videoSpanId + '_name';
@@ -245,11 +264,18 @@ function setDisplayName(videoSpanId, displayName) {

            if (displayName && displayName.length) {
                editableText.value
-                    = displayName.substring(0, displayName.indexOf(' (me)'));
+                    = displayName;
            }

+            var defaultNickname = APP.translation.translateString(
+                "defaultNickname", {name: "Jane Pink"});
            editableText.setAttribute('style', 'display:none;');
-            editableText.setAttribute('placeholder', 'ex. Jane Pink');
+            editableText.setAttribute('data-18n',
+                '[placeholder]defaultNickname');
+            editableText.setAttribute("data-i18n-options",
+                JSON.stringify({name: "Jane Pink"}));
+            editableText.setAttribute("placeholder", defaultNickname);
+
            $('#' + videoSpanId)[0].appendChild(editableText);

            $('#localVideoContainer .displayname')
@@ -1270,10 +1296,17 @@ var VideoLayout = (function (my) {

        if (!$('#localDisplayName').is(":visible")) {
            if (NicknameHandler.getNickname())
-                $('#localDisplayName').text(NicknameHandler.getNickname() + " (me)");
+            {
+                var meHTML = APP.translation.generateTranslatonHTML("me");
+                $('#localDisplayName').html(NicknameHandler.getNickname() + " (" + meHTML + ")");
+            }
            else
+            {
+                var defaultHTML = APP.translation.generateTranslatonHTML(
+                    interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
                $('#localDisplayName')
-                    .text(interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME);
+                    .html(defaultHTML);
+            }
            $('#localDisplayName').show();
        }

@@ -1796,17 +1829,20 @@ var VideoLayout = (function (my) {
                === APP.xmpp.myResource())
            return;

+        var members = APP.xmpp.getMembers();
        // Update the current dominant speaker.
        if (resourceJid !== currentDominantSpeaker) {
            var oldSpeakerVideoSpanId = "participant_" + currentDominantSpeaker,
                newSpeakerVideoSpanId = "participant_" + resourceJid;
-            if($("#" + oldSpeakerVideoSpanId + ">span.displayname").text() ===
-                interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME) {
+            var currentJID = APP.xmpp.findJidFromResource(currentDominantSpeaker);
+            var newJID = APP.xmpp.findJidFromResource(resourceJid);
+            if(currentDominantSpeaker && (!members || !members[currentJID] ||
+                !members[currentJID].displayName)) {
                setDisplayName(oldSpeakerVideoSpanId, null);
            }
-            if($("#" + newSpeakerVideoSpanId + ">span.displayname").text() ===
-                interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME) {
-                setDisplayName(newSpeakerVideoSpanId,
+            if(resourceJid && (!members || !members[newJID] ||
+                !members[newJID].displayName)) {
+                setDisplayName(newSpeakerVideoSpanId, null,
                    interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME);
            }
            currentDominantSpeaker = resourceJid;
--- a/modules/desktopsharing/desktopsharing.js
+++ b/modules/desktopsharing/desktopsharing.js
@@ -92,9 +92,8 @@ function isUpdateRequired(minVersion, extVersion)
    catch (e)
    {
        console.error("Failed to parse extension version", e);
-        APP.UI.messageHandler.showError("dialog.error", 'Error',
-            "dialod.detectext",
-            'Error when trying to detect desktopsharing extension.');
+        APP.UI.messageHandler.showError("dialog.error",
+            "dialog.detectext");
        return true;
    }
 }
@@ -175,9 +174,8 @@ function obtainScreenFromExtension(streamCallback, failCallback) {
                    function (arg) {
                        console.log("Failed to install the extension", arg);
                        failCallback(arg);
-                        APP.UI.messageHandler.showError("dialog.error", 'Error',
-                            "dialog.failtoinstall",
-                            'Failed to install desktop sharing extension');
+                        APP.UI.messageHandler.showError("dialog.error",
+                            "dialog.failtoinstall");
                    }
                );
            }
--- a/modules/settings/Settings.js
+++ b/modules/settings/Settings.js
@@ -1,6 +1,7 @@
 var email = '';
 var displayName = '';
 var userId;
+var language = null;


 function supportsLocalStorage() {
@@ -28,6 +29,7 @@ if (supportsLocalStorage()) {
    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();
@@ -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/RTPStatsCollector.js
+++ b/modules/statistics/RTPStatsCollector.js
@@ -151,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.
@@ -316,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.
@@ -326,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] = [];
@@ -693,18 +729,13 @@ StatsCollector.prototype.processAudioLevelReport = function ()
        {
            // TODO: can't find specs about what this value really is,
            // but it seems to vary between 0 and around 32k.
-            audioLevel = formatAudioLevel(audioLevel / 32767);
-            var oldLevel = jidStats.ssrc2AudioLevel[ssrc];
-            if(jid != APP.xmpp.myJid() && (!oldLevel || oldLevel != audioLevel))
-            {
-
-                jidStats.ssrc2AudioLevel[ssrc] = audioLevel;
-
+            audioLevel = audioLevel / 32767;
+            jidStats.setSsrcAudioLevel(ssrc, audioLevel);
+            if(jid != APP.xmpp.myJid())
                this.eventEmitter.emit("statistics.audioLevel", jid, audioLevel);
-            }
        }

    }


-};
+};
--- 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);
@@ -14,7 +13,6 @@ var defaultOptions = {
    detectLngQS: "lang",
    useCookie: false,
    fallbackLng: DEFAULT_LANG,
-    shortcutFunction: 'defaultValue',
    load: "unspecific",
    resGetPath: 'lang/__ns__-__lng__.json',
    ns: {
@@ -23,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) {
@@ -65,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, options) {
-        if(!cb)
-            return i18n.t(key, options);
-
-        if(initialized)
-        {
-            cb(i18n.t(key, options));
-        }
-        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);
@@ -108,20 +117,14 @@ module.exports = {
    translateElement: function (selector) {
        selector.i18n();
    },
-    generateTranslatonHTML: function (key, defaultString, options) {
+    generateTranslatonHTML: function (key, options) {
        var str = "<span data-i18n=\"" + key + "\"";
        if(options)
        {
            str += " data-i18n-options=\"" + JSON.stringify(options) + "\"";
        }
        str += ">";
-        if(!options)
-            options = {};
-        if(defaultString)
-        {
-            options.defaultValue = defaultString;
-        }
-        str += this.translateString(key, null, options);
+        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,9 +1226,8 @@ JingleSession.onJingleFatalError = function (session, error)
 {
    this.service.sessionTerminated = true;
    this.connection.emuc.doLeave();
-    APP.UI.messageHandler.showError("dialog.sorry", "Sorry",
-        "dialog.internalError",
-        "Internal application error[setRemoteDescription]");
+    APP.UI.messageHandler.showError("dialog.sorry",
+        "dialog.internalError");
 }

 JingleSession.prototype.setLocalDescription = function () {
@@ -1311,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;
@@ -1340,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;
            }

@@ -1357,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
@@ -275,6 +275,23 @@ var Moderator = {
                    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", error);
@@ -307,9 +324,7 @@ var Moderator = {
                if (!invalidSession) {
                    APP.UI.messageHandler.notify(
                        null, "notify.focus",
-                        'Conference focus', 'disconnected', "notify.focusFail",
-                        focusComponent + " not available - retry in " +
-                            retrySec + " sec",
+                        'disconnected', "notify.focusFail",
                        {component: focusComponent, ms: retrySec});
                }
                // Reset response timeout
--- a/modules/xmpp/strophe.emuc.js
+++ b/modules/xmpp/strophe.emuc.js
@@ -229,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];
@@ -271,26 +285,18 @@ module.exports = function(XMPP, eventEmitter) {
                    // We're either missing Jicofo/Prosody config for anonymous
                    // domains or something is wrong.
 //                    XMPP.promptLogin();
-                    APP.UI.messageHandler.openReportDialog(null, null,
-                        "dialog.joinError",
-                        'Oops ! We couldn`t join the conference.' +
-                        ' There might be some problem with security' +
-                        ' configuration. Please contact service' +
-                        ' administrator.', pres);
+                    APP.UI.messageHandler.openReportDialog(null,
+                        "dialog.joinError", pres);
                } else {
                    console.warn('onPresError ', pres);
-                    APP.UI.messageHandler.openReportDialog(null, null,
+                    APP.UI.messageHandler.openReportDialog(null,
                        "dialog.connectError",
-                        'Oops! Something went wrong and we couldn`t ' +
-                            'connect to the conference.',
                        pres);
                }
            } else {
                console.warn('onPresError ', pres);
-                APP.UI.messageHandler.openReportDialog(null, null,
+                APP.UI.messageHandler.openReportDialog(null,
                    "dialog.connectError",
-                    'Oops! Something went wrong and we couldn`t ' +
-                        'connect to the conference.',
                    pres);
            }
            return true;
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -251,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("dialog.error", 'Error',
-                "dialog.unableToSwitch", 'Unable to switch video stream.');
+            console.warn("No conference handler or conference not started yet");
            callback();
        }
    },
@@ -315,9 +313,7 @@ var XMPP = {
                            function (error) {
                                console.log('mute SLD error');
                                APP.UI.messageHandler.showError("dialog.error",
-                                    'Error', "dialog.SLDFailure",
-                                    'Oops! Something went wrong and we failed to ' +
-                                    'mute! (SLD Failure)');
+                                    "dialog.SLDFailure");
                            }
                        );
                    },
@@ -329,10 +325,8 @@ var XMPP = {
            },
            function (error) {
                console.log('muteVideo SRD error');
-                APP.UI.messageHandler.showError("dialog.error", 'Error',
-                    "dialog.SRDFailure",
-                    'Oops! Something went wrong and we failed to stop video!' +
-                    '(SRD Failure)');
+                APP.UI.messageHandler.showError("dialog.error",
+                    "dialog.SRDFailure");

            }
        );
@@ -369,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;

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

        connection.send(message);
+        return true;
    },
    populateData: function () {
        var data = {};
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
  "dependencies": {
      "events": "*",
      "pako": "*",
-      "i18next-client": "*"
+      "i18next-client": "*",
+      "sdp-interop": "jitsi/sdp-interop#f65fedfe57a"
  },
  "devDependencies": {
  },
--- a/service/translation/languages.js
+++ b/service/translation/languages.js
@@ -8,5 +8,8 @@ module.exports = {
        }
        return languages;
    },
-    EN: "en"
+    EN: "en",
+    BG: "bg",
+    DE: "de",
+    TR: "tr"
 }
--- 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
hristo	15f4f03ba3	Commit from translate.jitsi.org by user hristo.: 11 of 149 strings translated (0 fuzzy).	2015-03-11 17:50:42 +00:00
hristoterezov	4f9b6f7180	Changes the format of email text in the language resource files.	2015-03-11 18:54:43 +02:00
hristoterezov	b36ec5fd01	Moves supported browser list from the email message to the JS	2015-03-11 10:53:39 +02:00
ibauersachs	ac95ea03fe	Commit from translate.jitsi.org by user ibauersachs.: 148 of 148 strings translated (0 fuzzy).	2015-03-11 08:51:16 +00:00
hristoterezov	ae535fcb7d	Replaces %0D%0A with \n in the email template text.	2015-03-11 10:29:21 +02:00
hristoterezov	957cc6afc1	Merge branch 'master' of github.com:jitsi/jitsi-meet	2015-03-10 17:25:44 +02:00
hristoterezov	16fdd59617	Adds turkish language.	2015-03-10 17:24:27 +02:00
George Politis	fabf8f42c6	Updates .gitignore.	2015-03-10 15:50:26 +01:00
ibauersachs	c98a56dc37	Commit from translate.jitsi.org by user ibauersachs.: 135 of 135 strings translated (0 fuzzy).	2015-03-10 10:10:08 +00:00
hristoterezov	deb68dd420	Fixes translation issues	2015-03-10 11:38:09 +02:00
Boris Grozev	0fd1a7fa08	Removes embedded html as per Ingo's suggestion.	2015-03-09 19:14:11 +01:00
Boris Grozev	c6ff8aa5dd	Tries to improve readibility...	2015-03-09 18:44:42 +01:00
Boris Grozev	06f025e92a	Fix formatting.	2015-03-09 18:29:47 +01:00
Boris Grozev	f14329f2cd	Adds instructions to enable logging.	2015-03-09 18:27:56 +01:00
Boris Grozev	53e525597a	Add .swp files to .gitignore.	2015-03-09 18:27:55 +01:00
George Politis	54b3cbcf94	Reverts config.js	2015-03-09 17:58:11 +01:00
George Politis	2852740e71	Updates the Makefile. It calls npm update before building the project.	2015-03-09 17:41:17 +01:00
George Politis	5322ba086b	Reverts previous change of the Makefile.	2015-03-09 17:39:16 +01:00
hristoterezov	d2f95f3c81	Fixes some translation issues.	2015-03-09 17:50:13 +02:00
George Politis	3747251821	Adds dependency to specific commit for sdp-interop.	2015-03-09 16:21:53 +01:00
George Politis	159ba82167	Updates app.bundle.js with latest sdp-interop module that offers support for ssrc-groups.	2015-03-09 15:25:47 +01:00
George Politis	e34a8e6b60	Updates app.bundle.js with latest sdp-interop module.	2015-03-09 11:11:25 +01:00
jitsi-pootle	17a6e360a2	New files added from translate.jitsi.org based on templates	2015-03-09 08:16:17 +00:00
George Politis	b690f5d4a1	Updates app.bundle.js.	2015-03-05 20:25:50 +01:00
Damian Minkov	30f3168bf7	Adds watch file for the deb.	2015-03-05 19:23:55 +02:00
Damian Minkov	115f2e4663	Updates the patch for debian src package.	2015-03-05 19:23:29 +02:00
Damian Minkov	fa15a75928	Updates missing-source location.	2015-03-05 18:01:27 +02:00
Damian Minkov	4db75446f3	Do not edit /etc/nginx/nginx.conf file directly.	2015-03-05 17:52:05 +02:00
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