diff --git a/bbb-api-demo/src/main/webapp/demo12.jsp b/bbb-api-demo/src/main/webapp/demo12.jsp
index e2910fc75d2196ae672b994681f172469f6bb4ab..3fe64a501c2cecdffeecc44171c00b5f5000cbed 100644
--- a/bbb-api-demo/src/main/webapp/demo12.jsp
+++ b/bbb-api-demo/src/main/webapp/demo12.jsp
@@ -92,10 +92,10 @@ Author: Jesus Federico <jesus@123it.ca>
 
 		<label for="layout" >Layout:</label>
 	                <select id="layout" name="Layout">
-        	            <option value="Default" selected="selected">Default</option>
-                	    <option value="Video Chat">Video Chat</option>
-	                    <option value="Meeting">Meeting</option>
-			    <option value="Webinar">Webinar</option>
+        	            <option value="bbb.layout.name.defaultlayout" selected="selected">Default</option>
+                	    <option value="bbb.layout.name.videochat">Video Chat</option>
+	                    <option value="bbb.layout.name.webcamsfocus">Meeting</option>
+			    <option value="bbb.layout.name.presentfocus">Webinar</option>
 	                </select><br><br>
 
 		<label for="videomodule">Auto start webcam:</label>
diff --git a/bbb-client-check/locale/en_US/resources.properties b/bbb-client-check/locale/en_US/resources.properties
index c46bce3ceec39f1f0d5e90d5356497efa16f7fea..09e02a687954da3ec747940d92cbca43a9336621 100755
--- a/bbb-client-check/locale/en_US/resources.properties
+++ b/bbb-client-check/locale/en_US/resources.properties
@@ -9,6 +9,8 @@ bbbsystemcheck.copyAllText = Copy all text
 bbbsystemcheck.result.undefined = Undefined
 bbbsystemcheck.result.javaEnabled.disabled = Java is disabled in your browser
 bbbsystemcheck.result.javaEnabled.notDetected = No Java detected
+bbbsystemcheck.result.browser.changeBrowser = Recommend you use Firefox or Chrome for better audio
+bbbsystemcheck.result.browser.browserOutOfDate = Your browser is out-of-date. Recommend you update to latest version.
 bbbsystemcheck.status.succeeded = Succeded
 bbbsystemcheck.status.warning = Warning
 bbbsystemcheck.status.failed = Failed
diff --git a/bbb-client-check/resources/config.xml.template b/bbb-client-check/resources/config.xml.template
index 7c817fd5f1a260e8831a62266c3d9e22c3ec2b46..d385fe11255f6fd7926d7ff0aba5eb1ed331afdd 100644
--- a/bbb-client-check/resources/config.xml.template
+++ b/bbb-client-check/resources/config.xml.template
@@ -2,6 +2,8 @@
 <config>
 	<version>VERSION</version>
 	<mail>MAIL</mail>
+	<chromeLatestVersion>CHROME_VERSION</chromeLatestVersion>
+	<firefoxLatestVersion>FIREFOX_VERSION</firefoxLatestVersion>
 	<downloadFilePath url="test_image.jpg"/>
 	<ports>
 		<port>
diff --git a/bbb-client-check/resources/lib/api-bridge.js b/bbb-client-check/resources/lib/api-bridge.js
index a2e57dd140b3950cdd4bf6ac4d6fa5afe71cf10e..6bf5a9f1d9442d85ec597fd6dcc89271d9b5252d 100755
--- a/bbb-client-check/resources/lib/api-bridge.js
+++ b/bbb-client-check/resources/lib/api-bridge.js
@@ -96,8 +96,12 @@
         if ((ix = version.indexOf(' ')) != -1) version = version.substring(0, ix);
         if ((ix = version.indexOf(')')) != -1) version = version.substring(0, ix);
 
-		browserInfo = browser + " " + version;
-		swfObj.browser(browserInfo);
+		var result = {
+			browser: browser,
+			version: version
+		};
+
+		swfObj.browser(result);
 	}
 	
 	BBBClientCheck.screenSize = function(){
diff --git a/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as b/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
index 7500c262729c5674a91db46671a03233e35b6614..78ef39dfb3743c5a92be2189531b7ce9230a53eb 100644
--- a/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
+++ b/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
@@ -31,5 +31,7 @@ package org.bigbluebutton.clientcheck.model
 		function getRTMPApps():XMLList;
 		function getVersion():String;
 		function getMail():String;
+		function getChromeLatestVersion():String;
+		function getFirefoxLatestVersion():String;
 	}
 }
diff --git a/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as b/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
index 0aadf06b57fefce6f30f8bb4d03e19504ebc3389..b7fb5a7c1ac397ea500e704bdb0c9d50f1e5be9d 100644
--- a/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
+++ b/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
@@ -1,22 +1,22 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2014 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ * 
+ * Copyright (c) 2014 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ * 
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package org.bigbluebutton.clientcheck.model
 {
 	import org.osflash.signals.ISignal;
@@ -72,5 +72,17 @@ package org.bigbluebutton.clientcheck.model
 			var mail:String = _config.mail;
 			return mail;
 		}
+
+		public function getChromeLatestVersion():String
+		{
+			var version:String = _config.chromeLatestVersion;
+			return version;
+		}
+
+		public function getFirefoxLatestVersion():String
+		{
+			var version:String = _config.firefoxLatestVersion;
+			return version;
+		}
 	}
 }
diff --git a/bbb-client-check/src/org/bigbluebutton/clientcheck/model/test/BrowserTest.as b/bbb-client-check/src/org/bigbluebutton/clientcheck/model/test/BrowserTest.as
index 2b8b8a596917ed0436ce9a255115e4927192dde0..12d198228bf494a868d92c14fec59a123b568f6e 100644
--- a/bbb-client-check/src/org/bigbluebutton/clientcheck/model/test/BrowserTest.as
+++ b/bbb-client-check/src/org/bigbluebutton/clientcheck/model/test/BrowserTest.as
@@ -30,6 +30,7 @@ package org.bigbluebutton.clientcheck.model.test
 
 		private var _testSuccessfull:Boolean;
 		private var _testResult:String;
+		private var _testMessage:String = "";
 
 		private var _browserTestSuccessfullChangedSignal:ISignal=new Signal;
 
@@ -54,9 +55,35 @@ package org.bigbluebutton.clientcheck.model.test
 			_testResult=value;
 		}
 
+		public function get testMessage():String
+		{
+			return _testMessage;
+		}
+
+		public function set testMessage(value:String):void
+		{
+			_testMessage=value;
+		}
+
 		public function get browserTestSuccessfullChangedSignal():ISignal
 		{
 			return _browserTestSuccessfullChangedSignal;
 		}
+
+		public function isBrowserUpdated(thisVersion:String, latestVersion:String):Boolean
+		{
+			var tversion:Array = thisVersion.split(".");
+			var lversion:Array = latestVersion.split(".");
+
+			var size:int = (tversion.length <= lversion.length) ? tversion.length : lversion.length;
+
+			for (var i:int = 0; i < size; i++) {
+				if (Number(tversion[i]) < Number(lversion[i])) {
+					return false;
+				}
+			}
+
+			return true;
+		}
 	}
 }
diff --git a/bbb-client-check/src/org/bigbluebutton/clientcheck/service/ExternalApiCallbacks.as b/bbb-client-check/src/org/bigbluebutton/clientcheck/service/ExternalApiCallbacks.as
index aea1da53d12b9d6203d51ded05e78fce6117132a..3564a54f8d6e516bbf79f663791153e9a4d5e3bf 100644
--- a/bbb-client-check/src/org/bigbluebutton/clientcheck/service/ExternalApiCallbacks.as
+++ b/bbb-client-check/src/org/bigbluebutton/clientcheck/service/ExternalApiCallbacks.as
@@ -22,6 +22,7 @@ package org.bigbluebutton.clientcheck.service
 	import flash.external.ExternalInterface;
 
 	import org.bigbluebutton.clientcheck.model.ISystemConfiguration;
+	import org.bigbluebutton.clientcheck.model.IXMLConfig;
 	import org.bigbluebutton.clientcheck.model.test.ITestable;
 
 	import mx.resources.ResourceManager;
@@ -31,6 +32,9 @@ package org.bigbluebutton.clientcheck.service
 		[Inject]
 		public var systemConfiguration:ISystemConfiguration;
 
+		[Inject]
+		public var config:IXMLConfig;
+
 		public function ExternalApiCallbacks()
 		{
 			if (ExternalInterface.available)
@@ -114,9 +118,31 @@ package org.bigbluebutton.clientcheck.service
 			checkResult(value, systemConfiguration.screenSize);
 		}
 
-		private function browserCallbackHandler(value:String):void
+		private function browserCallbackHandler(value:Object):void
 		{
-			checkResult(value, systemConfiguration.browser);
+			systemConfiguration.browser.testResult = value.browser + " " + value.version;
+
+			switch (value.browser) {
+				case "Chrome":
+					if (systemConfiguration.browser.isBrowserUpdated(value.version, config.getChromeLatestVersion())) {
+						systemConfiguration.browser.testSuccessfull = true;
+					} else {
+						systemConfiguration.browser.testMessage = ResourceManager.getInstance().getString('resources', 'bbbsystemcheck.result.browser.browserOutOfDate');
+						systemConfiguration.browser.testSuccessfull = false;
+					}
+					break;
+				case "Firefox":
+					if (systemConfiguration.browser.isBrowserUpdated(value.version, config.getFirefoxLatestVersion())) {
+						systemConfiguration.browser.testSuccessfull = true;
+					} else {
+						systemConfiguration.browser.testMessage = ResourceManager.getInstance().getString('resources', 'bbbsystemcheck.result.browser.browserOutOfDate');
+						systemConfiguration.browser.testSuccessfull = false;
+					}
+					break;
+				default:
+					systemConfiguration.browser.testMessage = ResourceManager.getInstance().getString('resources', 'bbbsystemcheck.result.browser.changeBrowser');
+					systemConfiguration.browser.testSuccessfull = false;
+			}
 		}
 
 		public function userAgentCallbackHandler(value:String):void
diff --git a/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as b/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as
index ec9aa1199b61d2c55c00b5f5f795e4bcb952d670..dc0e04977bab19966878c605e9f9a401dc1b75e3 100644
--- a/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as
+++ b/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as
@@ -24,6 +24,7 @@ package org.bigbluebutton.clientcheck.view.mainview
 
 	import mx.collections.ArrayCollection;
 	import mx.resources.ResourceManager;
+	import mx.utils.ObjectUtil;
 
 	import org.bigbluebutton.clientcheck.command.GetConfigXMLDataSignal;
 	import org.bigbluebutton.clientcheck.command.RequestBandwidthInfoSignal;
@@ -300,7 +301,13 @@ package org.bigbluebutton.clientcheck.view.mainview
 
 		private function browserChangedHandler():void
 		{
-			var status:Object = (systemConfiguration.browser.testSuccessfull == true) ? StatusENUM.SUCCEED : StatusENUM.FAILED;
+			var status:Object;
+			if (systemConfiguration.browser.testSuccessfull == true) {
+				status = StatusENUM.SUCCEED;
+			} else {
+				status = ObjectUtil.clone(StatusENUM.WARNING);
+				status.StatusMessage = systemConfiguration.browser.testMessage;
+			}
 			dp.updateData({Item: BrowserTest.BROWSER, Result: systemConfiguration.browser.testResult}, status);
 		}
 
diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle
index e0e4166fc0e6ff5d5aad0d3d033b6717bb795ef5..a1b0f2e0b08167435d92a00132d4e3b77d409a3d 100755
--- a/bbb-video/build.gradle
+++ b/bbb-video/build.gradle
@@ -69,26 +69,27 @@ dependencies {
 	providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
 	
 	// Spring 
-	providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' 
+	providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' 
 	providedCompile  'org.springframework:spring-beans:4.0.7.RELEASE@jar'
 	providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
 	providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
 	
 	// Red5
-	providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar'
-	providedCompile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar'
+	providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar'
+	providedCompile 'org.red5:red5-io:1.0.4-RELEASE@jar'
+	providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar'
 	
 	// Logging
 	providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
 	providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar'
-	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:slf4j-api:1.7.7@jar'
+	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:slf4j-api:1.7.9@jar'
 	
 	// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
 	// Otherwise we get exception on aop utils class not found.
-	providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar'
+	providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar'
 	compile 'aopalliance:aopalliance:1.0@jar'
 	
     // Java Concurrency In Practice
diff --git a/bbb-video/src/main/resources/logback-video.xml b/bbb-video/src/main/resources/logback-video.xml
index a2c317a4b7eae57529cb017b8ed60709320cd45d..5a84cdfcf7ae4fac9e5a0c8618fdecf3ad875edf 100755
--- a/bbb-video/src/main/resources/logback-video.xml
+++ b/bbb-video/src/main/resources/logback-video.xml
@@ -5,8 +5,8 @@
     
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/video.%d{yyyy-MM-dd}.log</FileNamePattern>
-      <!-- keep 5 days worth of history -->
-      <MaxHistory>5</MaxHistory>
+      <!-- keep 30 days worth of history -->
+      <MaxHistory>30</MaxHistory>
     </rollingPolicy>
 
     <encoder>
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index 396de936e077ad2ccd6452281453a91606889725..01a7103b4a82cd1663caa3733b3d833198ebf6a6 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -69,26 +69,27 @@ dependencies {
 	providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
 	
   // Spring 
-  providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' 
-  providedCompile  'org.springframework:spring-beans:4.0.7.RELEASE@jar'
-  providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
-  providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
+  providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' 
+  providedCompile  'org.springframework:spring-beans:4.0.8.RELEASE@jar'
+  providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar'
+  providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar'
 
 	// Red5
-	providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar'
-	providedCompile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar'
-	
+	providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar'
+	providedCompile 'org.red5:red5-io:1.0.4-RELEASE@jar'
+	providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar'
+	  
 	// Logging
 	providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
 	providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar'
-	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:slf4j-api:1.7.7@jar'
+	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:slf4j-api:1.7.9@jar'
 
 	// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
 	// Otherwise we get exception on aop utils class not found.
-	providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar'
+	providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar'
 	compile 'aopalliance:aopalliance:1.0@jar'
 	
     // Java Concurrency In Practice
diff --git a/bbb-voice/src/main/resources/logback-sip.xml b/bbb-voice/src/main/resources/logback-sip.xml
index fd7dd5e9d98460c88b25ba557f1e6bf547caffad..bd0514a19aee996a06fc477f17627a1742663d92 100755
--- a/bbb-voice/src/main/resources/logback-sip.xml
+++ b/bbb-voice/src/main/resources/logback-sip.xml
@@ -5,8 +5,8 @@
     
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/sip.%d{yyyy-MM-dd}.log</FileNamePattern>
-      <!-- keep 5 days worth of history -->
-      <MaxHistory>5</MaxHistory>
+      <!-- keep 30 days worth of history -->
+      <MaxHistory>30</MaxHistory>
     </rollingPolicy>
 
     <encoder>
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index 377dd28830e74873d1414ac39f2cc2afe5690111..563b191d5f4260fafe0a1eb954808390354d45ce 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -67,21 +67,22 @@ dependencies {
   providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
 
   // Spring 
-  providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' 
-  providedCompile  'org.springframework:spring-beans:4.0.7.RELEASE@jar'
-  providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
-  providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
+  providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' 
+  providedCompile  'org.springframework:spring-beans:4.0.8.RELEASE@jar'
+  providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar'
+  providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar'
 
   // Red5
-  providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar'
+  providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar'
+  providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar'
   
   // Logging
   providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
   providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar'
-  providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar' 
-  providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar'
-  providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar'
-  providedCompile 'org.slf4j:slf4j-api:1.7.7@jar'
+  providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' 
+  providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
+  providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
+  providedCompile 'org.slf4j:slf4j-api:1.7.9@jar'
   	
   compile "redis.clients:jedis:2.1.0"
   compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
index 371b8d2b296390fd64d926cb4a3053af4f5e0202..6daf37f176b7bd8170c60643325e3bf75857c7b2 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import org.red5.server.api.Red5;
 import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService;
 import org.bigbluebutton.conference.service.recorder.RecorderApplication;
 import org.bigbluebutton.core.api.IBigBlueButtonInGW;
@@ -31,9 +30,10 @@ import org.red5.server.adapter.IApplication;
 import org.red5.server.adapter.MultiThreadedApplicationAdapter;
 import org.red5.server.api.IClient;
 import org.red5.server.api.IConnection;
-import org.red5.server.api.IContext;
+import org.red5.server.api.Red5;
 import org.red5.server.api.scope.IScope;
 import org.slf4j.Logger;
+
 import com.google.gson.Gson;
 
 public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
index 896e08529f63e95aa22c559c2d40eeb67edaa3fb..664c16e4414b9863e47e7fde5e75df33aed906b5 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
@@ -35,22 +35,24 @@ public class MeetingMessageHandler implements MessageHandler {
 			if (msg != null) {
 				if (msg instanceof EndMeetingMessage) {
 					EndMeetingMessage emm = (EndMeetingMessage) msg;
-					log.debug("Received end meeting request. Meeting id [{}]", emm.meetingId);
+					log.info("Received end meeting request. Meeting id [{}]", emm.meetingId);
 					bbbGW.endMeeting(emm.meetingId);
 				} else if (msg instanceof CreateMeetingMessage) {
 					CreateMeetingMessage emm = (CreateMeetingMessage) msg;
+					log.info("Received create meeting request. Meeting id [{}]", emm.id);
 					bbbGW.createMeeting2(emm.id, emm.externalId, emm.name, emm.record, emm.voiceBridge, 
 							  emm.duration, emm.autoStartRecording, emm.allowStartStopRecording);
 				} else if (msg instanceof RegisterUserMessage) {
 					RegisterUserMessage emm = (RegisterUserMessage) msg;
+					log.info("Received register user request. Meeting id [{}], userid=[{}], token=[{}]", emm.meetingID, emm.internalUserId, emm.authToken);
 					bbbGW.registerUser(emm.meetingID, emm.internalUserId, emm.fullname, emm.role, emm.externUserID, emm.authToken);
 				} else if (msg instanceof DestroyMeetingMessage) {
 					DestroyMeetingMessage emm = (DestroyMeetingMessage) msg;
-					log.debug("Received destroy meeting request. Meeting id [{}]", emm.meetingId);
+					log.info("Received destroy meeting request. Meeting id [{}]", emm.meetingId);
 					bbbGW.destroyMeeting(emm.meetingId);
 				} else if (msg instanceof ValidateAuthTokenMessage) {
 					ValidateAuthTokenMessage emm = (ValidateAuthTokenMessage) msg;
-					log.debug("Received ValidateAuthTokenMessage token request. Meeting id [{}]", emm.meetingId);
+					log.info("Received ValidateAuthTokenMessage token request. Meeting id [{}]", emm.meetingId);
 					bbbGW.validateAuthToken(emm.meetingId, emm.userId, emm.token, emm.replyTo);
 				} else if (msg instanceof UserConnectedToGlobalAudio) {
 					UserConnectedToGlobalAudio emm = (UserConnectedToGlobalAudio) msg;
@@ -82,7 +84,6 @@ public class MeetingMessageHandler implements MessageHandler {
 					String logStr =  gson.toJson(logData);
 					
 					log.info("User disconnected from global audio: data={}", logStr);
-					
 					bbbGW.userDisconnectedFromGlobalAudio(emm.voiceConf, emm.userid, emm.name);
 				}
 			}
diff --git a/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml b/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml
index e116f4aec3cc0bfbef3b258485956a0b7f30433d..9af45bf5f52525be769ae895ac70570d40e7b3e3 100755
--- a/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml
+++ b/bigbluebutton-apps/src/main/resources/logback-bigbluebutton.xml
@@ -24,8 +24,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/bigbluebutton.%d{yyyy-MM-dd}.log</FileNamePattern>
-      <!-- keep 5 days worth of history -->
-      <MaxHistory>5</MaxHistory>
+      <!-- keep 30 days worth of history -->
+      <MaxHistory>30</MaxHistory>
     </rollingPolicy>
 
     <encoder>
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
old mode 100644
new mode 100755
index 71c33a07c8eedb42cfaa19fd6bf0420dc3b75c32..6810a1aec3fd587eae87f8b2f4473e580454501c
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -4,8 +4,9 @@ import scala.actors.Actor
 import scala.actors.Actor._
 import scala.collection.mutable.HashMap
 import org.bigbluebutton.core.api._
+import org.bigbluebutton.core.util._
 
-class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor {
+class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor with LogHelper {
 
   private var meetings = new HashMap[String, MeetingActor]
   
@@ -48,11 +49,11 @@ class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor {
   private def handleMeetingNotFound(msg: InMessage) {
     msg match {
       case vat:ValidateAuthToken => {
-        println("No meeting [" + vat.meetingID + "] for auth token [" + vat.token + "]")
+        logger.info("No meeting [" + vat.meetingID + "] for auth token [" + vat.token + "]")
         outGW.send(new ValidateAuthTokenReply(vat.meetingID, vat.userId, vat.token, false, vat.correlationId))
       }
       case _ => {
-        println("No meeting [" + msg.meetingID + "] for message type [" + msg.getClass() + "]")
+        logger.info("No meeting [" + msg.meetingID + "] for message type [" + msg.getClass() + "]")
         // do nothing
       }
     }
@@ -63,16 +64,16 @@ class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor {
   }
     
   private def handleDestroyMeeting(msg: DestroyMeeting) {
-    println("****************** BBBActor received DestroyMeeting message for meeting id [" + msg.meetingID + "] **************")
+    logger.info("BBBActor received DestroyMeeting message for meeting id [" + msg.meetingID + "]")
     meetings.get(msg.meetingID) match {
       case None => println("Could not find meeting id[" + msg.meetingID + "] to destroy.")
       case Some(m) => {
         m ! StopMeetingActor
         meetings -= msg.meetingID    
-        println("Kinc everyone out on meeting id[" + msg.meetingID + "].")
+        logger.info("Kick everyone out on meeting id[" + msg.meetingID + "].")
         outGW.send(new EndAndKickAll(msg.meetingID, m.recorded))
         
-        println("Destroyed meeting id[" + msg.meetingID + "].")
+        logger.info("Destroyed meeting id[" + msg.meetingID + "].")
         outGW.send(new MeetingDestroyed(msg.meetingID))
       }
     }
@@ -81,7 +82,7 @@ class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor {
   private def handleCreateMeeting(msg: CreateMeeting):Unit = {
     meetings.get(msg.meetingID) match {
       case None => {
-        println("New meeting create request [" + msg.meetingName + "]")
+        logger.info("New meeting create request [" + msg.meetingName + "]")
     	  var m = new MeetingActor(msg.meetingID, msg.externalMeetingID, msg.meetingName, msg.recorded, 
     	                  msg.voiceBridge, msg.duration, 
     	                  msg.autoStartRecording, msg.allowStartStopRecording,
@@ -94,7 +95,7 @@ class BigBlueButtonActor(outGW: MessageOutGateway) extends Actor {
     	  m ! "StartTimer"
       }
       case Some(m) => {
-        println("Meeting already created [" + msg.meetingName + "]")
+        logger.info("Meeting already created [" + msg.meetingName + "]")
         // do nothing
       }
     }
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
old mode 100644
new mode 100755
index 14ccc3997aa7d1820ab013100bf458157f89e605..514e795a10b7397db40e323a29465b54c0830bd7
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
@@ -249,7 +249,7 @@ class BigBlueButtonInGW(bbbGW: BigBlueButtonGateway, presUtil: PreuploadedPresen
 	}
 	
 	def getPresentationInfo(meetingID: String, requesterID: String, replyTo: String) {
-	  println("**** Forwarding GetPresentationInfo for meeting[" + meetingID + "] ****")
+//	  println("**** Forwarding GetPresentationInfo for meeting[" + meetingID + "] ****")
 	  bbbGW.accept(new GetPresentationInfo(meetingID, requesterID, replyTo))
 	}
 	
@@ -262,7 +262,7 @@ class BigBlueButtonInGW(bbbGW: BigBlueButtonGateway, presUtil: PreuploadedPresen
 	}
 	
 	def gotoSlide(meetingID: String, pageId: String) {
-	  println("**** Forwarding GotoSlide for meeting[" + meetingID + "] ****")
+//	  println("**** Forwarding GotoSlide for meeting[" + meetingID + "] ****")
 	  bbbGW.accept(new GotoSlide(meetingID, pageId))
 	}
 	
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
old mode 100644
new mode 100755
index 9bffffe15a69f56da3147709db3df59fb810ed90..3635a8ad9479bcea19199a0eec5ca1d89381dc81
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
@@ -1252,7 +1252,7 @@ class CollectorActor(dispatcher: IDispatcher) extends Actor {
     header.put(Constants.TIMESTAMP, TimestampGenerator.generateTimestamp)
     header.put(Constants.CURRENT_TIME, TimestampGenerator.getCurrentTime)
     
-    println("***** DISPATCHING VOICE USER MUTED *****************")
+//    println("***** DISPATCHING VOICE USER MUTED *****************")
     dispatcher.dispatch(buildJson(header, payload))
   }
   
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
index fbb8f9085558b5e4acd96dc872eae45410515375..7021f5959e52d1e73525fa315f3f007b8339a8ed 100755
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
@@ -147,7 +147,7 @@ class MeetingActor(val meetingID: String, val externalMeetingID: String, val mee
   }
   
   def startRecordingIfAutoStart() {
-    if (!recording && autoStartRecording && users.numWebUsers == 1) {
+    if (recorded && !recording && autoStartRecording && users.numWebUsers == 1) {
       logger.info("Auto start recording for meeting=[" + meetingID + "]")
      recording = true
      outGW.send(new RecordingStatusChanged(meetingID, recorded, "system", recording))          
@@ -155,7 +155,7 @@ class MeetingActor(val meetingID: String, val externalMeetingID: String, val mee
   }
   
   def stopAutoStartedRecording() {
-    if (recording && autoStartRecording 
+    if (recorded && recording && autoStartRecording 
         && users.numWebUsers == 0) {
       logger.info("Last web user left. Auto stopping recording for meeting=[{}", meetingID)
       recording = false
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala
old mode 100644
new mode 100755
index b3ae0e28c9466bebd86dbdd94e3319ab5014bb48..0329e21704ebdf83cde9c3d3c0b73a0c2f457316
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp.scala
@@ -84,7 +84,7 @@ trait PresentationApp {
     }
     
     def handleGetPresentationInfo(msg: GetPresentationInfo) {
-      println("PresentationApp : handleGetPresentationInfo GetPresentationInfo for meeting [" + msg.meetingID + "] [" + msg.requesterID + "]" )
+//      println("PresentationApp : handleGetPresentationInfo GetPresentationInfo for meeting [" + msg.meetingID + "] [" + msg.requesterID + "]" )
       
       val curPresenter = getCurrentPresenter;
       val presenter = new CurrentPresenter(curPresenter.presenterID, 
@@ -107,15 +107,15 @@ trait PresentationApp {
     }
     
     def handleGotoSlide(msg: GotoSlide) {
-      println("Received GotoSlide for meeting=[" +  msg.meetingID + "] page=[" + msg.page + "]")
-      println("*** Before change page ****")
-      printPresentations
+//      println("Received GotoSlide for meeting=[" +  msg.meetingID + "] page=[" + msg.page + "]")
+//      println("*** Before change page ****")
+//      printPresentations
       presModel.changePage(msg.page) foreach {page => 
-        println("Switching page for meeting=[" +  msg.meetingID + "] page=[" + page.id + "]")
+//        println("Switching page for meeting=[" +  msg.meetingID + "] page=[" + page.id + "]")
         outGW.send(new GotoSlideOutMsg(meetingID, recorded, page))
       }
-      println("*** After change page ****")
-      printPresentations
+//      println("*** After change page ****")
+//      printPresentations
     }
     
     def handleSharePresentation(msg: SharePresentation) {
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
index 131ca8f6db6d7139aba77eabaa3caa01f8486a76..7f96eb4a09e71aa047e01f54aef33efe73a00c43 100755
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
@@ -90,11 +90,11 @@ class PresentationModel {
         val nPages = pres.pages + (page.id -> page)
         val newPres = pres.copy(pages= nPages)
         savePresentation(newPres)
-        println("Making page[" + page.id + "] not current[" + page.current + "]")  
-        println("After deact page. presentation id=[" + newPres.id + "] current=[" + newPres.current + "]")
-        newPres.pages.values foreach {page =>
-          println("page id=[" + page.id + "] current=[" + page.current + "]")
-        }   
+//        println("Making page[" + page.id + "] not current[" + page.current + "]")  
+//        println("After deact page. presentation id=[" + newPres.id + "] current=[" + newPres.current + "]")
+//        newPres.pages.values foreach {page =>
+//          println("page id=[" + page.id + "] current=[" + page.current + "]")
+//        }   
     }
   }
   
@@ -106,11 +106,11 @@ class PresentationModel {
         val newPages = pres.pages + (page.id -> page)
         val newPres = pres.copy(pages= newPages)
         savePresentation(newPres)
-        println("Making page[" + page.id + "] current[" + page.current + "]")
+//        println("Making page[" + page.id + "] current[" + page.current + "]")
         Some(page)
       }
       case None => {
-        println("Could not find page[" + page + "] in presentation [" + pres.id + "]")
+//        println("Could not find page[" + page + "] in presentation [" + pres.id + "]")
         None
       }
     }
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
index fa89c9153049c24aa87e1455cea3beeb81e084b5..18572be961aeb33cc6e412b3c3305e6fc643a559 100755
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
@@ -33,22 +33,22 @@ trait UsersApp {
   }
   
   def handleUserConnectedToGlobalAudio(msg: UserConnectedToGlobalAudio) {
-//    println("*************** Got UserConnectedToGlobalAudio message for [" + msg.name + "] ********************" )
     val user = users.getUserWithExternalId(msg.userid)
     user foreach {u =>
       val vu = u.voiceUser.copy(talking=false)
       val uvo = u.copy(listenOnly=true, voiceUser=vu)
       users.addUser(uvo)
+      logger.info("UserConnectedToGlobalAudio: mid=[" + meetingID + "] uid=[" + uvo.userID + "]")
       outGW.send(new UserListeningOnly(meetingID, recorded, uvo.userID, uvo.listenOnly))        
     }
   }
   
   def handleUserDisconnectedFromGlobalAudio(msg: UserDisconnectedFromGlobalAudio) {
-    println("*************** Got UserDisconnectedToGlobalAudio message for [" + msg.name + "] ********************" )
     val user = users.getUserWithExternalId(msg.userid)
     user foreach {u =>
       val uvo = u.copy(listenOnly=false)
       users.addUser(uvo)
+      logger.info("UserDisconnectedToGlobalAudio: mid=[" + meetingID + "] uid=[" + uvo.userID + "]")
       outGW.send(new UserListeningOnly(meetingID, recorded, uvo.userID, uvo.listenOnly))        
     }
   }
@@ -73,18 +73,26 @@ trait UsersApp {
   def handleValidateAuthToken(msg: ValidateAuthToken) {
 //    println("*************** Got ValidateAuthToken message ********************" )
     regUsers.get (msg.userId) match {
-      case Some(u) => outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, true, msg.correlationId))
-      case None => outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, false, msg.correlationId))
+      case Some(u) => {
+        logger.info("ValidateToken success: mid=[" + meetingID + "] uid=[" + msg.userId + "]")
+        outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, true, msg.correlationId))
+      }
+      case None => {
+        logger.info("ValidateToken failed: mid=[" + meetingID + "] uid=[" + msg.userId + "]")
+        outGW.send(new ValidateAuthTokenReply(meetingID, msg.userId, msg.token, false, msg.correlationId))
+      }
     }  
   }
   
   def handleRegisterUser(msg: RegisterUser) {
     if (hasMeetingEnded) {
       // Check first if the meeting has ended and the user refreshed the client to re-connect.
+      logger.info("Register user failed: reason=[meeting has ended] mid=[" + meetingID + "] uid=[" + msg.userID + "]")
       sendMeetingHasEnded(msg.userID)
     } else {
       val regUser = new RegisteredUser(msg.userID, msg.extUserID, msg.name, msg.role, msg.authToken)
       regUsers += msg.userID -> regUser
+      logger.info("Register user success: mid=[" + meetingID + "] uid=[" + msg.userID + "]")
       outGW.send(new UserRegistered(meetingID, recorded, regUser))      
     }
 
@@ -99,9 +107,11 @@ trait UsersApp {
     users.getUser(msg.userID) match {
       case Some(u) => {
 //        println("Sending mute user request uid=[" + msg.userID + "] mute=[" + msg.mute + "]")
+        logger.info("Muting user:  mid=[" + meetingID + "] uid=[" + u.userID + "]")
         outGW.send(new MuteVoiceUser(meetingID, recorded, msg.requesterID, u.userID, msg.mute))
       }
       case None => {
+        logger.info("Could not find user to mute:  mid=[" + meetingID + "] uid=[" + msg.userID + "]")
 //        println("Could not find user to mute. uid=[" + msg.userID + "] mute=[" + msg.mute + "]")
       }
     }
@@ -112,6 +122,7 @@ trait UsersApp {
     users.getUser(msg.userId) match {
       case Some(u) => {
         if (u.voiceUser.joined) {
+          logger.info("Ejecting user from voice:  mid=[" + meetingID + "] uid=[" + u.userID + "]")
           outGW.send(new EjectVoiceUser(meetingID, recorded, msg.ejectedBy, u.userID))
         }      
       }
@@ -191,6 +202,7 @@ trait UsersApp {
       
       users.removeUser(msg.userId)
       
+      logger.info("Ejecting user from meeting:  mid=[" + meetingID + "]uid=[" + msg.userId + "]")
       outGW.send(new UserEjectedFromMeeting(meetingID, recorded, msg.userId, msg.ejectedBy))
       outGW.send(new DisconnectUser(meetingID, msg.userId))
       
@@ -202,6 +214,7 @@ trait UsersApp {
     users.getUser(msg.userId) foreach {user =>
       val uvo = user.copy(hasStream=true, webcamStream=msg.stream)
       users.addUser(uvo)
+      logger.info("User shared webcam:  mid=[" + meetingID + "] uid=[" + uvo.userID + "]")
       outGW.send(new UserSharedWebcam(meetingID, recorded, uvo.userID, msg.stream))
     }     
   }
@@ -211,6 +224,7 @@ trait UsersApp {
       val stream = user.webcamStream
       val uvo = user.copy(hasStream=false, webcamStream="")
       users.addUser(uvo)
+      logger.info("User unshared webcam:  mid=[" + meetingID + "] uid=[" + uvo.userID + "]")
       outGW.send(new UserUnsharedWebcam(meetingID, recorded, uvo.userID, stream))
     }     
   }
@@ -236,7 +250,8 @@ trait UsersApp {
                   phoneUser=false, vu, listenOnly=false, permissions)
   	
 	    users.addUser(uvo)
-					
+		
+	    logger.info("User joined meeting:  mid=[" + meetingID + "] uid=[" + uvo.userID + "]")
 	    outGW.send(new UserJoined(meetingID, recorded, uvo))
 	
 	    outGW.send(new MeetingState(meetingID, recorded, uvo.userID, permissions, meetingMuted))
@@ -255,7 +270,10 @@ trait UsersApp {
   def handleUserLeft(msg: UserLeaving):Unit = {
 	 if (users.hasUser(msg.userID)) {
 	  val user = users.removeUser(msg.userID)
-	  user foreach (u => outGW.send(new UserLeft(msg.meetingID, recorded, u)))  
+	  user foreach { u => 
+	    logger.info("User left meeting:  mid=[" + meetingID + "] uid=[" + u.userID + "]")
+	    outGW.send(new UserLeft(msg.meetingID, recorded, u)) 
+	  }
 	  
     startCheckingIfWeNeedToEndVoiceConf()
     stopAutoStartedRecording()
@@ -317,6 +335,7 @@ trait UsersApp {
       users.addUser(nu)
             
 //      println("Received voice user left =[" + user.name + "] wid=[" + msg.userId + "]" )
+      logger.info("Received user left voice for user [" + nu.name + "] userid=[" + msg.userId + "]" )
       outGW.send(new UserLeftVoice(meetingID, recorded, voiceBridge, nu))    
       
       if (user.phoneUser) {
diff --git a/bigbluebutton-client/locale/az_AZ/bbbResources.properties b/bigbluebutton-client/locale/az_AZ/bbbResources.properties
index 0eb68ac3bd884c1b2829e0fbc3eb6a41f3e8afc6..5c7ef9458b43995b391b3c907cf25664ec03df11 100644
--- a/bigbluebutton-client/locale/az_AZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/az_AZ/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Yazını göndər
 bbb.chat.publicChatUsername = Hamı
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Yazışma üçün istifadəçini seçin
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Sazlamalar
 bbb.chat.fontSize = Şrift ölçüsüe
diff --git a/bigbluebutton-client/locale/bg_BG/bbbResources.properties b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
index c0d82661b2c294b01ddb163e1f1f67255e6095c4..1adb4bd3686fbf6498957ed1f9250400c8e78640 100644
--- a/bigbluebutton-client/locale/bg_BG/bbbResources.properties
+++ b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Копирай всичкия текст
 bbb.chat.publicChatUsername = Всички
 bbb.chat.optionsTabName = Настройки
 bbb.chat.privateChatSelect = Прозорец Чат Избери лице за персонален чат
-bbb.chat.private.userLeft = <b><i>Потребителят напусна.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Натисни тук за личен чат
 bbb.chat.chatOptions = Прозорец Чат Чат опции
 bbb.chat.fontSize = Прозорец Чат Големина на шрифта
diff --git a/bigbluebutton-client/locale/bn_IN/bbbResources.properties b/bigbluebutton-client/locale/bn_IN/bbbResources.properties
index bdf5bf59ff53af8c892665c5ab90af687e5c654a..63605a72c38f840539fffb1837934039f5b5f52a 100644
--- a/bigbluebutton-client/locale/bn_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/bn_IN/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.presentation.ok = ঠিক আছে
 # bbb.chat.publicChatUsername = Public
 # bbb.chat.optionsTabName = Options
 # bbb.chat.privateChatSelect = Select a person to chat with privately
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 # bbb.chat.chatOptions = Chat Options
 # bbb.chat.fontSize = Chat Message Font Size
diff --git a/bigbluebutton-client/locale/ca_ES/bbbResources.properties b/bigbluebutton-client/locale/ca_ES/bbbResources.properties
index bd074cf628de6404dbdbcc06d3f3f959910bade3..1d24a34416ab8e1111a1f7b3fe20f6d46a7a95a4 100644
--- a/bigbluebutton-client/locale/ca_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/ca_ES/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.accessibilityName = Enviar missatge del xat
 bbb.chat.publicChatUsername = Tots
 bbb.chat.optionsTabName = Opcions
 bbb.chat.privateChatSelect = Seleccioneu una persona per xerrar en privat
-bbb.chat.private.userLeft = <b><i>L'usuari ha sortit.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Opcions de xat
 bbb.chat.fontSize = Mida del text
diff --git a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
index c2951012cd341a8f1141a3fe9e2b1f08324472cc..1b929d902bf31468240911eca1b0d24662b8f692 100644
--- a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Kopírovat všechen text
 bbb.chat.publicChatUsername = VÅ¡ichni
 bbb.chat.optionsTabName = Volby
 bbb.chat.privateChatSelect = Vyberte osobu, se kterou chcete chatovat soukromÄ›
-bbb.chat.private.userLeft = <b><i>Uživatel se odhlásil.</i></b>
+bbb.chat.private.userLeft = Uživatel se odhlásil.
+bbb.chat.private.userJoined = Uživatel se přihlásil.
 bbb.chat.usersList.toolTip = Kliknutím na uživatele se otevře soukromý chat
 bbb.chat.chatOptions = Nastavení chatu
 bbb.chat.fontSize = Velikost písma
diff --git a/bigbluebutton-client/locale/cy_GB/bbbResources.properties b/bigbluebutton-client/locale/cy_GB/bbbResources.properties
index 950bbde87864b2f2087c7d4fb19299279070b13f..046e27ebf0919829dbcb2120f3adeb38cdb4345f 100644
--- a/bigbluebutton-client/locale/cy_GB/bbbResources.properties
+++ b/bigbluebutton-client/locale/cy_GB/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Copïo'r Holl Destun
 bbb.chat.publicChatUsername = Cyhoeddus
 bbb.chat.optionsTabName = Dewisiadau
 bbb.chat.privateChatSelect = Dewiswch defnyddiwr i sgwrsio gyda'n breifat
-bbb.chat.private.userLeft = <b><i>Gadawodd y defnyddiwr.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Cliciwch Ddefnyddiwr i Agor Sgwrs Breifat
 bbb.chat.chatOptions = Dewisiadau sgwrsio
 bbb.chat.fontSize = Maint Testun Neges Sgwrsio
diff --git a/bigbluebutton-client/locale/da_DK/bbbResources.properties b/bigbluebutton-client/locale/da_DK/bbbResources.properties
index 0e3db0c4ad21514a0d2f07550f0b8dcee9748936..fda0bbca8c1e25c751797f25ad8172e33e5e4628 100644
--- a/bigbluebutton-client/locale/da_DK/bbbResources.properties
+++ b/bigbluebutton-client/locale/da_DK/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Send besked
 bbb.chat.publicChatUsername = Alle
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Vælg en person at chatte med privat
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Chatindstillinger
 bbb.chat.fontSize = Skriftstørrelse
diff --git a/bigbluebutton-client/locale/de_DE/bbbResources.properties b/bigbluebutton-client/locale/de_DE/bbbResources.properties
index 91177db8b6d2fd28ef48dfaee4a4fdb27471b48d..013202752fdb115dce5f049434f5530dd1dae867 100644
--- a/bigbluebutton-client/locale/de_DE/bbbResources.properties
+++ b/bigbluebutton-client/locale/de_DE/bbbResources.properties
@@ -3,7 +3,7 @@ bbb.mainshell.statusProgress.connecting = Baue Verbindung zum Server auf
 bbb.mainshell.statusProgress.loading = Lade {0} Module
 bbb.mainshell.statusProgress.cannotConnectServer = Verbindung zum Server konnte nicht hergestellt werden.
 bbb.mainshell.copyrightLabel2 = (c) 2014 BigBlueButton Inc. [build {0}] - Weitere Informationen unter\: <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
-bbb.mainshell.logBtn.toolTip = Protokoll Fenster öffnen
+bbb.mainshell.logBtn.toolTip = Protokollfenster öffnen
 bbb.mainshell.meetingNotFound = Kein Meeting gefunden
 bbb.mainshell.invalidAuthToken = Ungültiges Authentifizierungs-Token
 bbb.mainshell.resetLayoutBtn.toolTip = Anordnung wiederherstellen
@@ -92,7 +92,7 @@ bbb.mainToolbar.recordBtn.confirm.message.start = Sind Sie sicher, dass Sie die
 bbb.mainToolbar.recordBtn.confirm.message.stop = Sind Sie sicher, dass Sie die Aufzeichnung der Sitzung beenden wollen?
 bbb.mainToolbar.recordBtn..notification.title = Aufnahme-Benachrichtigung
 bbb.mainToolbar.recordBtn..notification.message1 = Sie können diese Konferenz aufnehmen.
-bbb.mainToolbar.recordBtn..notification.message2 = Klicken Sie den Aufnahme Start-/Stop-Button in der Titelleiste um die Aufnahme zu beginnen oder zu beenden.
+bbb.mainToolbar.recordBtn..notification.message2 = Klicken Sie den Aufnahme Start-/Stop-Button in der Titelleiste, um die Aufnahme zu beginnen oder zu beenden.
 bbb.mainToolbar.recordingLabel.recording = (Aufnahme läuft)
 bbb.mainToolbar.recordingLabel.notRecording = Keine Aufnahme
 bbb.window.minimizeBtn.toolTip = Minimieren
@@ -134,14 +134,14 @@ bbb.users.usersGrid.statusItemRenderer.handRaised = Handmeldung
 bbb.users.usersGrid.statusItemRenderer.viewer = Zuschauer
 bbb.users.usersGrid.mediaItemRenderer = Medien
 bbb.users.usersGrid.mediaItemRenderer.talking = Sprechen
-bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam freigegeben
-bbb.users.usersGrid.mediaItemRenderer.webcamBtn = Webcam
+bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam ist freigegeben
+bbb.users.usersGrid.mediaItemRenderer.webcamBtn = Webcam lokal anzeigen
 bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Mikrofon von {0} freigeben
 bbb.users.usersGrid.mediaItemRenderer.pushToMute = {0} stummschalten
 bbb.users.usersGrid.mediaItemRenderer.pushToLock = {0} sperren
 bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = {0} freigeben
 bbb.users.usersGrid.mediaItemRenderer.kickUser = {0} ausloggen
-bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam freigegeben
+bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam ist freigegeben
 bbb.users.usersGrid.mediaItemRenderer.micOff = Mikrofon ausgeschaltet
 bbb.users.usersGrid.mediaItemRenderer.micOn = Mikrofon aktiv
 bbb.users.usersGrid.mediaItemRenderer.noAudio = Nicht in der Audiokonferenz
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Alle Texte kopieren
 bbb.chat.publicChatUsername = Alle
 bbb.chat.optionsTabName = Optionen
 bbb.chat.privateChatSelect = Wählen Sie eine Person für den privaten Chat
-bbb.chat.private.userLeft = <b><i>Der Teilnehmer hat die Konferenz verlassen.</i></b>
+bbb.chat.private.userLeft = Der Teilnehmer hat die Konferenz verlassen.
+bbb.chat.private.userJoined = Der Teilnehmer ist der Konferenz beigetreten.
 bbb.chat.usersList.toolTip = Benutzer anklicken, um einen privaten Chat zu öffnen
 bbb.chat.chatOptions = Chat Optionen
 bbb.chat.fontSize = Schriftgröße
@@ -230,14 +231,14 @@ bbb.video.controls.muteButton.toolTip = {0} stumm schalten oder sein Mikrofon fr
 bbb.video.controls.switchPresenter.toolTip = {0} Präsentationsrechte geben
 bbb.video.controls.ejectUserBtn.toolTip = {0} aus dem Meeting entfernen
 bbb.video.controls.privateChatBtn.toolTip = Mit {0} chatten
-bbb.video.publish.hint.noCamera = keine Webcam verfügbar
+bbb.video.publish.hint.noCamera = Keine Webcam verfügbar
 bbb.video.publish.hint.cantOpenCamera = Zugriff auf Webcam nicht möglich
 bbb.video.publish.hint.waitingApproval = Bestätigung abwarten
 bbb.video.publish.hint.videoPreview = Webcamvoransicht
 bbb.video.publish.hint.openingCamera = Starte Webcam
 bbb.video.publish.hint.cameraDenied = Zugriff auf Webcam verweigert
 bbb.video.publish.hint.cameraIsBeingUsed = Ein anderes Programm greift bereits auf die Webcam zu
-bbb.video.publish.hint.publishing = Veröffentliche
+bbb.video.publish.hint.publishing = Veröffentliche...
 bbb.video.publish.closeBtn.accessName = Webcam Einstellungen schließen
 bbb.video.publish.closeBtn.label = Abbrechen
 bbb.video.publish.titleBar = Webcam freigeben
diff --git a/bigbluebutton-client/locale/el_GR/bbbResources.properties b/bigbluebutton-client/locale/el_GR/bbbResources.properties
index a28e26837ac2d182af39ba6b86e7653f46fd133d..a64f13ce9c5e13a014cf07a7f89bbe0f10e8c3ce 100644
--- a/bigbluebutton-client/locale/el_GR/bbbResources.properties
+++ b/bigbluebutton-client/locale/el_GR/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Αντιγραφή όλων
 bbb.chat.publicChatUsername = Όλα
 bbb.chat.optionsTabName = Επιλογές
 bbb.chat.privateChatSelect = Παράθυρο συνομιλίας Επιλέξτε ένα πρόσωπο για ιδιωτική συνομιλία
-bbb.chat.private.userLeft = Ο χρήστης έφυγε.
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Παράθυρο συνομιλίας Επιλογές συνομιλίας
 bbb.chat.fontSize = Παράθυρο συνομιλίας Μέγεθος γραμματοσειράς
diff --git a/bigbluebutton-client/locale/es_ES/bbbResources.properties b/bigbluebutton-client/locale/es_ES/bbbResources.properties
index 5e21371e9c4585defaf1f57dcf2e6d8e9e720189..983d98d1c39df898e4ab485fdf4ff957a61f8c2c 100644
--- a/bigbluebutton-client/locale/es_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_ES/bbbResources.properties
@@ -36,7 +36,7 @@ bbb.micSettings.comboMicList.toolTip = Seleccione un micrófono
 bbb.micSettings.micRecordVolume.label = Ganancia
 bbb.micSettings.micRecordVolume.toolTip = Ajuste la ganancia de su micrófono
 bbb.micSettings.nextButton = Siguiente
-# bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.nextButton.toolTip = Iniciar el test de eco
 bbb.micSettings.join = Conectar audio
 bbb.micSettings.join.toolTip = Únase a la conferencia de audio
 bbb.micSettings.cancel = Cancelar
@@ -50,8 +50,8 @@ bbb.micSettings.webrtc.capableBrowser = Su navegador soporta WebRTC
 bbb.micSettings.webrtc.capableBrowser.dontuseit = Pulse para no usar WebRTC
 bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Pulse aquí si no desea utilizar tecnología WebRTC (recomendado si encuentra problemas con ella).
 bbb.micSettings.webrtc.notCapableBrowser = Su navegador no soporta WebRTC. Por favor, utilice Google Chrome (versión 32 o superior); o Mozilla Firefox (versión 26 o superior). Aún podrá unirse a la videoconferencia utilizando la Plataforma Adobe Flash.
-# bbb.micSettings.webrtc.connecting = Calling
-# bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.connecting = Llamando
+bbb.micSettings.webrtc.waitingforice = Conectando
 bbb.micSettings.webrtc.endingecho = Uniéndose al audio
 bbb.micSettings.webrtc.endedecho = Test de Eco finalizado.
 bbb.micPermissions.firefox.title = Permisos de Micrófono de Firefox
@@ -72,8 +72,8 @@ bbb.webrtcWarning.failedError.1002 = Error 1002\: No se pudo establecer una cone
 bbb.webrtcWarning.failedError.1003 = Error 1003\: versión de Navegador no soportada
 bbb.webrtcWarning.failedError.1004 = Error 1004\: Fallo en la llamada
 bbb.webrtcWarning.failedError.1005 = Error 1005\: Llamada finalizada de forma inesperada
-# bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
-# bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1006 = Error 1006\: La llamada agotó el tiempo de espera
+bbb.webrtcWarning.failedError.1007 = Error 1007\: Falló la negociación ICE
 bbb.webrtcWarning.failedError.unknown = Error {0}\: Código de error Desconocido
 bbb.mainToolbar.helpBtn = Ayuda
 bbb.mainToolbar.logoutBtn = Desconectar
@@ -152,7 +152,7 @@ bbb.presentation.fitToWidth.toolTip = Ajustar presentación a lo ancho
 bbb.presentation.fitToPage.toolTip = Ajustar presentación a la página
 bbb.presentation.uploadPresBtn.toolTip = Cargar documento para la presentación.
 bbb.presentation.backBtn.toolTip = Diapositiva anterior.
-# bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.accessibilityName = Diapositiva {0} de {1}
 bbb.presentation.btnSlideNum.toolTip = Hacer click para seleccionar una diapositiva
 bbb.presentation.forwardBtn.toolTip = Diapositiva siguiente
 bbb.presentation.maxUploadFileExceededAlert = Error\: El tamaño del archivo supera el máximo permitido.
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Copiar Todo el Texto
 bbb.chat.publicChatUsername = Todos
 bbb.chat.optionsTabName = Opciones
 bbb.chat.privateChatSelect = Seleccione una persona para charlar en privado
-bbb.chat.private.userLeft = <b><i>El usuario ha salido.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Haga click en usuario para abrir Chat privado
 bbb.chat.chatOptions = Opciones de charla
 bbb.chat.fontSize = Tamaño del texto
@@ -286,12 +287,12 @@ bbb.layout.combo.remote = Remota
 bbb.layout.save.complete = Disposiciones guardadas con éxito
 bbb.layout.load.complete = Disposiciones cargadas con éxito
 bbb.layout.load.failed = Falló la carga de disposiciones
-# bbb.layout.name.defaultlayout = Default Layout
-# bbb.layout.name.videochat = Video Chat
-# bbb.layout.name.webcamsfocus = Webcam Meeting
-# bbb.layout.name.presentfocus = Presentation Meeting
-# bbb.layout.name.lectureassistant = Lecture Assistant
-# bbb.layout.name.lecture = Lecture
+bbb.layout.name.defaultlayout = Diseño por defecto
+bbb.layout.name.videochat = Chat de Video
+bbb.layout.name.webcamsfocus = Reunión por Webcam
+bbb.layout.name.presentfocus = Reunión de Presentación
+bbb.layout.name.lectureassistant = Asistente de Conferencia
+bbb.layout.name.lecture = Conferencia
 bbb.highlighter.toolbar.pencil = Detallador
 bbb.highlighter.toolbar.pencil.accessibilityName = Cambiar el cursor a lápiz
 bbb.highlighter.toolbar.ellipse = Círculo
diff --git a/bigbluebutton-client/locale/et_EE/bbbResources.properties b/bigbluebutton-client/locale/et_EE/bbbResources.properties
index 5bf0b70e176fbe0db3d8f8623014c0d75907a432..4c9cdf1c03398921e0823dd47ec39a61547db93e 100644
--- a/bigbluebutton-client/locale/et_EE/bbbResources.properties
+++ b/bigbluebutton-client/locale/et_EE/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Kopeeri kogu tekst
 bbb.chat.publicChatUsername = Kõik
 bbb.chat.optionsTabName = Valikud
 bbb.chat.privateChatSelect = Vali isik, kellega soovid privaatselt vestelda
-bbb.chat.private.userLeft = <b><i>Kasutaja on lahkunud.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Privaatse vestluse avamiseks klõpsa kasutajal
 bbb.chat.chatOptions = Jututoa valikud
 bbb.chat.fontSize = Kirja suurus jututoa aknas
diff --git a/bigbluebutton-client/locale/eu_ES/bbbResources.properties b/bigbluebutton-client/locale/eu_ES/bbbResources.properties
index 43271e4fd63a452bdc15b93066db6f9eb3f93b15..437984955f091d8d212809616da2e54f4394f690 100644
--- a/bigbluebutton-client/locale/eu_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/eu_ES/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.accessibilityName = Bidali txat-mezua
 bbb.chat.publicChatUsername = Guztia
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Aukeratu lagun bat harekin txatean pribatuan aritzeko
-bbb.chat.private.userLeft = <b><i>Erabiltzaileak utzi du.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Txat-aukerak
 bbb.chat.fontSize = Txat-mezua Letra-tamaina
diff --git a/bigbluebutton-client/locale/fa_IR/bbbResources.properties b/bigbluebutton-client/locale/fa_IR/bbbResources.properties
index a01c73a49aa77c2054f3d1e18d9c40e2a0c83dfa..a27de8a4809cff24387c0415604a40d331ab5f01 100755
--- a/bigbluebutton-client/locale/fa_IR/bbbResources.properties
+++ b/bigbluebutton-client/locale/fa_IR/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = کپی کردن تمام من
 bbb.chat.publicChatUsername = عمومی
 bbb.chat.optionsTabName = امکانات
 bbb.chat.privateChatSelect = کاربری را جهت گفتگوی خصوصی انتخاب کنید
-bbb.chat.private.userLeft = <b><i>کاربر خارج شد</i></b>
+bbb.chat.private.userLeft = کاربر خارج شد
+bbb.chat.private.userJoined = کاربر وارد شد
 bbb.chat.usersList.toolTip = انتخاب کاربر جهت آغاز گفتگوی متنی خصوصی
 bbb.chat.chatOptions = تنظیمات مربوط به گفتگو
 bbb.chat.fontSize = اندازه قلم متن گفتگوی متنی
diff --git a/bigbluebutton-client/locale/fi_FI/bbbResources.properties b/bigbluebutton-client/locale/fi_FI/bbbResources.properties
index b49bed7cc450bdf103c87f0c50edcd6ea570f526..f51fbfa6ea56f38e37e8f1dd2c0edf3f6c9a02fa 100644
--- a/bigbluebutton-client/locale/fi_FI/bbbResources.properties
+++ b/bigbluebutton-client/locale/fi_FI/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Lähetä Viesti
 bbb.chat.publicChatUsername = Kaikki
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Keskusteluikkuna Valitse henkilö jonka kanssa haluat keskustella yksityisesti
-bbb.chat.private.userLeft = <b><i>Käyttäjä on lähtenyt.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Keskusteluikkuna Keskustelu vaihtoehdot
 bbb.chat.fontSize = Keskusteluikkunan Fontin koko
diff --git a/bigbluebutton-client/locale/fr_CA/bbbResources.properties b/bigbluebutton-client/locale/fr_CA/bbbResources.properties
index 437373452c871919bf93ebb1ef93597bedef5120..1ac01bffb305c2e65d15db0dd0a0e2fbcea55d3d 100644
--- a/bigbluebutton-client/locale/fr_CA/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_CA/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Copier tout le texte
 bbb.chat.publicChatUsername = Public
 bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Choississez un utilisateur avec qui discuter en privé
-bbb.chat.private.userLeft = <b><i>Cet utilisateur à quitté.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Cliquer le nom d'usager pour un clavardage en privé
 bbb.chat.chatOptions = Options de discussions
 bbb.chat.fontSize = Taille de la police
diff --git a/bigbluebutton-client/locale/fr_FR/bbbResources.properties b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
index 64e976a0cf3034b187add36af05d241b86099bf7..7aef2fe566bf51453bc7bcfe12bc09082eea7d1b 100644
--- a/bigbluebutton-client/locale/fr_FR/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Copier tout le texte
 bbb.chat.publicChatUsername = Public
 bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Choisissez une personne avec qui discuter en privé
-bbb.chat.private.userLeft = <b><i>L'utilisateur a quitté.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Sélectionnez un participant pour ouvrir une discussion privée
 bbb.chat.chatOptions = Options de discussions
 bbb.chat.fontSize = Taille de la police
diff --git a/bigbluebutton-client/locale/he_IL/bbbResources.properties b/bigbluebutton-client/locale/he_IL/bbbResources.properties
index f12cc384b5a4ef918ab747ea3d38e0a02b0cceab..03cd28f30da088d85591c854394c6ee8dd4bb743 100644
--- a/bigbluebutton-client/locale/he_IL/bbbResources.properties
+++ b/bigbluebutton-client/locale/he_IL/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = שלח הודעה
 bbb.chat.publicChatUsername = הכל
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = בחר אדם איתו תרצה לשוחח באופן פרטי
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = אפשרויות צ'אט
 bbb.chat.fontSize = גודל טקסט
diff --git a/bigbluebutton-client/locale/hr_HR/bbbResources.properties b/bigbluebutton-client/locale/hr_HR/bbbResources.properties
index 5d6c6fbf1c15cb27e5f82284b25c861791ddc872..f5eb14489205f777dbfd3a3d9f94c16e5db52766 100644
--- a/bigbluebutton-client/locale/hr_HR/bbbResources.properties
+++ b/bigbluebutton-client/locale/hr_HR/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Kopiraj sav tekst
 bbb.chat.publicChatUsername = Javno
 bbb.chat.optionsTabName = Opcije
 bbb.chat.privateChatSelect = Izaberite osobu sa kojom želite privatno ćaskati
-bbb.chat.private.userLeft = <b><i>Korisnik je otišao.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Podešavanja Chat-a
 bbb.chat.fontSize = Veličina fonta "Chat" poruke
diff --git a/bigbluebutton-client/locale/hu_HU/bbbResources.properties b/bigbluebutton-client/locale/hu_HU/bbbResources.properties
index 59865b8bb6c1ee559ad9378faa9bea71a753789c..f70ca85ffb961cc69d1b06157cc365da77967b3d 100644
--- a/bigbluebutton-client/locale/hu_HU/bbbResources.properties
+++ b/bigbluebutton-client/locale/hu_HU/bbbResources.properties
@@ -82,7 +82,7 @@ bbb.mainToolbar.langSelector = Válasszon nyelvet
 bbb.mainToolbar.settingsBtn = Beállítások
 bbb.mainToolbar.settingsBtn.toolTip = Beállítások megnyitása
 bbb.mainToolbar.shortcutBtn = Gyorsbillentyűk
-bbb.mainToolbar.shortcutBtn.toolTip = Gyorsbillentyű-ablak megnyitása
+bbb.mainToolbar.shortcutBtn.toolTip = Gyorsbillentyű ablak megnyitása
 bbb.mainToolbar.recordBtn.toolTip.start = Felvétel indítása
 bbb.mainToolbar.recordBtn.toolTip.stop = Felvétel leállítása
 bbb.mainToolbar.recordBtn.toolTip.recording = A felvétel rögzítésre kerül
@@ -155,11 +155,11 @@ bbb.presentation.backBtn.toolTip = Előző dia
 bbb.presentation.btnSlideNum.accessibilityName = {0} / {1} dia
 bbb.presentation.btnSlideNum.toolTip = Kattintson a dia kiválasztásához
 bbb.presentation.forwardBtn.toolTip = Következő dia
-bbb.presentation.maxUploadFileExceededAlert = Hiba\: A megengedettnél nagyobb a fájl.
+bbb.presentation.maxUploadFileExceededAlert = Hiba\: A fájl nagyobb a megengedettnél.
 bbb.presentation.uploadcomplete = Feltöltés befejeződött. Kérem várja meg a fájl átalakítását.
 bbb.presentation.uploaded = feltöltve.
 bbb.presentation.document.supported = A feltöltött fájl konvertálható. A konvertálás elkezdődött...
-bbb.presentation.document.converted = Sikerült a konvertálás.
+bbb.presentation.document.converted = A konvertálás sikerült.
 bbb.presentation.error.document.convert.failed = Hiba\: A fájl konvertálása nem sikerült.
 bbb.presentation.error.io = IO Hiba\: Keresse a rendszergazdát.
 bbb.presentation.error.security = Biztonsági hiba\: Keresse a rendszergazdát.
@@ -203,9 +203,10 @@ bbb.chat.sendBtn.toolTip = Üzenet küldése
 bbb.chat.sendBtn.accessibilityName = Chat üzenet küldése
 bbb.chat.contextmenu.copyalltext = Összes szöveg másolása
 bbb.chat.publicChatUsername = Nyilvános/mindenki
-bbb.chat.optionsTabName = Beállítás
+bbb.chat.optionsTabName = Beállítások
 bbb.chat.privateChatSelect = Válasszon felhasználót a privát chat-hez
-bbb.chat.private.userLeft = <b><i>A felhasználó kilépett.</i></b>
+bbb.chat.private.userLeft = A felhasználó kilépett.
+bbb.chat.private.userJoined = A felhasználó csatlakozott.
 bbb.chat.usersList.toolTip = Válasszon részvevőt a privát chat-hez
 bbb.chat.chatOptions = Chat beállítások
 bbb.chat.fontSize = Chat üzenetek betűmérete
@@ -241,7 +242,7 @@ bbb.video.publish.hint.publishing = Adásban van...
 bbb.video.publish.closeBtn.accessName = Webkamera beállítások bezárása
 bbb.video.publish.closeBtn.label = Mégsem
 bbb.video.publish.titleBar = Webkamera ablak közzététele
-bbb.desktopPublish.title = Képernyő megosztás\: Előadó nézete
+bbb.desktopPublish.title = Képernyőmegosztás\: Előadó nézete
 bbb.desktopPublish.fullscreen.tooltip = Teljes képernyő megosztása
 bbb.desktopPublish.fullscreen.label = Teljes
 bbb.desktopPublish.region.tooltip = A képernyő egy részének megosztása
@@ -250,10 +251,10 @@ bbb.desktopPublish.stop.tooltip = Képernyőmegosztás bezárása
 bbb.desktopPublish.stop.label = Bezárás
 bbb.desktopPublish.maximizeRestoreBtn.toolTip = Ezt az ablakot nem lehet nagyméretűre állítani
 bbb.desktopPublish.closeBtn.toolTip = Megosztás leállítása és bezárás
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Mac OS X alatt az Asztal megosztásához a Firefox nem támogatott. Használjon inkább Firefox-ot.
+bbb.desktopPublish.chromeOnMacUnsupportedHint = Mac OS X alatt Chrome használatával a képernyőmegosztás nem támogatott. Képernyő megosztásához használjon inkább Firefox-ot.
 bbb.desktopPublish.minimizeBtn.toolTip = Kis méret
-bbb.desktopPublish.minimizeBtn.accessibilityName = Képernyő-megosztása ablak kis méretűre
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Képernyő-megosztása ablak teljes méretűre
+bbb.desktopPublish.minimizeBtn.accessibilityName = Képernyőmegosztás ablak kis méretűre
+bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Képernyőmegosztás ablak teljes méretűre
 bbb.desktopPublish.javaRequiredLabel = A futáshoz Java 7v51 (vagy későbbi) szükséges.
 bbb.desktopPublish.javaTestLinkLabel = Java teszt
 bbb.desktopPublish.javaTestLinkLabel.tooltip = Java teszt
@@ -261,21 +262,21 @@ bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Java teszt
 bbb.desktopView.title = Képernyőm megosztása
 bbb.desktopView.fitToWindow = Ablakhoz igazítása
 bbb.desktopView.actualSize = Eredeti méret
-bbb.desktopView.minimizeBtn.accessibilityName = Képernyő megosztás ablak kis méretűre
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Képernyő megosztás ablak teljes méretűre
-bbb.desktopView.closeBtn.accessibilityName = Képernyő megosztás ablak bezárása
+bbb.desktopView.minimizeBtn.accessibilityName = Képernyőmegosztás ablak kis méretűre
+bbb.desktopView.maximizeRestoreBtn.accessibilityName = Képernyőmegosztás ablak teljes méretűre
+bbb.desktopView.closeBtn.accessibilityName = Képernyőmegosztás ablak bezárása
 bbb.toolbar.phone.toolTip.start = Mikrofonom megosztása
 bbb.toolbar.phone.toolTip.stop = Mikrofonmegosztás befejezése
 bbb.toolbar.phone.toolTip.mute = A találkozó hangjának kikapcsolása
 bbb.toolbar.phone.toolTip.unmute = A találkozó hangjának bekapcsolása
 bbb.toolbar.phone.toolTip.nomic = Nincs mikrofon
-bbb.toolbar.deskshare.toolTip.start = Asztal megosztása
-bbb.toolbar.deskshare.toolTip.stop = Asztalmegosztás befejezése
+bbb.toolbar.deskshare.toolTip.start = Képernyőm megosztása
+bbb.toolbar.deskshare.toolTip.stop = Képernyőmegosztás befejezése
 bbb.toolbar.video.toolTip.start = Webkamerám megosztása
 bbb.toolbar.video.toolTip.stop = Webkamerám megosztásának befejezése
 bbb.layout.addButton.toolTip = Egyéni elrendezés hozzáadása a listához
 bbb.layout.broadcastButton.toolTip = Jelenlegi elrendezés alkalmazása  az összes résztvevőnél
-bbb.layout.combo.toolTip = Elrendezés megváltoztatás
+bbb.layout.combo.toolTip = Elrendezés változtatása
 bbb.layout.loadButton.toolTip = Elrendezés betöltése fájlból
 bbb.layout.saveButton.toolTip = Elrendezés mentése fájlba
 bbb.layout.lockButton.toolTip = Elrendezés zárolása
@@ -332,7 +333,7 @@ bbb.settings.deskshare.instructions = Kattintson az engedélyezésre, hogy kider
 bbb.settings.deskshare.start = Képernyőmegosztás ellenőrzése
 bbb.settings.voice.volume = Mikrofon-aktivitás
 bbb.settings.java.label = Java verzió hiba
-bbb.settings.java.text = {0} verzió van telepítve, de {1} szükséges, hogy megoszthassa képernyőjét. \n Az alábbi gombra kattintva telepítheti a legújabb Java JRE verziót
+bbb.settings.java.text = {0} verzió van telepítve, de {1} szükséges, hogy megoszthassa képernyőjét. Az alábbi gombra kattintva telepítheti a legújabb Java JRE verziót
 bbb.settings.java.command = Telepítse a legújabb Java verziót
 bbb.settings.flash.label = Hibás flash verzió
 bbb.settings.flash.text = {0} flash verzió van telepítve, de {1} flash verzióval szükséges a hibátlan futáshoz. \n Az alábbi gombra kattintva telepítheti a legújabb Adobe Flash verziót.
@@ -367,7 +368,7 @@ bbb.accessibility.notes.notesview.input = Jegyzet bevitele
 bbb.shortcuthelp.title = Gyorsbillentyűk
 bbb.shortcuthelp.minimizeBtn.accessibilityName = Gyorsbillentyű súgó kis méretűre
 bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Gyorsbillentyű súgó teljes méretűre
-bbb.shortcuthelp.closeBtn.accessibilityName = Gyorsbillentyű súgó kis méretűre bezárása
+bbb.shortcuthelp.closeBtn.accessibilityName = Gyorsbillentyű súgó bezárása
 bbb.shortcuthelp.dropdown.general = Általános gyorsbillentyűk
 bbb.shortcuthelp.dropdown.presentation = Prezentáció gyorsbillentyűk
 bbb.shortcuthelp.dropdown.chat = Chat gyorsbillentyűk
@@ -375,7 +376,7 @@ bbb.shortcuthelp.dropdown.users = Felhasználók gyorsbillentyűk
 bbb.shortcuthelp.dropdown.polling = Előadó Kérdőív gyorsbillentyűk
 bbb.shortcuthelp.dropdown.polling2 = Résztvevő Kérdőív gyorsbillentyűk.
 bbb.shortcuthelp.headers.shortcut = Gyorsbillentyű
-bbb.shortcuthelp.headers.function = Függvény
+bbb.shortcuthelp.headers.function = Funkció
 
 bbb.shortcutkey.general.minimize = 189
 bbb.shortcutkey.general.minimize.function = Kis méret
@@ -385,7 +386,7 @@ bbb.shortcutkey.general.maximize.function = Teljes méret
 bbb.shortcutkey.flash.exit = 81
 bbb.shortcutkey.flash.exit.function = Kattintson a Flash ablak mellé
 bbb.shortcutkey.users.muteme = 77
-bbb.shortcutkey.users.muteme.function = Mikrofonja némítása/hangosítása
+bbb.shortcutkey.users.muteme.function = Mikrofonom némítása/hangosítása
 bbb.shortcutkey.chat.chatinput = 73
 bbb.shortcutkey.chat.chatinput.function = Fókusz a chat beviteli mezőre
 bbb.shortcutkey.present.focusslide = 67
@@ -418,7 +419,7 @@ bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Webkamerám bekapcsolása
 
 bbb.shortcutkey.shortcutWindow = 72
-bbb.shortcutkey.shortcutWindow.function = Gyorsbillentyű-ablak megnyitása
+bbb.shortcutkey.shortcutWindow.function = Gyorsbillentyű ablak megnyitása
 bbb.shortcutkey.logout = 76
 bbb.shortcutkey.logout.function = Kilépés
 bbb.shortcutkey.raiseHand = 82
diff --git a/bigbluebutton-client/locale/hy_AM/bbbResources.properties b/bigbluebutton-client/locale/hy_AM/bbbResources.properties
index 6b9284e3e27182b1f0b3b48f6e4148e26e37c538..46a09de853fd5450a1472eaef4c7b7b0f83a8680 100644
--- a/bigbluebutton-client/locale/hy_AM/bbbResources.properties
+++ b/bigbluebutton-client/locale/hy_AM/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¡Õ´Õ¢Õ¸Õ²Õ» Õ¿Õ¥Ö„Õ½Õ¿Õ¨
 bbb.chat.publicChatUsername = Ô¸Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€
 bbb.chat.optionsTabName = Ô¿Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
 bbb.chat.privateChatSelect = Ընտրեք մասնակցին անհատական զրույցի համար
-bbb.chat.private.userLeft = <b><i>Մասնակիցը լքեց.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Ընտրեք մասնակցին անհատական զրույցի համար
 bbb.chat.chatOptions = Զրուցարանի կարգաբերումներ
 bbb.chat.fontSize = Զրուցարանի հաղորդագրության տառաշարի չափի ընտրություն
diff --git a/bigbluebutton-client/locale/id_ID/bbbResources.properties b/bigbluebutton-client/locale/id_ID/bbbResources.properties
index 3b3b66d6062ea4e3d775e99fded7e23031ae2f37..216f53a6ff3b640148b6c353449d95e060a1ff5e 100644
--- a/bigbluebutton-client/locale/id_ID/bbbResources.properties
+++ b/bigbluebutton-client/locale/id_ID/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Kirim Pesan
 bbb.chat.publicChatUsername = Semua
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Pilih seseorang untuk obrolan pribadi
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Opsi Obrolan
 bbb.chat.fontSize = Ukuran Huruf
diff --git a/bigbluebutton-client/locale/it_IT/bbbResources.properties b/bigbluebutton-client/locale/it_IT/bbbResources.properties
index 451c924788a7a894136b55ad89b5aea48a959b9e..b2877e55cf257a6abe44dc9115b86d5c3affff30 100644
--- a/bigbluebutton-client/locale/it_IT/bbbResources.properties
+++ b/bigbluebutton-client/locale/it_IT/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Copia tutto il testo
 bbb.chat.publicChatUsername = Tutti
 bbb.chat.optionsTabName = Opzioni
 bbb.chat.privateChatSelect = Seleziona l'interlocutore per la conversazione privata
-bbb.chat.private.userLeft = <b><i>Il partecipante è uscito.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Clicca su di un partecipante per aprire una Chat privata.
 bbb.chat.chatOptions = Opzioni chat
 bbb.chat.fontSize = Dimensione font
diff --git a/bigbluebutton-client/locale/ja_JP/bbbResources.properties b/bigbluebutton-client/locale/ja_JP/bbbResources.properties
index fb57cf0cd9b7ba4e3a0cb5ce2aac5b2bbce57c90..4e41e9efbb31d3fb07feff493858e73a06c657ce 100644
--- a/bigbluebutton-client/locale/ja_JP/bbbResources.properties
+++ b/bigbluebutton-client/locale/ja_JP/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = メッセージを送信
 bbb.chat.publicChatUsername = すべて
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = チャットウィンドウ 非公開でチャットする人を選択してください
-bbb.chat.private.userLeft = <B> <I>ユーザーは退場しています。</I> </B>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = チャットウィンドウ チャットオプション
 bbb.chat.fontSize = チャットウィンドウ フォントサイズ
diff --git a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
index 82412be90dc6c88092a61280b938989b67fb6ae2..e8a9236dd63893618dc531ca0aee45e6fc5f545d 100644
--- a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn = Жөнелту
 # bbb.chat.publicChatUsername = Public
 # bbb.chat.optionsTabName = Options
 # bbb.chat.privateChatSelect = Select a person to chat with privately
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 # bbb.chat.chatOptions = Chat Options
 # bbb.chat.fontSize = Chat Message Font Size
diff --git a/bigbluebutton-client/locale/km_KH/bbbResources.properties b/bigbluebutton-client/locale/km_KH/bbbResources.properties
index 7eeab1bbc14de6753745477b6ce4c4ed992ca079..ffc61b8f5a4890e02d65210002d69d1f93d6d460 100644
--- a/bigbluebutton-client/locale/km_KH/bbbResources.properties
+++ b/bigbluebutton-client/locale/km_KH/bbbResources.properties
@@ -205,7 +205,8 @@
 # bbb.chat.publicChatUsername = Public
 # bbb.chat.optionsTabName = Options
 # bbb.chat.privateChatSelect = Select a person to chat with privately
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 # bbb.chat.chatOptions = Chat Options
 # bbb.chat.fontSize = Chat Message Font Size
diff --git a/bigbluebutton-client/locale/ko_KR/bbbResources.properties b/bigbluebutton-client/locale/ko_KR/bbbResources.properties
index 543efbac6ae21967d06c87552bee00a6d9a06e4b..001a8f6f93d0e086b7fb7962884c08b4e4330974 100644
--- a/bigbluebutton-client/locale/ko_KR/bbbResources.properties
+++ b/bigbluebutton-client/locale/ko_KR/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.accessibilityName = 채팅 메시지 보내기
 bbb.chat.publicChatUsername = 공용 
 bbb.chat.optionsTabName = 옵션 
 bbb.chat.privateChatSelect = 개별 채팅을 할 참석자를 선택 \# Select a person to chat with privately
-bbb.chat.private.userLeft = <b><i>사용자가 나갔습니다.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = 채팅 옵션 
 bbb.chat.fontSize = 채팅 메시지 폰트 사이즈 
diff --git a/bigbluebutton-client/locale/lt_LT/bbbResources.properties b/bigbluebutton-client/locale/lt_LT/bbbResources.properties
index b9293073065da244f599abf2010c603265c1a5e3..b6a624589b1ba43ff69275811ac5c1fb9b8ca8e3 100644
--- a/bigbluebutton-client/locale/lt_LT/bbbResources.properties
+++ b/bigbluebutton-client/locale/lt_LT/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Kopijuoti visÄ… tekstÄ…
 bbb.chat.publicChatUsername = Visiems
 bbb.chat.optionsTabName = Parinktys
 bbb.chat.privateChatSelect = Pasirinkite asmenį kalbėtis privačiai
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 # bbb.chat.chatOptions = Chat Options
 # bbb.chat.fontSize = Chat Message Font Size
diff --git a/bigbluebutton-client/locale/lv_LV/bbbResources.properties b/bigbluebutton-client/locale/lv_LV/bbbResources.properties
index 93c7bf54290223bbe24f09a9e4f3f727a8841b60..c9c768dcc98dc82d0710da8dfc4df85c3a1c1614 100644
--- a/bigbluebutton-client/locale/lv_LV/bbbResources.properties
+++ b/bigbluebutton-client/locale/lv_LV/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = S?t?t zi?u
 bbb.chat.publicChatUsername = Visi
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Izv?l?ties personu priv?tam ?atam
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = ?ata opcijas
 bbb.chat.fontSize = Å rifta izm?rs
diff --git a/bigbluebutton-client/locale/ml_IN/bbbResources.properties b/bigbluebutton-client/locale/ml_IN/bbbResources.properties
index 4540420de2207f645dfd62fd810f84771c8e1db3..113f21ffa552724f1e492a72c057e184b7e7c1b7 100644
--- a/bigbluebutton-client/locale/ml_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/ml_IN/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.presentation.title = അവതരണം
 # bbb.chat.publicChatUsername = Public
 # bbb.chat.optionsTabName = Options
 # bbb.chat.privateChatSelect = Select a person to chat with privately
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 # bbb.chat.chatOptions = Chat Options
 # bbb.chat.fontSize = Chat Message Font Size
diff --git a/bigbluebutton-client/locale/mn_MN/bbbResources.properties b/bigbluebutton-client/locale/mn_MN/bbbResources.properties
index 337d6cc5d0f944f68d4f4f609a51a60518faa895..cce7074b066e79db8ee6c8b3118a59a5e63d08a9 100644
--- a/bigbluebutton-client/locale/mn_MN/bbbResources.properties
+++ b/bigbluebutton-client/locale/mn_MN/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Бүх текстыг хуулах
 bbb.chat.publicChatUsername = Бүгд
 bbb.chat.optionsTabName = Тохиргоо
 bbb.chat.privateChatSelect = Чатлах хүнээ сонгоно уу
-bbb.chat.private.userLeft = Хэрэглэгч гарлаа
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Чат тохиргоо
 bbb.chat.fontSize = Фонт хэмжээ
diff --git a/bigbluebutton-client/locale/ms_MY/bbbResources.properties b/bigbluebutton-client/locale/ms_MY/bbbResources.properties
index d4468530547f4b3ae19e83c8336b0ef40daa777a..196368e06043a9a30a33e5f2a0ac6da051a90d31 100644
--- a/bigbluebutton-client/locale/ms_MY/bbbResources.properties
+++ b/bigbluebutton-client/locale/ms_MY/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.accessibilityName = Hantar mesej chat
 bbb.chat.publicChatUsername = Public
 bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Pilih seseorang untuk chat secara peribadi
-bbb.chat.private.userLeft = <b><i>User sudah keluar.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Chat Options
 bbb.chat.fontSize = Mesej Chat Font Size
diff --git a/bigbluebutton-client/locale/ne_NP/bbbResources.properties b/bigbluebutton-client/locale/ne_NP/bbbResources.properties
index 08953cda93bb5236a30d138cf193a1c1b710b963..d870b32c7daf4d734bec699a8e45d0a36d60a565 100644
--- a/bigbluebutton-client/locale/ne_NP/bbbResources.properties
+++ b/bigbluebutton-client/locale/ne_NP/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Stuur bericht
 bbb.chat.publicChatUsername = Iedereen
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Selecteer een persoon om een privé chat mee te starten
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Chat opties
 bbb.chat.fontSize = Tekst grootte
diff --git a/bigbluebutton-client/locale/nl_NL/bbbResources.properties b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
index 0779d18019a2c39978fe23b7872796919107bf0c..ba8eaa8bdd57f3a5fe1a45a69b87220c4e95e990 100644
--- a/bigbluebutton-client/locale/nl_NL/bbbResources.properties
+++ b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Stuur bericht
 bbb.chat.publicChatUsername = Iedereen
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Selecteer een persoon om een privé chat mee te starten
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Chat opties
 bbb.chat.fontSize = Tekst grootte
diff --git a/bigbluebutton-client/locale/no_NO/bbbResources.properties b/bigbluebutton-client/locale/no_NO/bbbResources.properties
index 1784582d572d9ea1a4f77fb2fb5ce5e556f02670..c7e27768146bfa5871fca74058c5e05a95c9e113 100644
--- a/bigbluebutton-client/locale/no_NO/bbbResources.properties
+++ b/bigbluebutton-client/locale/no_NO/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Kopier hele teksten
 bbb.chat.publicChatUsername = Alle
 bbb.chat.optionsTabName = Innstillinger
 bbb.chat.privateChatSelect = Velg person til privat chat
-bbb.chat.private.userLeft = <b><i>Brukeren er borte.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Klikk bruker for å åpne privat chat
 bbb.chat.chatOptions = Innstillinger for prat
 bbb.chat.fontSize = Chatvindu Fontstørrelse
diff --git a/bigbluebutton-client/locale/pl_PL/bbbResources.properties b/bigbluebutton-client/locale/pl_PL/bbbResources.properties
index f7c82b0982b16bf3113064cc0620d68eef4b3d96..a2172041fee172399f1dc8d32f0d8940fc4ce922 100644
--- a/bigbluebutton-client/locale/pl_PL/bbbResources.properties
+++ b/bigbluebutton-client/locale/pl_PL/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Kopiuj Cały Tekst
 bbb.chat.publicChatUsername = Wszyscy
 bbb.chat.optionsTabName = Opcje
 bbb.chat.privateChatSelect = Wybierz osobÄ™ do czatu prywatnego
-bbb.chat.private.userLeft = <b><i>Użytkownik opuścił czat.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Naciśnij na Użytkownika aby Otworzyć Chat
 bbb.chat.chatOptions = Opcje czatu
 bbb.chat.fontSize = Rozmiar czcionki czatu
diff --git a/bigbluebutton-client/locale/pt_BR/bbbResources.properties b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
index 96d574aac798165089417858117fc9e234e97417..052f973d2de46d45eac61ec54d76da988dec436d 100644
--- a/bigbluebutton-client/locale/pt_BR/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
@@ -36,7 +36,7 @@ bbb.micSettings.comboMicList.toolTip = Selecione um microfone
 bbb.micSettings.micRecordVolume.label = Ganho
 bbb.micSettings.micRecordVolume.toolTip = Ajuste o ganho do seu microfone
 bbb.micSettings.nextButton = Próximo
-# bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.nextButton.toolTip = Iniciar teste de eco
 bbb.micSettings.join = Iniciar áudio
 bbb.micSettings.join.toolTip = Entrar na conferência de voz
 bbb.micSettings.cancel = Cancelar
@@ -50,8 +50,8 @@ bbb.micSettings.webrtc.capableBrowser = Seu navegador suporte WebRTC.
 bbb.micSettings.webrtc.capableBrowser.dontuseit = Clique para não usar WebRTC
 bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Clique aqui se você não quer utilizar a tecnologia WebRTC (recomendado se você tiver problemas ao utilizá-la).
 bbb.micSettings.webrtc.notCapableBrowser = WebRTC não é suportado no seu navegador. Utilize o Google Chrome (versão 32 ou posterior) ou o Mozilla Firefox (versão 26 ou posterior). Você ainda será capaz de entrar na conferência de voz usando a plataforma Adobe Flash.
-# bbb.micSettings.webrtc.connecting = Calling
-# bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.connecting = Chamando
+bbb.micSettings.webrtc.waitingforice = Conectando
 bbb.micSettings.webrtc.endingecho = Habilitando o áudio
 bbb.micSettings.webrtc.endedecho = Teste de eco encerrado.
 bbb.micPermissions.firefox.title = Permissões de microfone do Firefox
@@ -72,8 +72,8 @@ bbb.webrtcWarning.failedError.1002 = Erro 1002\: Não foi possível estabelecer
 bbb.webrtcWarning.failedError.1003 = Erro 1003\: Versão de navegador não suportada
 bbb.webrtcWarning.failedError.1004 = Erro 1004\: Falha na chamada
 bbb.webrtcWarning.failedError.1005 = Erro 1005\: Chamada encerrada inesperadamente
-# bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
-# bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1006 = Erro 1006\: Tempo de espera da chamada expirou
+bbb.webrtcWarning.failedError.1007 = Erro 1007\: Negociação ICE falhou
 bbb.webrtcWarning.failedError.unknown = Erro {0}\: Código de erro desconhecido
 bbb.mainToolbar.helpBtn = Ajuda
 bbb.mainToolbar.logoutBtn = Sair
@@ -152,7 +152,7 @@ bbb.presentation.fitToWidth.toolTip = Ajustar apresentação à largura
 bbb.presentation.fitToPage.toolTip = Ajustar apresentação à página
 bbb.presentation.uploadPresBtn.toolTip = Carregar apresentação
 bbb.presentation.backBtn.toolTip = Slide anterior
-# bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.accessibilityName = Slide {0} de {1}
 bbb.presentation.btnSlideNum.toolTip = Selecionar um slide
 bbb.presentation.forwardBtn.toolTip = Próximo slide
 bbb.presentation.maxUploadFileExceededAlert = Erro\: O arquivo é maior do que o permitido.
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Copiar todo o texto
 bbb.chat.publicChatUsername = Público
 bbb.chat.optionsTabName = Opções
 bbb.chat.privateChatSelect = Selecione uma pessoa para um bate-papo privado
-bbb.chat.private.userLeft = <b><i>O usuário saiu.</i></b>
+bbb.chat.private.userLeft = O usuário saíu.
+bbb.chat.private.userJoined = O usuário entrou.
 bbb.chat.usersList.toolTip = Clique no usuário para abrir bate-papo privado
 bbb.chat.chatOptions = Opções de bate-papo
 bbb.chat.fontSize = Tamanho da fonte das mensagens de bate-papo
@@ -286,12 +287,12 @@ bbb.layout.combo.remote = Remoto
 bbb.layout.save.complete = Layouts salvos com sucesso
 bbb.layout.load.complete = Layouts carregados com sucesso
 bbb.layout.load.failed = Falha ao carregar layouts
-# bbb.layout.name.defaultlayout = Default Layout
-# bbb.layout.name.videochat = Video Chat
-# bbb.layout.name.webcamsfocus = Webcam Meeting
-# bbb.layout.name.presentfocus = Presentation Meeting
-# bbb.layout.name.lectureassistant = Lecture Assistant
-# bbb.layout.name.lecture = Lecture
+bbb.layout.name.defaultlayout = Layout padrão
+bbb.layout.name.videochat = Vídeo Chamada
+bbb.layout.name.webcamsfocus = Reunião com câmeras
+bbb.layout.name.presentfocus = Reunião com apresentação
+bbb.layout.name.lectureassistant = Assistente de aula
+bbb.layout.name.lecture = Aula
 bbb.highlighter.toolbar.pencil = Lápis
 bbb.highlighter.toolbar.pencil.accessibilityName = Mudar o cursor do quadro branco para lápis
 bbb.highlighter.toolbar.ellipse = Círculo
diff --git a/bigbluebutton-client/locale/pt_PT/bbbResources.properties b/bigbluebutton-client/locale/pt_PT/bbbResources.properties
index 451246546a455dde3ce24d0c340fd3669eb31c00..ff89e9ca052530605e3e5d7c5770d736151343a0 100644
--- a/bigbluebutton-client/locale/pt_PT/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_PT/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Enviar menssagem
 bbb.chat.publicChatUsername = Todos
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Seleccione uma pessoa para conversar em privado
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Opções de conversação
 bbb.chat.fontSize = Tamanho da fonte
diff --git a/bigbluebutton-client/locale/ro_RO/bbbResources.properties b/bigbluebutton-client/locale/ro_RO/bbbResources.properties
index e17bb8fefb94c951b05263a9fbe8f441cf08dcba..41e0e8eae7d9d9810b76416cb71a1a7b4ee50f24 100644
--- a/bigbluebutton-client/locale/ro_RO/bbbResources.properties
+++ b/bigbluebutton-client/locale/ro_RO/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Trimiteţi mesajul
 bbb.chat.publicChatUsername = Toţi
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Selectaţi o persoana cu care sa discutaţi în privat
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Opţiuni Chat
 bbb.chat.fontSize = Dimensiune Font
diff --git a/bigbluebutton-client/locale/ru_RU/bbbResources.properties b/bigbluebutton-client/locale/ru_RU/bbbResources.properties
index 89de365abc2327e5f6659b7fa897fb75b661c18d..f263a6cb8ba181b85ed103d4ebfb79ec5d3dc8e7 100755
--- a/bigbluebutton-client/locale/ru_RU/bbbResources.properties
+++ b/bigbluebutton-client/locale/ru_RU/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Копировать весь текст
 bbb.chat.publicChatUsername = Все
 bbb.chat.optionsTabName = Настройки
 bbb.chat.privateChatSelect = Выбрать пользователя для частного общения
-bbb.chat.private.userLeft = <b><i>Пользователь вышел.</i></b>
+bbb.chat.private.userLeft = Пользователь вышел.
+bbb.chat.private.userJoined = Пользователь присоединился.
 bbb.chat.usersList.toolTip = Чтобы общаться в личных сообщениях, нажмите на ник пользователя
 bbb.chat.chatOptions = Настройка чата
 bbb.chat.fontSize = Размер шрифта
diff --git a/bigbluebutton-client/locale/si_LK/bbbResources.properties b/bigbluebutton-client/locale/si_LK/bbbResources.properties
index 14f88e9ca0f20b79b897450b65dd1fb41c240d7d..96e0d6b6aebb271179f6741dccfc97102361dbe6 100644
--- a/bigbluebutton-client/locale/si_LK/bbbResources.properties
+++ b/bigbluebutton-client/locale/si_LK/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = පණිවිඩය යවන්න
 bbb.chat.publicChatUsername = සියල්ල
 # bbb.chat.optionsTabName = Options
 # bbb.chat.privateChatSelect = Select a person to chat with privately
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 # bbb.chat.chatOptions = Chat Options
 bbb.chat.fontSize = අකුරු ප්‍රමානය
diff --git a/bigbluebutton-client/locale/sk_SK/bbbResources.properties b/bigbluebutton-client/locale/sk_SK/bbbResources.properties
index efe5405c3775d14c408e04d8318f8f6c94ccd6f4..d35298e8b752f00590e7aba9fef6438ab052d406 100644
--- a/bigbluebutton-client/locale/sk_SK/bbbResources.properties
+++ b/bigbluebutton-client/locale/sk_SK/bbbResources.properties
@@ -4,10 +4,10 @@ bbb.mainshell.statusProgress.loading = Nahráva {0} modulov
 bbb.mainshell.statusProgress.cannotConnectServer = Ľutujeme, nepodarilo sa pripojiť k serveru.
 bbb.mainshell.copyrightLabel2 = (c) 2014 BigBlueButton Inc. [build {0}] - Pre viac informácií navštívte <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
 bbb.mainshell.logBtn.toolTip = Otvoriť okno záznamov
-# bbb.mainshell.meetingNotFound = Meeting Not Found
-# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.meetingNotFound = Lekcia nenájdená
+bbb.mainshell.invalidAuthToken = Neplatná autentifikácia
 bbb.mainshell.resetLayoutBtn.toolTip = Resetovať rozmiestnenie
-# bbb.mainshell.notification.tunnelling = Tunnelling
+bbb.mainshell.notification.tunnelling = Tunelovanie
 bbb.mainshell.notification.webrtc = WebRTC zvuk
 bbb.oldlocalewindow.reminder1 = Je možné že máte starý preklad BigBlueButton-u.
 bbb.oldlocalewindow.reminder2 = Vyčistite vyrovnávaciu pamäť vášho prehliadača a skúste znova.
@@ -17,7 +17,7 @@ bbb.audioSelection.btnMicrophone.label = Mikrofón
 bbb.audioSelection.btnMicrophone.toolTip = Pridať zvuk s vaším mikrofónom
 bbb.audioSelection.btnListenOnly.label = Len počúvať
 bbb.audioSelection.btnListenOnly.toolTip = Pridať zvuk len na počúvanie
-# bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial\: {0} then enter {1} as the conference pin number.
+bbb.audioSelection.txtPhone.text = Na pripojenie k tejto lekcii telefónom vytočte\: {0} a potom {1} ako pin číslo lekcie.
 bbb.micSettings.title = Test zvuku
 bbb.micSettings.speakers.header = Vyskúšať reproduktory
 bbb.micSettings.microphone.header = Vyskúšať mikrofón
@@ -29,19 +29,19 @@ bbb.micSettings.echoTestMicPrompt = Toto je súkromný test ozveny. Povedzte pá
 bbb.micSettings.echoTestAudioYes = Áno
 bbb.micSettings.echoTestAudioNo = Nie
 bbb.micSettings.speakIntoMicTestLevel = Hovorte do vášho mikrofónu. Mali by ste vidieť pohybujúci sa pás. Pokiaľ nie, zvoľte iný mikrofón.
-# bbb.micSettings.recommendHeadset = Use a headset with a microphone for best audio experience.
+bbb.micSettings.recommendHeadset = Použite headset s mikrofónom pre lepší zvuk.
 bbb.micSettings.changeMic = Vymeniť mikrofón.
 bbb.micSettings.changeMic.toolTip = Otvoriť dialógové okno Flash Player nastavenia mikrofónu
 bbb.micSettings.comboMicList.toolTip = Vybrať mikrofón
 bbb.micSettings.micRecordVolume.label = Pridať
-# bbb.micSettings.micRecordVolume.toolTip = Set your microphone gain
+bbb.micSettings.micRecordVolume.toolTip = Nastaviť silu vášho mikrofónu
 bbb.micSettings.nextButton = Ďalší
 bbb.micSettings.nextButton.toolTip = Spustiť test ozveny
 bbb.micSettings.join = Pripojiť zvuk
-# bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.join.toolTip = Pripojiť sa k zvukovej konferencii
 bbb.micSettings.cancel = Zrušiť
 bbb.micSettings.connectingtoecho = Pripájanie
-# bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
+bbb.micSettings.connectingtoecho.error = Chyba v skúške ozveny\: Prosím kontaktujte administrátora.
 bbb.micSettings.cancel.toolTip = Zrušiť pripojenie zvuku
 bbb.micSettings.access.helpButton = Otvoriť videá s návodmi v novom okne
 bbb.micSettings.access.title = Nastavenia zvuku. Dokým nezatvoríte okno, zvuk sa bude nastavovať tu.
@@ -52,28 +52,28 @@ bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Kliknite sem, pokiaľ
 bbb.micSettings.webrtc.notCapableBrowser = WebRTC nie je podporovaný vaším prehlidačom. Prosím, použite Google Chrome (verzia 32 a vyššie) alebo Mozilla Firefox (verzia 26 a vyššie). Stále budete mať možnosť pridať sa k hlasovej konferencii použijúc Adobe Flash platformu.
 bbb.micSettings.webrtc.connecting = Volá
 bbb.micSettings.webrtc.waitingforice = Pripájanie
-# bbb.micSettings.webrtc.endingecho = Joining audio
-# bbb.micSettings.webrtc.endedecho = Echo test ended.
+bbb.micSettings.webrtc.endingecho = Pripájanie zvuku
+bbb.micSettings.webrtc.endedecho = Test ozveny ukončený.
 bbb.micPermissions.firefox.title = Firefox povolenia mikrofónu
-# bbb.micPermissions.firefox.message1 = Choose your mic and then click Share.
-# bbb.micPermissions.firefox.message2 = If you don't see the list of microphones, click on the microphone icon.
+bbb.micPermissions.firefox.message1 = Vyberte mikrofón a potom kliknite na Zdieľať.
+bbb.micPermissions.firefox.message2 = Ak nevidíte zoznam mikrofónov, kliknite na ikonu mikrofónu.
 bbb.micPermissions.chrome.title = Chrome povolenia mikrofónu
-# bbb.micPermissions.chrome.message1 = Click Allow to give Chrome permission to use your microphone.
+bbb.micPermissions.chrome.message1 = Kliknite na Povoliť pre povolenie prístupu Chrome k vášmu mikrofónu.
 bbb.micWarning.title = Zvukové upozornenie
 bbb.micWarning.joinBtn.label = Pridať sa aj tak
 bbb.micWarning.testAgain.label = Vyskúšať znovu
 bbb.micWarning.message = Váš mikrofón nevykazuje žiadnu aktivitu, ostatní účastníci vás pravdepodobne nebudú počas lekcie počuť.
-# bbb.webrtcWarning.message = Detected the following WebRTC issue\: {0}. Do you want to try Flash instead?
-# bbb.webrtcWarning.mediamessage = Could not get your microphone for a WebRTC call. Do you want to try Flash instead?
-# bbb.webrtcWarning.endedunexpectedly = The WebRTC echo test ended unexpectedly. Do you want to try Flash instead?
-# bbb.webrtcWarning.title = WebRTC Connection Failed
+bbb.webrtcWarning.message = Zistený nasledovný problém s WebRTC\: {0}. Chcete radšej vyskúšať Flash?
+bbb.webrtcWarning.mediamessage = Nepodarilo sa pridať mikrofón k WebRTC hovoru. Chcete radšej vyskúšať Flash?
+bbb.webrtcWarning.endedunexpectedly = WebRTC test ozveny bol nečakane ukončený. Chcete radšej vyskúšať Flash?
+bbb.webrtcWarning.title = WebRTC spojenie zlyhalo
 bbb.webrtcWarning.failedError.1001 = Chyba 1001\: WebSocket odpojený
 bbb.webrtcWarning.failedError.1002 = Chyba 1002\: Nepodarilo sa vytvoriť WebSocket pripojenie
 bbb.webrtcWarning.failedError.1003 = Chyba 1003\: Nepodporovaná verzia prehliadača
 bbb.webrtcWarning.failedError.1004 = Chyba 1004\: Chyba v hovore
 bbb.webrtcWarning.failedError.1005 = Chyba 1005\: Hovor nečakane ukončený
-# bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
-# bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1006 = Chyba 1006\: Prerušenie hovoru
+bbb.webrtcWarning.failedError.1007 = Chyba 1007\: ICE jednanie zlyhalo
 bbb.webrtcWarning.failedError.unknown = Chyba {0}\: Neznámy kód chyby
 bbb.mainToolbar.helpBtn = Nápoveda
 bbb.mainToolbar.logoutBtn = Odhlásenie
@@ -90,19 +90,19 @@ bbb.mainToolbar.recordBtn.toolTip.notRecording = Lekcia nie je nahrávaná
 bbb.mainToolbar.recordBtn.confirm.title = Potvrdiť nahrávanie
 bbb.mainToolbar.recordBtn.confirm.message.start = Ste si istý, že chcete spustiť nahrávanie lekcie?
 bbb.mainToolbar.recordBtn.confirm.message.stop = Ste si istý, že chcete zastaviť nahrávanie lekcie?
-# bbb.mainToolbar.recordBtn..notification.title = Record Notification
-# bbb.mainToolbar.recordBtn..notification.message1 = You can record this meeting.
-# bbb.mainToolbar.recordBtn..notification.message2 = You must click the Start/Stop Recording button in the title bar to begin/end recording.
-# bbb.mainToolbar.recordingLabel.recording = (Recording)
-# bbb.mainToolbar.recordingLabel.notRecording = Not Recording
+bbb.mainToolbar.recordBtn..notification.title = Nahrať upozornenie
+bbb.mainToolbar.recordBtn..notification.message1 = Túto lekciu si môžete nahrať.
+bbb.mainToolbar.recordBtn..notification.message2 = Musíte kliknúť na tlačidlo Zapnúť/Vypnúť nahrávanie v titulke na začatie/ukončenie nahrávania.
+bbb.mainToolbar.recordingLabel.recording = (Nahrávanie)
+bbb.mainToolbar.recordingLabel.notRecording = Nenahráva sa
 bbb.window.minimizeBtn.toolTip = Minimalizovať
 bbb.window.maximizeRestoreBtn.toolTip = Maximalizovať
 bbb.window.closeBtn.toolTip = Zavrieť
-# bbb.videoDock.titleBar = Webcam Window Title Bar
-# bbb.presentation.titleBar = Presentation Window Title Bar
-# bbb.chat.titleBar = Chat Window Title Bar
+bbb.videoDock.titleBar = Titulný pás okna webkamery
+bbb.presentation.titleBar = Titulný pás okna prezentácie
+bbb.chat.titleBar = Titulný pás okna chatu
 bbb.users.title = Uživatelia {0} {1}
-# bbb.users.titleBar = Users Window title bar
+bbb.users.titleBar = Titulný pás okna užívateľov
 bbb.users.quickLink.label = Okno užívateľov
 bbb.users.minimizeBtn.accessibilityName = Minimalizovať okno užívateľov
 bbb.users.maximizeRestoreBtn.accessibilityName = Maximalizovať okno užívateľov
@@ -111,33 +111,33 @@ bbb.users.settings.audioSettings = Test zvuku
 bbb.users.settings.webcamSettings = Nastavenia webkamery
 bbb.users.settings.muteAll = Stlmiť všetkých používateľov
 bbb.users.settings.muteAllExcept = Stlmiť všetkých používateľov okrem prezentéra
-# bbb.users.settings.unmuteAll = Unmute All Users
-# bbb.users.settings.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.roomMuted.text = Viewers Muted
-# bbb.users.roomLocked.text = Viewers Locked
+bbb.users.settings.unmuteAll = Stlmiť všetkých užívateľov
+bbb.users.settings.lowerAllHands = Dať dolu všetky ruky
+bbb.users.raiseHandBtn.toolTip = Zdvihnúť ruku
+bbb.users.roomMuted.text = Diváci stlmení
+bbb.users.roomLocked.text = Diváci zamknutí
 bbb.users.pushToTalk.toolTip = Hovoriť
-# bbb.users.pushToMute.toolTip = Mute yourself
-# bbb.users.muteMeBtnTxt.talk = Unmute
-# bbb.users.muteMeBtnTxt.mute = Mute
-# bbb.users.muteMeBtnTxt.muted = Muted
-# bbb.users.muteMeBtnTxt.unmuted = Unmuted
-# bbb.users.usersGrid.accessibilityName = Users List. Use the arrow keys to navigate.
+bbb.users.pushToMute.toolTip = Stlmiť seba
+bbb.users.muteMeBtnTxt.talk = Vypnúť stlmenie
+bbb.users.muteMeBtnTxt.mute = Stlmiť
+bbb.users.muteMeBtnTxt.muted = Stlmený
+bbb.users.muteMeBtnTxt.unmuted = Nestlmený
+bbb.users.usersGrid.accessibilityName = Zoznam užívateľov. Na navigáciu použite šípky
 bbb.users.usersGrid.nameItemRenderer = Meno
 bbb.users.usersGrid.nameItemRenderer.youIdentifier = Vy
 bbb.users.usersGrid.statusItemRenderer = Status
 bbb.users.usersGrid.statusItemRenderer.changePresenter = Kliknúť a spraviť prezentérom
 bbb.users.usersGrid.statusItemRenderer.presenter = Prezentér
 bbb.users.usersGrid.statusItemRenderer.moderator = Moderátor
-# bbb.users.usersGrid.statusItemRenderer.lowerHand = Lower Hand
+bbb.users.usersGrid.statusItemRenderer.lowerHand = Dať dolu ruku
 bbb.users.usersGrid.statusItemRenderer.handRaised = Zdvihnutá ruka
-# bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
-# bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.statusItemRenderer.viewer = Divák
+bbb.users.usersGrid.mediaItemRenderer = Médium
 bbb.users.usersGrid.mediaItemRenderer.talking = Hovorí
 bbb.users.usersGrid.mediaItemRenderer.webcam = Zdieľanie webkamery
-# bbb.users.usersGrid.mediaItemRenderer.webcamBtn = View webcam
-# bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Unmute {0}
-# bbb.users.usersGrid.mediaItemRenderer.pushToMute = Mute {0}
+bbb.users.usersGrid.mediaItemRenderer.webcamBtn = Ukázať webkameru
+bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Vypnuté stlmenie {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToMute = Stlmenie {0}
 bbb.users.usersGrid.mediaItemRenderer.pushToLock = Zamknúť {0}
 bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Odomknúť {0}
 bbb.users.usersGrid.mediaItemRenderer.kickUser = Vyhodiť {0}
@@ -148,8 +148,8 @@ bbb.users.usersGrid.mediaItemRenderer.noAudio = Neprítomný v zvukovej konferen
 bbb.presentation.title = Prezentácia
 bbb.presentation.titleWithPres = Prezentácia\: {0}
 bbb.presentation.quickLink.label = Okno prezentácie
-# bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width
-# bbb.presentation.fitToPage.toolTip = Fit Presentation To Page
+bbb.presentation.fitToWidth.toolTip = Prispôsobiť prezentáciu šírke
+bbb.presentation.fitToPage.toolTip = Prispôsobiť prezentáciu stránke
 bbb.presentation.uploadPresBtn.toolTip = Nahrať prezentáciu
 bbb.presentation.backBtn.toolTip = Predchádzajúca roleta.
 bbb.presentation.btnSlideNum.accessibilityName = Slajd {0} z {1}
@@ -168,9 +168,9 @@ bbb.presentation.error.convert.nbpage = Chyba\: Nepodarilo sa určiť počet str
 bbb.presentation.error.convert.maxnbpagereach = Chyba\: Nahraný súbor ma príliš veľa strán.
 bbb.presentation.converted = Skonvertovaných {0} z {1} slajdov.
 bbb.presentation.ok = OK
-# bbb.presentation.slider = Presentation zoom level
-# bbb.presentation.slideloader.starttext = Slide text start
-# bbb.presentation.slideloader.endtext = Slide text end
+bbb.presentation.slider = Úroveň zoomu prezentácie
+bbb.presentation.slideloader.starttext = Začať posúvanie textu
+bbb.presentation.slideloader.endtext = Ukončiť posúvanie textu
 bbb.presentation.uploadwindow.presentationfile = Prezentačný súbor
 bbb.presentation.uploadwindow.pdf = PDF
 bbb.presentation.uploadwindow.word = WORD
@@ -181,7 +181,7 @@ bbb.presentation.minimizeBtn.accessibilityName = Minimalizovať okno prezentáci
 bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximalizovať okno prezentácie
 bbb.presentation.closeBtn.accessibilityName = Zatvoriť okno prezentácie
 bbb.fileupload.title = Nahrať prezentáciu.
-# bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.lblFileName.defaultText = Nebol vybraný žiaden súbor
 bbb.fileupload.selectBtn.label = Vybrať súbor
 bbb.fileupload.selectBtn.toolTip = Nájsť súbor
 bbb.fileupload.uploadBtn = Nahrať
@@ -190,14 +190,14 @@ bbb.fileupload.deleteBtn.toolTip = Odstrániť prezentáciu
 bbb.fileupload.showBtn = Ukázať
 bbb.fileupload.showBtn.toolTip = Ukázať prezentáciu
 bbb.fileupload.okCancelBtn = Zrušiť
-# bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
+bbb.fileupload.okCancelBtn.toolTip = Zatvoriť dialógové okno nahrávania súborov
 bbb.fileupload.genThumbText = Vytváranie náhľadu...
 bbb.fileupload.progBarLbl = Priebeh\:
 bbb.fileupload.fileFormatHint = Nahrať akýkoľvek office dokument alebo dokument vo formáte Portable Document File (PDF). Pre najlepšie výsledky použite PDF.
 bbb.chat.title = Pokec
 bbb.chat.quickLink.label = Okno chatu
 bbb.chat.cmpColorPicker.toolTip = Farba textu
-# bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.input.accessibilityName = Pole úpravy chatovej správy
 bbb.chat.sendBtn = Odoslať
 bbb.chat.sendBtn.toolTip = Odoslať správu
 bbb.chat.sendBtn.accessibilityName = Poslať správu na chate
@@ -205,30 +205,31 @@ bbb.chat.contextmenu.copyalltext = Skopírovať celý text
 bbb.chat.publicChatUsername = VÅ¡etky
 bbb.chat.optionsTabName = Možnosti
 bbb.chat.privateChatSelect = Označte osobu s ktorou chcete zaviesť osobný Pokec.
-bbb.chat.private.userLeft = <b><i>Užívateľ odišiel.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = Kliknutím na používateľa otvoríte súkromný chat
 bbb.chat.chatOptions = Možnosti Pokecu
 bbb.chat.fontSize = Veľkosť písma
 bbb.chat.cmbFontSize.toolTip = Vybrať veľkosť písma chatovej správy
-# bbb.chat.messageList = Message Box
+bbb.chat.messageList = Okno správy
 bbb.chat.minimizeBtn.accessibilityName = Minimalizovať okno chatu
 bbb.chat.maximizeRestoreBtn.accessibilityName = Maximalizovať okno chatu
 bbb.chat.closeBtn.accessibilityName = Zatvoriť okno chatu
 bbb.chat.chatTabs.accessibleNotice = Nová správa v tomto okne.
 bbb.publishVideo.changeCameraBtn.labelText = Zmeniť webkameru
-# bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
+bbb.publishVideo.changeCameraBtn.toolTip = Otvoriť dialógové okno zmeny webkamery
 bbb.publishVideo.cmbResolution.tooltip = Vybrať rozlíšenie webkamery
 bbb.publishVideo.startPublishBtn.labelText = Začať zdieľanie
 bbb.publishVideo.startPublishBtn.toolTip = Začať zdieľanie
-# bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
-# bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.webcamPermissions.chrome.title = Chrome povolenia pre webkameru
+bbb.webcamPermissions.chrome.message1 = Kliknite na Povoliť pre povolenie prístupu Chrome k vašej webkamere.
 bbb.videodock.title = Základňa videa
 bbb.videodock.quickLink.label = Okno webkamery
-# bbb.video.minimizeBtn.accessibilityName = Minimize the Webcams Window
-# bbb.video.maximizeRestoreBtn.accessibilityName = Maximize the Webcams Window
-# bbb.video.controls.muteButton.toolTip = Mute or unmute {0}
-# bbb.video.controls.switchPresenter.toolTip = Make {0} presenter
-# bbb.video.controls.ejectUserBtn.toolTip = Eject {0} from meeting
+bbb.video.minimizeBtn.accessibilityName = Minimalizovať okno webkamier
+bbb.video.maximizeRestoreBtn.accessibilityName = Maximalizovať okno webkamier
+bbb.video.controls.muteButton.toolTip = Stlmiť alebo vypnúť stlmenie {0}
+bbb.video.controls.switchPresenter.toolTip = Urobiť {0} prezentérom
+bbb.video.controls.ejectUserBtn.toolTip = Vyhodiť {0} z lekcie
 bbb.video.controls.privateChatBtn.toolTip = Chatovať s {0}
 bbb.video.publish.hint.noCamera = Žiadna dostupná kamera
 bbb.video.publish.hint.cantOpenCamera = Nemôže načítať vašu kameru
@@ -240,8 +241,8 @@ bbb.video.publish.hint.cameraIsBeingUsed = Vaša kamera je používaná inou apl
 bbb.video.publish.hint.publishing = Zverejňovanie...
 bbb.video.publish.closeBtn.accessName = Zatvoriť dialógové okno nastavení webkamery
 bbb.video.publish.closeBtn.label = Zrušiť
-# bbb.video.publish.titleBar = Publish Webcam Window
-bbb.desktopPublish.title = Zdieľanie Plochy\: Náhľad Moderátora
+bbb.video.publish.titleBar = Publikovať okno webkamery
+bbb.desktopPublish.title = Zdieľanie plochy\: Náhľad moderátora
 bbb.desktopPublish.fullscreen.tooltip = Zdieľať hlavnú obrazovku
 bbb.desktopPublish.fullscreen.label = Celá obrazovka
 bbb.desktopPublish.region.tooltip = Zdieľať časť obrazovky
@@ -250,10 +251,10 @@ bbb.desktopPublish.stop.tooltip = Zavrieť zdieľanie obrazovky
 bbb.desktopPublish.stop.label = Zavrieť
 bbb.desktopPublish.maximizeRestoreBtn.toolTip = Nemôžete maximalizovať toto okno.
 bbb.desktopPublish.closeBtn.toolTip = Zastaviť zdieľanie a zatvoriť toto okno.
-# bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. Recommend you use FireFox to share desktop.
+bbb.desktopPublish.chromeOnMacUnsupportedHint = Zdieľanie obrazovky nie je aktuálne podporované na Chrome bežiacom na Mac OS X. Na zdieľanie obrazovky odporúčame použiť Firefox.
 bbb.desktopPublish.minimizeBtn.toolTip = Minimalizovať toto okno.
-# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
+bbb.desktopPublish.minimizeBtn.accessibilityName = Minimalizovať okno zdieľania plochy
+bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximalizovať okno zdieľania plochy
 bbb.desktopPublish.javaRequiredLabel = Požaduje Java 7u51 (alebo vyššie) na úspešné spustenie.
 bbb.desktopPublish.javaTestLinkLabel = Vyskúšať Javu
 bbb.desktopPublish.javaTestLinkLabel.tooltip = Vyskúšajte vašu verziu Javy
@@ -261,53 +262,53 @@ bbb.desktopPublish.javaTestLinkLabel.tooltip.accessibility = Vyskúšajte vašu
 bbb.desktopView.title = Zdieľanie plochy
 bbb.desktopView.fitToWindow = Prispôsobiť do okna
 bbb.desktopView.actualSize = Zobraziť aktuálnu veľkosť
-# bbb.desktopView.minimizeBtn.accessibilityName = Minimize the Desktop Sharing View Window
-# bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing View Window
-# bbb.desktopView.closeBtn.accessibilityName = Close the Desktop Sharing View Window
+bbb.desktopView.minimizeBtn.accessibilityName = Minimalizovať okno ukážky zdieľania plochy
+bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximalizovať okno ukážky zdieľania plochy
+bbb.desktopView.closeBtn.accessibilityName = Zatvoriť okno ukážky zdieľania plochy
 bbb.toolbar.phone.toolTip.start = Zdieľať mikrofón
-# bbb.toolbar.phone.toolTip.stop = Stop Sharing Your Microphone
-# bbb.toolbar.phone.toolTip.mute = Stop listening the conference
-# bbb.toolbar.phone.toolTip.unmute = Start listening the conference
-# bbb.toolbar.phone.toolTip.nomic = No microphone detected
-# bbb.toolbar.deskshare.toolTip.start = Share Your Desktop
-# bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Desktop
-# bbb.toolbar.video.toolTip.start = Share Your Webcam
-# bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam
-# bbb.layout.addButton.toolTip = Add the custom layout to the list
-# bbb.layout.broadcastButton.toolTip = Apply Current Layout to All Viewers
-# bbb.layout.combo.toolTip = Change Your Layout
-# bbb.layout.loadButton.toolTip = Load layouts from a file
-# bbb.layout.saveButton.toolTip = Save layouts to a file
-# bbb.layout.lockButton.toolTip = Lock layout
-# bbb.layout.combo.prompt = Apply a layout
-# bbb.layout.combo.custom = * Custom layout
-# bbb.layout.combo.customName = Custom layout
-# bbb.layout.combo.remote = Remote
-# bbb.layout.save.complete = Layouts were successfully saved
-# bbb.layout.load.complete = Layouts were successfully loaded
-# bbb.layout.load.failed = Failed to load the layouts
+bbb.toolbar.phone.toolTip.stop = Ukončiť zdieľanie mikrofónu
+bbb.toolbar.phone.toolTip.mute = Prestať počúvať lekciu
+bbb.toolbar.phone.toolTip.unmute = Začať počúvať lekciu
+bbb.toolbar.phone.toolTip.nomic = Mikrofón nebol nájdený
+bbb.toolbar.deskshare.toolTip.start = Zdieľať pracovnú plochu
+bbb.toolbar.deskshare.toolTip.stop = Ukončiť zdieľanie pracovnej plochy
+bbb.toolbar.video.toolTip.start = Zdieľať webkameru
+bbb.toolbar.video.toolTip.stop = Ukončiť zdieľanie webkamery
+bbb.layout.addButton.toolTip = Pridať vlastné rozloženie do zoznamu
+bbb.layout.broadcastButton.toolTip = Použiť aktuálne rozloženie pre všetkých divákov
+bbb.layout.combo.toolTip = Zmeniť rozloženie
+bbb.layout.loadButton.toolTip = Načítať rozloženia zo súboru
+bbb.layout.saveButton.toolTip = Uložiť rozloženia do súboru
+bbb.layout.lockButton.toolTip = Zamknúť rozloženie
+bbb.layout.combo.prompt = Použiť rozloženie
+bbb.layout.combo.custom = * Vlastné rozloženie
+bbb.layout.combo.customName = Vlastné rozloženie
+bbb.layout.combo.remote = Vzdialený
+bbb.layout.save.complete = Rozloženia boli úspešne uložené
+bbb.layout.load.complete = Rozloženia boli úspešne načítané
+bbb.layout.load.failed = Nepodarilo sa načítať rozloženia
 bbb.layout.name.defaultlayout = Prednastavené rozloženie
 bbb.layout.name.videochat = Video chat
-# bbb.layout.name.webcamsfocus = Webcam Meeting
-# bbb.layout.name.presentfocus = Presentation Meeting
-# bbb.layout.name.lectureassistant = Lecture Assistant
+bbb.layout.name.webcamsfocus = Lekcia s webkamerou
+bbb.layout.name.presentfocus = Lekcia s prezentáciou
+bbb.layout.name.lectureassistant = Asistent lekcie
 bbb.layout.name.lecture = Lekcia
 bbb.highlighter.toolbar.pencil = Zvýrazňovač
-# bbb.highlighter.toolbar.pencil.accessibilityName = Switch whiteboard cursor to pencil
+bbb.highlighter.toolbar.pencil.accessibilityName = Prepnúť kurzor na tabuli na ceruzku
 bbb.highlighter.toolbar.ellipse = Kruh
-# bbb.highlighter.toolbar.ellipse.accessibilityName = Switch whiteboard cursor to circle
+bbb.highlighter.toolbar.ellipse.accessibilityName = Prepnúť kurzor na tabuli na kruh
 bbb.highlighter.toolbar.rectangle = Obdĺžnik
-# bbb.highlighter.toolbar.rectangle.accessibilityName = Switch whiteboard cursor to rectangle
-# bbb.highlighter.toolbar.panzoom = Pan and Zoom
-# bbb.highlighter.toolbar.panzoom.accessibilityName = Switch whiteboard cursor to pan and zoom
-# bbb.highlighter.toolbar.clear = Clear All Annotations
-# bbb.highlighter.toolbar.clear.accessibilityName = Clear the whiteboard page
-# bbb.highlighter.toolbar.undo = Undo Annotation
-# bbb.highlighter.toolbar.undo.accessibilityName = Undo the last whiteboard shape
-bbb.highlighter.toolbar.color = Označiť farbu
-# bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
+bbb.highlighter.toolbar.rectangle.accessibilityName = Prepnúť kurzor na tabuli na obdĺžnik
+bbb.highlighter.toolbar.panzoom = Zamerať a priblížiť
+bbb.highlighter.toolbar.panzoom.accessibilityName = Prepnúť kurzor na tabuli na zamerať a priblížiť
+bbb.highlighter.toolbar.clear = Zmazať všetky komentáre
+bbb.highlighter.toolbar.clear.accessibilityName = Vyčistiť stranu tabule
+bbb.highlighter.toolbar.undo = Vrátiť anotáciu
+bbb.highlighter.toolbar.undo.accessibilityName = Zmazať posledný útvar na tabuli
+bbb.highlighter.toolbar.color = Vybrať farbu
+bbb.highlighter.toolbar.color.accessibilityName = Farba kreslenia na tabuli
 bbb.highlighter.toolbar.thickness = Zmeniť hrúbku
-# bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
+bbb.highlighter.toolbar.thickness.accessibilityName = Hrúbka kreslenia na tabuľu
 bbb.logout.title = Boli ste odhlásený
 bbb.logout.button.label = OK
 bbb.logout.appshutdown = Serverová aplikácia bola vypnutá.
@@ -318,7 +319,7 @@ bbb.logout.rejected = Pripojenie k serveru bolo odmietnuté
 bbb.logout.invalidapp = Nenašla sa žiadna red5 aplikácia
 bbb.logout.unknown = Váš klient stratil pripojenie so serverom
 bbb.logout.usercommand = Boli ste odhlásený z konferencie
-# bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
+bbb.logout.refresh.message = Pokiaľ toto odhlásenie bolo nečakané, kliknite na tlačidlo nižšie kvôli znovupripojeniu.
 bbb.logout.refresh.label = Znovu pripojiť
 bbb.logout.confirm.title = Potvrdiť odhlásenie
 bbb.logout.confirm.message = Ste si istý, že sa chcete odhlásiť?
@@ -345,35 +346,35 @@ bbb.settings.warning.close = Zavrieť toto upozornenie
 bbb.settings.noissues = Neboli nájdené žiadne výnimočné problémy\n
 bbb.settings.instructions = Prijmite výzvu Flash-u, ktorý od vás pýta povolenie prístupu na kameru. Ak môžete vidieť sami seba a počuje sa, tak váš prehliadač je správne nastavený. Iné možné problémy sú uvedené nižšie. Kliknite na každý aby ste našli možné riešenie.
 ltbcustom.bbb.highlighter.toolbar.triangle = Trojuholník
-# ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Switch whiteboard cursor to triangle
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Prepnúť kurzor na tabuli na trojuholník
 ltbcustom.bbb.highlighter.toolbar.line = Priamka
-# ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Switch whiteboard cursor to line
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Prepnúť kurzor na tabuli na priamku
 ltbcustom.bbb.highlighter.toolbar.text = Text
-# ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
-ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Farba text
+ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Prepnúť kurzor na tabuli na text
+ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Farba textu
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Veľkosť písma
 
-# bbb.accessibility.chat.chatBox.reachedFirst = You have reached the first message.
-# bbb.accessibility.chat.chatBox.reachedLatest = You have reached the latest message.
-# bbb.accessibility.chat.chatBox.navigatedFirst =  You have navigated to the first message.
-# bbb.accessibility.chat.chatBox.navigatedLatest = You have navigated to the latest message.
-# bbb.accessibility.chat.chatBox.navigatedLatestRead = You have navigated to the most recent message you have read.
-# bbb.accessibility.chat.chatwindow.input = Chat input
+bbb.accessibility.chat.chatBox.reachedFirst = Obdržali ste prvú správu
+bbb.accessibility.chat.chatBox.reachedLatest = Obdržali ste poslednú správu
+bbb.accessibility.chat.chatBox.navigatedFirst =  Dostali ste sa k prvej správe.
+bbb.accessibility.chat.chatBox.navigatedLatest = Dostali ste sa k poslednej správe.
+bbb.accessibility.chat.chatBox.navigatedLatestRead = Dostali ste sa k posledne prečítanej správe.
+bbb.accessibility.chat.chatwindow.input = Vstúp do chatu
 
-# bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+bbb.accessibility.chat.initialDescription = Prosím použite šípky na navigáciu v chatových správach
 
-# bbb.accessibility.notes.notesview.input = Notes input
+bbb.accessibility.notes.notesview.input = Vstup do poznámok
 
 bbb.shortcuthelp.title = Klávesové skratky
-# bbb.shortcuthelp.minimizeBtn.accessibilityName = Minimize the Shortcut Help Window
-# bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Maximize the Shortcut Help Window
-# bbb.shortcuthelp.closeBtn.accessibilityName = Close the Shortcut Help Window
+bbb.shortcuthelp.minimizeBtn.accessibilityName = Minimalizovať okno pomocníka klávesových skratiek
+bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Maximalizovať okno pomocníka klávesových skratiek
+bbb.shortcuthelp.closeBtn.accessibilityName = Zatvoriť okno pomocníka klávesových skratiek
 bbb.shortcuthelp.dropdown.general = Globálne skratky
 bbb.shortcuthelp.dropdown.presentation = Prezentačné skratky
 bbb.shortcuthelp.dropdown.chat = Chatové skratky
 bbb.shortcuthelp.dropdown.users = Užívateľské skratky
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
+bbb.shortcuthelp.dropdown.polling = Klávesové skratky pre hlasovanie prezentéra
+bbb.shortcuthelp.dropdown.polling2 = Klávesové skratky pre divákov
 bbb.shortcuthelp.headers.shortcut = Skratka
 bbb.shortcuthelp.headers.function = Funkcia
 
@@ -383,43 +384,43 @@ bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximalizovať aktuálne okno
 
 bbb.shortcutkey.flash.exit = 8
-# bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
+bbb.shortcutkey.flash.exit.function = Zaostriť mimo Flash okna
 bbb.shortcutkey.users.muteme = 7
-# bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
+bbb.shortcutkey.users.muteme.function = Stlmte a vypnite stlmenie vášho mikrofónu
 bbb.shortcutkey.chat.chatinput = 73
-# bbb.shortcutkey.chat.chatinput.function = Focus the chat input field
+bbb.shortcutkey.chat.chatinput.function = Zaostriť na okno vstupu do chatu
 bbb.shortcutkey.present.focusslide = 67
-# bbb.shortcutkey.present.focusslide.function = Focus the presentation slide
+bbb.shortcutkey.present.focusslide.function = Zaostriť na prezentačný slajd
 bbb.shortcutkey.whiteboard.undo = 90
 bbb.shortcutkey.whiteboard.undo.function = Zmazať poslednú stopu na tabuli
 
 bbb.shortcutkey.focus.users = 49
-# bbb.shortcutkey.focus.users.function = Move focus to the Users window
-# bbb.shortcutkey.focus.video = 50
-# bbb.shortcutkey.focus.video.function = Move focus to the Webcam window
+bbb.shortcutkey.focus.users.function = Presunúť zaostrenie na okno užívateľov 
+bbb.shortcutkey.focus.video = 50
+bbb.shortcutkey.focus.video.function = Presunúť zaostrenie na okno webkamery
 bbb.shortcutkey.focus.presentation = 51
-# bbb.shortcutkey.focus.presentation.function = Move focus to the Presentation window
+bbb.shortcutkey.focus.presentation.function = Presunúť zaostrenie na okno prezentácie
 bbb.shortcutkey.focus.chat = 52
-# bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
+bbb.shortcutkey.focus.chat.function = Presunúť zaostrenie na okno chatu
 bbb.shortcutkey.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
+bbb.shortcutkey.focus.pollingCreate.function = Presunúť zaostrenie na okno vytvárania hlasovania, pokiaľ je otvorené.
 bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
+bbb.shortcutkey.focus.pollingStats.function = Presunúť zaostrenie na okno štatistiky o hlasovaní, pokiaľ je otvorené.
 bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
+bbb.shortcutkey.focus.voting.function = Presunúť zaostrenie na okno hlasovania, pokiaľ je otvorené.
 
 bbb.shortcutkey.share.desktop = 68
-# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
+bbb.shortcutkey.share.desktop.function = Otvoriť okno zdieľania obrazovky
 bbb.shortcutkey.share.microphone = 79
-# bbb.shortcutkey.share.microphone.function = Open audio settings window
+bbb.shortcutkey.share.microphone.function = Otvoriť okno nastavení zvuku
 bbb.shortcutkey.share.pauseRemoteStream = 80
 bbb.shortcutkey.share.pauseRemoteStream.function = Začať/skončiť počúvanie lekcie
 bbb.shortcutkey.share.webcam = 66
-# bbb.shortcutkey.share.webcam.function = Open webcam sharing window
+bbb.shortcutkey.share.webcam.function = Otvoriť okno zdieľania webkamery
 
-# bbb.shortcutkey.shortcutWindow = 72
-# bbb.shortcutkey.shortcutWindow.function = Open/focus to shortcut help window
-# bbb.shortcutkey.logout = 76
+bbb.shortcutkey.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Otvoriť/zaostriť na okno s pomocníkom klávesových skratiek
+bbb.shortcutkey.logout = 76
 bbb.shortcutkey.logout.function = Odhlásiť sa z tejto lekcie
 bbb.shortcutkey.raiseHand = 82
 bbb.shortcutkey.raiseHand.function = Zdvihnúť ruku
@@ -438,65 +439,65 @@ bbb.shortcutkey.present.fitPage = 80
 bbb.shortcutkey.present.fitPage.function = Prispôsobiť slajdy stránke
 
 bbb.shortcutkey.users.makePresenter = 80
-# bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
+bbb.shortcutkey.users.makePresenter.function = Urobiť vybranú osobu prezentérom
 bbb.shortcutkey.users.kick = 75
-# bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
+bbb.shortcutkey.users.kick.function = Vyhodiť vybranú osobu z lekcie
 bbb.shortcutkey.users.mute = 83
-# bbb.shortcutkey.users.mute.function = Mute or unmute selected person
+bbb.shortcutkey.users.mute.function = Stlmiť alebo vypnúť stlmenie vybranej osoby
 bbb.shortcutkey.users.muteall = 6
-# bbb.shortcutkey.users.muteall.function = Mute or unmute all users
+bbb.shortcutkey.users.muteall.function = Stlmiť alebo vypnúť stlmenie všetkých užívateľov
 bbb.shortcutkey.users.focusUsers = 85
-# bbb.shortcutkey.users.focusUsers.function = Focus to users list
+bbb.shortcutkey.users.focusUsers.function = Zaostriť na zoznam užívateľov
 bbb.shortcutkey.users.muteAllButPres = 6
-# bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
+bbb.shortcutkey.users.muteAllButPres.function = Stlmiť každého okrem prezentéra
 
 bbb.shortcutkey.chat.focusTabs = 89
-# bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
+bbb.shortcutkey.chat.focusTabs.function = Zaostriť na záložku chatu
 bbb.shortcutkey.chat.focusBox = 66
-# bbb.shortcutkey.chat.focusBox.function = Focus to chat box
+bbb.shortcutkey.chat.focusBox.function = Zaostriť na okno chatu
 bbb.shortcutkey.chat.changeColour = 67
-# bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.
+bbb.shortcutkey.chat.changeColour.function = Zaostriť na výber farby písma
 bbb.shortcutkey.chat.sendMessage = 83
 bbb.shortcutkey.chat.sendMessage.function = Poslať správu na chate
 bbb.shortcutkey.chat.explanation = ----
-# bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+bbb.shortcutkey.chat.explanation.function = Pre navigáciu v správe musíte zaostriť na okno chatu.
 
-# bbb.shortcutkey.chat.chatbox.advance = 40
-# bbb.shortcutkey.chat.chatbox.advance.function = Navigate to the next message
-# bbb.shortcutkey.chat.chatbox.goback = 38
-# bbb.shortcutkey.chat.chatbox.goback.function = Navigate to the previous message
-# bbb.shortcutkey.chat.chatbox.repeat = 32
-# bbb.shortcutkey.chat.chatbox.repeat.function = Repeat current message
-# bbb.shortcutkey.chat.chatbox.golatest = 39
-# bbb.shortcutkey.chat.chatbox.golatest.function = Navigate to the latest message
-# bbb.shortcutkey.chat.chatbox.gofirst = 37
-# bbb.shortcutkey.chat.chatbox.gofirst.function = Navigate to the first message
+bbb.shortcutkey.chat.chatbox.advance = 40
+bbb.shortcutkey.chat.chatbox.advance.function = Presunúť sa na ďalšiu správu
+bbb.shortcutkey.chat.chatbox.goback = 38
+bbb.shortcutkey.chat.chatbox.goback.function = Presunúť sa na predchádzajúcu správu
+bbb.shortcutkey.chat.chatbox.repeat = 32
+bbb.shortcutkey.chat.chatbox.repeat.function = Opakovať aktuálnu správu
+bbb.shortcutkey.chat.chatbox.golatest = 39
+bbb.shortcutkey.chat.chatbox.golatest.function = Navigovať k poslednej správe
+bbb.shortcutkey.chat.chatbox.gofirst = 37
+bbb.shortcutkey.chat.chatbox.gofirst.function = Navigovať k prvej správe
 bbb.shortcutkey.chat.chatbox.goread = 75
-# bbb.shortcutkey.chat.chatbox.goread.function = Navigate to the most recent message you've read
-# bbb.shortcutkey.chat.chatbox.debug = 71
-# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
+bbb.shortcutkey.chat.chatbox.goread.function = Navigovať k posledne prečítanej správe
+bbb.shortcutkey.chat.chatbox.debug = 71
+bbb.shortcutkey.chat.chatbox.debug.function = Dočasný kláves na odstránenie chýb
 
 bbb.polling.toolbar.toolTip = Ovládať hlasovanie
 bbb.polling.buttonName = Ovládať hlasovanie
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
+bbb.polling.createPoll = Vytvoriť nové hlasovanie
+bbb.polling.createPoll.moreThanOneResponse = Povoliť užívateľom vybrať viac ako jednu odpoveď
+bbb.polling.createPoll.hint = Nápoveda\: Začnite každú odpoveď v novom riadku
+bbb.polling.createPoll.answers = Odpovede\:
+bbb.polling.createPoll.question = Otázky\:
+bbb.polling.createPoll.title = Názov\:
+bbb.polling.createPoll.publishToWeb = Povolené webové hlasovanie
 
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
+bbb.polling.pollPreview = Ukážka hlasovania
+bbb.polling.pollPreview.modify = Upraviť
+bbb.polling.pollPreview.publish = Publikovať
+bbb.polling.pollPreview.preview = Náhľad
 bbb.polling.pollPreview.save = Uložiť
 bbb.polling.pollPreview.cancel = Zrušiť
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
+bbb.polling.pollPreview.modify = Upraviť
+bbb.polling.pollPreview.hereIsYourPoll = Tu je vaše hlasovanie\:
 bbb.polling.pollPreview.ifYouWantChanges = Pokiaľ chcete vykonať nejaké zmeny, kliknite na tlačidlo 'Upraviť'
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
+bbb.polling.pollPreview.checkAll = (zaškrknúť všetko čo sa hodí)
+bbb.polling.pollPreview.pollWillPublishOnline = Tento hlas bude dostupný na webové hlasovanie.
 
 bbb.polling.resultBtn.label=Výsledok
 bbb.polling.resultBtn.toolTip=Ukázať výsledok hlasovania
@@ -513,9 +514,9 @@ bbb.accessibility.alerts.madePresenter = Teraz ste prezentérom.
 bbb.accessibility.alerts.madeViewer = Teraz ste divákom.
 
 bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
+bbb.shortcutkey.polling.buttonClick.function = Otvoriť menu hlasovania.
 bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
+bbb.shortcutkey.polling.focusTitle.function = Zaostriť na okno vkladania názvu.
 bbb.shortcutkey.polling.focusQuestion = 8
 bbb.shortcutkey.polling.focusQuestion.function = Zamerajte sa na okno Kladenie otázok.
 bbb.shortcutkey.polling.focusAnswers = 6
@@ -523,17 +524,17 @@ bbb.shortcutkey.polling.focusAnswers.function = Zamerajte sa na okno Kladenie od
 bbb.shortcutkey.polling.focusMultipleCB = 7
 bbb.shortcutkey.polling.focusMultipleCB.function = Zamerajte sa na okno "Povoliť výber viacerých".
 bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
+bbb.shortcutkey.polling.focusWebPollCB.function = Zaostriť na možnosť "Povoliť webové hlasovanie".
 bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
+bbb.shortcutkey.polling.previewClick.function = Skontrolovať váš hlas a pokračovať.
 bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
+bbb.shortcutkey.polling.cancelClick.function = Zrušiť a vyjsť z vytvárania hlasovania.
 bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
+bbb.shortcutkey.polling.modify.function = Ísť späť a modifikovať váš hlas.
 bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
+bbb.shortcutkey.polling.publish.function = Publikovať váš hlas a otvoriť hlasovanie.
 bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
+bbb.shortcutkey.polling.save.function = Odložte si váš hlas na použitie neskôr.
 
 bbb.shortcutkey.pollStats.explanation = ----
 bbb.shortcutkey.pollStats.explanation.function = Výsledky hlasovania sú dostupné po publikovaní.
@@ -576,7 +577,7 @@ bbb.lockSettings.save.tooltip = Použiť nastavenia zámku
 bbb.lockSettings.cancel = Zrušiť
 bbb.lockSettings.cancel.toolTip = Zatvoriť okno bez ukladania
 
-# bbb.lockSettings.moderatorLocking = Moderator locking
+bbb.lockSettings.moderatorLocking = Zamknutie moderátorom
 bbb.lockSettings.privateChat = Súkromný chat
 bbb.lockSettings.publicChat = Verejný chat
 bbb.lockSettings.webcam = Webkamera
diff --git a/bigbluebutton-client/locale/sl_SI/bbbResources.properties b/bigbluebutton-client/locale/sl_SI/bbbResources.properties
index 822dac8909c7b0512a21d53ff43acba8ed3398a7..7177208b09e87c8bc58e36b19e650696a0971756 100644
--- a/bigbluebutton-client/locale/sl_SI/bbbResources.properties
+++ b/bigbluebutton-client/locale/sl_SI/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Pošlji sporočilo
 bbb.chat.publicChatUsername = Vse
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Izberite osebo, s katero želite zasebno klepetati
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Možnosti klepeta
 bbb.chat.fontSize = Velikost pisave
diff --git a/bigbluebutton-client/locale/sr_RS/bbbResources.properties b/bigbluebutton-client/locale/sr_RS/bbbResources.properties
index b04002aa14f7fbb97a4ee0146376f9d9e5271bc9..c40bde540bd4f85cad5c62b4b7912c1389912fd7 100644
--- a/bigbluebutton-client/locale/sr_RS/bbbResources.properties
+++ b/bigbluebutton-client/locale/sr_RS/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = Pošalji poruku
 bbb.chat.publicChatUsername = Sve
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Izaberite osobu sa kojom želite privatno ćaskati
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Podešavanja ćaskanja
 bbb.chat.fontSize = Veličina fonta
diff --git a/bigbluebutton-client/locale/sv_SE/bbbResources.properties b/bigbluebutton-client/locale/sv_SE/bbbResources.properties
index 417b0da9d381d0e43321e942116b19e4f6fb9416..552dc00c9b481f3445601b46c4683dd1f9f44b46 100644
--- a/bigbluebutton-client/locale/sv_SE/bbbResources.properties
+++ b/bigbluebutton-client/locale/sv_SE/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.accessibilityName = Sänd chattmeddelande
 bbb.chat.publicChatUsername = Alla
 bbb.chat.optionsTabName = Valmöjligheter
 bbb.chat.privateChatSelect = Välj en person att chatta med privat
-bbb.chat.private.userLeft = <b><i>Användaren har lämnat mötet.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Chattalternativ
 bbb.chat.fontSize = Textstorlek chattmeddelande
diff --git a/bigbluebutton-client/locale/th_TH/bbbResources.properties b/bigbluebutton-client/locale/th_TH/bbbResources.properties
index 8e933c5511549c67116e60596be7abfd0c80e859..b077aab98b8e2f602aeff99306781d3da83a6e6e 100644
--- a/bigbluebutton-client/locale/th_TH/bbbResources.properties
+++ b/bigbluebutton-client/locale/th_TH/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = ส่งข้อความ
 bbb.chat.publicChatUsername = ทั้งหมด
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = เลือกบุคคลเพื่อสนทนาแบบส่วนตัว
-# bbb.chat.private.userLeft = <b><i>The user has left.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = ตัวเลือกในการสนทนา
 bbb.chat.fontSize = ขนาดอักษร
diff --git a/bigbluebutton-client/locale/tr_TR/bbbResources.properties b/bigbluebutton-client/locale/tr_TR/bbbResources.properties
index 59a0b6c81208bae20a68a8f2cccd19345d1daf64..4e369f525114a9e489db09e404b2cf24ea7ce6c2 100644
--- a/bigbluebutton-client/locale/tr_TR/bbbResources.properties
+++ b/bigbluebutton-client/locale/tr_TR/bbbResources.properties
@@ -36,7 +36,7 @@ bbb.micSettings.comboMicList.toolTip = Mikrofonu seç
 bbb.micSettings.micRecordVolume.label = Sinyal Seviyesi
 bbb.micSettings.micRecordVolume.toolTip = Mikrofonun sinyal seviyesini ayarla
 bbb.micSettings.nextButton = Sonraki
-# bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.nextButton.toolTip = Yankı testini başlat
 bbb.micSettings.join = Sesli Katıl
 bbb.micSettings.join.toolTip = Sesli konferansa katıl
 bbb.micSettings.cancel = Vazgeç
@@ -50,8 +50,8 @@ bbb.micSettings.webrtc.capableBrowser = Tarayıcınızın WebRTC desteği vardı
 bbb.micSettings.webrtc.capableBrowser.dontuseit = WebRTC kullanmamak için tıklayın
 bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = WebRTC teknolojisini (kullanımda sıkıntı yaşıyorsanız önerilir) kullanmak istemiyorsanız buraya tıklayın.
 bbb.micSettings.webrtc.notCapableBrowser = Tarayıcınız için WebRTC desteği bulunmamaktadır. Lütfen Google Chrome (32 ya da üzeri sürümünü); ya da Mozilla Firefox (26 ya da üzeri sürümünü) kullanın. Bu rağmen Adobe Flash Platformunu kullanarak sesli konferansa katılabileceksiniz.
-# bbb.micSettings.webrtc.connecting = Calling
-# bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.connecting = Aranıyor
+bbb.micSettings.webrtc.waitingforice = Bağlanıyor
 bbb.micSettings.webrtc.endingecho = Sesli katılıyor
 bbb.micSettings.webrtc.endedecho = Ses testi sonlandı.
 bbb.micPermissions.firefox.title = Firefox Mikrofon Izinleri
@@ -152,7 +152,7 @@ bbb.presentation.fitToWidth.toolTip = Sunumu Genişliğe Sığdır
 bbb.presentation.fitToPage.toolTip = Sunumu Sayfaya Sığdır
 bbb.presentation.uploadPresBtn.toolTip = Sunum Yükle
 bbb.presentation.backBtn.toolTip = Önceki slayt.
-# bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.accessibilityName = Slayt {0} - {1}
 bbb.presentation.btnSlideNum.toolTip = Bir slayt seç
 bbb.presentation.forwardBtn.toolTip = Sonraki slayt
 bbb.presentation.maxUploadFileExceededAlert = Hata\: Dosya izin verilenden daha büyük.
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Tüm Metni Kopyala
 bbb.chat.publicChatUsername = Tümü
 bbb.chat.optionsTabName = Seçenekler
 bbb.chat.privateChatSelect = Özel yazışmak istediğiniz kişiyi seçin
-bbb.chat.private.userLeft = <b><i>Kullanıcı çıkış yaptı.</i></b>
+bbb.chat.private.userLeft = Kullanıcı çıkış yaptı.
+bbb.chat.private.userJoined = Kullanıcı giriş yaptı.
 bbb.chat.usersList.toolTip = Özel Sohbet için Kullanıcı Seç.
 bbb.chat.chatOptions = Sohbet Seçenekleri
 bbb.chat.fontSize = Sohbet Mesajı Yazı Boyutu
@@ -286,12 +287,12 @@ bbb.layout.combo.remote = Uzaktan
 bbb.layout.save.complete = Sayfa düzeni başarıyla kaydedildi
 bbb.layout.load.complete = Sayfa düzeni başarıyla yüklendi
 bbb.layout.load.failed = Sayfa düzeni yüklenemedi
-# bbb.layout.name.defaultlayout = Default Layout
-# bbb.layout.name.videochat = Video Chat
-# bbb.layout.name.webcamsfocus = Webcam Meeting
-# bbb.layout.name.presentfocus = Presentation Meeting
-# bbb.layout.name.lectureassistant = Lecture Assistant
-# bbb.layout.name.lecture = Lecture
+bbb.layout.name.defaultlayout = Varsayılan Görünüm
+bbb.layout.name.videochat = Video Görünümü
+bbb.layout.name.webcamsfocus = Web Kamerası Görünümü
+bbb.layout.name.presentfocus = Sunum Görünümü
+bbb.layout.name.lectureassistant = Ders Asistanı Görünümü
+bbb.layout.name.lecture = Ders Görünümü
 bbb.highlighter.toolbar.pencil = Kalem
 bbb.highlighter.toolbar.pencil.accessibilityName = Beyaz tahta imlecini kalem olarak deÄŸiÅŸtir
 bbb.highlighter.toolbar.ellipse = Daire
diff --git a/bigbluebutton-client/locale/uk_UA/bbbResources.properties b/bigbluebutton-client/locale/uk_UA/bbbResources.properties
index 1da20a7a6846807af47277a8d844a8113e4fe86a..7c06990f857d80703409f96a92f70baa8b17968c 100644
--- a/bigbluebutton-client/locale/uk_UA/bbbResources.properties
+++ b/bigbluebutton-client/locale/uk_UA/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = Копіювати весь текст
 bbb.chat.publicChatUsername = Всі
 bbb.chat.optionsTabName = Опції
 bbb.chat.privateChatSelect = Вибрати користувача для приватного спілкування
-bbb.chat.private.userLeft = <b><i>Користувач вийшов.</i></b>
+bbb.chat.private.userLeft = Користувач вийшов.
+bbb.chat.private.userJoined = Користувач приєднався.
 bbb.chat.usersList.toolTip = Щоб спілкуватися в особистих повідомленнях, натисніть на нік користувача
 bbb.chat.chatOptions = Налаштування чату
 bbb.chat.fontSize = Розмір шрифту чату
diff --git a/bigbluebutton-client/locale/vi_VN/bbbResources.properties b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
index 42cb753817730e284b1eba1a42a44891ac5a4613..a45b1bcbc4218fed0ccf1c3814c32b3c6fd57a17 100644
--- a/bigbluebutton-client/locale/vi_VN/bbbResources.properties
+++ b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.accessibilityName = Gửi tin nhắn tán gẫu
 bbb.chat.publicChatUsername = Tất cả
 bbb.chat.optionsTabName = Tuỳ chọn
 bbb.chat.privateChatSelect = Hãy chọn một người để nói chuyện riêng
-bbb.chat.private.userLeft = <b><i>Người dùng đã rời khỏi.</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = Tuỳ chọn Trò chuyện
 bbb.chat.fontSize = Kích thước Phông
diff --git a/bigbluebutton-client/locale/zh_CN/bbbResources.properties b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
index 45a17bb8191459f338de5f7224b56b93d9b6e96c..6ffc91eb62f1d587c08165242fd35d739549caca 100644
--- a/bigbluebutton-client/locale/zh_CN/bbbResources.properties
+++ b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.contextmenu.copyalltext = 复制所有文字
 bbb.chat.publicChatUsername = 所有
 bbb.chat.optionsTabName = 选择
 bbb.chat.privateChatSelect = 聊天窗口中选择私聊对象
-bbb.chat.private.userLeft = <b><i>用户已经离开。</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 bbb.chat.usersList.toolTip = 点击用户打开私聊窗口
 bbb.chat.chatOptions = 聊天选项
 bbb.chat.fontSize = 对话字体大小
diff --git a/bigbluebutton-client/locale/zh_TW/bbbResources.properties b/bigbluebutton-client/locale/zh_TW/bbbResources.properties
index 37a34bd729bb9281636c340080f2cdaba4a12dc7..ca7d9eb64ee37fb6a597342ef149b2967877ac26 100644
--- a/bigbluebutton-client/locale/zh_TW/bbbResources.properties
+++ b/bigbluebutton-client/locale/zh_TW/bbbResources.properties
@@ -205,7 +205,8 @@ bbb.chat.sendBtn.toolTip = 送出消息
 bbb.chat.publicChatUsername = 所有人
 # bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = 選擇私聊對象
-bbb.chat.private.userLeft = <b><i>用戶已經離開會議。</i></b>
+# bbb.chat.private.userLeft = The user has left.
+# bbb.chat.private.userJoined = The user has joined.
 # bbb.chat.usersList.toolTip = Click User To Open Private Chat
 bbb.chat.chatOptions = 聊天選項
 bbb.chat.fontSize = 字體大小
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index 633f13b4dabda33da84b135e53ef20d6ee8899c5..f7351de115514a070816b5c36fa34c65c6d03d24 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -23,7 +23,7 @@
 			uri="rtmp://HOST/bigbluebutton" 
 			dependsOn="UsersModule"	
 			privateEnabled="true"  
-			fontSize="10"
+			fontSize="12"
 			position="top-right"
 			baseTabIndex="701"
 			colorPickerIsVisible="false"
diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index ac2866f8cfd8f18aca98e692f48db5553276e11f..b9b35bbe4a1fc794203e6da4762ef5bb5be3d418 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -238,7 +238,7 @@ function webrtc_call(username, voiceBridge, callback) {
 		return;
 	}
 	
-	var server = window.document.location.host;
+	var server = window.document.location.hostname;
 	console.log("user " + username + " calling to " +  voiceBridge);
 	
 	if (!userAgent) {
diff --git a/deskshare/app/build.gradle b/deskshare/app/build.gradle
index 6baef85baa0b94169d8fa358f7bdd2cea84f6d52..532eaba930ea8fec01127a2921387d6eb8e331cf 100755
--- a/deskshare/app/build.gradle
+++ b/deskshare/app/build.gradle
@@ -75,27 +75,28 @@ dependencies {
   providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
 	
   // Spring 
-  providedCompile 'org.springframework:spring-web:4.0.7.RELEASE@jar' 
-  providedCompile  'org.springframework:spring-beans:4.0.7.RELEASE@jar'
-  providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
-  providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
+  providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' 
+  providedCompile  'org.springframework:spring-beans:4.0.8.RELEASE@jar'
+  providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar'
+  providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar'
   
 	// Red5
-	providedCompile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar'
-	providedCompile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar'
+	providedCompile 'org/red5:red5-server:1.0.4-RELEASE@jar'
+	providedCompile 'org.red5:red5-io:1.0.4-RELEASE@jar'
+	providedCompile 'org/red5:red5-server-common:1.0.4-RELEASE@jar'
 	
 	// Logging
 	providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
 	providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar'
-	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:jul-to-slf4j:1.7.7@jar'
-	providedCompile 'org.slf4j:slf4j-api:1.7.7@jar'
+	providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
+	providedCompile 'org.slf4j:slf4j-api:1.7.9@jar'
 
 
   // Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
   // Otherwise we get exception on aop utils class not found.
-  providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar'
+  providedCompile 'org.springframework:spring-aop:4.0.8.RELEASE@jar'
   providedCompile 'aopalliance:aopalliance:1.0@jar'
 	        
   // Testing
diff --git a/deskshare/app/src/main/resources/logback-deskshare.xml b/deskshare/app/src/main/resources/logback-deskshare.xml
index 73904c323003a1b838587c79cb75f8930d6f55ab..323ffbde0cf17b5740c7f322abef7cbd5da9d7d9 100755
--- a/deskshare/app/src/main/resources/logback-deskshare.xml
+++ b/deskshare/app/src/main/resources/logback-deskshare.xml
@@ -5,8 +5,8 @@
     
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <FileNamePattern>log/deskshare-slf.%d{yyyy-MM-dd}.log</FileNamePattern>
-      <!-- keep 5 days worth of history -->
-      <MaxHistory>5</MaxHistory>
+      <!-- keep 30 days worth of history -->
+      <MaxHistory>30</MaxHistory>
     </rollingPolicy>
 
     <encoder>
diff --git a/deskshare/build.gradle b/deskshare/build.gradle
index ec2c584c31a5a60a45911b5e991c720fed9792c6..c932e0b49c1527054e03404837627e9e3fb043c3 100755
--- a/deskshare/build.gradle
+++ b/deskshare/build.gradle
@@ -73,26 +73,27 @@ dependencies {
   compile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
 	
   // Spring 
-  compile 'org.springframework:spring-web:4.0.7.RELEASE@jar' 
-  compile  'org.springframework:spring-beans:4.0.7.RELEASE@jar'
-  compile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
-  compile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
+  compile 'org.springframework:spring-web:4.0.8.RELEASE@jar' 
+  compile  'org.springframework:spring-beans:4.0.8.RELEASE@jar'
+  compile 'org.springframework:spring-context:4.0.8.RELEASE@jar'
+  compile 'org.springframework:spring-core:4.0.8.RELEASE@jar'
 	
 	// Red5
-	compile 'org/red5:red5-server:1.0.4-SNAPSHOT@jar'
-	compile 'org.red5:red5-io:1.0.4-SNAPSHOT@jar'
+	compile 'org/red5:red5-server:1.0.4-RELEASE@jar'
+	compile 'org.red5:red5-io:1.0.4-RELEASE@jar'
+	compile 'org/red5:red5-server-common:1.0.4-RELEASE@jar'
 	
 	// Logging
 	compile 'ch.qos.logback:logback-core:1.1.2@jar'
 	compile 'ch.qos.logback:logback-classic:1.1.2@jar'
-	compile 'org.slf4j:log4j-over-slf4j:1.7.7@jar'
-	compile 'org.slf4j:jcl-over-slf4j:1.7.7@jar'
-	compile 'org.slf4j:jul-to-slf4j:1.7.7@jar'
-	compile 'org.slf4j:slf4j-api:1.7.7@jar'
+	compile 'org.slf4j:log4j-over-slf4j:1.7.9@jar'
+	compile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
+	compile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
+	compile 'org.slf4j:slf4j-api:1.7.9@jar'
 
 	// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
 	// Otherwise we get exception on aop utils class not found.
-	compile 'org.springframework:spring-aop:4.0.7.RELEASE@jar'
+	compile 'org.springframework:spring-aop:4.0.8.RELEASE@jar'
 	compile 'aopalliance:aopalliance:1.0@jar'
 	        
   // Testing