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-11 01:00:20 +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
37 changed files with 1789 additions and 302 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/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/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/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=25"></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,5 +1,6 @@
 {
    "en": "Englisch",
    "bg": "Bulgarisch",
-    "de": "Deutsch"
+    "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,5 +1,6 @@
 {
    "en": "English",
    "bg": "Bulgarian",
-    "de": "German"
+    "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
@@ -3,6 +3,12 @@
    "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",
@@ -45,7 +51,7 @@
        "videomute": "Kamera starten / stoppen",
        "authenticate": "Anmelden",
        "record": "Aufnehmen",
-        "lock": "Raum sperren / entsperren",
+        "lock": "Raum schützen / Schutz aufheben",
        "invite": "Andere einladen",
        "chat": "Chat öffnen / schliessen",
        "prezi": "Prezi freigeben",
@@ -60,8 +66,8 @@
    },
    "bottomtoolbar": {
        "chat": "Chat öffnen / schliessen",
-        "filmstrip": "Kontaktliste öffnen / schliessen",
-        "contactlist": "Videovorschauen anzeigen / verstecken"
+        "filmstrip": "Videovorschauen anzeigen / verstecken",
+        "contactlist": "Kontaktliste öffnen / schliessen"
    },
    "chat": {
        "nickname": {
@@ -77,7 +83,7 @@
    },
    "videothumbnail": {
        "editnickname": "Klicken um den Anzeigenamen zu bearbeiten",
-        "moderator": "Der Besitzer dieser Konferenz",
+        "moderator": "Besitzer dieser Konferenz",
        "videomute": "Teilnehmer hat die Kamera pausiert.",
        "mute": "Teilnehmer ist stumm geschaltet",
        "kick": "Hinauswerfen",
@@ -160,18 +166,42 @@
        "Dial": "Wählen",
        "sipMsg": "Geben Sie eine SIP Nummer ein",
        "passwordCheck": "Sind Sie sicher dass Sie das Passwort entfernen möchten?",
-        "passwordMsg": "Passwort setzen um den Raum zu sperren",
+        "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 sperren:",
+        "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__"
+        "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": {
@@ -178,7 +184,37 @@
        "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
        "Yes": "Yes",
        "reservationError": "Reservation system error",
-        "reservationErrorMsg": "Error code: __code__, message: __msg__"
-
+        "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();
            };
@@ -355,4 +362,4 @@ RTCUtils.prototype.handleLocalStream = function(stream)



-module.exports = RTCUtils;
+module.exports = RTCUtils;
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -393,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.
@@ -408,7 +407,7 @@ function onMucJoined(jid, info) {
        ? info.displayName : Strophe.getResourceFromJid(jid);

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

 function initEtherpad(name) {
@@ -478,7 +477,10 @@ function onPasswordReqiured(callback) {
    message += APP.translation.translateString(
        "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,
@@ -644,7 +646,8 @@ UI.showLoginPopup = function(callback)
        '<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/prezi/Prezi.js
+++ b/modules/UI/prezi/Prezi.js
@@ -73,12 +73,15 @@ var Prezi = {
            buttons1.button2 = {title: backButton, value: true};
            var linkError = APP.translation.generateTranslatonHTML(
                "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/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -128,10 +128,12 @@ function toggleRecording() {
    APP.xmpp.toggleRecording(function (callback) {
        var msg = APP.translation.generateTranslatonHTML(
            "dialog.recordingToken");
+        var token = APP.translation.translateString("dialog.token");
        APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
                '<h2>' + msg + '</h2>' +
                '<input id="recordingToken" type="text" ' +
-                'placeholder="token" autofocus>',
+                ' data-i18n="[placeholder]dialog.token" ' +
+                'placeholder="' + token + '" autofocus>',
            false,
            "dialog.Save",
            function (e, v, m, f) {
@@ -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;
@@ -381,6 +378,7 @@ var Toolbar = (function (my) {
                messageHandler.openTwoButtonDialog(null, null, null,
                    '<h2>' + msg + '</h2>' +
                        '<input id="lockKey" type="text"' +
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
                        'placeholder="' + yourPassword + '" autofocus>',
                    false,
                    "dialog.Save",
@@ -406,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",
            null, null,
-            '<input id="inviteLinkRef" type="text" value="' +
-                inviteLink + '" onclick="this.select();" readonly>',
+            '<input id="inviteLinkRef" type="text" ' +
+                inviteAttreibutes + ' onclick="this.select();" readonly>',
            false,
            "dialog.Invite",
            function (e, v) {
--- 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/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
@@ -1310,7 +1310,7 @@ function sendKeyframe(pc) {
 }


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

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

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

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

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

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

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

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

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

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

 TraceablePeerConnection.prototype.setRemoteDescription = function (description, successCallback, failureCallback) {
+    this.trace('setRemoteDescription::preTransform (Plan B)', dumpSDP(description));
+    // if we're running on FF, transform to Plan A first.
+    if (navigator.mozGetUserMedia) {
+        description = this.interop.toPlanA(description);
+    }
+    else {
+        description = APP.simulcast.transformRemoteDescription(description);
+    }
+    this.trace('setRemoteDescription::postTransform (Plan A)', dumpSDP(description));
    var self = this;
-    description = APP.simulcast.transformRemoteDescription(description);
-    this.trace('setRemoteDescription', dumpSDP(description));
    this.peerconnection.setRemoteDescription(description,
        function () {
            self.trace('setRemoteDescriptionOnSuccess');
@@ -203,7 +238,12 @@ TraceablePeerConnection.prototype.createOffer = function (successCallback, failu
    this.trace('createOffer', JSON.stringify(constraints, null, ' '));
    this.peerconnection.createOffer(
        function (offer) {
-            self.trace('createOfferOnSuccess', dumpSDP(offer));
+            self.trace('createOfferOnSuccess::preTransform (Plan A)', dumpSDP(offer));
+            // if we're running on FF, transform to Plan B first.
+            if (navigator.mozGetUserMedia) {
+                offer = self.interop.toPlanB(offer);
+            }
+            self.trace('createOfferOnSuccess::postTransform (Plan B)', dumpSDP(offer));
            successCallback(offer);
        },
        function(err) {
@@ -219,8 +259,14 @@ TraceablePeerConnection.prototype.createAnswer = function (successCallback, fail
    this.trace('createAnswer', JSON.stringify(constraints, null, ' '));
    this.peerconnection.createAnswer(
        function (answer) {
-            answer = APP.simulcast.transformAnswer(answer);
-            self.trace('createAnswerOnSuccess', dumpSDP(answer));
+            self.trace('createAnswerOnSuccess::preTransfom (Plan A)', dumpSDP(answer));
+            // if we're running on FF, transform to Plan A first.
+            if (navigator.mozGetUserMedia) {
+                answer = self.interop.toPlanB(answer);
+            } else {
+                answer = APP.simulcast.transformAnswer(answer);
+            }
+            self.trace('createAnswerOnSuccess::postTransfom (Plan B)', dumpSDP(answer));
            successCallback(answer);
        },
        function(err) {
--- a/modules/xmpp/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",
-                "dialog.unableToSwitch");
+            console.warn("No conference handler or conference not started yet");
            callback();
        }
    },
--- 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
@@ -10,5 +10,6 @@ module.exports = {
    },
    EN: "en",
    BG: "bg",
-    DE: "de"
+    DE: "de",
+    TR: "tr"
 }
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