diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
index d5562595647c8e667561507bed7284bc40f206ea..ce1c25bb2329733c64c0dad0034ac1260f29e624 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
@@ -79,6 +79,9 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
 		for (IConnection conn : conns) {
 			String connUserId = (String) conn.getAttribute("USERID");
 			String connSessionId = conn.getSessionId();
+			String clientId = conn.getClient().getId();
+			String remoteHost = conn.getRemoteAddress();
+			int remotePort = conn.getRemotePort();
 			if (connUserId != null && connUserId.equals(userId) && !connSessionId.equals(sessionId)) {
 				conn.removeAttribute("USERID");
 				Map<String, Object> logData = new HashMap<String, Object>();
@@ -86,6 +89,8 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
 				logData.put("userId", userId);
 				logData.put("oldConnId", connSessionId);
 				logData.put("newConnId", sessionId);
+				logData.put("clientId", clientId);
+				logData.put("remoteAddress", remoteHost + ":" + remotePort);
 				logData.put("event", "removing_defunct_connection");
 				logData.put("description", "Removing defunct connection BBB Video.");
 
@@ -96,11 +101,17 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
 			  }
 		  }
 
+	  String remoteHost = Red5.getConnectionLocal().getRemoteAddress();
+	  int remotePort = Red5.getConnectionLocal().getRemotePort();
+	  String clientId = Red5.getConnectionLocal().getClient().getId();
+
 		Map<String, Object> logData = new HashMap<String, Object>();
 		logData.put("meetingId", meetingId);
 		logData.put("userId", userId);
 		logData.put("connType", connType);
 		logData.put("connId", sessionId);
+	  logData.put("clientId", clientId);
+	  logData.put("remoteAddress", remoteHost + ":" + remotePort);
 		logData.put("event", "user_joining_bbb_video");
 		logData.put("description", "User joining BBB Video.");
 
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
index ee600aab123798fba46d0dfd44e3963eba47a1ec..d508fa1f8f88316f7d5977935295fffc5e1d1673 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
@@ -138,6 +138,9 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
 		for (IConnection conn : conns) {
 			String connUserId = (String) conn.getAttribute("INTERNAL_USER_ID");
 			String connSessionId = conn.getSessionId();
+			String clientId = conn.getClient().getId();
+			String remoteHost = connection.getRemoteAddress();
+			int remotePort = connection.getRemotePort();
 			if (connUserId != null && connUserId.equals(userId) && !connSessionId.equals(sessionId)) {
 				conn.removeAttribute("INTERNAL_USER_ID");
 				Map<String, Object> logData = new HashMap<String, Object>();
@@ -145,6 +148,8 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
 				logData.put("userId", userId);
 				logData.put("oldConnId", connSessionId);
 				logData.put("newConnId", sessionId);
+				logData.put("clientId", clientId);
+				logData.put("remoteAddress", remoteHost + ":" + remotePort);
 				logData.put("event", "removing_defunct_connection");
 				logData.put("description", "Removing defunct connection BBB Apps.");
 
@@ -173,14 +178,15 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
 	    String connId = Red5.getConnectionLocal().getSessionId();	        
 		
 		String remoteHost = Red5.getConnectionLocal().getRemoteAddress();
-		int remotePort = Red5.getConnectionLocal().getRemotePort();   
-
+		int remotePort = Red5.getConnectionLocal().getRemotePort();
+		String clientId = Red5.getConnectionLocal().getClient().getId();
 
 		Map<String, Object> logData = new HashMap<String, Object>();
 		logData.put("meetingId", meetingId);
 		logData.put("connType", connType);
 		logData.put("connId", connId);
-		logData.put("conn", remoteHost + ":" + remotePort);
+		logData.put("clientId", clientId);
+		logData.put("remoteAddress", remoteHost + ":" + remotePort);
 		logData.put("userId", userId);
 		logData.put("externalUserId", externalUserID);
 		logData.put("sessionId", sessionId);
@@ -222,14 +228,15 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
 	    String connType = getConnectionType(Red5.getConnectionLocal().getType());
 	    String userFullname = bbbSession.getUsername();
 	    String connId = Red5.getConnectionLocal().getSessionId();
-	    
+		String clientId = Red5.getConnectionLocal().getClient().getId();
         String sessionId =  CONN + userId;
 	    	    
 	    Map<String, Object> logData = new HashMap<String, Object>();
 	    logData.put("meetingId", meetingId);
 	    logData.put("connType", connType);
 	    logData.put("connId", connId);
-	    logData.put("conn", remoteHost + ":" + remotePort);
+		logData.put("clientId", clientId);
+		logData.put("remoteAddress", remoteHost + ":" + remotePort);
 	    logData.put("sessionId", sessionId);
 	    logData.put("userId", userId);
 	    logData.put("username", userFullname);
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
index 0ce096841767dd6d51ebc08023cdf18277e9f904..2d23b2118c7bbf49c41e6262b7571179ec8610e0 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
@@ -145,8 +145,8 @@ public class ConnectionInvokerService {
   private void handlDisconnectClientMessage(DisconnectClientMessage msg) {
     IScope meetingScope = getScope(msg.getMeetingId());
     if (meetingScope != null) {
-      String sessionId = CONN + msg.getUserId();
-      IConnection conn = getConnection(meetingScope, sessionId);
+      String userId = msg.getUserId();
+      IConnection conn = getConnection(meetingScope, userId);
       if (conn != null) {
         if (conn.isConnected()) {
           log.info("Disconnecting user=[{}] from meeting=[{}]", msg.getUserId(), msg.getMeetingId());
diff --git a/bigbluebutton-client/locale/.gitignore b/bigbluebutton-client/locale/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0bdf92cab5ebc8ea287dde5e8ad06feca49392b1
--- /dev/null
+++ b/bigbluebutton-client/locale/.gitignore
@@ -0,0 +1,2 @@
+.tx
+
diff --git a/bigbluebutton-client/locale/am_ET/bbbResources.properties b/bigbluebutton-client/locale/am_ET/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/am_ET/bbbResources.properties
+++ b/bigbluebutton-client/locale/am_ET/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ar_EG/bbbResources.properties b/bigbluebutton-client/locale/ar_EG/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/ar_EG/bbbResources.properties
+++ b/bigbluebutton-client/locale/ar_EG/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ar_SA/bbbResources.properties b/bigbluebutton-client/locale/ar_SA/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/ar_SA/bbbResources.properties
+++ b/bigbluebutton-client/locale/ar_SA/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/az_AZ/bbbResources.properties b/bigbluebutton-client/locale/az_AZ/bbbResources.properties
index f9fa10dc6bb6cf6a254103b22c39b0c298f56994..2ee8230ab859f07b1911151c7e9197de070e959a 100644
--- a/bigbluebutton-client/locale/az_AZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/az_AZ/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentasiya
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = İşçi masasını göstər
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Pəncərə paylaşması
-bbb.desktopView.fitToWindow = Pəncərə boyda et
-bbb.desktopView.actualSize = Aktual ölçüyə gətir
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/be_BY/bbbResources.properties b/bigbluebutton-client/locale/be_BY/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/be_BY/bbbResources.properties
+++ b/bigbluebutton-client/locale/be_BY/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/bg_BG/bbbResources.properties b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
index b852e61ce2a1aee4247700eb1762908106a0304c..6093b85061f2d499856c3d94c72adbd46ab630ec 100644
--- a/bigbluebutton-client/locale/bg_BG/bbbResources.properties
+++ b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
@@ -43,7 +43,7 @@ bbb.micSettings.cancel = Отмени
 bbb.micSettings.connectingtoecho = Свързване
 bbb.micSettings.connectingtoecho.error = Изпробването на аудиото се провали. Потърсете помощ от техник
 bbb.micSettings.cancel.toolTip = Отмени присъединяването към разговора
-bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.helpButton = Информация (виж инструкциите в нов прозорец)
 bbb.micSettings.access.title = Аудио настройки. Фокусът ще остане в този прозорец за аудио настройки, докато прозорецът се затвори.
 bbb.micSettings.webrtc.title = Поддръжка на WebRTC
 bbb.micSettings.webrtc.capableBrowser = Вашият браузър поддържа WebRTC.
@@ -52,7 +52,7 @@ bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Моля натисн
 bbb.micSettings.webrtc.notCapableBrowser = Вашият браузър не поддържа WebRTC. Моля използвайте Google Chrome (версия 32  или по-скорошна); или Mozilla Firefox (версия 26 или по-скорошна). Все пак ще можете да се включите в разговора чрез Adobe Flash Platform.
 bbb.micSettings.webrtc.connecting = Обаждане
 bbb.micSettings.webrtc.waitingforice = Свързване
-bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.transferring = В процес на трансфер
 bbb.micSettings.webrtc.endingecho = Свързване към аудиото
 bbb.micSettings.webrtc.endedecho = Изпробването на аудиото приключи.
 bbb.micPermissions.firefox.title = Разрешения за микрофон под Firefox
@@ -105,7 +105,7 @@ bbb.mainToolbar.recordingLabel.recording = (Записва се)
 bbb.mainToolbar.recordingLabel.notRecording = Не се записва
 bbb.clientstatus.title = Настройки на известията
 bbb.clientstatus.notification = Непрочетени известия
-bbb.clientstatus.close = Close
+bbb.clientstatus.close = Затвори
 bbb.clientstatus.tunneling.title = Firewall
 bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
 bbb.clientstatus.browser.title = Browser Version
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Флаш плейър
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Аудио
 bbb.clientstatus.webrtc.message = За по-добър звук, моля използвайте браузър Firefox или Chrome.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Минимизирай
 bbb.window.maximizeRestoreBtn.toolTip = Увеличи
 bbb.window.closeBtn.toolTip = Затвори
@@ -135,8 +131,8 @@ bbb.users.settings.webcamSettings = Настройки на камерата
 bbb.users.settings.muteAll = Заглушете всички
 bbb.users.settings.muteAllExcept = Заглушете всички с изключение на лектора
 bbb.users.settings.unmuteAll = Позволете на всички да говорят
-bbb.users.settings.clearAllStatus = Clear all status icons
-bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.settings.clearAllStatus = Заличи всички статуси
+bbb.users.emojiStatusBtn.toolTip = Промени моя статус
 bbb.users.roomMuted.text = Потребителите не могат да говорят
 bbb.users.roomLocked.text = Потребителите са заключени
 bbb.users.pushToTalk.toolTip = Щракнете, за да говорите
@@ -145,7 +141,7 @@ bbb.users.muteMeBtnTxt.talk = Позволете говор
 bbb.users.muteMeBtnTxt.mute = Заглушете
 bbb.users.muteMeBtnTxt.muted = Заглушен
 bbb.users.muteMeBtnTxt.unmuted = Позволен да говори
-bbb.users.usersGrid.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.contextmenu.exportusers = Копирай имената на потребителите
 bbb.users.usersGrid.accessibilityName = Потребителски списък. Използвайте клавишите със стрелки, за да навигирате.
 bbb.users.usersGrid.nameItemRenderer = Име
 bbb.users.usersGrid.nameItemRenderer.youIdentifier = Вие
@@ -153,10 +149,10 @@ bbb.users.usersGrid.statusItemRenderer = Статус
 bbb.users.usersGrid.statusItemRenderer.changePresenter = Натиснете тук за да презентирате
 bbb.users.usersGrid.statusItemRenderer.presenter = Лектор
 bbb.users.usersGrid.statusItemRenderer.moderator = Модератор
-bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Заличи статус
 bbb.users.usersGrid.statusItemRenderer.viewer = Наблюдаващ
-bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
-bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Сподели уебкамера
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Лектор
 bbb.users.usersGrid.mediaItemRenderer = Медия
 bbb.users.usersGrid.mediaItemRenderer.talking = Говорене
 bbb.users.usersGrid.mediaItemRenderer.webcam = Споделена камера
@@ -170,17 +166,20 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Споделена камера
 bbb.users.usersGrid.mediaItemRenderer.micOff = Изкл. микрофон
 bbb.users.usersGrid.mediaItemRenderer.micOn = Вкл. микрофон
 bbb.users.usersGrid.mediaItemRenderer.noAudio = Не е аудио конференция
-bbb.users.emojiStatus.clear = Clear
-bbb.users.emojiStatus.clear.toolTip = Clear status
-bbb.users.emojiStatus.close = Close
+bbb.users.emojiStatus.clear = Изчисти
+bbb.users.emojiStatus.clear.toolTip = Изчисти статуса
+bbb.users.emojiStatus.close = Затвори
 bbb.users.emojiStatus.close.toolTip = Close status popup
-bbb.users.emojiStatus.raiseHand = Raise hand status
-bbb.users.emojiStatus.happy = Happy status
-bbb.users.emojiStatus.smile = Smile status
-bbb.users.emojiStatus.sad = Sad status
-bbb.users.emojiStatus.confused = Confused status
-bbb.users.emojiStatus.neutral = Neutral status
-bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.raiseHand = Вдигни ръка
+bbb.users.emojiStatus.happy = Щастлив
+bbb.users.emojiStatus.smile = Усмивка
+bbb.users.emojiStatus.sad = Тъга
+bbb.users.emojiStatus.confused = Объркване
+bbb.users.emojiStatus.neutral = Безизразен
+bbb.users.emojiStatus.away = Недостъпен
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Презентация
 bbb.presentation.titleWithPres = Презентация\: {0}
 bbb.presentation.quickLink.label = Прозорец за презентацията
@@ -196,7 +195,7 @@ bbb.presentation.uploadcomplete = Качването завърши. Моля, 
 bbb.presentation.uploaded = качено.
 bbb.presentation.document.supported = Каченият документ се поддържа. Започва конвертиране...
 bbb.presentation.document.converted = Успешно конвертиране на офис документа.
-bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.document.convert.failed = Грешка\: Документът не се конвертира успешно.
 bbb.presentation.error.io = IO Грешка\: Моля, свържете се с администратор.
 bbb.presentation.error.security = Грешка в сигурността\: Моля, свържете се с администратор.
 bbb.presentation.error.convert.notsupported = Грешка\: Каченият документ не се поддържа. Моля, заредете съвместим файл.
@@ -244,7 +243,7 @@ bbb.chat.privateChatSelect = Прозорец Чат Избери лице за
 bbb.chat.private.userLeft = Потребителят е напуснал.
 bbb.chat.private.userJoined = The user has joined.
 bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
-bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.usersList.toolTip = Избери потребител за директно съобщение
 bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
 bbb.chat.chatOptions = Прозорец Чат Чат опции
 bbb.chat.fontSize = Прозорец Чат Големина на шрифта
@@ -254,7 +253,7 @@ bbb.chat.minimizeBtn.accessibilityName = Минимизирайте прозор
 bbb.chat.maximizeRestoreBtn.accessibilityName = Максимизирайте прозорец Чат
 bbb.chat.closeBtn.accessibilityName = Затворете прозорец Чат
 bbb.chat.chatTabs.accessibleNotice = Новите съобщения се показват тук.
-bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.systemMessage = Система
 bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
 bbb.publishVideo.changeCameraBtn.labelText = Смяна на камерата
 bbb.publishVideo.changeCameraBtn.toolTip = Прозорец за избиране на видео камера
@@ -278,43 +277,76 @@ bbb.video.publish.hint.waitingApproval = Изчакване за одобрен
 bbb.video.publish.hint.videoPreview = Преглед на видео
 bbb.video.publish.hint.openingCamera = Отваряне на камера...
 bbb.video.publish.hint.cameraDenied = Няма достъп до камерата
-bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.cameraIsBeingUsed = Вашата уебкамера не  е достъпна - свързана  е с друга програма в момента
 bbb.video.publish.hint.publishing = Публикуване...
 bbb.video.publish.closeBtn.accessName = Прозорец Уебкамера Затвори прозорец
 bbb.video.publish.closeBtn.label = Отмени
 bbb.video.publish.titleBar = Прозорец Публикуване на камера
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Споделяне на екрана\: Представяне на Презентатора
-bbb.desktopPublish.fullscreen.tooltip = Споделете екрана си
-bbb.desktopPublish.fullscreen.label = На цял екран
-bbb.desktopPublish.region.tooltip = Сподели част от екрана си
-bbb.desktopPublish.region.label = Област
-bbb.desktopPublish.stop.tooltip = Затвори екрана за споделяне
-bbb.desktopPublish.stop.label = Затвори
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Вие не можете да разширите този прозорец.
-bbb.desktopPublish.closeBtn.toolTip = Спиране на споделянето и затваряне
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Минимизиране
-bbb.desktopPublish.minimizeBtn.accessibilityName = Минимизиране на прозореца Публикуване на споделен екран
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Увеличи прозорец Публикуване на споделен екран
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Споделяне на екрана
-bbb.desktopView.fitToWindow = Вмести в прозореца
-bbb.desktopView.actualSize = Покажи в реален размер
-bbb.desktopView.minimizeBtn.accessibilityName = Минимизирай прозорец Преглед на споделен екран
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Увеличи прозорец Преглед на споделен екран
-bbb.desktopView.closeBtn.accessibilityName = Затвори прозорец Преглед на споделен екран
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Минимизирай
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Начало
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Споделяне на екрана
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Споделете микрофона
 bbb.toolbar.phone.toolTip.stop = Прекратете споделянето на микрофона си
 bbb.toolbar.phone.toolTip.mute = Спрете да слушате аудиото.
 bbb.toolbar.phone.toolTip.unmute = Слушайте аудиото.
 bbb.toolbar.phone.toolTip.nomic = Не бе намерен микрофон
-bbb.toolbar.deskshare.toolTip.start = Споделете екрана си
-bbb.toolbar.deskshare.toolTip.stop = Спрете да споделяте екрана си
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Споделете камерата си
 bbb.toolbar.video.toolTip.stop = Прекратете споделянето на камерата си
 bbb.layout.addButton.toolTip = Добави потребителски изглед към списъка
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Изгледите бяха успешно съхра
 bbb.layout.load.complete = Изгледите бяха успешно заредени
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Стандартен изглед
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Видео Чат
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = Връзката до сървъра беше отказа
 bbb.logout.invalidapp = Приложението red5 не съществува
 bbb.logout.unknown = Вашият клиент е загубил връзка със сървъра
 bbb.logout.usercommand = Вие сте излезли от конференцията
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = Ако изходът от системата е неочакван, натиснете бутона по-долу, за да се свържете повторно.
 bbb.logout.refresh.label = Повторно свързване
@@ -374,7 +408,7 @@ bbb.connection.reconnecting=Reconnecting
 bbb.connection.reestablished=Connection reestablished
 bbb.connection.bigbluebutton=BigBlueButton
 bbb.connection.sip=SIP
-bbb.connection.video=Video
+bbb.connection.video=Видео
 bbb.connection.deskshare=Deskshare
 bbb.notes.title = Бележки
 bbb.notes.cmpColorPicker.toolTip = Цвят на текста
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Съхрани бележката
 bbb.settings.deskshare.instructions = Кликни "Allow", когато изкочи, за проверка на правилната работа на споделянето на работния плот
 bbb.settings.deskshare.start = Проверете споделянето на работният екран
 bbb.settings.voice.volume = Микрофон
-bbb.settings.java.label = Грешка на Java версията
-bbb.settings.java.text = Имате инсталирана Java версия {0}, но трябва да имате инсталирана версия поне {1}, за да използвате споделяне на екрана през BigBlueButton. Щракнете бутона по-долу, за да инсталирате най-новата версия на Java JRE.
-bbb.settings.java.command = Инсталирайте най-новата версия на Java
 bbb.settings.flash.label = Грешка на Flash версията
 bbb.settings.flash.text = Имате инсталирана Flash версия {0}, но трябва да имате инсталирана версия поне {1}, за да използвате споделяне на екрана през BigBlueButton. Щракнете бутона по-долу, за да инсталирате най-новата версия на Adobe Flash.
 bbb.settings.flash.command = Инсталирайте най-новия Flash
@@ -404,8 +435,31 @@ ltbcustom.bbb.highlighter.toolbar.text = Текст
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Превключи от курсор към текст
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Цвят на текст
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Размер на шрифта
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
 
-bbb.accessibility.clientReady = Ready
+
+bbb.accessibility.clientReady = В готовност
 
 bbb.accessibility.chat.chatBox.reachedFirst = Достигнали сте до първото съобщение.
 bbb.accessibility.chat.chatBox.reachedLatest = Достигнали сте до последното съобщение.
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Минимизирай текущи
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Максимизирай текущия прозорец
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Фокусирайте върху прозореца Флаш
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Заглушете или позволете вашия микрофон
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Преместете фокусът вър
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Отворете прозорецът за споделяне на работния екран
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Отворете прозорецът за настройки на микрофона
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Започнете/Спрете да слушате аудиото
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Отворете прозорецът за споделяне на камерата
 
@@ -533,18 +583,18 @@ bbb.polling.pollModal.title = Live Poll Results
 bbb.polling.customChoices.title = Enter Polling Choices
 bbb.polling.respondersLabel.novotes = Waiting for responses
 bbb.polling.respondersLabel.text = {0} Users Responded
-bbb.polling.respondersLabel.finished = Done
+bbb.polling.respondersLabel.finished = Готово
 bbb.polling.answer.Yes = Да
 bbb.polling.answer.No = Не
-bbb.polling.answer.True = True
-bbb.polling.answer.False = False
-bbb.polling.answer.A = A
-bbb.polling.answer.B = B
-bbb.polling.answer.C = C
-bbb.polling.answer.D = D
-bbb.polling.answer.E = E
-bbb.polling.answer.F = F
-bbb.polling.answer.G = G
+bbb.polling.answer.True = Вярно
+bbb.polling.answer.False = Грешно
+bbb.polling.answer.A = А
+bbb.polling.answer.B = Б
+bbb.polling.answer.C = Ð’
+bbb.polling.answer.D = Г
+bbb.polling.answer.E = Д
+bbb.polling.answer.F = Е
+bbb.polling.answer.G = Ж
 bbb.polling.results.accessible.header = Poll Results.
 bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Затвори всички ви
 bbb.users.settings.lockAll=Заключи всички потребители
 bbb.users.settings.lockAllExcept=Заключи всички потребители без презентиращия.
 bbb.users.settings.lockSettings=Заключи всички потребители
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Отключи всички потребители
 bbb.users.settings.roomIsLocked=Заключено по подразбиране
 bbb.users.settings.roomIsMuted=Заглушен по подразбиране
@@ -583,5 +635,36 @@ bbb.lockSettings.microphone = Микрофон
 bbb.lockSettings.layout = Изглед
 bbb.lockSettings.title=Заключи потребителите
 bbb.lockSettings.feature=Функционалност
-bbb.lockSettings.locked=Locked
-bbb.lockSettings.lockOnJoin=Lock On Join
+bbb.lockSettings.locked=Заключен
+bbb.lockSettings.lockOnJoin=Заключи при свързване
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Стаи
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Стая
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Лимит
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Минути
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Начало
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Затвори
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Стая
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/bn_IN/bbbResources.properties b/bigbluebutton-client/locale/bn_IN/bbbResources.properties
index 2f2e785f8fb417bc84189711f38a68b754a84482..6a3a345ad625c76ea19446f39eef5ce832e41c89 100644
--- a/bigbluebutton-client/locale/bn_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/bn_IN/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/bs_BA/bbbResources.properties b/bigbluebutton-client/locale/bs_BA/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/bs_BA/bbbResources.properties
+++ b/bigbluebutton-client/locale/bs_BA/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ca_ES/bbbResources.properties b/bigbluebutton-client/locale/ca_ES/bbbResources.properties
index e752323a4b7eb4448befb1fc9063bf5b7ebaa05c..9708f332d88f0f339fb9e2c9547a5d575ad58c3e 100644
--- a/bigbluebutton-client/locale/ca_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/ca_ES/bbbResources.properties
@@ -43,7 +43,7 @@ bbb.micSettings.cancel = Cancel
 bbb.micSettings.connectingtoecho = Connecting
 bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
 bbb.micSettings.cancel.toolTip = Cancel·lar la unió a la conferència d'àudio
-bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.helpButton = Ajuda (obrir videotutorials en una pàgina nova) 
 bbb.micSettings.access.title = Configuracions d'Àudio. Aquesta finestra romandrà enfocada fins que es tanqui la mateixa.
 bbb.micSettings.webrtc.title = WebRTC Support
 bbb.micSettings.webrtc.capableBrowser = Your browser supports WebRTC.
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimitzar
 bbb.window.maximizeRestoreBtn.toolTip = Maximitzar
 bbb.window.closeBtn.toolTip = Tancar
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentació
 bbb.presentation.titleWithPres = Presentació\: {0}
 bbb.presentation.quickLink.label = Finestra de Presentació
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Tancar la finestra de configuracions de
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Finestra d'iniciació de la càmera web
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Compartir Pantalla\: Previsualització del presentador
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Pantalla completa
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Regió
-bbb.desktopPublish.stop.tooltip = Aturar la compartició de pantalla
-bbb.desktopPublish.stop.label = Tancar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = No pot maximitzar aquesta finestra.
-bbb.desktopPublish.closeBtn.toolTip = Aturar la compartició i tancar aquesta finestra.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimitzar aquesta finestra.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimitzar la finestra d'iniciar el compartir escriptori
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximitzar la finestra d'iniciar el compartir escriptori
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Compartició de pantalla
-bbb.desktopView.fitToWindow = Ajustar a la finestra
-bbb.desktopView.actualSize = Mostrar la mida actual
-bbb.desktopView.minimizeBtn.accessibilityName = Minimitzar la Finestra de Compartir Escriptori
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximitzar la Finestra de Compartir Escriptori
-bbb.desktopView.closeBtn.accessibilityName = Tancar la Finestra de Compartir Escriptori
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Share Your Webcam
 bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam
 bbb.layout.addButton.toolTip = Afegir el disseny personalitzat a la llista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Els dissenys van ser guardats amb èxit
 bbb.layout.load.complete = Els dissenys van ser carregats
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = La connexió amb el servidor ha estat rebutjada
 bbb.logout.invalidapp = No existeix l'aplicació Red5
 bbb.logout.unknown = S'ha perdut la connexió amb el servidor
 bbb.logout.usercommand = Ha desconnectat de la conferència
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Guardar Nota
 bbb.settings.deskshare.instructions = Premeu Permetre a la finestra emergent per verificar que la compartició del escriptori us està funcionant adequadament
 bbb.settings.deskshare.start = Comprovar Compartició de pantalla
 bbb.settings.voice.volume = Activitat del micròfon
-bbb.settings.java.label = Error de versió de Java
-bbb.settings.java.text = Disposa de Java {0} instal · lat, però necessita almenys {1} per a utilitzar la funcionalitat Compartir Pantalla. Premi el botó per actualitzar la seva versió de Java JRE.
-bbb.settings.java.command = Actualitzar Java
 bbb.settings.flash.label = Error de versió de Flash
 bbb.settings.flash.text = Disposa de Flash {0}, però necessita almenys {1} per a utilitzar la videoconferència. Premi el botó per actualitzar la seva versió de Adobe Flash.
 bbb.settings.flash.command = Actualitzar Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Canviar Cursos de pissarra a text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Color de text
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Mida de font
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimitzar finestra actual
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximitzar finestra actual
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Desenfocar de la finestra de flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Activar o Desactivar el so del teu micròfon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Moure enfocament a la venda de xat
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Obrir la finestra de compartir escriptori
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Obrir la finestra de configuració del micròfon
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Obrir finestra per compartir càmera
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
index 20fb83afaaba9a859a8503809e86b242e32a35e3..5c59649101997c14f792d48f258d25058be6a235 100644
--- a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash přehrávač
 bbb.clientstatus.flash.message = Váš Flash přehrávač plugin ({0}) je zastaralý. Doporučujeme aktualizovat na poslední verzi.
 bbb.clientstatus.webrtc.title = Zvuk
 bbb.clientstatus.webrtc.message = Pro lepší zvuk doporučujeme Firefox nebo Chrome.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Verze Javy nebyla detekována
-bbb.clientstatus.java.notinstalled = Nemáte nainstalovánu Javu, klikněte prosím <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ZDE</a></font> pro instalaci Javy používané při sdílení pracovní plochy.
-bbb.clientstatus.java.oldversion = Máte starou verzi Javy, klikněte prosím <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ZDE</a></font> pro instalaci Javy používané při sdílení pracovní plochy.
 bbb.window.minimizeBtn.toolTip = Minimalizovat
 bbb.window.maximizeRestoreBtn.toolTip = Maximalizovat
 bbb.window.closeBtn.toolTip = Zavřít
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Stav "smutný"
 bbb.users.emojiStatus.confused = Stav "zmatený"
 bbb.users.emojiStatus.neutral = Stav "neutrální"
 bbb.users.emojiStatus.away = Stav "pryč"
+bbb.users.emojiStatus.thumbsUp = Stav "palec nahoru"
+bbb.users.emojiStatus.thumbsDown = Stav "palec dolu"
+bbb.users.emojiStatus.applause = Stav "tleskám"
 bbb.presentation.title = Prezentace
 bbb.presentation.titleWithPres = Prezentace\: {0}
 bbb.presentation.quickLink.label = Okno prezentace
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Zavřít dialogové okno pro nastavení
 bbb.video.publish.closeBtn.label = Zrušit
 bbb.video.publish.titleBar = Okno zveřejnění webové kamery
 bbb.video.streamClose.toolTip = Ukončit stream pro\: {0}
-bbb.desktopPublish.title = Sdílení plochy\: Náhled prezentujícího
-bbb.desktopPublish.fullscreen.tooltip = Sdílet Vaší hlavní obrazovku
-bbb.desktopPublish.fullscreen.label = Celá obrazovka
-bbb.desktopPublish.region.tooltip = Sdílet část Vaší obrazovky
-bbb.desktopPublish.region.label = Oblast
-bbb.desktopPublish.stop.tooltip = Zrušit sdílení plochy
-bbb.desktopPublish.stop.label = Zrušit
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Nemůžete maximalizovat toto okno.
-bbb.desktopPublish.closeBtn.toolTip = Ukončit sdílení a zavřít toto okno.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Sdílení obrazovky momentálně není podporováno v prohlížeči Chrome pod operačním systémem Mac OS X. Pro sdílení Vaší obrazovky je třeba použít jiný webový prohlížeč (doporučujeme Firefox).
-bbb.desktopPublish.chrome42UnsupportedHint = Prohlížeč Chrome již nepodporuje applety Java. Pro sdílení Vaší obrazovky je třeba použít jiný webový prohlížeč (doporučujeme Firefox).
-bbb.desktopPublish.edgePluginUnsupportedHint = Prohlížeč Edge nepodporuje Java applety. Pro sdílení Vaší obrazovky je třeba použít jiný webový prohlížeč (doporučujeme Firefox).
-bbb.desktopPublish.minimizeBtn.toolTip = Minimalizovat toto okno.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimalizovat okno pro sdílení pracovní plochy
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximalizovat okno pro sdílení pracovní plochy
-bbb.desktopPublish.chromeHint.title = Chrome může potřebovat vaše oprávnění
-bbb.desktopPublish.chromeHint.message = Použijte ikonu pro správu pluginů  (v pravém horním rohu Chrome), odblokujte pluginy a klikněte na 'Zkusit znovu'.
-bbb.desktopPublish.chromeHint.button = Zkusit znovu
-bbb.desktopView.title = Sdílení plochy
-bbb.desktopView.fitToWindow = Přizpůsobit oknu
-bbb.desktopView.actualSize = Zobrazit aktuální velikost
-bbb.desktopView.minimizeBtn.accessibilityName = Minimalizovat pohled pro sdílení pracovní plochy
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximalizovat pohled pro sdílení pracovní plochy
-bbb.desktopView.closeBtn.accessibilityName = Zavřít pohled pro sdílení pracovní plochy
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Ukončit sdílení a zavřít
+bbb.screensharePublish.minimizeBtn.toolTip = Minimalizovat
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Přizpůsobit oknu
+bbb.screenshareView.actualSize = Zobrazit aktuální velikost
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Sdílet Váš mikrofon
 bbb.toolbar.phone.toolTip.stop = Zastavit sdílení Vašeho mikrofonu
 bbb.toolbar.phone.toolTip.mute = Ukončit poslouchání konference
 bbb.toolbar.phone.toolTip.unmute = Zahájit poslouchání konference
 bbb.toolbar.phone.toolTip.nomic = Mikrofon nebyl nalezen
-bbb.toolbar.deskshare.toolTip.start = Sdílet Vaši pracovní plochu
-bbb.toolbar.deskshare.toolTip.stop = Zastavit sdílení pracovní plochy
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Sdílet Vaši webovou kameru
 bbb.toolbar.video.toolTip.stop = Zastavit sdílení webové kamery
 bbb.layout.addButton.toolTip = Přidat vlastní vzhled do seznamu
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Vzhledy byly úspěšně uloženy
 bbb.layout.load.complete = Vzhledy byly úspěšně nahrány
 bbb.layout.load.failed = Nelze nahrát rozvržení vzhledu
 bbb.layout.name.defaultlayout = Původní vzhled
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video chat
 bbb.layout.name.webcamsfocus = Sezení s webovou kamerou
 bbb.layout.name.presentfocus = Sezení s prezentací
@@ -362,6 +395,7 @@ bbb.logout.rejected = Připojení k serveru bylo zamítnuto
 bbb.logout.invalidapp = Aplikace red5 neexistuje
 bbb.logout.unknown = Váš klient ztratil spojení se serverem
 bbb.logout.usercommand = Odhlásil-a jste se z konference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Moderátor Vás vyhodil z konference.
 bbb.logout.refresh.message = Pokud jste se odhlásil-a neúmyslně, použijte tlačítko dole pro opětovné připojení.
 bbb.logout.refresh.label = Znovu připojit
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Uložit poznámku
 bbb.settings.deskshare.instructions = V následujícím okně zvolte "Povolit" pro správné fungování sdílení pracovní plochy
 bbb.settings.deskshare.start = Zaškrtnout sdílení pracovní plochy
 bbb.settings.voice.volume = Aktivita na mikrofonu
-bbb.settings.java.label = Chybná verze Java
-bbb.settings.java.text = Máte nainstalovánu verzi Java {0}, pro sdílení pracovní plochy je potřeba alespoň verze {1}. Tlačítkem dole nainstalujete nejnovější verzi JRE.
-bbb.settings.java.command = Instalovat nejnovější verzi Java
 bbb.settings.flash.label = Chybná verze Flashe
 bbb.settings.flash.text = Máte nainstalovánu verzi Flash {0}, pro používání této aplikace je potřeba alespoň verze {1}. Tlačítkem dole nainstalujete nejnovější verzi Flash od Adobe.
 bbb.settings.flash.command = Instalovat nejnovější verzi Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Přepnout ukazovátko tabule na text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Barva textu
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Velikost písma
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Hotovo
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimalizovat aktuální okno
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximalizovat aktuální okno
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Opustit okno Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Ztlumit a zesílit Váš mikrofon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Přejít na okno chatu
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Otevřít okno sdílení pracovní plochy
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Otevřít okno nastavení zvuku
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Zahájit/ukončit poslouchání konference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Otevřít okno sdílení webové kamery
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Zavřít všechna videa
 bbb.users.settings.lockAll=Zamknout všechny uživatele
 bbb.users.settings.lockAllExcept=Zamknout všechny uživatele vyjma přednášejícího
 bbb.users.settings.lockSettings=Zamknout pozorovatele
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Odemknout všechny pozorovatele
 bbb.users.settings.roomIsLocked=Standardně uzamčeno
 bbb.users.settings.roomIsMuted=StandardnÄ› ztlumeno
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Zamknout pozorovatele
 bbb.lockSettings.feature=Vlastnost
 bbb.lockSettings.locked=Zamčeno
 bbb.lockSettings.lockOnJoin=Zamknout po přihlášení
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Zavřít
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/cy_GB/bbbResources.properties b/bigbluebutton-client/locale/cy_GB/bbbResources.properties
index e5b075cae60b492cb4e1a697b5cf319e3387b733..eec55806615789d983908142ab6efb9d2601c0c0 100644
--- a/bigbluebutton-client/locale/cy_GB/bbbResources.properties
+++ b/bigbluebutton-client/locale/cy_GB/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Sain
 bbb.clientstatus.webrtc.message = Argymhellir defnyddio naill ai Firefox neu Chrome ar gyfer gwell sain.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Methwyd canfod fersiwn Java.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Lleihau
 bbb.window.maximizeRestoreBtn.toolTip = Ehangu
 bbb.window.closeBtn.toolTip = Cau
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Statws trist
 bbb.users.emojiStatus.confused = Statws dryslyd
 bbb.users.emojiStatus.neutral = Statws niwtral
 bbb.users.emojiStatus.away = Statws i ffwrdd
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Cyflwyniad
 bbb.presentation.titleWithPres = Cyflwyniad\: {0}
 bbb.presentation.quickLink.label = Ffenestr Cyflwyniad
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Cau blwch deialog newid gwegamera
 bbb.video.publish.closeBtn.label = Diddymu
 bbb.video.publish.titleBar = Cyhoeddi Ffenestr Gwegamera
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Rhannu Bwrdd Gwaith\: Rhagolwg Cyflwynydd
-bbb.desktopPublish.fullscreen.tooltip = Rhannu Dy Prif Fwrdd Gwaith.
-bbb.desktopPublish.fullscreen.label = Llenwi'r Sgrin
-bbb.desktopPublish.region.tooltip = Rhannu Rhan o'm Fwrdd Gwaith.
-bbb.desktopPublish.region.label = Rhanbarth
-bbb.desktopPublish.stop.tooltip = Cau rhannu bwrdd gwaith
-bbb.desktopPublish.stop.label = Cau
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Ni allwch ehangu'r ffenestr hon.
-bbb.desktopPublish.closeBtn.toolTip = Terfynu'r Rhannu a Chau
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Ar hyn o bryd, ni chefnogir rhannu bwrdd gwaith gan Chrome ar Mac OS X. Mae angen defnyddio porwr wahanol (argymhellir Firefox) i rannu eich bwrdd gwaith.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Lleihau
-bbb.desktopPublish.minimizeBtn.accessibilityName = Lleihau'r Ffenestr Cyhoeddi Rhannu Bwrdd Gwaith
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Ehangu'r Ffenestr Cyhoeddi Rhannu Bwrdd Gwaith
-bbb.desktopPublish.chromeHint.title = Efallai y bydd Chrome yn gofyn am eich caniatâd.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Ailgeisio
-bbb.desktopView.title = Rhannu Bwrdd Gwaith
-bbb.desktopView.fitToWindow = Addasu i'r Ffenestr
-bbb.desktopView.actualSize = Dangos faint gwirioneddol
-bbb.desktopView.minimizeBtn.accessibilityName = Lleihau'r Ffenestr Gweld Rhannu Bwrdd Gwaith
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Ehangu'r Ffenestr Gweld Rhannu Bwrdd Gwaith
-bbb.desktopView.closeBtn.accessibilityName = Cau'r Ffenestr Gweld Rhannu Bwrdd Gwaith
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Rhannu Dy Feicroffon
 bbb.toolbar.phone.toolTip.stop = Terfynu Rhannu Fy Meicroffon
 bbb.toolbar.phone.toolTip.mute = Terfynu gwrando ar y gynhadledd
 bbb.toolbar.phone.toolTip.unmute = Dechrau gwrando ar y gynhadledd
 bbb.toolbar.phone.toolTip.nomic = Ni chanfuwyd meicroffon
-bbb.toolbar.deskshare.toolTip.start = Rhannu Dy Fwrdd Gwaith.
-bbb.toolbar.deskshare.toolTip.stop = Terfynu Rhannu Dy Fwrdd Gwaith
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Rhannu Dy Wegamera
 bbb.toolbar.video.toolTip.stop = Terfynu Rhannu Dy Wegamera
 bbb.layout.addButton.toolTip = Ychwanegu'r addasiad gosodiad i'r rhestr
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Arbedwyd y gosodiadau yn llwyddiannus
 bbb.layout.load.complete = Llwythwyd y gosodiadau yn llwyddiannus
 bbb.layout.load.failed = Methwyd llwytho'r gosodiadau
 bbb.layout.name.defaultlayout = Gosodiad Rhagosodedig
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Sgwrs Fideo
 bbb.layout.name.webcamsfocus = Cyfarfod Gwegamera
 bbb.layout.name.presentfocus = Cyfarfod Cyflwyniad
@@ -362,6 +395,7 @@ bbb.logout.rejected = Gwrthodwyd cysylltiad â'r gweinydd
 bbb.logout.invalidapp = Nid yw'r rhaglen red5 yn bodoli
 bbb.logout.unknown = Collwyd cysylltiad â'r gweinydd gan eich cleient
 bbb.logout.usercommand = Fe allgofnodoch o'r gynhadledd
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Ailgysylltu
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Arbed nodiadau
 bbb.settings.deskshare.instructions = Dewiswch Ganiatáu ar yr annog sy'n amlygu'i hun i wirio bod rhannu bwrdd gwaith yn gweithio'n iawn i chi
 bbb.settings.deskshare.start = Gwirio Rhannu Bwrdd Gwaith
 bbb.settings.voice.volume = Gweithgaredd Meicroffon
-bbb.settings.java.label = Gwall fersiwn Java
-bbb.settings.java.text = Mae gennych Java {0} wedi'i osod, ond mae angen o leiaf fersiwn {1} i defnyddio BigBlueButton yn effeithiol. Bydd y botwm isod yn gosod y fersiwn diweddaraf o Java JRE.
-bbb.settings.java.command = Gosodwch Java diweddaraf
 bbb.settings.flash.label = Gwall fersiwn Flash
 bbb.settings.flash.text = Mae gennych Flash {0} wedi'i osod, ond mae angen o leiaf fersiwn {1} i defnyddio BigBlueButton yn effeithiol. Bydd y botwm isod yn gosod y fersiwn diweddaraf o Adobe Flash.
 bbb.settings.flash.command = Gosodwch Flash diweddaraf
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Testun
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Newid cyrchwr bwrdd gwyn i destun
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Lliw'r Testun
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Maint Ffont
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Yn Barod
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Lleihau ffenestr bresennol
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Ehangu ffenestr bresennol
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Symud ffocws oddi ar y ffenestr Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Pylu neu Datpylu eich meicroffon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Symud ffocws i'r Ffenestr Sgwrsio
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Agor ffenestr rhannu bwrdd gwaith
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Agor ffenestr gosodiadau sain
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Dechrau/Terfynu gwrando ar y gynhadledd
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Agor ffenestr rhannu gwegamera
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Cau pob fideo
 bbb.users.settings.lockAll=Cloi Pob Defnyddiwr
 bbb.users.settings.lockAllExcept=Cloi Pob Defnyddiwr Ac Eithrio'r Cyflwynydd
 bbb.users.settings.lockSettings=Cloi Gwyliwr ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Datgloi Pob Defnyddiwr
 bbb.users.settings.roomIsLocked=Rhagosod Dan glo
 bbb.users.settings.roomIsMuted=Rhagosod Pylu
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Cloi Gwyliwr
 bbb.lockSettings.feature=Nodwedd
 bbb.lockSettings.locked=Dan Glo
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/da_DK/bbbResources.properties b/bigbluebutton-client/locale/da_DK/bbbResources.properties
index f5f4e077792900a43a8b6aad715a99556cf505cc..2492bee8eebbaaa7057ae164d15f989ffe20e037 100644
--- a/bigbluebutton-client/locale/da_DK/bbbResources.properties
+++ b/bigbluebutton-client/locale/da_DK/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Din Flash Player plugin ({0}) er forældet. Vi anbefaler at opdatere til den seneste version. 
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Vi anbefaler anvendelse af Firefox eller Chrome for bedre lydkvalitet
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java versionen er ikke registreret
-bbb.clientstatus.java.notinstalled = Du har ikke installeret Java. Venligst tryk <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> for at installere den seneste Java til at anvende dele skrivebord funktionen.
-bbb.clientstatus.java.oldversion = Du har en ældre Java installeret, venligst tryk <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> for at installere den seneste Java for at anvende dele skrivebord funktionen.
 bbb.window.minimizeBtn.toolTip = Minimér
 bbb.window.maximizeRestoreBtn.toolTip = Maksimér
 bbb.window.closeBtn.toolTip = Luk
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sur
 bbb.users.emojiStatus.confused = Forvirret
 bbb.users.emojiStatus.neutral = Neutral
 bbb.users.emojiStatus.away = Ikke tilstede
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Præsentation
 bbb.presentation.titleWithPres = Præsentation\: {0}
 bbb.presentation.quickLink.label = Præsentationsvinduet
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Luk webcam indstillingsvinduet
 bbb.video.publish.closeBtn.label = Fortryd
 bbb.video.publish.titleBar = Offentliggør webcam vindue
 bbb.video.streamClose.toolTip = Afslut stream for\: {0}
-bbb.desktopPublish.title = Skrivebordsdeling\: Præsentators forhåndsvisning
-bbb.desktopPublish.fullscreen.tooltip = Del dit skærm
-bbb.desktopPublish.fullscreen.label = Fuld skærm
-bbb.desktopPublish.region.tooltip = Del dele af din skærm
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Luk skærmdeling
-bbb.desktopPublish.stop.label = Luk
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Du kan ikke maksimere dette vindue.
-bbb.desktopPublish.closeBtn.toolTip = Stop deling og luk dette vindue.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Dele skrivebord er i øjeblikket desværre ikke understøttet af Chrome i forbindelse med Mac OS X. Du skal anvende en anden web browser (Firefox er anbefalet) til at dele skrivebord.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome understøtter ikke Java Applets. Du skal anvende en anden web browser (Firefox er anbefalet) til at dele dit skrivebord
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge understøtter ikke Java Applets. Du bedes anvende en anden browser (Firefox er anbefalet) for at dele skrivebord.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimer dette vindue
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimer skriveborddelings offentliggørelses vinduet
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maksimer skriveborddelings offentliggørelses vinduet
-bbb.desktopPublish.chromeHint.title = Chrome må anvende din tillaldelse
-bbb.desktopPublish.chromeHint.message = Vælg det plug-in ikon (øverst højre hjørne af Chrome) indtil un-block plug-ins og herefter vælg "Forsøg igen"
-bbb.desktopPublish.chromeHint.button = Forsøg igen
-bbb.desktopView.title = Del skrivebord
-bbb.desktopView.fitToWindow = Tilpas til vindue
-bbb.desktopView.actualSize = Vis faktiske størrelse
-bbb.desktopView.minimizeBtn.accessibilityName = Minimer skriveborddelingsvinduet  
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maksimer skriveborddelingsvinduet  
-bbb.desktopView.closeBtn.accessibilityName = Luk skrivebord delingsvinduet
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Del din mikrofon
 bbb.toolbar.phone.toolTip.stop = Stop deling af din mikrofon
 bbb.toolbar.phone.toolTip.mute = Stop med at lytte til sessionen.
 bbb.toolbar.phone.toolTip.unmute = Begynd med at lytte til sessionen
 bbb.toolbar.phone.toolTip.nomic = Ingen mikrofon opdaget
-bbb.toolbar.deskshare.toolTip.start = Del dit skrivebord
-bbb.toolbar.deskshare.toolTip.stop = Stop deling af dit skrivebord
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Del dit webcam
 bbb.toolbar.video.toolTip.stop = Stop deling af dit webcam
 bbb.layout.addButton.toolTip = Tilføj det skræddersyede layout til listen
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts er gemt
 bbb.layout.load.complete = Layouts er uploaded 
 bbb.layout.load.failed = Ikke muligt at indlæse layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam møde
 bbb.layout.name.presentfocus = Præsentationsmøde
@@ -362,6 +395,7 @@ bbb.logout.rejected = Forbindelsen til serveren blev afvist
 bbb.logout.invalidapp = Programmet red5 findes ikke
 bbb.logout.unknown = Din klient mistede forbindelsen til serveren
 bbb.logout.usercommand = Du er logget ud af konferencen
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Du er blevet udelukket af den ansvarlige i whiteboardet
 bbb.logout.refresh.message = I tilfælde af at forbindelsen pludselig forsvandt, klik på knappen for at forbinde igen.
 bbb.logout.refresh.label = Forbind igen.
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Gem noter
 bbb.settings.deskshare.instructions = Klik Tillad ved prompten, der vises for at tjekke at skrivebordsdeling virker for dig.
 bbb.settings.deskshare.start = Check skrivebordsdeling
 bbb.settings.voice.volume = Mikrofonaktivitet
-bbb.settings.java.label = Java versionsfejl
-bbb.settings.java.text = Du har Java {0} installeret, men du skal mindst have version {1} for at bruge BigBlueButton's skrivebordsdeling. Klik på knappen forneden for at installere den nyeste version af Java JRE.
-bbb.settings.java.command = Installer nyeste version af Java
 bbb.settings.flash.label = Fejl i Flash-version
 bbb.settings.flash.text = Du har Flash {0} installeret, men du skal mindst benytte version {1} for at bruge BigBlueButton ordentligt. Klik på knappen forneden for at installere den nyeste version af Flash.
 bbb.settings.flash.command = Installer nyeste version af Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekst
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Skift whiteboard cursoren til tekst
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Tekst farver
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Skriftstørrelse
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Klar
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimer det nuværende vindue
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maksimer det nuværende vindue
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Fokuser ikke på flashvinduet 
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute og unmute din mikrofon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Ret fokus på chatboksen
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Ã…bn deleskrivebord vinduet
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ã…ben dine lydindstillinger
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Begynd/Stop med at lytte til sessionen
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Ã…ben dit webcam delevinduet
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Luk alle videoer
 bbb.users.settings.lockAll=LÃ¥s alle brugere
 bbb.users.settings.lockAllExcept=LÃ¥s alle brugere - undtagen foredragsholderen
 bbb.users.settings.lockSettings=LÃ¥s deltagere...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Ã…ben alle deltagere
 bbb.users.settings.roomIsLocked=LÃ¥s som default
 bbb.users.settings.roomIsMuted=Muted som default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=LÃ¥s deltagere
 bbb.lockSettings.feature=Funktioner
 bbb.lockSettings.locked=LÃ¥st
 bbb.lockSettings.lockOnJoin=Lås på deltagelse
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/de/bbbResources.properties b/bigbluebutton-client/locale/de/bbbResources.properties
new file mode 100644
index 0000000000000000000000000000000000000000..58663b57531fcf74290462d4c3fe4ab11db39227
--- /dev/null
+++ b/bigbluebutton-client/locale/de/bbbResources.properties
@@ -0,0 +1,670 @@
+bbb.mainshell.locale.version = 0.9.0
+bbb.mainshell.statusProgress.connecting = Connecting to the server
+bbb.mainshell.statusProgress.loading = Loading {0} modules
+bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
+bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
+bbb.mainshell.logBtn.toolTip = Open Log Window
+bbb.mainshell.meetingNotFound = Meeting Not Found
+bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
+bbb.mainshell.notification.tunnelling = Tunnelling
+bbb.mainshell.notification.webrtc = WebRTC Audio
+bbb.oldlocalewindow.reminder1 = You may have an old language translations of BigBlueButton.
+bbb.oldlocalewindow.reminder2 = Please clear your browser's cache and try again.
+bbb.oldlocalewindow.windowTitle = Warning\: Old Language Translations
+bbb.audioSelection.title = How do you want to join the audio?
+bbb.audioSelection.btnMicrophone.label = Microphone
+bbb.audioSelection.btnMicrophone.toolTip = Join the audio with your microphone
+bbb.audioSelection.btnListenOnly.label = Listen Only
+bbb.audioSelection.btnListenOnly.toolTip = Join the audio as listen only
+bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial\: {0} then enter {1} as the conference pin number.
+bbb.micSettings.title = Audio Test
+bbb.micSettings.speakers.header = Test Speakers
+bbb.micSettings.microphone.header = Test Microphone
+bbb.micSettings.playSound = Test Speakers
+bbb.micSettings.playSound.toolTip = Play music to test your speakers
+bbb.micSettings.hearFromHeadset = You should hear audio in your headset, not your computer speakers.
+bbb.micSettings.speakIntoMic = If you are using a headset (or earbuds), you should hear the audio from your headset -- not from your computer speakers.
+bbb.micSettings.echoTestMicPrompt = This is a private echo test.  Speak a few words.  Did you hear audio?
+bbb.micSettings.echoTestAudioYes = Yes
+bbb.micSettings.echoTestAudioNo = No
+bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic.
+bbb.micSettings.recommendHeadset = Use a headset with a microphone for best audio experience.
+bbb.micSettings.changeMic = Test or Change Microphone
+bbb.micSettings.changeMic.toolTip = Open the Flash Player microphone settings dialog box
+bbb.micSettings.comboMicList.toolTip = Select a microphone
+bbb.micSettings.micRecordVolume.label = Gain
+bbb.micSettings.micRecordVolume.toolTip = Set your microphone gain
+bbb.micSettings.nextButton = Next
+bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.join = Join Audio
+bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.cancel = Cancel
+bbb.micSettings.connectingtoecho = Connecting
+bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
+bbb.micSettings.cancel.toolTip = Cancel joining the audio conference
+bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.title = Audio Settings. Focus will remain in this audio settings window until the window is closed.
+bbb.micSettings.webrtc.title = WebRTC Support
+bbb.micSettings.webrtc.capableBrowser = Your browser supports WebRTC.
+bbb.micSettings.webrtc.capableBrowser.dontuseit = Click not to use WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Click here if you don't want to use the WebRTC technology (recommended if you have problems using it).
+bbb.micSettings.webrtc.notCapableBrowser = WebRTC is not supported in your browser. Please use Google Chrome (version 32 or greater); or Mozilla Firefox (version 26 or greater). You will still be able to join the voice conference using the Adobe Flash Platform.
+bbb.micSettings.webrtc.connecting = Calling
+bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.endingecho = Joining audio
+bbb.micSettings.webrtc.endedecho = Echo test ended.
+bbb.micPermissions.firefox.title = Firefox Microphone Permissions
+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.chrome.title = Chrome Microphone Permissions
+bbb.micPermissions.chrome.message1 = Click Allow to give Chrome permission to use your microphone.
+bbb.micWarning.title = Audio Warning
+bbb.micWarning.joinBtn.label = Join anyway
+bbb.micWarning.testAgain.label = Test again
+bbb.micWarning.message = Your microphone did not show any activity, others probably won't be able to hear you during the session.
+bbb.webrtcWarning.message = Detected the following WebRTC issue\: {0}. Do you want to try Flash instead?
+bbb.webrtcWarning.title = WebRTC Audio Failure
+bbb.webrtcWarning.failedError.1001 = Error 1001\: WebSocket disconnected
+bbb.webrtcWarning.failedError.1002 = Error 1002\: Could not make a WebSocket connection
+bbb.webrtcWarning.failedError.1003 = Error 1003\: Browser version not supported
+bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1005 = Error 1005\: Call ended unexpectedly
+bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
+bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
+bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
+bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.unknown = Error {0}\: Unknown error code
+bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
+bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
+bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
+bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
+bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
+bbb.mainToolbar.helpBtn = Help
+bbb.mainToolbar.logoutBtn = Logout
+bbb.mainToolbar.logoutBtn.toolTip = Log Out
+bbb.mainToolbar.langSelector = Select language
+bbb.mainToolbar.settingsBtn = Settings
+bbb.mainToolbar.settingsBtn.toolTip = Open Settings
+bbb.mainToolbar.shortcutBtn = Shortcut Keys
+bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Keys Window
+bbb.mainToolbar.recordBtn.toolTip.start = Start recording
+bbb.mainToolbar.recordBtn.toolTip.stop = Stop recording
+bbb.mainToolbar.recordBtn.toolTip.recording = The session is being recorded
+bbb.mainToolbar.recordBtn.toolTip.notRecording = The session isn't being recorded
+bbb.mainToolbar.recordBtn.confirm.title = Confirm recording
+bbb.mainToolbar.recordBtn.confirm.message.start = Are you sure you want to start recording the session?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Are you sure you want to stop recording the session?
+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.clientstatus.title = Configuration Notifications
+bbb.clientstatus.notification = Unread notifications
+bbb.clientstatus.close = Close
+bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
+bbb.clientstatus.browser.title = Browser Version
+bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
+bbb.clientstatus.flash.title = Flash Player
+bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
+bbb.clientstatus.webrtc.title = Audio
+bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
+bbb.window.minimizeBtn.toolTip = Minimize
+bbb.window.maximizeRestoreBtn.toolTip = Maximize
+bbb.window.closeBtn.toolTip = Close
+bbb.videoDock.titleBar = Webcam Window Title Bar
+bbb.presentation.titleBar = Presentation Window Title Bar
+bbb.chat.titleBar = Chat Window Title Bar
+bbb.users.title = Users{0} {1}
+bbb.users.titleBar = Users Window title bar
+bbb.users.quickLink.label = Users Window
+bbb.users.minimizeBtn.accessibilityName = Minimize the Users Window
+bbb.users.maximizeRestoreBtn.accessibilityName = Maximize the Users Window
+bbb.users.settings.buttonTooltip = Settings
+bbb.users.settings.audioSettings = Audio Test
+bbb.users.settings.webcamSettings = Webcam Settings
+bbb.users.settings.muteAll = Mute All Users
+bbb.users.settings.muteAllExcept = Mute All Users Except Presenter
+bbb.users.settings.unmuteAll = Unmute All Users
+bbb.users.settings.clearAllStatus = Clear all status icons
+bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.roomMuted.text = Viewers Muted
+bbb.users.roomLocked.text = Viewers Locked
+bbb.users.pushToTalk.toolTip = Talk
+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.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.accessibilityName = Users List. Use the arrow keys to navigate.
+bbb.users.usersGrid.nameItemRenderer = Name
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = you
+bbb.users.usersGrid.statusItemRenderer = Status
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
+bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
+bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.mediaItemRenderer.talking = Talking
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+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.pushToLock = Lock {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Unlock {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off
+bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
+bbb.users.emojiStatus.clear = Clear
+bbb.users.emojiStatus.clear.toolTip = Clear status
+bbb.users.emojiStatus.close = Close
+bbb.users.emojiStatus.close.toolTip = Close status popup
+bbb.users.emojiStatus.raiseHand = Raise hand status
+bbb.users.emojiStatus.happy = Happy status
+bbb.users.emojiStatus.smile = Smile status
+bbb.users.emojiStatus.sad = Sad status
+bbb.users.emojiStatus.confused = Confused status
+bbb.users.emojiStatus.neutral = Neutral status
+bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
+bbb.presentation.title = Presentation
+bbb.presentation.titleWithPres = Presentation\: {0}
+bbb.presentation.quickLink.label = Presentation Window
+bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width
+bbb.presentation.fitToPage.toolTip = Fit Presentation To Page
+bbb.presentation.uploadPresBtn.toolTip = Upload Presentation
+bbb.presentation.backBtn.toolTip = Previous slide
+bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.toolTip = Select a slide
+bbb.presentation.forwardBtn.toolTip = Next slide
+bbb.presentation.maxUploadFileExceededAlert = Error\: The file is bigger than what's allowed.
+bbb.presentation.uploadcomplete = Upload completed. Please wait while we convert the document.
+bbb.presentation.uploaded = uploaded.
+bbb.presentation.document.supported = The uploaded document is supported. Starting to convert...
+bbb.presentation.document.converted = Successfully converted the office document.
+bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.io = IO Error\: Please contact administrator.
+bbb.presentation.error.security = Security Error\: Please contact administrator.
+bbb.presentation.error.convert.notsupported = Error\: The uploaded document is unsupported. Please upload a compatible file.
+bbb.presentation.error.convert.nbpage = Error\: Failed to determine the number of pages in the uploaded document.
+bbb.presentation.error.convert.maxnbpagereach = Error\: The uploaded document has too many pages.
+bbb.presentation.converted = Converted {0} of {1} slides.
+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.uploadwindow.presentationfile = Presentation file
+bbb.presentation.uploadwindow.pdf = PDF
+bbb.presentation.uploadwindow.word = WORD
+bbb.presentation.uploadwindow.excel = EXCEL
+bbb.presentation.uploadwindow.powerpoint = POWERPOINT
+bbb.presentation.uploadwindow.image = IMAGE
+bbb.presentation.minimizeBtn.accessibilityName = Minimize the Presentation Window
+bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximize the Presentation Window
+bbb.presentation.closeBtn.accessibilityName = Close the Presentation Window
+bbb.fileupload.title = Add Files to Your Presentation
+bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.selectBtn.label = Select File
+bbb.fileupload.selectBtn.toolTip = Open dialog box to select a file
+bbb.fileupload.uploadBtn = Upload
+bbb.fileupload.uploadBtn.toolTip = Upload the selected file
+bbb.fileupload.deleteBtn.toolTip = Delete Presentation
+bbb.fileupload.showBtn = Show
+bbb.fileupload.showBtn.toolTip = Show Presentation
+bbb.fileupload.okCancelBtn = Close
+bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
+bbb.fileupload.genThumbText = Generating thumbnails..
+bbb.fileupload.progBarLbl = Progress\:
+bbb.fileupload.fileFormatHint = Upload any office document or Portable Document Format (PDF) file.  For best results upload PDF.
+bbb.chat.title = Chat
+bbb.chat.quickLink.label = Chat Window
+bbb.chat.cmpColorPicker.toolTip = Text Color
+bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.sendBtn = Send
+bbb.chat.sendBtn.toolTip = Send Message
+bbb.chat.sendBtn.accessibilityName = Send chat message
+bbb.chat.contextmenu.copyalltext = Copy All Text
+bbb.chat.publicChatUsername = Public
+bbb.chat.optionsTabName = Options
+bbb.chat.privateChatSelect = Select a person to chat with privately
+bbb.chat.private.userLeft = The user has left.
+bbb.chat.private.userJoined = The user has joined.
+bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
+bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
+bbb.chat.chatOptions = Chat Options
+bbb.chat.fontSize = Chat Message Font Size
+bbb.chat.cmbFontSize.toolTip = Select Chat Message Font Size
+bbb.chat.messageList = Message Box
+bbb.chat.minimizeBtn.accessibilityName = Minimize the Chat Window
+bbb.chat.maximizeRestoreBtn.accessibilityName = Maximize the Chat Window
+bbb.chat.closeBtn.accessibilityName = Close the Chat Window
+bbb.chat.chatTabs.accessibleNotice = New messages in this tab.
+bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
+bbb.publishVideo.cmbResolution.tooltip = Select a webcam resolution
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.startPublishBtn.toolTip = Start sharing your webcam
+bbb.publishVideo.startPublishBtn.errorName = Can't share webcam. Reason\: {0}
+bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
+bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.videodock.title = Webcams
+bbb.videodock.quickLink.label = Webcams Window
+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.controls.privateChatBtn.toolTip = Chat with {0}
+bbb.video.publish.hint.noCamera = No webcam available
+bbb.video.publish.hint.cantOpenCamera = Can't open your webcam
+bbb.video.publish.hint.waitingApproval = Waiting for approval
+bbb.video.publish.hint.videoPreview = Webcam preview
+bbb.video.publish.hint.openingCamera = Opening webcam...
+bbb.video.publish.hint.cameraDenied = Webcam access denied
+bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.publishing = Publishing...
+bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
+bbb.video.publish.closeBtn.label = Cancel
+bbb.video.publish.titleBar = Publish Webcam Window
+bbb.video.streamClose.toolTip = Close stream for\: {0}
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
+bbb.toolbar.phone.toolTip.start = Share Your Microphone
+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 Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
+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 = Unable to load the layouts
+bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
+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.highlighter.toolbar.pencil = Pencil
+bbb.highlighter.toolbar.pencil.accessibilityName = Switch whiteboard cursor to pencil
+bbb.highlighter.toolbar.ellipse = Circle
+bbb.highlighter.toolbar.ellipse.accessibilityName = Switch whiteboard cursor to circle
+bbb.highlighter.toolbar.rectangle = Rectangle
+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 = Select Color
+bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
+bbb.highlighter.toolbar.thickness = Change Thickness
+bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
+bbb.logout.title = Logged Out
+bbb.logout.button.label = OK
+bbb.logout.appshutdown = The server app has been shut down
+bbb.logout.asyncerror = An Async Error occured
+bbb.logout.connectionclosed = The connection to the server has been closed
+bbb.logout.connectionfailed = The connection to the server has ended
+bbb.logout.rejected = The connection to the server has been rejected
+bbb.logout.invalidapp = The red5 app does not exist
+bbb.logout.unknown = Your client has lost connection with the server
+bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
+bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
+bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
+bbb.logout.refresh.label = Reconnect
+bbb.logout.confirm.title = Confirm Logout
+bbb.logout.confirm.message = Are you sure you want to log out?
+bbb.logout.confirm.yes = Yes
+bbb.logout.confirm.no = No
+bbb.connection.failure=Detected Connectivity Problems
+bbb.connection.reconnecting=Reconnecting
+bbb.connection.reestablished=Connection reestablished
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Deskshare
+bbb.notes.title = Notes
+bbb.notes.cmpColorPicker.toolTip = Text Color
+bbb.notes.saveBtn = Save
+bbb.notes.saveBtn.toolTip = Save Note
+bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
+bbb.settings.deskshare.start = Check Desktop Sharing
+bbb.settings.voice.volume = Microphone Activity
+bbb.settings.flash.label = Flash version error
+bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
+bbb.settings.flash.command = Install newest Flash
+bbb.settings.isight.label = iSight webcam error
+bbb.settings.isight.text = If you have problems with your iSight webcam, it may be because you are running OS X 10.6.5, which is known to have a problem with Flash capturing video from the iSight webcam. \n To correct this, the link below will install a newer version of Flash player, or update your Mac to the newest version
+bbb.settings.isight.command = Install Flash 10.2 RC2
+bbb.settings.warning.label = Warning
+bbb.settings.warning.close = Close this Warning
+bbb.settings.noissues = No outstanding issues have been detected.
+bbb.settings.instructions = Accept the Flash prompt that asks you for webcam permissions. If the output matches what is expected, your browser has been set up correctly. Other potentials issues are below. Examine them to find a possible solution.
+ltbcustom.bbb.highlighter.toolbar.triangle = Triangle
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Switch whiteboard cursor to triangle
+ltbcustom.bbb.highlighter.toolbar.line = Line
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Switch whiteboard cursor to line
+ltbcustom.bbb.highlighter.toolbar.text = Text
+ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
+ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
+ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
+
+bbb.accessibility.clientReady = Ready
+
+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.chatwindow.audibleChatNotification = Audible Chat Notification
+
+bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+
+bbb.accessibility.notes.notesview.input = Notes input
+
+bbb.shortcuthelp.title = Shortcut Keys
+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.dropdown.general = Global shortcuts
+bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
+bbb.shortcuthelp.dropdown.chat = Chat shortcuts
+bbb.shortcuthelp.dropdown.users = Users shortcuts
+bbb.shortcuthelp.headers.shortcut = Shortcut
+bbb.shortcuthelp.headers.function = Function
+
+bbb.shortcutkey.general.minimize = 189
+bbb.shortcutkey.general.minimize.function = Minimize current window
+bbb.shortcutkey.general.maximize = 187
+bbb.shortcutkey.general.maximize.function = Maximize current window
+
+bbb.shortcutkey.flash.exit = 79
+bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
+bbb.shortcutkey.chat.chatinput = 73
+bbb.shortcutkey.chat.chatinput.function = Focus the chat input field
+bbb.shortcutkey.present.focusslide = 67
+bbb.shortcutkey.present.focusslide.function = Focus the presentation slide
+bbb.shortcutkey.whiteboard.undo = 90
+bbb.shortcutkey.whiteboard.undo.function = Undo last whiteboard mark
+
+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.presentation = 51
+bbb.shortcutkey.focus.presentation.function = Move focus to the Presentation window
+bbb.shortcutkey.focus.chat = 52
+bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
+
+bbb.shortcutkey.share.desktop = 68
+bbb.shortcutkey.share.desktop.function = Open desktop sharing window
+bbb.shortcutkey.share.webcam = 66
+bbb.shortcutkey.share.webcam.function = Open webcam sharing window
+
+bbb.shortcutkey.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Open/focus to shortcut help window
+bbb.shortcutkey.logout = 76
+bbb.shortcutkey.logout.function = Log out of this meeting
+bbb.shortcutkey.raiseHand = 82
+bbb.shortcutkey.raiseHand.function = Raise your hand
+
+bbb.shortcutkey.present.upload = 85
+bbb.shortcutkey.present.upload.function = Upload presentation
+bbb.shortcutkey.present.previous = 65
+bbb.shortcutkey.present.previous.function = Go to previous slide
+bbb.shortcutkey.present.select = 83
+bbb.shortcutkey.present.select.function = View all slides
+bbb.shortcutkey.present.next = 69
+bbb.shortcutkey.present.next.function = Go to next slide
+bbb.shortcutkey.present.fitWidth = 70
+bbb.shortcutkey.present.fitWidth.function = Fit slides to width
+bbb.shortcutkey.present.fitPage = 80
+bbb.shortcutkey.present.fitPage.function = Fit slides to page
+
+bbb.shortcutkey.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Mute or unmute selected person
+bbb.shortcutkey.users.muteall = 65
+bbb.shortcutkey.users.muteall.function = Mute or unmute all users
+bbb.shortcutkey.users.focusUsers = 85
+bbb.shortcutkey.users.focusUsers.function = Focus to users list
+bbb.shortcutkey.users.muteAllButPres = 65
+bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
+
+bbb.shortcutkey.chat.focusTabs = 89
+bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
+bbb.shortcutkey.chat.focusBox = 66
+bbb.shortcutkey.chat.focusBox.function = Focus to chat box
+bbb.shortcutkey.chat.changeColour = 67
+bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.
+bbb.shortcutkey.chat.sendMessage = 83
+bbb.shortcutkey.chat.sendMessage.function = Send chat message
+bbb.shortcutkey.chat.closePrivate = 69
+bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.explanation = ----
+bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+
+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.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.polling.startButton.tooltip = Start a poll
+bbb.polling.startButton.label = Start Poll
+bbb.polling.publishButton.label = Publish
+bbb.polling.closeButton.label = Close
+bbb.polling.pollModal.title = Live Poll Results
+bbb.polling.customChoices.title = Enter Polling Choices
+bbb.polling.respondersLabel.novotes = Waiting for responses
+bbb.polling.respondersLabel.text = {0} Users Responded
+bbb.polling.respondersLabel.finished = Done
+bbb.polling.answer.Yes = Yes
+bbb.polling.answer.No = No
+bbb.polling.answer.True = True
+bbb.polling.answer.False = False
+bbb.polling.answer.A = A
+bbb.polling.answer.B = B
+bbb.polling.answer.C = C
+bbb.polling.answer.D = D
+bbb.polling.answer.E = E
+bbb.polling.answer.F = F
+bbb.polling.answer.G = G
+bbb.polling.results.accessible.header = Poll Results.
+bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
+
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+
+bbb.accessibility.alerts.madePresenter = You are now the Presenter.
+bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+
+bbb.shortcutkey.specialKeys.space = Spacebar
+bbb.shortcutkey.specialKeys.left = Left Arrow
+bbb.shortcutkey.specialKeys.right = Right Arrow
+bbb.shortcutkey.specialKeys.up = Up Arrow
+bbb.shortcutkey.specialKeys.down = Down Arrow
+bbb.shortcutkey.specialKeys.plus = Plus
+bbb.shortcutkey.specialKeys.minus = Minus
+
+bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
+bbb.users.settings.lockAll=Lock All Users
+bbb.users.settings.lockAllExcept=Lock Users Except Presenter
+bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
+bbb.users.settings.unlockAll=Unlock All Viewers
+bbb.users.settings.roomIsLocked=Locked by default
+bbb.users.settings.roomIsMuted=Muted by default
+
+bbb.lockSettings.save = Apply
+bbb.lockSettings.save.tooltip = Apply lock settings
+bbb.lockSettings.cancel = Cancel
+bbb.lockSettings.cancel.toolTip = Close this window without saving
+
+bbb.lockSettings.moderatorLocking = Moderator locking
+bbb.lockSettings.privateChat = Private Chat
+bbb.lockSettings.publicChat = Public Chat
+bbb.lockSettings.webcam = Webcam
+bbb.lockSettings.microphone = Microphone
+bbb.lockSettings.layout = Layout
+bbb.lockSettings.title=Lock Viewers
+bbb.lockSettings.feature=Feature
+bbb.lockSettings.locked=Locked
+bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/de_DE/bbbResources.properties b/bigbluebutton-client/locale/de_DE/bbbResources.properties
index a5b4ddba7a5957e063bd163366d1d2466e20cb8d..25336311f03d2fea68d2abae986e2c121ac84cb0 100644
--- a/bigbluebutton-client/locale/de_DE/bbbResources.properties
+++ b/bigbluebutton-client/locale/de_DE/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Ihr Flash Player Plugin ({0}) ist nicht aktuell. Es wird empfohlen, den Flash Player auf die neuste Version zu aktualisieren.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Es wird empfohlen entweder Firefox oder Chrome als Browser zu verwenden, denn dadurch wird die Audioübertragungsqualität verbessert.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java Version wurde nicht gefunden
-bbb.clientstatus.java.notinstalled = Sie haben kein Java installiert, bitte folgen SIe <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>diesem Link</a></font> um die neuste Version von Java zu installieren. Erst dann können Sie Ihren Bildschirm mit anderen teilen.
-bbb.clientstatus.java.oldversion = SIe haben eine veraltete Version von Java installiert. Bitte folgen Sie <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>diesem Link</a></font> um die neuste Version zu installieren. Erst dann können Sie Ihren Bildschirm mit anderen teilen.
 bbb.window.minimizeBtn.toolTip = Minimieren
 bbb.window.maximizeRestoreBtn.toolTip = Maximieren
 bbb.window.closeBtn.toolTip = Schließen
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Unglücklich-Status
 bbb.users.emojiStatus.confused = Verwirrt-Status
 bbb.users.emojiStatus.neutral = Neutral-Status
 bbb.users.emojiStatus.away = Abwesend-Status
+bbb.users.emojiStatus.thumbsUp = Daumen hoch Status
+bbb.users.emojiStatus.thumbsDown = Daumen runter Status
+bbb.users.emojiStatus.applause = Beifall Status
 bbb.presentation.title = Präsentation
 bbb.presentation.titleWithPres = Präsentation\: {0}
 bbb.presentation.quickLink.label = Präsentation Fenster
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Webcam Einstellungen schließen
 bbb.video.publish.closeBtn.label = Abbrechen
 bbb.video.publish.titleBar = Webcam freigeben
 bbb.video.streamClose.toolTip = Beende den Stream für\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Präsentationsvorschau
-bbb.desktopPublish.fullscreen.tooltip = Hauptfenster freigeben
-bbb.desktopPublish.fullscreen.label = Vollbild
-bbb.desktopPublish.region.tooltip = Bildschirmausschnitt freigeben
-bbb.desktopPublish.region.label = Ausschnitt
-bbb.desktopPublish.stop.tooltip = Bildschirmfreigabe schließen
-bbb.desktopPublish.stop.label = Schließen
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Fenster kann nicht maximiert werden.
-bbb.desktopPublish.closeBtn.toolTip = Teilen beenden und Fenster schließen.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Bildschirmfreigabe wird gegenwärtig bei Verwendung von Mac OS X nicht von Chrome unterstützt. Um Ihren Bildschirm freizugeben, verwenden Sie bitte einen anderen Browser (z.B. Firefox).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome unterstützt keine Java Applikationen mehr. Um Ihren Bildschirm zu teilen, müssen Sie einen anderen Browser verwenden (z.B. Firefox)
-bbb.desktopPublish.edgePluginUnsupportedHint = Der Edge Browser unterstützt keine Java Applets. Um Ihren Desktop zu teilen, müssen Sie einen anderen Browser verwenden (Firefox wird empfohlen).
-bbb.desktopPublish.minimizeBtn.toolTip = Fenster minimieren.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Desktop Freigabe minimieren
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Desktop Freigabe maximieren
-bbb.desktopPublish.chromeHint.title = Chrome benötigt Ihre Erlaubnis.
-bbb.desktopPublish.chromeHint.message = Wählen Sie das Plugin-Icon (rechte obere Ecke von Chrome), erlauben Sie Plug-Ins und klicken Sie dann auf 'Erneut versuchen'
-bbb.desktopPublish.chromeHint.button = Erneut versuchen
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = An Fenstergröße anpassen
-bbb.desktopView.actualSize = Tatsächliche Größe anzeigen
-bbb.desktopView.minimizeBtn.accessibilityName = Desktop Freigabe minimieren
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Desktop Freigabe maximieren
-bbb.desktopView.closeBtn.accessibilityName = Desktop Freigabe schließen
+bbb.screensharePublish.title = Bildschirmfreigabe\: Präsentationsvorschau
+bbb.screensharePublish.pause.tooltip = Bildschirmfreigabe unterbrechen
+bbb.screensharePublish.pause.label = Unterbrechen
+bbb.screensharePublish.restart.tooltip = Bildschirmfreigabe fortsetzen
+bbb.screensharePublish.restart.label = Fortsetzen
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Das Fenster kann nicht maximiert werden
+bbb.screensharePublish.closeBtn.toolTip = Freigabe beenden und schließen
+bbb.screensharePublish.minimizeBtn.toolTip = Minimieren
+bbb.screensharePublish.minimizeBtn.accessibilityName = Bildschirmfreigabefenster minimieren
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Bildschirmfreigabefenster maximieren
+bbb.screensharePublish.commonHelpText.text = Die folgenden Schritte führen Sie durch die Prozess Ihren Bildschirm freizugeben (dafür wird Java benötigt).
+bbb.screensharePublish.helpButton.toolTip = Hilfe
+bbb.screensharePublish.helpButton.accessibilityName = Hilfe (Anleitungsvideos auf neuer Seite öffnen)
+bbb.screensharePublish.helpText.PCIE1 = 1. Wählen Sie 'Öffnen'
+bbb.screensharePublish.helpText.PCIE2 = 2. Akzeptieren Sie das Zertifikat
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Zum Starten auf 'OK' klicken
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Akzeptieren Sie das Zertifikat
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Finden Sie 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Zum Öffnen anklicken
+bbb.screensharePublish.helpText.PCChrome3 = 3. Akzeptieren Sie das Zertifikat
+bbb.screensharePublish.helpText.MacSafari1 = 1. Finden Sie 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Wählen Sie 'Anzeigen'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Rechtsklick und 'Öffnen' auswählen
+bbb.screensharePublish.helpText.MacSafari4 = 4. Wählen Sie 'Öffnen' (falls Sie danach gefragt werden)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Wählen Sie 'Datei speichern' (falls Sie danach gefragt werden)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Wählen Sie 'Anzeigen'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Rechtsklick und 'Öffnen' auswählen
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Wählen Sie 'Öffnen' (falls Sie danach gefragt werden)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Finden Sie 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Wählen Sie 'Anzeigen'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Rechtsklick und 'Öffnen' auswählen
+bbb.screensharePublish.helpText.MacChrome4 = 4. Wählen Sie 'Öffnen' (falls Sie danach gefragt werden)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Zum Starten auf 'OK' klicken
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Akzeptieren Sie das Zertifikat
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Finden Sie 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Zum Öffnen anklicken
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Akzeptieren Sie das Zertifikat
+bbb.screensharePublish.shareTypeLabel.text = Freigeben\:
+bbb.screensharePublish.shareType.fullScreen = Vollbild
+bbb.screensharePublish.shareType.region = Bereich
+bbb.screensharePublish.pauseMessage.label = Bildschirmfreigabe ist zur Zeit pausiert.
+bbb.screensharePublish.startFailed.label = Beginn der Bildschirmfreigabe wurde nicht erkannt
+bbb.screensharePublish.restartFailed.label = Neustart der Bildschirmfreigabe wurde nicht erkannt
+bbb.screensharePublish.jwsCrashed.label = Die Bildschirmfreigabe wurde unerwartet beendet.
+bbb.screensharePublish.commonErrorMessage.label = Wählen Sie 'Abbrechen' und versuchen Sie es erneut.
+bbb.screensharePublish.cancelButton.label = Abbrechen
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Bildschirmfreigabe
+bbb.screenshareView.fitToWindow = An Fenstergröße anpassen
+bbb.screenshareView.actualSize = In tatsächlicher Größe darstellen
+bbb.screenshareView.minimizeBtn.accessibilityName = Bildschirmfreigabefenster minimieren
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Bildschirmfreigabefenster maximieren
+bbb.screenshareView.closeBtn.accessibilityName = Bildschirmfreigabefenster schließen
 bbb.toolbar.phone.toolTip.start = Mikrofon freigeben
 bbb.toolbar.phone.toolTip.stop = Mikrofon nicht mehr freigeben
 bbb.toolbar.phone.toolTip.mute = Der Konferenz nicht weiter zuhören
 bbb.toolbar.phone.toolTip.unmute = Der Konferenz jetzt zuhören
 bbb.toolbar.phone.toolTip.nomic = Kein Mikrofon gefunden
-bbb.toolbar.deskshare.toolTip.start = Desktop freigeben
-bbb.toolbar.deskshare.toolTip.stop = Desktop nicht mehr freigeben
+bbb.toolbar.deskshare.toolTip.start = Bildschirm freigeben
+bbb.toolbar.deskshare.toolTip.stop = Bildschirmfreigabe beenden
 bbb.toolbar.video.toolTip.start = Webcam freigeben
 bbb.toolbar.video.toolTip.stop = Webcam nicht mehr freigeben
 bbb.layout.addButton.toolTip = Benutzerdefiniertes Layout zur Liste hinzufügen
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts wurden gespeichert
 bbb.layout.load.complete = Layouts wurden geladen
 bbb.layout.load.failed = Die Layouts können nicht geladen werden
 bbb.layout.name.defaultlayout = Standard Anordnung
+bbb.layout.name.closedcaption = Untertitel
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam-Konferenz
 bbb.layout.name.presentfocus = Präsentations-Konferenz
@@ -362,6 +395,7 @@ bbb.logout.rejected = Die Verbindung zum Server wurde abgelehnt
 bbb.logout.invalidapp = Die red5 Applikation existiert nicht
 bbb.logout.unknown = Die Verbindung zwischen Ihrem Client und dem Server wurde abgebrochen
 bbb.logout.usercommand = Sie haben sich aus der Konferenz ausgeloggt
+bbb.logour.breakoutRoomClose = Ihr Browserfenster wird geschlossen
 bbb.logout.ejectedFromMeeting = Ein Moderator hat Sie aus der Konferenz entfernt.
 bbb.logout.refresh.message = Falls Sie sich gar nicht ausloggen wollten, klicken Sie unten auf Erneut verbinden
 bbb.logout.refresh.label = Erneut verbinden
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Notiz speichern
 bbb.settings.deskshare.instructions = Klicken Sie im nächsten Fenster auf "Erlauben" um das Funktionieren des Desktop Sharing zu überprüfen
 bbb.settings.deskshare.start = Desktop Sharing überprüfen
 bbb.settings.voice.volume = Mikrofon Aktivität
-bbb.settings.java.label = Java Versionsfehler
-bbb.settings.java.text = Sie haben Java {0} installiert, Sie brauchen aber mindestens die Version {1} um BigBlueButton Desktop Sharing zu benutzen. Klicken Sie auf den unteren Knopf um die neuste Java JRE Version zu installieren.
-bbb.settings.java.command = Installieren Sie die neuste Java Version
 bbb.settings.flash.label = Flash Versionsfehler
 bbb.settings.flash.text = Sie haben Flash {0} installiert, aber Sie benötigen mindestens die Version {1} damit BigBlueButton richtig funktioniert. Klicken Sie auf den unteren Knopf um die neuste Adobe Flash Version zu installieren.
 bbb.settings.flash.command = Installieren Sie die neuste Flash Version
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Text wählen
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Textfarbe
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Schriftgröße
+bbb.caption.window.title = Untertitel
+bbb.caption.window.titleBar = Titelleiste des Untertitelfensters
+bbb.caption.window.minimizeBtn.accessibilityName = Untertitelfenster minimieren
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Untertitelfenster maximieren
+bbb.caption.transcript.noowner = Keine
+bbb.caption.transcript.youowner = Sie
+bbb.caption.transcript.pastewarning.title = Untertitel-Einfüge-Warnung
+bbb.caption.transcript.pastewarning.text = Es können nicht mehr als {0} Buchstaben eingefügt werden. Sie versuchen {1} Buchstaben einzufügen.
+bbb.caption.option.label = Optionen
+bbb.caption.option.language = Sprache\:
+bbb.caption.option.language.tooltip = Untertitelsprache auswählen
+bbb.caption.option.language.accessibilityName = Untertitelsprache auswählen. Dabei Pfeiltasten zur Navigation benutzen.
+bbb.caption.option.takeowner = Untertitelkontrolle übernehmen
+bbb.caption.option.takeowner.tooltip = Untertitelkontrolle für ausgewählte Sprache übernehmen
+bbb.caption.option.fontfamily = Schriftart\:
+bbb.caption.option.fontfamily.tooltip = Schriftart
+bbb.caption.option.fontsize = Schriftgröße\:
+bbb.caption.option.fontsize.tooltip = Schriftgröße
+bbb.caption.option.backcolor = Hintergrundfarbe\:
+bbb.caption.option.backcolor.tooltip = Hintergrundfarbe
+bbb.caption.option.textcolor = Schriftfarbe\:
+bbb.caption.option.textcolor.tooltip = Schriftfarbe
+
 
 bbb.accessibility.clientReady = Fertig
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Aktuelles Fenster minimieren
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Aktuelles Fenster maximieren
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Außerhalb des Flash Fensters fokussieren
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mikrofon stumm schalten und freigeben 
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Chat fokussieren
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Dektop Freigabe öffnen
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Audio Einstellungen
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Zuhören der Konferenz starten/beenden
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Webcam Freigabe
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Alle Videos schließen
 bbb.users.settings.lockAll=Alle Teilnehmer stummschalten
 bbb.users.settings.lockAllExcept=Teilnehmer sperren außer Präsentator
 bbb.users.settings.lockSettings=Teilnehmer sperren...
+bbb.users.settings.breakoutRooms=Breakout Räume ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Einladungen für Breakout Räume verschicken ...
 bbb.users.settings.unlockAll=Alle Teilnehmer freigeben
 bbb.users.settings.roomIsLocked=Gesperrt als Grundeinstellung
 bbb.users.settings.roomIsMuted=Stummschaltung als Grundeinstellung
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Teilnehmer sperren
 bbb.lockSettings.feature=Eigenschaft
 bbb.lockSettings.locked=Gesperrt
 bbb.lockSettings.lockOnJoin=Beim Konferenzbeitritt sperren
+
+bbb.users.breakout.breakoutRooms = Breakout Räume
+bbb.users.breakout.updateBreakoutRooms = Breakout Räume aktualisieren
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} verbleibend</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} verbleibend</b>
+bbb.users.breakout.calculatingRemainingTime = Berechne verbleibende Zeit...
+bbb.users.breakout.remainingTimeEnded = Zeit abgelaufen, der Breakout Raum wird geschlossen
+bbb.users.breakout.rooms = Räume
+bbb.users.breakout.roomsCombo.accessibilityName = Anzahl der zu erstellenden Räume
+bbb.users.breakout.room = Raum
+bbb.users.breakout.randomAssign = Nutzer zufällig auf Räume verteilen
+bbb.users.breakout.timeLimit = Zeitlimit
+bbb.users.breakout.durationStepper.accessibilityName = Zeitlimit in Minuten
+bbb.users.breakout.minutes = Minuten
+bbb.users.breakout.record = Aufzeichnen
+bbb.users.breakout.recordCheckbox.accessibilityName = Aufzeichnung in Breakout Räumen
+bbb.users.breakout.notAssigned = Nicht zugewiesen
+bbb.users.breakout.dragAndDropToolTip = Hinweis\: Sie können Nutzer per Drag-and-Drop auf die Räume verteilen
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Einladen
+bbb.users.breakout.close = Schließen
+bbb.users.breakout.closeAllRooms = Alle Breakout Räume schließen
+bbb.users.breakout.insufficientUsers = Zu wenige Nutzer. Sie sollen jedem Breakout Raum wenigstens einen Nutzer zuweisen.
+bbb.users.breakout.openJoinURL = Sie wurden in Breakout Raum {0} eingeladen. \n(Wenn Sie zustimmen, verlassen Sie automatisch die momentane Audiokonferenz)
+bbb.users.breakout.confirm = Zustimmung zum Betreten des Breakout Raums
+bbb.users.roomsGrid.room = Raum
+bbb.users.roomsGrid.users = Nutzer
+bbb.users.roomsGrid.action = Tätigkeit
+bbb.users.roomsGrid.transfer = Audio übertragen
+bbb.users.roomsGrid.join = Beitreten
+bbb.users.roomsGrid.noUsers = Keine Nutzer in diesem Raum
diff --git a/bigbluebutton-client/locale/el_GR/bbbResources.properties b/bigbluebutton-client/locale/el_GR/bbbResources.properties
index f38c56f64b45d858bbbd52cd433638c3b625e48d..679d57bbb34709eac97767a0de778fa441165e70 100644
--- a/bigbluebutton-client/locale/el_GR/bbbResources.properties
+++ b/bigbluebutton-client/locale/el_GR/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Ο Flash Player σας ({0}) δεν είναι ενημερωμένος. Προτείνεται ενημέρωση στην τελευταία έκδοση.
 bbb.clientstatus.webrtc.title = Ήχος
 bbb.clientstatus.webrtc.message = Συνιστούμε τη χρήση είτε του Firefox ή του Chrome για καλύτερη ακουστική.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Δεν βρέθηκε η έκδοση της Java
-bbb.clientstatus.java.notinstalled = Δεν έχετε εγκατεστημένη την Java, παρακαλούμε κάντε κλικ στο <font color \= "\# 0a4a7a"> <a href\='http\://www.java.com/download/' target\='_blank'> ΕΔΩ </a> </ font> για να εγκαταστήσετε την πιο πρόσφατη έκδοση της Java για να χρησιμοποιήσετε τη λειτουργία κοινής χρήσης επιφάνειας εργασίας.
-bbb.clientstatus.java.oldversion = Έχετε μια παλιά έκδοση της Java, παρακαλούμε κάντε κλικ στο κουμπί <font color \= "\# 0a4a7a"> <a href\='http\://www.java.com/download/' target\='_blank'> ΕΔΩ </a> </ font > για να εγκαταστήσετε την πιο πρόσφατη έκδοση της Java για να χρησιμοποιήσετε τη λειτουργία κοινής χρήσης επιφάνειας εργασίας.
 bbb.window.minimizeBtn.toolTip = Ελαχιστοποίηση
 bbb.window.maximizeRestoreBtn.toolTip = Μεγιστοποίηση
 bbb.window.closeBtn.toolTip = Κλείσιμο
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Θλιβερή κατάσταση
 bbb.users.emojiStatus.confused = Μπερδεμένη κατάσταση
 bbb.users.emojiStatus.neutral = Ουδέτερη κατάσταση
 bbb.users.emojiStatus.away = Κατάσταση πάντα
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Παρουσίαση
 bbb.presentation.titleWithPres = Παρουσίαση\: {0}
 bbb.presentation.quickLink.label = Παράθυρο Παρουσίασης
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Κλείσιμο παραθύρου τη
 bbb.video.publish.closeBtn.label = Ακύρωση
 bbb.video.publish.titleBar = Δημοσίευση παραθύρου κάμερας
 bbb.video.streamClose.toolTip = Κλείσιμο ροής για\: {0}
-bbb.desktopPublish.title = Διαμοιρασμός επιφάνειας εργασίας\: προεπισκόπηση εισηγητή
-bbb.desktopPublish.fullscreen.tooltip = Διαμοιρασμός κύριας οθόνης
-bbb.desktopPublish.fullscreen.label = Πλήρης οθόνη
-bbb.desktopPublish.region.tooltip = Διαμοιρασμός τμήματος της οθόνης σας
-bbb.desktopPublish.region.label = Περιοχή
-bbb.desktopPublish.stop.tooltip = Κλείσιμο διαμοιρασμού οθόνης
-bbb.desktopPublish.stop.label = Κλείσιμο
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Δεν μπορείτε να μεγιστοποιήσετε αυτό το παράθυρο
-bbb.desktopPublish.closeBtn.toolTip = Διακοπή διαμοιρασμού και κλείσιμο του παραθύρου
-bbb.desktopPublish.chromeOnMacUnsupportedHint = H κοινή χρήση της επιφάνειας εργασίας δεν υποστηρίζεται επί του παρόντος όταν ο Chrome τρέχει σε Mac OS X. Μπορείτε να χρησιμοποιήσετε ένα διαφορετικό πρόγραμμα περιήγησης (ο Firefox συνιστάται) για να μοιραστείτε την επιφάνεια εργασίας σας.
-bbb.desktopPublish.chrome42UnsupportedHint = Ο Chrome δεν υποστηρίζει πλέον Java Applets. Θα πρέπει να χρησιμοποιήσετε ένα διαφορετικό πρόγραμμα περιήγησης στο (ο Firefox συνιστάται) για να μοιραστείτε την επιφάνεια εργασίας σας.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge δεν υποστηρίζει Java Applets. Θα πρέπει να χρησιμοποιήσετε ένα διαφορετικό πρόγραμμα περιήγησης (o Firefox συνιστάται) για να μοιραστείτε την επιφάνεια εργασίας σας.
-bbb.desktopPublish.minimizeBtn.toolTip = Ελαχιστοποίηση
-bbb.desktopPublish.minimizeBtn.accessibilityName = Ελαχιστοποίηση του παραθύρου διαμοιρασμού επιφάνειας εργασίας
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Μεγιστοποίηση του παραθύρου διαμοιρασμού επιφάνειας εργασίας
-bbb.desktopPublish.chromeHint.title = O Chrome ενδέχεται να χρειάζεται την άδειά σας.
-bbb.desktopPublish.chromeHint.message = Επιλέξτε το εικονίδιο plug-in (επάνω δεξιά γωνία του Chrome), ξεμπλοκάρετε τα plugins, και στη συνέχεια επιλέξτε «Επανάληψη».
-bbb.desktopPublish.chromeHint.button = Επανάληψη
-bbb.desktopView.title = Διαμοιρασμός επιφάνειας εργασίας
-bbb.desktopView.fitToWindow = Προσαρμογή στο παράθυρο
-bbb.desktopView.actualSize = Προβολή πραγματικού μεγέθους
-bbb.desktopView.minimizeBtn.accessibilityName = Ελαχιστοποίηση του παραθύρου επισκόπισης διαμοιρασμού επιφάνειας εργασίας
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Μεγιστοποίση του παραθύρου επισκόπησης διαμοιρασμού επιφάνειας εργασίας
-bbb.desktopView.closeBtn.accessibilityName = Κλείσιμο του παραθύρου επισκόπησης διαμοιρασμού επιφάνειας εργασίας
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Διαμοιρασμός του μικροφώνου σας
 bbb.toolbar.phone.toolTip.stop = Κλείσιμο διαμοιρασμού του μικροφώνου σου
 bbb.toolbar.phone.toolTip.mute = Διακοπή παρακολούθησης συνεδρίου
 bbb.toolbar.phone.toolTip.unmute = Εκκίνηση παρακολούθησης συνεδρίου
 bbb.toolbar.phone.toolTip.nomic = Δε βρέθηκε μικρόφωνο
-bbb.toolbar.deskshare.toolTip.start = Διαμοιρασμός της επιφάνειας εργασίας σας
-bbb.toolbar.deskshare.toolTip.stop = Κλείσιμο διαμοιρασμού της επιφάνειας εργασίας σου
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Διαμοιρασμός της κάμερας σας
 bbb.toolbar.video.toolTip.stop = Κλείσιμο διαμοιρασμού της κάμεράς σου
 bbb.layout.addButton.toolTip = Προσθήκη της προσαρμοσμένης εμφάνισης στην λίστα
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Οι εμφανίσεις αποθηκεύτηκαν
 bbb.layout.load.complete = Οι εμφανίσεις φορτώθηκαν επιτυχώς
 bbb.layout.load.failed = Δεν ήταν δυνατόν να φορτωθούν οι εμφανίσεις
 bbb.layout.name.defaultlayout = Προεπιλεγμένη Εμφάνιση
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Συνομιλία βίντεο
 bbb.layout.name.webcamsfocus = Συνεδρίαση κάμερας
 bbb.layout.name.presentfocus = Συνεδρίαση παρουσίασης
@@ -362,6 +395,7 @@ bbb.logout.rejected = Η σύνδεση με τον διακομιστή έχε
 bbb.logout.invalidapp = Η εφαρμογή red5 δεν υπάρχει
 bbb.logout.unknown = Έχετε χάσει τη σύνδεσή σας με τον διακομιστή
 bbb.logout.usercommand = Έχετε αποσυνδεθεί από τη τηλεδιάσκεψη
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Ένας συντονιστής σας έθεσε εκτός από τη συνεδρίαση.
 bbb.logout.refresh.message = Εάν αυτή η αποσύνδεση ήταν απρόσμενη, κάντε κλικ στο κουμπί παρακάτω για να επανασυνδεθείτε.
 bbb.logout.refresh.label = Επανασύνδεση
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Αποθήκευση σημείωσης
 bbb.settings.deskshare.instructions = Κάντε κλικ στο "Επιτρέπεται" στο παράθυρο που ανοίγει, για να ελέγξετε αν ο διαμοιρασμός της επιφάνειας εργασίας σας λειτουργεί κανονικά
 bbb.settings.deskshare.start = Έλεγχος διαμοιρασμού επιφάνειας εργασίας
 bbb.settings.voice.volume = Δραστηριότητα μικροφώνου
-bbb.settings.java.label = Σφάλμα έκδοσης Java
-bbb.settings.java.text = Έχετε εγκατεστημένη την έκδοση {0}, αλλά χρειάζεστε τουλάχιστον την έκδοση {1} για να χρησιμοποιήσετε τη λειτουργία διαμοιρασμού της επιφάνειας εργασίας του BigBlueButton. Κάντε κλικ στο πλήκτρο παρακάτω για να εγκαταστήσετε τη νεότερη έκδοση της Java.
-bbb.settings.java.command = Εγκατάσταση νεότερης έκδοσης της Java
 bbb.settings.flash.label = Σφάλμα έκδοσης Flash
 bbb.settings.flash.text = Έχετε εγκατεστημένη την έκδοση {0} του Flash, αλλά χρειάζεστε τουλάχιστον την έκδοση {1} για να λειτουργεί το BigBlueButton απρόσκοπτα. Κάντε κλικ στο πλήκτρο παρακάτω για να εγκαταστήσετε τη νεότερη έκδοση του προγράμματος Adobe Flash.
 bbb.settings.flash.command = Εγκατάσταση νεότερης έκδοσης Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Κείμενο
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Αλλαγή του κέρσορα της οθόνης σε κείμενο
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Χρώμα κειμένου
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Μέγεθος γραμματοσειράς
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Έτοιμο
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Ελαχιστοποίηση τρέ
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Μεγιστοποίηση τρέχοντος παραθύρου
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Επικέντρωση εκτός του flash παραθύρου
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Σίγαση και ενεργοποίηση του μικροφώνου σου
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Μεταφορά της εστίασης 
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Άνοιγμα του παραθύρου διαμοιρασμού της επιφάνειας εργασίας
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Άνοιγμα του παραθύρου ρυθμίσεων του μικροφώνου
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Εκκίνηση / Τερματισμός παρακολούθησης συνεδρίου
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Άνοιγμα του παραθύρου διαμοιρασμού της κάμερας
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Κλείσιμο όλων των
 bbb.users.settings.lockAll=Κλείδωμα όλων των χρηστών
 bbb.users.settings.lockAllExcept=Κλείδωμα όλων εκτός του παρουσιαστή
 bbb.users.settings.lockSettings=Κλείδωμα θεατών
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Ξεκλείδωμα όλων των θεατών
 bbb.users.settings.roomIsLocked=Κλείδωμα εκ προεπιλογής
 bbb.users.settings.roomIsMuted=Σίγαση εκ προεπιλογής
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Κλείδωμα θεατών
 bbb.lockSettings.feature=Δυνατότητα
 bbb.lockSettings.locked=Κλειδωμένο
 bbb.lockSettings.lockOnJoin=Κλείδωμα κατά την Είσοδο
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/en_AU/bbbResources.properties b/bigbluebutton-client/locale/en_AU/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/en_AU/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_AU/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/es_419/bbbResources.properties b/bigbluebutton-client/locale/es_419/bbbResources.properties
index fd0a5acea3ba89d3bd7a6f98cbd4858d9da40ac1..467fbd321de8d06602b16b03e89a7bec9c3ee9d2 100644
--- a/bigbluebutton-client/locale/es_419/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_419/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Reproductor Flash
 bbb.clientstatus.flash.message = El reproductor Flash ({0}) no se encuentra actualizado. Se recomienda actualizarlo a la última versión.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Se recomienda utilizar Firefox o Chrome para obtener mejor calidad de audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = la version de Java no ha sido detectada
-bbb.clientstatus.java.notinstalled = Usted no tiene instalado Java, por favor has click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> para instalar la versión de JAVA mas reciente paraa usar la funcionalidad de escritorio remoto.
-bbb.clientstatus.java.oldversion = Usted tiene una versión de Java desactualizada, has click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>Aqui</a></font> para instalar la última versión de Java para utilizar la función de compartir escritorio.
 bbb.window.minimizeBtn.toolTip = Minimizar
 bbb.window.maximizeRestoreBtn.toolTip = Maximizar
 bbb.window.closeBtn.toolTip = Cerrar
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Estado triste
 bbb.users.emojiStatus.confused = Estado confundido
 bbb.users.emojiStatus.neutral = Estado neutral
 bbb.users.emojiStatus.away = Estado fuera de línea
+bbb.users.emojiStatus.thumbsUp = Estado Pulgares Arriba
+bbb.users.emojiStatus.thumbsDown = Estado Pulgares Abajo
+bbb.users.emojiStatus.applause = Estado Aplauso
 bbb.presentation.title = Presentación
 bbb.presentation.titleWithPres = Presentación\: {0}
 bbb.presentation.quickLink.label = Ventana de Presentación
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Cerrar la ventana de configuraciones de
 bbb.video.publish.closeBtn.label = Cancelar
 bbb.video.publish.titleBar = Ventana de iniciación de la cámara web
 bbb.video.streamClose.toolTip = Terminar transmisión para\: {0}
-bbb.desktopPublish.title = Escritorio compartido\: Vista preliminar del expositor
-bbb.desktopPublish.fullscreen.tooltip = Compartir su pantalla principal
-bbb.desktopPublish.fullscreen.label = Pantalla Completa
-bbb.desktopPublish.region.tooltip = Compartir una parte de su pantalla
-bbb.desktopPublish.region.label = Región
-bbb.desktopPublish.stop.tooltip = Cerrar ventana compartida
-bbb.desktopPublish.stop.label = Cerrar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = No puede maximizar esta ventana.
-bbb.desktopPublish.closeBtn.toolTip = Detener Compartir y Cerrar
-bbb.desktopPublish.chromeOnMacUnsupportedHint = La función de escritorio compartido no se encuentra soportada en Chrome en Mac OS X. Debe utilizar un navegador distinto (se recomienda Firefox) para compartir el escritorio.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome ya no soporta Java Applets. Debes utilizar un navegador diferente (se recomienda Firefox) para compartir tu escritorio.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge no soporta Applets Java. Debes elegir otro navegador (recomendamos Firefox) para compartir el escritorio.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimizar
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar la ventana de iniciar el compartir escritorio
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de iniciar el compartir escritorio
-bbb.desktopPublish.chromeHint.title = Chrome puede necesitar su autorización
-bbb.desktopPublish.chromeHint.message = Seleccione el icono plug-in (en la esquina superior derecha de Google Chrome), seleccione desbloquear plug-ins, y a continuación, seleccione "Reintentar".
-bbb.desktopPublish.chromeHint.button = Reintentar
-bbb.desktopView.title = Compartir Escritorio
-bbb.desktopView.fitToWindow = Ajustar Ventana
-bbb.desktopView.actualSize = Mostrar tamaño actual
-bbb.desktopView.minimizeBtn.accessibilityName = Minimizar la Ventana de Compartir Escritorio
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Mazimizar la Ventana de Compartir Escritorio
-bbb.desktopView.closeBtn.accessibilityName = Cerrar la Ventana de Compartir Escritorio
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Compartir su micrófono
 bbb.toolbar.phone.toolTip.stop = Dejar de compartir su micrófono
 bbb.toolbar.phone.toolTip.mute = Dejar de escuchar la conferencia
 bbb.toolbar.phone.toolTip.unmute = Empezar a escuchar la conferencia
 bbb.toolbar.phone.toolTip.nomic = No se ha detectado micrófono
-bbb.toolbar.deskshare.toolTip.start = Compartir su escritorio
-bbb.toolbar.deskshare.toolTip.stop = Dejar de compartir su escritorio
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Compartir su cámara Web
 bbb.toolbar.video.toolTip.stop = Dejar de compartir su cámara Web
 bbb.layout.addButton.toolTip = Añadir el diseño personalizado a la lista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Los diseños fueron guardados exitosamente
 bbb.layout.load.complete = Los diseños fueron cargados
 bbb.layout.load.failed = Error al cargar diseños
 bbb.layout.name.defaultlayout = Alineación de ventanas por defecto
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Chat de Video
 bbb.layout.name.webcamsfocus = Cámara web
 bbb.layout.name.presentfocus = Presentación
@@ -362,6 +395,7 @@ bbb.logout.rejected = La conexión al servidor ha sido rechazada
 bbb.logout.invalidapp = La aplicación red5 no existe
 bbb.logout.unknown = Su cliente ha perdido conexión con el servidor
 bbb.logout.usercommand = Usted ha salido de la conferencia
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Un moderador te ha sacado de la conferencia
 bbb.logout.refresh.message = Si esta desconexión no estaba planificada, pulse el botón para reconectar.
 bbb.logout.refresh.label = Reconectar
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Guardar Nota
 bbb.settings.deskshare.instructions = Presione Permitir en la ventana emergente para verificar que la compartición del escritorio está funcionando adecuadamente para usted
 bbb.settings.deskshare.start = Revisar Escritorio Compartido
 bbb.settings.voice.volume = Actividad del Micrófono
-bbb.settings.java.label = Error en versión de Java
-bbb.settings.java.text = Usted tiene Java {0} instalado, pero necesita por lo menos la versión {1} para ejecutar la opción escritorio compartido de BigBlueButton. Haga clic en el botón de abajo para instalar la versión más reciente de Java JRE.
-bbb.settings.java.command = Instalar la versión más reciente de Java
 bbb.settings.flash.label = Error de versión de Flash
 bbb.settings.flash.text = Usted tiene Flash {0} instalado, pero necesita por lo menos la versión {1} para ejecutar BigBlueButton adecuadamente. Haga clic en el botón de abajo para instalar la última versión de Adobe Flash.
 bbb.settings.flash.command = Instalar la versión más reciente de Java
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Texto
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Cambiar Cursos de pizarra a texto
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Color de texto
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Támaño de fuente
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Listo
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimizar ventana actual
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Mazimizar ventana actual
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Desenfocar de la ventana de flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Acticar o Desactivar el sonido de tu micrófono
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Mover enfoque a la venta de chat
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Abrir la ventana de compartir escritorio
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Abrir la ventana de configuración del micrófono
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Iniciar/Finalizar escuchar la conferencia
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Abrir ventana para compartir cámara
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Cerrar todos los videos
 bbb.users.settings.lockAll=Bloquear a todos
 bbb.users.settings.lockAllExcept=Bloquear todos menos presentador
 bbb.users.settings.lockSettings=Bloquear espectadores ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Desbloquear a todos los espectadores
 bbb.users.settings.roomIsLocked=Bloqueado por defecto
 bbb.users.settings.roomIsMuted=Silenciado por defecto
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Bloquear espectadores
 bbb.lockSettings.feature=Característica
 bbb.lockSettings.locked=Bloqueado
 bbb.lockSettings.lockOnJoin=Unirse
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/es_CL/bbbResources.properties b/bigbluebutton-client/locale/es_CL/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/es_CL/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_CL/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/es_ES/bbbResources.properties b/bigbluebutton-client/locale/es_ES/bbbResources.properties
index 93df527846b14605b600b3e64bffbe2295cbd479..159a5db9c960e559afc3e2e96243b3e2c085c340 100644
--- a/bigbluebutton-client/locale/es_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_ES/bbbResources.properties
@@ -6,13 +6,13 @@ bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebut
 bbb.mainshell.logBtn.toolTip = Abrir ventana de histórico
 bbb.mainshell.meetingNotFound = Reunión no encontrada
 bbb.mainshell.invalidAuthToken = Token de Autentificación No Válido
-bbb.mainshell.resetLayoutBtn.toolTip = Reiniciar posición de ventanas
+bbb.mainshell.resetLayoutBtn.toolTip = Reiniciar diseño de ventanas
 bbb.mainshell.notification.tunnelling = Túnel
 bbb.mainshell.notification.webrtc = Audio WebRTC
 bbb.oldlocalewindow.reminder1 = Puede que tenga una traducción obsoleta de BigBlueButton.
 bbb.oldlocalewindow.reminder2 = Por favor, vacíe el caché de su navegador, e inténtelo de nuevo.
-bbb.oldlocalewindow.windowTitle = Aviso\: Traducción de idioma obsoleta
-bbb.audioSelection.title = ¿Como quiere conectarse al audio?
+bbb.oldlocalewindow.windowTitle = Aviso\: traducción de idioma obsoleta
+bbb.audioSelection.title = ¿Cómo quiere conectarse al audio?
 bbb.audioSelection.btnMicrophone.label = Micrófono
 bbb.audioSelection.btnMicrophone.toolTip = Únase al audio con su micrófono
 bbb.audioSelection.btnListenOnly.label = Solo escuchar
@@ -22,15 +22,15 @@ bbb.micSettings.title = Prueba de audio
 bbb.micSettings.speakers.header = Probar altavoces
 bbb.micSettings.microphone.header = Probar Micrófono
 bbb.micSettings.playSound = Probar altavoces
-bbb.micSettings.playSound.toolTip = Escuchar música para probar los parlantes.
+bbb.micSettings.playSound.toolTip = Escuchar música para probar los altavoces.
 bbb.micSettings.hearFromHeadset = Debería escuchar audio en sus auriculares, no en los altavoces del ordenador.
-bbb.micSettings.speakIntoMic = Debe escuchar audio en sus auriculares, no en los altavoces del ordenador.
+bbb.micSettings.speakIntoMic = Si está usando auriculares (o intrauriculares) debería escuchar el audio en sus auriculares, no en los altavoces del ordenador.
 bbb.micSettings.echoTestMicPrompt = Este es un test de eco privado. Diga algunas palabras. ¿Escucha audio?
 bbb.micSettings.echoTestAudioYes = Si
 bbb.micSettings.echoTestAudioNo = No
 bbb.micSettings.speakIntoMicTestLevel = Hable a su micrófono. Debería ver esta barra moviéndose. Si no, seleccione otro micrófono.
 bbb.micSettings.recommendHeadset = Use unos cascos con micrófono para una mejor experiencia de audio.
-bbb.micSettings.changeMic = Probar/Cambiar Micrófono
+bbb.micSettings.changeMic = Probar/Cambiar micrófono
 bbb.micSettings.changeMic.toolTip = Abrir la ventana de configuraciones del micrófono de Flash Player
 bbb.micSettings.comboMicList.toolTip = Seleccione un micrófono
 bbb.micSettings.micRecordVolume.label = Ganancia
@@ -41,10 +41,10 @@ bbb.micSettings.join = Conectar audio
 bbb.micSettings.join.toolTip = Únase a la conferencia de audio
 bbb.micSettings.cancel = Cancelar
 bbb.micSettings.connectingtoecho = Conectando
-bbb.micSettings.connectingtoecho.error = Error en el Test de Eco\: contacte al administrador.
+bbb.micSettings.connectingtoecho.error = Error en el test de eco\: contacte al administrador.
 bbb.micSettings.cancel.toolTip = Cancelar la unión a la conferencia de audio
 bbb.micSettings.access.helpButton = Ayuda (abre videos tutoriales en una nueva página)
-bbb.micSettings.access.title = Configuraciones de Audio. Esta ventana permanecerá enfocada hasta que se cierre la misma.
+bbb.micSettings.access.title = Configuraciones de audio. Esta ventana permanecerá enfocada hasta que se cierre la misma.
 bbb.micSettings.webrtc.title = Soporte WebRTC
 bbb.micSettings.webrtc.capableBrowser = Su navegador soporta WebRTC
 bbb.micSettings.webrtc.capableBrowser.dontuseit = Pulse para no usar WebRTC
@@ -60,7 +60,7 @@ bbb.micPermissions.firefox.message1 = Elija su micrófono y pulse Compartir
 bbb.micPermissions.firefox.message2 = Si no ve la lista de micrófonos, pulse el icono de micrófono
 bbb.micPermissions.chrome.title = Permisos de Micrófono de Chrome
 bbb.micPermissions.chrome.message1 = Pulse Permitir para dar a Chrome permiso para utilizar su micrófono
-bbb.micWarning.title = Aviso de Audio
+bbb.micWarning.title = Aviso de audio
 bbb.micWarning.joinBtn.label = Unirse igualmente
 bbb.micWarning.testAgain.label = Probar de nuevo
 bbb.micWarning.message = Su micrófono no ha mostrado actividad, probablemente no puedan escucharle durante la sesión.
@@ -73,8 +73,8 @@ bbb.webrtcWarning.failedError.1004 = Error 1004\: Fallo en la llamada (motivo\={
 bbb.webrtcWarning.failedError.1005 = Error 1005\: Llamada finalizada de forma inesperada
 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.1008 = Error 1008\: Transferencia fallida
-bbb.webrtcWarning.failedError.1009 = Error 1009\: No se pudo recoger la información STUN/TURN del servidor
+bbb.webrtcWarning.failedError.1008 = Error 1008\: transferencia fallida
+bbb.webrtcWarning.failedError.1009 = Error 1009\: no se pudo recoger la información STUN/TURN del servidor
 bbb.webrtcWarning.failedError.1010 = Error 1010\: tiempo de negociación ICE agotado
 bbb.webrtcWarning.failedError.1011 = Error 1011\: tiempo de reunión ICE agotado
 bbb.webrtcWarning.failedError.unknown = Error {0}\: Código de error desconocido
@@ -90,7 +90,7 @@ bbb.mainToolbar.langSelector = Seleccione idioma
 bbb.mainToolbar.settingsBtn = Configuración
 bbb.mainToolbar.settingsBtn.toolTip = Abrir configuración
 bbb.mainToolbar.shortcutBtn = Atajos de teclado
-bbb.mainToolbar.shortcutBtn.toolTip = Abre la ventana de Atajos de Teclado
+bbb.mainToolbar.shortcutBtn.toolTip = Abre la ventana "Atajos de teclado"
 bbb.mainToolbar.recordBtn.toolTip.start = Iniciar grabación
 bbb.mainToolbar.recordBtn.toolTip.stop = Detener grabación
 bbb.mainToolbar.recordBtn.toolTip.recording = La sesión está siendo grabada
@@ -114,39 +114,35 @@ bbb.clientstatus.flash.title = Reproductor Flash
 bbb.clientstatus.flash.message = El reproductor Flash ({0}) no se encuentra actualizado. Se recomienda actualizarlo a la última versión.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Se recomienda utilizar Firefox o Chrome para obtener mejor calidad de audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Versión de Java no detectada
-bbb.clientstatus.java.notinstalled = No tiene instalado Java, por favor, pulse <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>AQUÍ</a></font> para instalar el Java más reciente para usar la característica de compartir escritorio.
-bbb.clientstatus.java.oldversion = TIene una versión vieja de Java instalada, por favor, pulse <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>AQUÍ</a></font> para instalar el Java más reciente para usar la característica de compartir escritorio.
 bbb.window.minimizeBtn.toolTip = Minimizar
 bbb.window.maximizeRestoreBtn.toolTip = Maximizar
 bbb.window.closeBtn.toolTip = Cerrar
-bbb.videoDock.titleBar = Barra de Título de la Ventana de Bloque de Video
-bbb.presentation.titleBar = Barra de Titulo de la Ventana de Presentación
-bbb.chat.titleBar = Barra de Título de la Ventana de Chat. Para navegar entre los mensajes, seleccione la lista de mensajes.
+bbb.videoDock.titleBar = Barra de título de la ventana de video
+bbb.presentation.titleBar = Barra de titulo de la ventana de presentación
+bbb.chat.titleBar = Barra de título de la ventana de chat
 bbb.users.title = Usuarios {0} {1}
-bbb.users.titleBar = Barra de título de la Ventana de Asistentes, doble click para maximizar
-bbb.users.quickLink.label = Ventana de Usuarios
-bbb.users.minimizeBtn.accessibilityName = Minimizar la Ventana de Asistentes
-bbb.users.maximizeRestoreBtn.accessibilityName = Maximizar la Ventana de Asistentes
+bbb.users.titleBar = Barra de título de la ventana de asistentes
+bbb.users.quickLink.label = Ventana de usuarios
+bbb.users.minimizeBtn.accessibilityName = Minimizar la ventana de asistentes
+bbb.users.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de asistentes
 bbb.users.settings.buttonTooltip = Configuración
 bbb.users.settings.audioSettings = Prueba de audio
-bbb.users.settings.webcamSettings = Configuración de Webcam
+bbb.users.settings.webcamSettings = Configuración de webcam
 bbb.users.settings.muteAll = Silenciar a todos
 bbb.users.settings.muteAllExcept = Silenciar a todos salvo al presentador
-bbb.users.settings.unmuteAll = Habilitar audio para Todos
+bbb.users.settings.unmuteAll = Habilitar audio para todos
 bbb.users.settings.clearAllStatus = Limpiar los iconos de estado
 bbb.users.emojiStatusBtn.toolTip = Actualizar mi icono de estado
-bbb.users.roomMuted.text = Audiencia Silenciada
+bbb.users.roomMuted.text = Audiencia silenciada
 bbb.users.roomLocked.text = Audiencia Bloqueada
 bbb.users.pushToTalk.toolTip = Pulse para hablar
-bbb.users.pushToMute.toolTip = Pulse para silenciarse a si mismo
+bbb.users.pushToMute.toolTip = Pulse para silenciarse a sí mismo
 bbb.users.muteMeBtnTxt.talk = Habilitar audio
 bbb.users.muteMeBtnTxt.mute = Silenciar
 bbb.users.muteMeBtnTxt.muted = Silenciado
 bbb.users.muteMeBtnTxt.unmuted = No silenciado
-bbb.users.usersGrid.contextmenu.exportusers = Copiar Nombres de Usuario
-bbb.users.usersGrid.accessibilityName = Lista de Asistentes. Usar las teclas de dirección para navegar.
+bbb.users.usersGrid.contextmenu.exportusers = Copiar nombres de usuario
+bbb.users.usersGrid.accessibilityName = Lista de asistentes. Usar las teclas de dirección para navegar.
 bbb.users.usersGrid.nameItemRenderer = Nombre
 bbb.users.usersGrid.nameItemRenderer.youIdentifier = tu
 bbb.users.usersGrid.statusItemRenderer = Estado
@@ -156,7 +152,7 @@ bbb.users.usersGrid.statusItemRenderer.moderator = Moderador
 bbb.users.usersGrid.statusItemRenderer.clearStatus = Vaciar estado
 bbb.users.usersGrid.statusItemRenderer.viewer = Espectador
 bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Compartiendo webcam.
-bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Es el Ponente.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Es el ponente.
 bbb.users.usersGrid.mediaItemRenderer = Media
 bbb.users.usersGrid.mediaItemRenderer.talking = Hablando
 bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam compartida
@@ -169,9 +165,9 @@ bbb.users.usersGrid.mediaItemRenderer.kickUser = Expulsar al asistente
 bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam compartida
 bbb.users.usersGrid.mediaItemRenderer.micOff = Micrófono inactivo
 bbb.users.usersGrid.mediaItemRenderer.micOn = Micrófono activo
-bbb.users.usersGrid.mediaItemRenderer.noAudio = No esta en la Conferencia de Voz
+bbb.users.usersGrid.mediaItemRenderer.noAudio = No está en la Conferencia de Voz
 bbb.users.emojiStatus.clear = Limpiar
-bbb.users.emojiStatus.clear.toolTip = Limpiar Estado
+bbb.users.emojiStatus.clear.toolTip = Limpiar estado
 bbb.users.emojiStatus.close = Cerrar
 bbb.users.emojiStatus.close.toolTip = Cerrar el popup de estado
 bbb.users.emojiStatus.raiseHand = Estado de mano levantada
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Estado Triste
 bbb.users.emojiStatus.confused = Estado Confuso
 bbb.users.emojiStatus.neutral = Estado Neutral
 bbb.users.emojiStatus.away = Estado Inactivo
+bbb.users.emojiStatus.thumbsUp = Estado Pulgares Arriba
+bbb.users.emojiStatus.thumbsDown = Estado Pulgares Abajo
+bbb.users.emojiStatus.applause = Estado Aplauso
 bbb.presentation.title = Presentación
 bbb.presentation.titleWithPres = Presentación\: {0}
 bbb.presentation.quickLink.label = Ventana de Presentación
@@ -191,17 +190,17 @@ bbb.presentation.backBtn.toolTip = Diapositiva anterior.
 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.
+bbb.presentation.maxUploadFileExceededAlert = Error\: el tamaño del archivo supera el máximo permitido.
 bbb.presentation.uploadcomplete = Carga completa. Por favor espere mientras convertimos el documento.
 bbb.presentation.uploaded = cargado.
 bbb.presentation.document.supported = El documento cargado está soportado. Comenzando la conversión...
 bbb.presentation.document.converted = Documento convertido con éxito.
-bbb.presentation.error.document.convert.failed = Error\: No se pudo convertir el documento de office
-bbb.presentation.error.io = Error E/S\: Por favor, contacte con el Administrador.
-bbb.presentation.error.security = Error de Seguridad\: Por favor, contacte con el Administrador.
+bbb.presentation.error.document.convert.failed = Error\: no se pudo convertir el documento de office
+bbb.presentation.error.io = Error E/S\: contacte con el Administrador.
+bbb.presentation.error.security = Error de seguridad\: por favor, contacte con el Administrador.
 bbb.presentation.error.convert.notsupported = El tipo de archivo cargado no está soportado. Por favor, cargue un archivo compatible.
-bbb.presentation.error.convert.nbpage = Error\: No se pudo estimar el número de páginas del archivo cargado.
-bbb.presentation.error.convert.maxnbpagereach = Error\: El documento cargado excede el máximo de páginas.
+bbb.presentation.error.convert.nbpage = Error\: no se pudo estimar el número de páginas del archivo cargado.
+bbb.presentation.error.convert.maxnbpagereach = Error\: el documento cargado excede el máximo de páginas.
 bbb.presentation.converted = Convertidas {0} de {1} diapositivas.
 bbb.presentation.ok = OK
 bbb.presentation.slider = Nivel de zoom en la presentación
@@ -218,13 +217,13 @@ bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de
 bbb.presentation.closeBtn.accessibilityName = Cerrar la ventana de presentación
 bbb.fileupload.title = Añada archivos a su presentación
 bbb.fileupload.lblFileName.defaultText = Archivo no seleccionado
-bbb.fileupload.selectBtn.label = Seleccionar Archivo
+bbb.fileupload.selectBtn.label = Seleccionar archivo
 bbb.fileupload.selectBtn.toolTip = Seleccione archivo
 bbb.fileupload.uploadBtn = Cargar
 bbb.fileupload.uploadBtn.toolTip = Cargar archivo
 bbb.fileupload.deleteBtn.toolTip = Eliminar presentación
 bbb.fileupload.showBtn = Mostrar
-bbb.fileupload.showBtn.toolTip = Mostrar Presentación
+bbb.fileupload.showBtn.toolTip = Mostrar presentación
 bbb.fileupload.okCancelBtn = Cancelar
 bbb.fileupload.okCancelBtn.toolTip = Cerrar la ventana para subir archivos
 bbb.fileupload.genThumbText = Generando miniaturas...
@@ -255,8 +254,8 @@ bbb.chat.maximizeRestoreBtn.accessibilityName = Maximizar la ventana del charla
 bbb.chat.closeBtn.accessibilityName = Cerrar la ventana de charla
 bbb.chat.chatTabs.accessibleNotice = Nuevos mensajes en esta pestaña.
 bbb.chat.chatMessage.systemMessage = Sistema
-bbb.chat.chatMessage.tooLong = El mensaje supera en {0} caracter(es) el máximo
-bbb.publishVideo.changeCameraBtn.labelText = Cambiar de Cámara
+bbb.chat.chatMessage.tooLong = El mensaje supera en {0} carácter(es) el máximo
+bbb.publishVideo.changeCameraBtn.labelText = Cambiar de cámara
 bbb.publishVideo.changeCameraBtn.toolTip = Abrir para abrir la ventana de cambios en la cámara
 bbb.publishVideo.cmbResolution.tooltip = Seleccionar la resolución de la cámara
 bbb.publishVideo.startPublishBtn.labelText = Empezar a compartir
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Cerrar la ventana de configuraciones de
 bbb.video.publish.closeBtn.label = Cancelar
 bbb.video.publish.titleBar = Ventana de iniciación de la cámara web
 bbb.video.streamClose.toolTip = Cerrar emisión de\: {0}
-bbb.desktopPublish.title = Compartir Pantalla\: Previsualición del Presentador
-bbb.desktopPublish.fullscreen.tooltip = Compartir la Pantalla Principal
-bbb.desktopPublish.fullscreen.label = Pantalla completa
-bbb.desktopPublish.region.tooltip = Compartir Parte de la Pantalla
-bbb.desktopPublish.region.label = Región
-bbb.desktopPublish.stop.tooltip = Detener la compartición de pantalla
-bbb.desktopPublish.stop.label = Cerrar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = No puede maximizar esta ventana.
-bbb.desktopPublish.closeBtn.toolTip = Detener la compartición y cerrar esta ventana.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = No es posible compartir Escritorio con Chrome bajo Mac OS X. Debes utilizar otro navegador (se recomienda Firefox) para compartir tu escritorio.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome ya no soporta Applets Java. Debes utilizar otro navegador (se recomienda Firefox) para compartir tu escritorio.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge no soporta Applets Java. Debes elegir otro navegador (recomendamos Firefox) para compartir el escritorio.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimizar esta ventana.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar la ventana de iniciar el compartir escritorio
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de iniciar el compartir escritorio
-bbb.desktopPublish.chromeHint.title = Chrome puede neceistar su permiso.
-bbb.desktopPublish.chromeHint.message = Escoja el icono de extensiones (en la esquina superior derecha de Chrome), desbloquée las extensiones, y escoja "Reintentar".
-bbb.desktopPublish.chromeHint.button = Reintentar
-bbb.desktopView.title = Compartición de pantalla
-bbb.desktopView.fitToWindow = Ajustar a la ventana
-bbb.desktopView.actualSize = Mostrar tamaño actual
-bbb.desktopView.minimizeBtn.accessibilityName = Minimizar la Ventana de Compartir Escritorio
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximizar la Ventana de Compartir Escritorio
-bbb.desktopView.closeBtn.accessibilityName = Cerrar la Ventana de Compartir Escritorio
+bbb.screensharePublish.title = Compartir Pantalla\: Previsualización del Presentador
+bbb.screensharePublish.pause.tooltip = Pausar la compartición de pantalla
+bbb.screensharePublish.pause.label = Pausa
+bbb.screensharePublish.restart.tooltip = Reiniciar la compartición de pantalla
+bbb.screensharePublish.restart.label = Reiniciar
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = No puedes maximizar esta ventana.
+bbb.screensharePublish.closeBtn.toolTip = Detener compartición y Cerrar
+bbb.screensharePublish.minimizeBtn.toolTip = Minimizar
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimizar la Ventana de Publicar Compartir Pantalla
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximizar la Ventana de Publicar Compartir Pantalla
+bbb.screensharePublish.commonHelpText.text = Los pasos a continuación te guiarán para iniciar la compartición de pantalla (requiere Java)
+bbb.screensharePublish.helpButton.toolTip = Ayuda
+bbb.screensharePublish.helpButton.accessibilityName = Ayuda (abre un tutorial en ventana nueva)
+bbb.screensharePublish.helpText.PCIE1 = 1. Selecciona 'Abrir'
+bbb.screensharePublish.helpText.PCIE2 = 2. Acepta el certificado
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Pulsa 'OK' para ejecutar
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Acepta el certificado
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Localiza 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Pulsa para abrir
+bbb.screensharePublish.helpText.PCChrome3 = 3. Acepta el certificado
+bbb.screensharePublish.helpText.MacSafari1 = 1. Localiza 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Selecciona 'Mostrar en el Explorador'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Haz click derecho y selecciona 'Abrir'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Selecciona 'Abrir' (si te pregunta)
+bbb.screensharePublish.helpText.MacFirefox1 = 1.- Elige "Guardar archivo" (si te pregunta)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Selecciona 'Mostrar en el Explorador'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Haz click derecho y selecciona 'Abrir'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Selecciona 'Abrir' (si te pregunta)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Localiza 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Selecciona 'Mostrar en el Explorador'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Haz click derecho y selecciona 'Abrir'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Selecciona 'Abrir' (si te pregunta)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Pulsa 'OK' para ejecutar
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Acepta el certificado
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Localiza 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Pulsa para abrir
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Acepta el certificado
+bbb.screensharePublish.shareTypeLabel.text = Compartir\:
+bbb.screensharePublish.shareType.fullScreen = Pantalla completa
+bbb.screensharePublish.shareType.region = Área
+bbb.screensharePublish.pauseMessage.label = Compartir Pantalla está pausado
+bbb.screensharePublish.startFailed.label = No se detectó el inicio de la compartición de pantalla.
+bbb.screensharePublish.restartFailed.label = No se detectó el reinicio de la compartición de pantalla.
+bbb.screensharePublish.jwsCrashed.label = La aplicación de compartición de pantalla se ha cerrado de forma inesperada.
+bbb.screensharePublish.commonErrorMessage.label = Selecciona 'Cancelar' e inténtalo de nuevo.
+bbb.screensharePublish.cancelButton.label = Cancelar
+bbb.screensharePublish.startButton.label = Iniciar
+bbb.screensharePublish.stopButton.label = Detener
+bbb.screenshareView.title = Compartir Pantalla
+bbb.screenshareView.fitToWindow = Ajustar a la ventana
+bbb.screenshareView.actualSize = Tamaño real
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimizar la Ventana de Publicar Compartir Pantalla
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximizar la Ventana de Vista de Compartir Pantalla
+bbb.screenshareView.closeBtn.accessibilityName = Cerrar la Ventana de Vista de Compartir Pantalla
 bbb.toolbar.phone.toolTip.start = Compartir su Micrófono
 bbb.toolbar.phone.toolTip.stop = Dejar de compartir su micrófono
 bbb.toolbar.phone.toolTip.mute = Parar de escuchar la conferencia
 bbb.toolbar.phone.toolTip.unmute = Empezar a escuchar la conferencia
 bbb.toolbar.phone.toolTip.nomic = No se ha detectado micrófono
-bbb.toolbar.deskshare.toolTip.start = Compartir su Escritorio
-bbb.toolbar.deskshare.toolTip.stop = Dejar de compartir su Escritorio
+bbb.toolbar.deskshare.toolTip.start = Comparte Tu Pantalla
+bbb.toolbar.deskshare.toolTip.stop = Parar de Compartir tu Pantalla
 bbb.toolbar.video.toolTip.start = Compartir su Cámara
 bbb.toolbar.video.toolTip.stop = Dejar de compartir su Cámara
 bbb.layout.addButton.toolTip = Añadir el diseño personalizado a la lista
@@ -322,35 +354,36 @@ bbb.layout.broadcastButton.toolTip = Aplicar este Diseño a toda la Audiencia
 bbb.layout.combo.toolTip = Cambiar diseño
 bbb.layout.loadButton.toolTip = Cargar diseños de un archivo
 bbb.layout.saveButton.toolTip = Guardar diseños en un archivo
-bbb.layout.lockButton.toolTip = Bloquear disposición
-bbb.layout.combo.prompt = Aplicar una disposición
-bbb.layout.combo.custom = Disposición a medida
-bbb.layout.combo.customName = Disposición a medida
+bbb.layout.lockButton.toolTip = Bloquear diseño
+bbb.layout.combo.prompt = Aplicar un diseño
+bbb.layout.combo.custom = * Diseño a medida
+bbb.layout.combo.customName = Diseño a medida
 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 = No se pudieron cargar los diseños
 bbb.layout.name.defaultlayout = Diseño por defecto
+bbb.layout.name.closedcaption = Subtítulos
 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 = Lápiz
 bbb.highlighter.toolbar.pencil.accessibilityName = Cambiar el cursor a lápiz
 bbb.highlighter.toolbar.ellipse = Círculo
 bbb.highlighter.toolbar.ellipse.accessibilityName = Cambiar el cursor a círculo
 bbb.highlighter.toolbar.rectangle = Ractángulo
 bbb.highlighter.toolbar.rectangle.accessibilityName = Cambiar el cursor a rectángulo
 bbb.highlighter.toolbar.panzoom = Panorámica y Zoom
-bbb.highlighter.toolbar.panzoom.accessibilityName = Cambiar el cursor a panómarico y zoom
+bbb.highlighter.toolbar.panzoom.accessibilityName = Cambiar el cursor a panorámico y zoom
 bbb.highlighter.toolbar.clear = Limpiar todas las notas
 bbb.highlighter.toolbar.clear.accessibilityName = Limpiar la página del pizarrón
 bbb.highlighter.toolbar.undo = Deshacer nota
 bbb.highlighter.toolbar.undo.accessibilityName = Deshacer la última figura de la pizarra
 bbb.highlighter.toolbar.color = Seleccionar color
 bbb.highlighter.toolbar.color.accessibilityName = Dibujar un color en la pizarra
-bbb.highlighter.toolbar.thickness = Modificar el grosor de linea
+bbb.highlighter.toolbar.thickness = Modificar el grosor de línea
 bbb.highlighter.toolbar.thickness.accessibilityName = Dibujar grosor en la pizarra
 bbb.logout.title = Desconectado
 bbb.logout.button.label = OK
@@ -362,6 +395,7 @@ bbb.logout.rejected = La conexión con el servidor ha sido rechazada
 bbb.logout.invalidapp = La aplicación red5 no existe
 bbb.logout.unknown = Se ha perdido la conexión con el servidor
 bbb.logout.usercommand = Ha desconectado de la conferencia
+bbb.logour.breakoutRoomClose = La ventana de tu navegador se cerrará
 bbb.logout.ejectedFromMeeting = Un moderador te ha expulsado de la reunión.
 bbb.logout.refresh.message = Si esta desconexión no estaba planificada, pulse el botón para reconectar.
 bbb.logout.refresh.label = Reconectar
@@ -369,13 +403,13 @@ bbb.logout.confirm.title = Confirmar Cerrar Sesión
 bbb.logout.confirm.message = ¿Está seguro que desea cerrar sesión?
 bbb.logout.confirm.yes = Si
 bbb.logout.confirm.no = No
-bbb.connection.failure=Detectados Problemas de Conectividad
+bbb.connection.failure=Detectados problemas de conectividad
 bbb.connection.reconnecting=Reconectando
 bbb.connection.reestablished=Conexión restablecida
 bbb.connection.bigbluebutton=BigBlueButton
 bbb.connection.sip=SIP
 bbb.connection.video=Video
-bbb.connection.deskshare=Compartir Escritorio
+bbb.connection.deskshare=Compartir escritorio
 bbb.notes.title = Notas
 bbb.notes.cmpColorPicker.toolTip = Color de Texto
 bbb.notes.saveBtn = Guardar
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Guardar Nota
 bbb.settings.deskshare.instructions = Presione Permitir en el aviso para verificar que la compartición del escritorio está funcionando correctamente para usted
 bbb.settings.deskshare.start = Comprobar Compartición de Escritorio
 bbb.settings.voice.volume = Actividad del micrófono
-bbb.settings.java.label = Error de versión de Java
-bbb.settings.java.text = Dispone de Java {0} instalado, pero necesita al menos {1} para utilizar la funcionalidad Compartir Pantalla. Pulse el botón para actualizar su versión de Java JRE.
-bbb.settings.java.command = Actualizar Java
 bbb.settings.flash.label = Error de versión de Flash
 bbb.settings.flash.text = Dispone de Flash {0} , pero necesita al menos {1} para utilizar la videoconferencia. Pulse el botón para actualizar su versión de Adobe Flash.
 bbb.settings.flash.command = Actualizar Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Texto
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Cambiar Cursos de pizarra a texto
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Color de texto
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Tamaño de letra
+bbb.caption.window.title = Subtítulos
+bbb.caption.window.titleBar = Barra de título de los subtítulos
+bbb.caption.window.minimizeBtn.accessibilityName = Minimizar la ventana de subtítulos
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de subtítulos
+bbb.caption.transcript.noowner = Nadie
+bbb.caption.transcript.youowner = Tú
+bbb.caption.transcript.pastewarning.title = Aviso de pegado
+bbb.caption.transcript.pastewarning.text = No puedes pegar texto superior a {0} caracteres. Has pegado {1} caracteres.
+bbb.caption.option.label = Opciones
+bbb.caption.option.language = Idioma\:
+bbb.caption.option.language.tooltip = Seleccionar idioma de subtítulos
+bbb.caption.option.language.accessibilityName = Selecciona el idioma de los textos. Usa las teclas de dirección para moverte.
+bbb.caption.option.takeowner = Hacerte propietario
+bbb.caption.option.takeowner.tooltip = Hacerte propietario del idioma seleccionado
+bbb.caption.option.fontfamily = Familia de la fuente\:
+bbb.caption.option.fontfamily.tooltip = Familia de la fuente
+bbb.caption.option.fontsize = Tamaño de la fuente\:
+bbb.caption.option.fontsize.tooltip = Tamaño de la fuente
+bbb.caption.option.backcolor = Color de fondo\:
+bbb.caption.option.backcolor.tooltip = Color de fondo
+bbb.caption.option.textcolor = Color de texto\:
+bbb.caption.option.textcolor.tooltip = Color de texto
+
 
 bbb.accessibility.clientReady = Listo
 
@@ -413,7 +467,7 @@ bbb.accessibility.chat.chatBox.navigatedFirst =  Has navegado al primer mensaje
 bbb.accessibility.chat.chatBox.navigatedLatest = Has navegado al último mensaje
 bbb.accessibility.chat.chatBox.navigatedLatestRead = Has navegado al mensaje leído más reciente
 bbb.accessibility.chat.chatwindow.input = Entrada del chat
-bbb.accessibility.chat.chatwindow.audibleChatNotification = Sonido de Notificaciones de Chat
+bbb.accessibility.chat.chatwindow.audibleChatNotification = Sonido de notificaciones de chat
 
 bbb.accessibility.chat.initialDescription = Por favor usar las teclas direccionales para navegar a través de los mensajes del chat.
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimizar ventana actual
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximizar ventana actual
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Desenfocar de la ventana de flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Activar o Desactivar el sonido de tu micrófono
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Mover enfoque a la ventana de chat
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Abrir la ventana de compartir escritorio
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Abrir la ventana de configuración del micrófono
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Empezar/Parar de escuchar la conferencia
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Abrir ventana para compartir cámara
 
@@ -526,11 +576,11 @@ bbb.shortcutkey.chat.chatbox.debug = 71
 bbb.shortcutkey.chat.chatbox.debug.function = Tecla de acceso rápido para depurar temporalmente
 
 bbb.polling.startButton.tooltip = Iniciar una encuesta
-bbb.polling.startButton.label = Iniciar Encuesta
+bbb.polling.startButton.label = Iniciar encuesta
 bbb.polling.publishButton.label = Publicar
 bbb.polling.closeButton.label = Cerrar
-bbb.polling.pollModal.title = Resultados en Vivo
-bbb.polling.customChoices.title = Opciones de la Encuesta
+bbb.polling.pollModal.title = Resultados en vivo
+bbb.polling.customChoices.title = Opciones de la encuesta
 bbb.polling.respondersLabel.novotes = Esperando respuestas
 bbb.polling.respondersLabel.text = {0} Usuarios han respondido
 bbb.polling.respondersLabel.finished = Hecho
@@ -549,7 +599,7 @@ bbb.polling.results.accessible.header = Resultados de la encuesta.
 bbb.polling.results.accessible.answer = La respuesta {0} tuvo {1} votos.
 
 bbb.publishVideo.startPublishBtn.labelText = Empezar a compartir
-bbb.publishVideo.changeCameraBtn.labelText = Cambiar de Cámara
+bbb.publishVideo.changeCameraBtn.labelText = Cambiar de cámara
 
 bbb.accessibility.alerts.madePresenter = Ahora eres el presentador.
 bbb.accessibility.alerts.madeViewer = Ahora eres un espectador.
@@ -563,10 +613,12 @@ bbb.shortcutkey.specialKeys.plus = Más
 bbb.shortcutkey.specialKeys.minus = Menos
 
 bbb.toolbar.videodock.toolTip.closeAllVideos = Cerrar todos los videos
-bbb.users.settings.lockAll=Bloquear a Todos los Usuarios
-bbb.users.settings.lockAllExcept=Bloquear Usuarios salvo el Presentador
+bbb.users.settings.lockAll=Bloquear a todos los usuarios
+bbb.users.settings.lockAllExcept=Bloquear usuarios salvo el presentador
 bbb.users.settings.lockSettings=Bloquear Audiencia ...
-bbb.users.settings.unlockAll=Desbloquear toda la Audiencia
+bbb.users.settings.breakoutRooms=Sala de grupo ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Enviar Invitaciones a salas de espera ...
+bbb.users.settings.unlockAll=Desbloquear toda la audiencia
 bbb.users.settings.roomIsLocked=Bloqueado por defecto
 bbb.users.settings.roomIsMuted=Silenciado por defecto
 
@@ -575,13 +627,44 @@ bbb.lockSettings.save.tooltip = Aplicar ajustes de bloqueo
 bbb.lockSettings.cancel = Cancelar
 bbb.lockSettings.cancel.toolTip = Cerrar ventana sin guardar
 
-bbb.lockSettings.moderatorLocking = Bloqueo de Moderador
-bbb.lockSettings.privateChat = Chat Privado
-bbb.lockSettings.publicChat = Chat Público
+bbb.lockSettings.moderatorLocking = Bloqueo de moderador
+bbb.lockSettings.privateChat = Chat privado
+bbb.lockSettings.publicChat = Chat público
 bbb.lockSettings.webcam = Cámara
 bbb.lockSettings.microphone = Micrófono
 bbb.lockSettings.layout = Diseño
-bbb.lockSettings.title=Bloquear Audiencia
+bbb.lockSettings.title=Bloquear audiencia
 bbb.lockSettings.feature=Característica
 bbb.lockSettings.locked=Bloqueado
-bbb.lockSettings.lockOnJoin=Bloquear al Unirse
+bbb.lockSettings.lockOnJoin=Bloquear al unirse
+
+bbb.users.breakout.breakoutRooms = Salas de grupo
+bbb.users.breakout.updateBreakoutRooms = Actualizar salas de espera
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} restantes</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} restantes</b>
+bbb.users.breakout.calculatingRemainingTime = Calculando tiempo restante...
+bbb.users.breakout.remainingTimeEnded = Tiempo finalizado, la sala de grupo se cerrará.
+bbb.users.breakout.rooms = Salas
+bbb.users.breakout.roomsCombo.accessibilityName = Número de salas a crear
+bbb.users.breakout.room = Sala
+bbb.users.breakout.randomAssign = Asignar usuarios de forma aleatoria
+bbb.users.breakout.timeLimit = Límite de tiempo
+bbb.users.breakout.durationStepper.accessibilityName = Límite de tiempo en minutos
+bbb.users.breakout.minutes = Minutos
+bbb.users.breakout.record = Grabar
+bbb.users.breakout.recordCheckbox.accessibilityName = Grabar salas de espera
+bbb.users.breakout.notAssigned = No asignado
+bbb.users.breakout.dragAndDropToolTip = Truco\: puedes arrastrar y soltar usuarios entre salas
+bbb.users.breakout.start = Iniciar
+bbb.users.breakout.invite = Invitar
+bbb.users.breakout.close = Cerrar
+bbb.users.breakout.closeAllRooms = Cerrar todas las salas de grupo
+bbb.users.breakout.insufficientUsers = Usuarios insuficientes. Debes situar al menos a un usuario en una sala de grupo
+bbb.users.breakout.openJoinURL = Has sido invitado a unirte a la sala de grupo {0}\n(Si aceptas, dejarás la conferencia de audio)
+bbb.users.breakout.confirm = Confirma la unión a la sala de grupo
+bbb.users.roomsGrid.room = Sala
+bbb.users.roomsGrid.users = Usuarios
+bbb.users.roomsGrid.action = Acción
+bbb.users.roomsGrid.transfer = Transferir audio
+bbb.users.roomsGrid.join = Unirse
+bbb.users.roomsGrid.noUsers = Sin usuarios en esta sala
diff --git a/bigbluebutton-client/locale/es_LA/bbbResources.properties b/bigbluebutton-client/locale/es_LA/bbbResources.properties
index fd0a5acea3ba89d3bd7a6f98cbd4858d9da40ac1..467fbd321de8d06602b16b03e89a7bec9c3ee9d2 100644
--- a/bigbluebutton-client/locale/es_LA/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_LA/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Reproductor Flash
 bbb.clientstatus.flash.message = El reproductor Flash ({0}) no se encuentra actualizado. Se recomienda actualizarlo a la última versión.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Se recomienda utilizar Firefox o Chrome para obtener mejor calidad de audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = la version de Java no ha sido detectada
-bbb.clientstatus.java.notinstalled = Usted no tiene instalado Java, por favor has click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> para instalar la versión de JAVA mas reciente paraa usar la funcionalidad de escritorio remoto.
-bbb.clientstatus.java.oldversion = Usted tiene una versión de Java desactualizada, has click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>Aqui</a></font> para instalar la última versión de Java para utilizar la función de compartir escritorio.
 bbb.window.minimizeBtn.toolTip = Minimizar
 bbb.window.maximizeRestoreBtn.toolTip = Maximizar
 bbb.window.closeBtn.toolTip = Cerrar
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Estado triste
 bbb.users.emojiStatus.confused = Estado confundido
 bbb.users.emojiStatus.neutral = Estado neutral
 bbb.users.emojiStatus.away = Estado fuera de línea
+bbb.users.emojiStatus.thumbsUp = Estado Pulgares Arriba
+bbb.users.emojiStatus.thumbsDown = Estado Pulgares Abajo
+bbb.users.emojiStatus.applause = Estado Aplauso
 bbb.presentation.title = Presentación
 bbb.presentation.titleWithPres = Presentación\: {0}
 bbb.presentation.quickLink.label = Ventana de Presentación
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Cerrar la ventana de configuraciones de
 bbb.video.publish.closeBtn.label = Cancelar
 bbb.video.publish.titleBar = Ventana de iniciación de la cámara web
 bbb.video.streamClose.toolTip = Terminar transmisión para\: {0}
-bbb.desktopPublish.title = Escritorio compartido\: Vista preliminar del expositor
-bbb.desktopPublish.fullscreen.tooltip = Compartir su pantalla principal
-bbb.desktopPublish.fullscreen.label = Pantalla Completa
-bbb.desktopPublish.region.tooltip = Compartir una parte de su pantalla
-bbb.desktopPublish.region.label = Región
-bbb.desktopPublish.stop.tooltip = Cerrar ventana compartida
-bbb.desktopPublish.stop.label = Cerrar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = No puede maximizar esta ventana.
-bbb.desktopPublish.closeBtn.toolTip = Detener Compartir y Cerrar
-bbb.desktopPublish.chromeOnMacUnsupportedHint = La función de escritorio compartido no se encuentra soportada en Chrome en Mac OS X. Debe utilizar un navegador distinto (se recomienda Firefox) para compartir el escritorio.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome ya no soporta Java Applets. Debes utilizar un navegador diferente (se recomienda Firefox) para compartir tu escritorio.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge no soporta Applets Java. Debes elegir otro navegador (recomendamos Firefox) para compartir el escritorio.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimizar
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar la ventana de iniciar el compartir escritorio
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar la ventana de iniciar el compartir escritorio
-bbb.desktopPublish.chromeHint.title = Chrome puede necesitar su autorización
-bbb.desktopPublish.chromeHint.message = Seleccione el icono plug-in (en la esquina superior derecha de Google Chrome), seleccione desbloquear plug-ins, y a continuación, seleccione "Reintentar".
-bbb.desktopPublish.chromeHint.button = Reintentar
-bbb.desktopView.title = Compartir Escritorio
-bbb.desktopView.fitToWindow = Ajustar Ventana
-bbb.desktopView.actualSize = Mostrar tamaño actual
-bbb.desktopView.minimizeBtn.accessibilityName = Minimizar la Ventana de Compartir Escritorio
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Mazimizar la Ventana de Compartir Escritorio
-bbb.desktopView.closeBtn.accessibilityName = Cerrar la Ventana de Compartir Escritorio
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Compartir su micrófono
 bbb.toolbar.phone.toolTip.stop = Dejar de compartir su micrófono
 bbb.toolbar.phone.toolTip.mute = Dejar de escuchar la conferencia
 bbb.toolbar.phone.toolTip.unmute = Empezar a escuchar la conferencia
 bbb.toolbar.phone.toolTip.nomic = No se ha detectado micrófono
-bbb.toolbar.deskshare.toolTip.start = Compartir su escritorio
-bbb.toolbar.deskshare.toolTip.stop = Dejar de compartir su escritorio
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Compartir su cámara Web
 bbb.toolbar.video.toolTip.stop = Dejar de compartir su cámara Web
 bbb.layout.addButton.toolTip = Añadir el diseño personalizado a la lista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Los diseños fueron guardados exitosamente
 bbb.layout.load.complete = Los diseños fueron cargados
 bbb.layout.load.failed = Error al cargar diseños
 bbb.layout.name.defaultlayout = Alineación de ventanas por defecto
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Chat de Video
 bbb.layout.name.webcamsfocus = Cámara web
 bbb.layout.name.presentfocus = Presentación
@@ -362,6 +395,7 @@ bbb.logout.rejected = La conexión al servidor ha sido rechazada
 bbb.logout.invalidapp = La aplicación red5 no existe
 bbb.logout.unknown = Su cliente ha perdido conexión con el servidor
 bbb.logout.usercommand = Usted ha salido de la conferencia
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Un moderador te ha sacado de la conferencia
 bbb.logout.refresh.message = Si esta desconexión no estaba planificada, pulse el botón para reconectar.
 bbb.logout.refresh.label = Reconectar
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Guardar Nota
 bbb.settings.deskshare.instructions = Presione Permitir en la ventana emergente para verificar que la compartición del escritorio está funcionando adecuadamente para usted
 bbb.settings.deskshare.start = Revisar Escritorio Compartido
 bbb.settings.voice.volume = Actividad del Micrófono
-bbb.settings.java.label = Error en versión de Java
-bbb.settings.java.text = Usted tiene Java {0} instalado, pero necesita por lo menos la versión {1} para ejecutar la opción escritorio compartido de BigBlueButton. Haga clic en el botón de abajo para instalar la versión más reciente de Java JRE.
-bbb.settings.java.command = Instalar la versión más reciente de Java
 bbb.settings.flash.label = Error de versión de Flash
 bbb.settings.flash.text = Usted tiene Flash {0} instalado, pero necesita por lo menos la versión {1} para ejecutar BigBlueButton adecuadamente. Haga clic en el botón de abajo para instalar la última versión de Adobe Flash.
 bbb.settings.flash.command = Instalar la versión más reciente de Java
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Texto
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Cambiar Cursos de pizarra a texto
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Color de texto
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Támaño de fuente
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Listo
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimizar ventana actual
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Mazimizar ventana actual
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Desenfocar de la ventana de flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Acticar o Desactivar el sonido de tu micrófono
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Mover enfoque a la venta de chat
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Abrir la ventana de compartir escritorio
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Abrir la ventana de configuración del micrófono
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Iniciar/Finalizar escuchar la conferencia
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Abrir ventana para compartir cámara
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Cerrar todos los videos
 bbb.users.settings.lockAll=Bloquear a todos
 bbb.users.settings.lockAllExcept=Bloquear todos menos presentador
 bbb.users.settings.lockSettings=Bloquear espectadores ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Desbloquear a todos los espectadores
 bbb.users.settings.roomIsLocked=Bloqueado por defecto
 bbb.users.settings.roomIsMuted=Silenciado por defecto
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Bloquear espectadores
 bbb.lockSettings.feature=Característica
 bbb.lockSettings.locked=Bloqueado
 bbb.lockSettings.lockOnJoin=Unirse
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/et_EE/bbbResources.properties b/bigbluebutton-client/locale/et_EE/bbbResources.properties
index 39e3609dde4e32acbdc7097a0ba3e99c473cab66..a2909997df9cd06d3a33e6d3258c85da80fe9d2b 100644
--- a/bigbluebutton-client/locale/et_EE/bbbResources.properties
+++ b/bigbluebutton-client/locale/et_EE/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Sinu Flash Player lisamoodul ({0}) on aegunud. Soovitame see uuendada viimasele versioonile.
 bbb.clientstatus.webrtc.title = Heli
 bbb.clientstatus.webrtc.message = Soovitame parima helikvaliteedi saavutamiseks kasutada Firefox või Chrome brauserit.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java versiooni tuvastamine nurjus.
-bbb.clientstatus.java.notinstalled = Sinu arvutis pole Java tarkvara. Palun klõpsa <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>SIIN</a></font> ja installeeri uusim Java, et kasutada ekraani jagamise funktsionaalsust.
-bbb.clientstatus.java.oldversion = Sinu arvutis on vana Java versioon. Palun klõpsa <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>SIIN</a></font> ja installeeri uusim Java, et kasutada ekraani jagamise funktsionaalsust.
 bbb.window.minimizeBtn.toolTip = Minimeeri
 bbb.window.maximizeRestoreBtn.toolTip = Maksimeeri
 bbb.window.closeBtn.toolTip = Sulge
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Kurb
 bbb.users.emojiStatus.confused = Segaduses
 bbb.users.emojiStatus.neutral = Neutraalne
 bbb.users.emojiStatus.away = Eemal
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Esitlus
 bbb.presentation.titleWithPres = Esitlus\: {0}
 bbb.presentation.quickLink.label = Esitluse aken
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Sulge veebikaamera sätete aken
 bbb.video.publish.closeBtn.label = Katkesta
 bbb.video.publish.titleBar = Veebikaamera avaldamise aken
 bbb.video.streamClose.toolTip = Sulge voog\: {0}
-bbb.desktopPublish.title = Töölaua jagamine\: Esineja eelvaade
-bbb.desktopPublish.fullscreen.tooltip = Jaga oma peamist ekraani
-bbb.desktopPublish.fullscreen.label = Kogu ekraan
-bbb.desktopPublish.region.tooltip = Jaga osa enda ekraanist
-bbb.desktopPublish.region.label = Regioon
-bbb.desktopPublish.stop.tooltip = Sulge ekraani jagamine
-bbb.desktopPublish.stop.label = Sulge
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Seda akent ei ole võimalik suuremaks teha.
-bbb.desktopPublish.closeBtn.toolTip = Lõpeta jagamine ja sulge
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Ekraani jagamine ei ole hetkel Chrome brauseriga Mac OS X operatsioonisüsteemis toetatud. Kasuta ekraani jagamiseks teistsugust brauserit (soovitame Firefox-i).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome ei toeta enam Java rakendusi (Applets). Ekraani jagamiseks pead kasutama teistsugust brauserit (soovitame Firefox-i).
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge brauser ei toeta Java rakendusi (Applets). Töölaua jagamiseks on vaja kasutada alternatiivset brauserit (soovitame Firefox-i).
-bbb.desktopPublish.minimizeBtn.toolTip = Minimeeri
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimeeri töölaua jagamise aken
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maksimeeri töölaua jagamise aken
-bbb.desktopPublish.chromeHint.title = Chrome võib vajada sinu nõusolekut.
-bbb.desktopPublish.chromeHint.message = Vali lisade ikoon (Chrome brauseri paremas ülanurgas), luba lisad, ja siis klõpsa nupul 'Proovi uuesti'.
-bbb.desktopPublish.chromeHint.button = Proovi uuesti
-bbb.desktopView.title = Töölaua jagamine
-bbb.desktopView.fitToWindow = Sobita aknasse
-bbb.desktopView.actualSize = Näita tegelikus suuruses
-bbb.desktopView.minimizeBtn.accessibilityName = Minimeeri töölaua jagamise eelvaate aken
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maksimeeri töölaua jagamise eelvaate aken
-bbb.desktopView.closeBtn.accessibilityName = Sulge töölaua jagamise eelvaate aken
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Jaga oma mikrofoni
 bbb.toolbar.phone.toolTip.stop = Lõpeta oma mikrofoni jagamine
 bbb.toolbar.phone.toolTip.mute = Lõpeta konverentsi kuulamine
 bbb.toolbar.phone.toolTip.unmute = Alusta konverentsi kuulamist
 bbb.toolbar.phone.toolTip.nomic = Ei tuvastanud ühtegi mikrofoni
-bbb.toolbar.deskshare.toolTip.start = Jaga oma töölauda
-bbb.toolbar.deskshare.toolTip.stop = Lõpeta oma töölaua jagamine
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Jaga oma veebikaamerat
 bbb.toolbar.video.toolTip.stop = Lõpeta oma veebikaamera jagamine
 bbb.layout.addButton.toolTip = Lisa mugandatud paigutus nimekirja
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Paigutused salvestati edukalt
 bbb.layout.load.complete = Paigutused on edukalt laetud
 bbb.layout.load.failed = Paigutuste laadimine ebaõnnestus
 bbb.layout.name.defaultlayout = Vaikimisi paigutus
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Videokõne
 bbb.layout.name.webcamsfocus = Veebikaameratega kohtumine
 bbb.layout.name.presentfocus = Esitlusega kohtumine
@@ -362,6 +395,7 @@ bbb.logout.rejected = Ühendumine serveriga on tagasi lükatud
 bbb.logout.invalidapp = red5 rakendus puudub
 bbb.logout.unknown = Sinu klientprogrammi ühendus serveriga katkes
 bbb.logout.usercommand = Oled veebikoosolekult välja logitud
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Moderaator on Su koosolekult eemaldanud.
 bbb.logout.refresh.message = Kui sinu välja logimine oli ootamatu, siis palun klõpsa all nähtaval nupul.
 bbb.logout.refresh.label = Ãœhendu uuesti
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Salvesta märkmed
 bbb.settings.deskshare.instructions = Klõpsa avanevas hüpikaknas "Allow/Luba", et tagada töölaua jagamise toimimine
 bbb.settings.deskshare.start = Kontrolli töölaua jagamist
 bbb.settings.voice.volume = Mikrofoni olek
-bbb.settings.java.label = Java versiooni viga
-bbb.settings.java.text = Sinu arvutis on olemas Java versioon {0} aga BigBlueButton-i kaudu töölaua jagamiseks on vaja vähemalt versiooni {1}. Klõpsa all asuval nupul, et installeerida oma arvutisse uusim Java JRE versioon.
-bbb.settings.java.command = Installeeri uusim Java
 bbb.settings.flash.label = Flash versiooni viga
 bbb.settings.flash.text = Sinu arvutis on olemas Flash versioon {0} aga BigBlueButton-i kasutamiseks on vaja vähemalt versiooni {1}. Klõpsa all asuval nupul, et installeerida oma arvutisse uusim Adobe Flash versioon.
 bbb.settings.flash.command = Installeeri uusim Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekst
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Muuda valge tahvli kursor tekstiks
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Teksti värv
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Fondi suurus
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Valmis
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimeeri praegune aken
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maksimeeri praegune aken
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Vii fookus Flash rakenduse aknalt välja
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Vaigista ja aktiveeri oma mikrofon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Vii fookus jututoa aknale
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Ava töölaua jagamise aken
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ava mikrofoni sätete aken
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Alusta/lõpeta konverentsi kuulamist
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Ava veebikaamera jagamise aken
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Sulge kõik videod
 bbb.users.settings.lockAll=Lukusta kõik kasutajad
 bbb.users.settings.lockAllExcept=Lukusta kõik kasutajad peale esineja
 bbb.users.settings.lockSettings=Lukusta vaatajad...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Lukusta lahti kõik vaatajad
 bbb.users.settings.roomIsLocked=Vaikimisi lukustatud
 bbb.users.settings.roomIsMuted=Vaikimisi vaigistatud
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lukusta vaatajad
 bbb.lockSettings.feature=Võimekus
 bbb.lockSettings.locked=Lukustatud
 bbb.lockSettings.lockOnJoin=Lukusta liitumisel
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/eu_ES/bbbResources.properties b/bigbluebutton-client/locale/eu_ES/bbbResources.properties
index 3c552e500fef1348ab514a35a80e8869d390ef17..41a8c935b0c9302f5e0d4af6d1e26fe750350eb9 100644
--- a/bigbluebutton-client/locale/eu_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/eu_ES/bbbResources.properties
@@ -4,199 +4,198 @@ bbb.mainshell.statusProgress.loading = {0} modulu kargatzen
 bbb.mainshell.statusProgress.cannotConnectServer = Barkatu, ezin dugu zerbitzariarekin konektatu.
 bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
 bbb.mainshell.logBtn.toolTip = Zabaldu agerraldien leihoa
-bbb.mainshell.meetingNotFound = Meeting Not Found
-bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.meetingNotFound = Bilera ez da agertzen
+bbb.mainshell.invalidAuthToken = Token egiaztatzekoa ez da baliozkoa
 bbb.mainshell.resetLayoutBtn.toolTip = Berrabiarazi diseinua
 bbb.mainshell.notification.tunnelling = Tunnelling
-bbb.mainshell.notification.webrtc = WebRTC Audio
+bbb.mainshell.notification.webrtc = WebRTC audio
 bbb.oldlocalewindow.reminder1 = Agian BigBlueButton-en hizkuntza-itzulpen zaharra izango duzu.
 bbb.oldlocalewindow.reminder2 = Mesedez, garbitu zure nabigatzailearen cache-a eta saiatu berriz.
 bbb.oldlocalewindow.windowTitle = Kontuz\: Hizkuntza-itzulpen zaharrak
-bbb.audioSelection.title = How do you want to join the audio?
-bbb.audioSelection.btnMicrophone.label = Microphone
-bbb.audioSelection.btnMicrophone.toolTip = Join the audio with your microphone
-bbb.audioSelection.btnListenOnly.label = Listen Only
-bbb.audioSelection.btnListenOnly.toolTip = Join the audio as listen only
-bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial\: {0} then enter {1} as the conference pin number.
-bbb.micSettings.title = Audio Test
-bbb.micSettings.speakers.header = Test Speakers
-bbb.micSettings.microphone.header = Test Microphone
-bbb.micSettings.playSound = Egiaztatu bozgoragailuak
+bbb.audioSelection.title = Audioarekin, nola parte hartu nahi duzu?
+bbb.audioSelection.btnMicrophone.label = Mikrofonoa
+bbb.audioSelection.btnMicrophone.toolTip = Parte hartu zure mikrofonoarekin
+bbb.audioSelection.btnListenOnly.label = Entzun soilik
+bbb.audioSelection.btnListenOnly.toolTip = Parte hartu entzuten, besterik ez.
+bbb.audioSelection.txtPhone.text = Bilera honetan parte hartzeko telefono bidez, markatu {0}, gero, konferentziako pin zenbakia gisa sartu {1}.
+bbb.micSettings.title = Audio proba
+bbb.micSettings.speakers.header = Audio-irteera proba
+bbb.micSettings.microphone.header = Mikrofono proba
+bbb.micSettings.playSound = Egiaztatu bozgorailuak
 bbb.micSettings.playSound.toolTip = Jo musika zure entzungailuak probatzeko
 bbb.micSettings.hearFromHeadset = Zure entzungailuetan entzun beharko zenuke soinua, ez ordenagailuaren bozgorailuetan.
-bbb.micSettings.speakIntoMic = If you are using a headset (or earbuds), you should hear the audio from your headset -- not from your computer speakers.
-bbb.micSettings.echoTestMicPrompt = This is a private echo test.  Speak a few words.  Did you hear audio?
-bbb.micSettings.echoTestAudioYes = Yes
-bbb.micSettings.echoTestAudioNo = No
-bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic.
-bbb.micSettings.recommendHeadset = Use a headset with a microphone for best audio experience.
+bbb.micSettings.speakIntoMic = Aurikularrak erabiltzen badituzu, hauetan entzun beharko zenuke soinua, ez ordenagailuko bozgorailuetan.
+bbb.micSettings.echoTestMicPrompt = Oihartzun-proba pribatu bat da. Hitz egin zerbait. Audioa entzuten duzu?
+bbb.micSettings.echoTestAudioYes = Bai
+bbb.micSettings.echoTestAudioNo = Ez
+bbb.micSettings.speakIntoMicTestLevel = Mikrofono aurrean hitz egin. Barra mugitzen ikusi beharko zenuke. Ez bada, beste mikrofono bat hautatu.
+bbb.micSettings.recommendHeadset = Audioaren esperientzia hobeago izateko mikrofonoa integratua duten entzungailuak erabili. 
 bbb.micSettings.changeMic = Egiaztatu/aldatu mikrofonoa
 bbb.micSettings.changeMic.toolTip = Ireki Flash Player mikrofonoaren ezarpenen leihoa
-bbb.micSettings.comboMicList.toolTip = Select a microphone
-bbb.micSettings.micRecordVolume.label = Gain
-bbb.micSettings.micRecordVolume.toolTip = Set your microphone gain
-bbb.micSettings.nextButton = Next
-bbb.micSettings.nextButton.toolTip = Start the echo test
-bbb.micSettings.join = Eman soinua
-bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.comboMicList.toolTip = Aukeratu mikrofonoa
+bbb.micSettings.micRecordVolume.label = irabazia
+bbb.micSettings.micRecordVolume.toolTip = Doitu zure mikrofonoaren irabazia
+bbb.micSettings.nextButton = Hurrengoa
+bbb.micSettings.nextButton.toolTip = Oihartzun-proba hasi
+bbb.micSettings.join = Audioarekin parte-hartu
+bbb.micSettings.join.toolTip = Parte hartu audio-konferentzian
 bbb.micSettings.cancel = Utzi
-bbb.micSettings.connectingtoecho = Connecting
-bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
-bbb.micSettings.cancel.toolTip = Cancel joining the audio conference
-bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
-bbb.micSettings.access.title = Audio-ezarpenak.  Audio-ezarpenen leiho honetan fokalizatuta geratuko da leihoa itxi arte.
-bbb.micSettings.webrtc.title = WebRTC Support
-bbb.micSettings.webrtc.capableBrowser = Your browser supports WebRTC.
-bbb.micSettings.webrtc.capableBrowser.dontuseit = Click not to use WebRTC
-bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Click here if you don't want to use the WebRTC technology (recommended if you have problems using it).
-bbb.micSettings.webrtc.notCapableBrowser = WebRTC is not supported in your browser. Please use Google Chrome (version 32 or greater); or Mozilla Firefox (version 26 or greater). You will still be able to join the voice conference using the Adobe Flash Platform.
-bbb.micSettings.webrtc.connecting = Calling
-bbb.micSettings.webrtc.waitingforice = Connecting
-bbb.micSettings.webrtc.transferring = Transferring
-bbb.micSettings.webrtc.endingecho = Joining audio
-bbb.micSettings.webrtc.endedecho = Echo test ended.
-bbb.micPermissions.firefox.title = Firefox Microphone Permissions
-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.chrome.title = Chrome Microphone Permissions
-bbb.micPermissions.chrome.message1 = Click Allow to give Chrome permission to use your microphone.
-bbb.micWarning.title = Audio Warning
-bbb.micWarning.joinBtn.label = Join anyway
-bbb.micWarning.testAgain.label = Test again
-bbb.micWarning.message = Your microphone did not show any activity, others probably won't be able to hear you during the session.
-bbb.webrtcWarning.message = Detected the following WebRTC issue\: {0}. Do you want to try Flash instead?
-bbb.webrtcWarning.title = WebRTC Audio Failure
-bbb.webrtcWarning.failedError.1001 = Error 1001\: WebSocket disconnected
-bbb.webrtcWarning.failedError.1002 = Error 1002\: Could not make a WebSocket connection
-bbb.webrtcWarning.failedError.1003 = Error 1003\: Browser version not supported
-bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
-bbb.webrtcWarning.failedError.1005 = Error 1005\: Call ended unexpectedly
-bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
-bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
-bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
-bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
-bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
-bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
-bbb.webrtcWarning.failedError.unknown = Error {0}\: Unknown error code
-bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
-bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
-bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
-bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
-bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
+bbb.micSettings.connectingtoecho = Konektatzen
+bbb.micSettings.connectingtoecho.error = Errorea eman du oihartzun-probak\: jarri harremanetan administratzailearekin.
+bbb.micSettings.cancel.toolTip = Ez parte-hartu audioarekin
+bbb.micSettings.access.helpButton = Laguntza (bideo tutorialak zabaldu orrialde berri batean)
+bbb.micSettings.access.title = Audio-ezarpenak. Fokua leiho honetan geratuko da leihoa itxi arte.
+bbb.micSettings.webrtc.title = WebRTC-ri eusten dio
+bbb.micSettings.webrtc.capableBrowser = Zure nabigatzaileak WebRTC-ri eusten dio
+bbb.micSettings.webrtc.capableBrowser.dontuseit = WebRTC ez erabiltzeko klik egin
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = WebRTC teknologia saihesteko klik egin hemen (gomendatuta baldin eta arazoak badituzu teknologia hori erabiltzen) 
+bbb.micSettings.webrtc.notCapableBrowser = Zure nabigatzaileak ez dio eusten WebRTC-ri. Google Chrome erabili (32. bertsiotik gora); edo Mozilla Firefox (26. bertsiotik gora). Hala ere, Adobe Flash Platform erabiliz posible duzu audio-konferentzian parte-hartzea. 
+bbb.micSettings.webrtc.connecting = Deitzen
+bbb.micSettings.webrtc.waitingforice = Konektatzen
+bbb.micSettings.webrtc.transferring = Transferentzia
+bbb.micSettings.webrtc.endingecho = Partekatzen audioa
+bbb.micSettings.webrtc.endedecho = Oihartzun-proba amaitu da.
+bbb.micPermissions.firefox.title = Firefox mikrofonoaren baimenak
+bbb.micPermissions.firefox.message1 = Aukeratu zure mikrofonoa eta sakatu Partekatu
+bbb.micPermissions.firefox.message2 = Mikrofonoaren zerrenda ez baduzu ikusten, sakatu mikrofonoaren ikonoa.
+bbb.micPermissions.chrome.title = Chrome mikrofonoaren baimenak
+bbb.micPermissions.chrome.message1 = Egin klik Chrome-ri baimenak emateko zure mikrofonoa erabili ahal izateko.
+bbb.micWarning.title = Kontuz audioarekin
+bbb.micWarning.joinBtn.label = Parte hartu, edonola ere
+bbb.micWarning.testAgain.label = Probatu berriro
+bbb.micWarning.message = Zure mikrofonoak ez du erakutsi inolako aktibitaterik, parte-hartzaileek ezin izango dute entzun zure ahotsa.
+bbb.webrtcWarning.message = WebRTC arazo hauek aurkitu ditugu\: {0}. Honen ordez, flash erabiltzea nahi duzu?
+bbb.webrtcWarning.title = WebRTC audioren errorea
+bbb.webrtcWarning.failedError.1001 = 1001 errore\: WebSocket deskonektatu da
+bbb.webrtcWarning.failedError.1002 = 1002 errorea\: Ezin izan da WebSocket konexio bat egin.
+bbb.webrtcWarning.failedError.1003 = 1003 errore\: Nabigatzailearen bertsioa ez da baliozkoa
+bbb.webrtcWarning.failedError.1004 = 1004 errore\: Deitzean huts egite bat (arrazoia\={0})
+bbb.webrtcWarning.failedError.1005 = 1005 errore\: Ustekabean amaitu da deia
+bbb.webrtcWarning.failedError.1006 = 1006 errore\: Denboraz kanpo da deia
+bbb.webrtcWarning.failedError.1007 = 1007 errore\: ICE negoziazioa huts egin du
+bbb.webrtcWarning.failedError.1008 = 1008 errore\: Transferentzia huts egin du
+bbb.webrtcWarning.failedError.1009 = 1009 errore\: Ezin da informazioa lortu STUN/TURN zerbitzaritik
+bbb.webrtcWarning.failedError.1010 = 1010 errore\: denboraz kanpo ICE negoziazioan
+bbb.webrtcWarning.failedError.1011 = 1011 errore\: ICE gathering denboraz kanpo
+bbb.webrtcWarning.failedError.unknown = {0} errore\: Errorearen kodea ezezaguna da
+bbb.webrtcWarning.failedError.mediamissing = Ezin lortu zure mikrofonoa WebRTC deia egiteko.
+bbb.webrtcWarning.failedError.endedunexpectedly = Ustekabean bukatu da WebRTC oihartzun proba
+bbb.webrtcWarning.connection.dropped = WebRTC konexioa erori da
+bbb.webrtcWarning.connection.reconnecting = Berriro konektatzen ahaleginetan
+bbb.webrtcWarning.connection.reestablished = WebRTC konexioa berriro ezarri da
 bbb.mainToolbar.helpBtn = Laguntza
 bbb.mainToolbar.logoutBtn = Amaitu saioa
-bbb.mainToolbar.logoutBtn.toolTip = Log Out
+bbb.mainToolbar.logoutBtn.toolTip = Amaitu saioa
 bbb.mainToolbar.langSelector = Aukeratu hizkuntza
 bbb.mainToolbar.settingsBtn = Ezarpenak
 bbb.mainToolbar.settingsBtn.toolTip = Ireki ezarpenak
 bbb.mainToolbar.shortcutBtn = Lasterbide-giltzak
-bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Keys Window
-bbb.mainToolbar.recordBtn.toolTip.start = Start recording
-bbb.mainToolbar.recordBtn.toolTip.stop = Stop recording
-bbb.mainToolbar.recordBtn.toolTip.recording = The session is being recorded
-bbb.mainToolbar.recordBtn.toolTip.notRecording = The session isn't being recorded
-bbb.mainToolbar.recordBtn.confirm.title = Confirm recording
-bbb.mainToolbar.recordBtn.confirm.message.start = Are you sure you want to start recording the session?
-bbb.mainToolbar.recordBtn.confirm.message.stop = Are you sure you want to stop recording the session?
-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.clientstatus.title = Configuration Notifications
-bbb.clientstatus.notification = Unread notifications
-bbb.clientstatus.close = Close
-bbb.clientstatus.tunneling.title = Firewall
-bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
-bbb.clientstatus.browser.title = Browser Version
-bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
+bbb.mainToolbar.shortcutBtn.toolTip = Zabaldu laster-teklen leihoa
+bbb.mainToolbar.recordBtn.toolTip.start = Hasi grabatzen
+bbb.mainToolbar.recordBtn.toolTip.stop = Gelditu grabatzen
+bbb.mainToolbar.recordBtn.toolTip.recording = Grabatzen ari gara saioa
+bbb.mainToolbar.recordBtn.toolTip.notRecording = Ez gara ari grabatzen saioa
+bbb.mainToolbar.recordBtn.confirm.title = Baieztatu grabazioa
+bbb.mainToolbar.recordBtn.confirm.message.start = Ziur zaude saioa grabatu nahi duzula?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Ziur zaude gelditu nahi duzula saioaren grabazioa?
+bbb.mainToolbar.recordBtn..notification.title = Jakinarazpena grabatu
+bbb.mainToolbar.recordBtn..notification.message1 = Bilera hau grabatu daiteke.
+bbb.mainToolbar.recordBtn..notification.message2 = Hasteko eta Bukatzeko grabazioa botoi bat sakatu behar duzu, goiko izenburu-barran dagoena.
+bbb.mainToolbar.recordingLabel.recording = (Grabazioa)
+bbb.mainToolbar.recordingLabel.notRecording = Grabaziorik ez
+bbb.clientstatus.title = Jakinarazpenen konfigurazioa
+bbb.clientstatus.notification = Irakurri gabeko jakinarazpenak
+bbb.clientstatus.close = Itxi
+bbb.clientstatus.tunneling.title = Suebaki
+bbb.clientstatus.tunneling.message = Suebaki batek saihesten du zure bezeroa eta zerbitzariaren arteko konexioa. Konexio hau zuzenean 1935 atakan da. Muga apaleko sare bat erabiltzea gomendatzen dugu konexio egonkorrago bat lortzeko. 
+bbb.clientstatus.browser.title = Nabigatzailearen bertsioa
+bbb.clientstatus.browser.message = Zure nabigatzailea ({0}) ez da gaurkotu. Azken bertsioarekin eguneratzea gomendatzen dugu.
 bbb.clientstatus.flash.title = Flash Player
-bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
-bbb.clientstatus.webrtc.title = Audio
-bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
+bbb.clientstatus.flash.message = Flash Player plugin-a zaharkitu da ({0}). Azken bertsioarekin eguneratzea gomendatzen dugu.
+bbb.clientstatus.webrtc.title = Audioa
+bbb.clientstatus.webrtc.message = Audioa hobetzeko Firefox edo Chrome erabiltzea gomendatzen dugu
 bbb.window.minimizeBtn.toolTip = Txikitu
 bbb.window.maximizeRestoreBtn.toolTip = Handitu
 bbb.window.closeBtn.toolTip = Itxi\n
 bbb.videoDock.titleBar = Bideo-leihoa Izenburu-barra
 bbb.presentation.titleBar = Aurkezpen-leihoa Izenburu-barra
-bbb.chat.titleBar = Txat-leihoa Izenburu-barra. Mezuetara joateko, fokalizatu txat-kutxan.
+bbb.chat.titleBar = Txat-leihoa Izenburu-barra
 bbb.users.title = Erabiltzaileak {0} {1}
-bbb.users.titleBar = Erabiltzaile-leihoa Izenburu barra, bi aldiz sakatu handitzeko
-bbb.users.quickLink.label = Users Window
+bbb.users.titleBar = Erabiltzaile-leihoa izenburu barra
+bbb.users.quickLink.label = Erabiltzaileen leihoa
 bbb.users.minimizeBtn.accessibilityName = Txikitu erabiltzaileen leihoa
 bbb.users.maximizeRestoreBtn.accessibilityName = Handitu erabiltzaileen leihoa
 bbb.users.settings.buttonTooltip = Ezarpenak
-bbb.users.settings.audioSettings = Audio Test
+bbb.users.settings.audioSettings = Audio proba
 bbb.users.settings.webcamSettings = Web-kameraren ezarpenak
 bbb.users.settings.muteAll = Mututu guztiak
 bbb.users.settings.muteAllExcept = Mututu guztiak, aurkezlea izan ezik
 bbb.users.settings.unmuteAll = Eman hitza guztiei
-bbb.users.settings.clearAllStatus = Clear all status icons
-bbb.users.emojiStatusBtn.toolTip = Update my status icon
-bbb.users.roomMuted.text = Viewers Muted
-bbb.users.roomLocked.text = Viewers Locked
-bbb.users.pushToTalk.toolTip = Sakatu hitz egiteko
-bbb.users.pushToMute.toolTip = Sakatu zeure burua mututzeko
+bbb.users.settings.clearAllStatus = Ezabatu egoeren ikono guztiak
+bbb.users.emojiStatusBtn.toolTip = Eguneratu nire egoeraren ikonoa
+bbb.users.roomMuted.text = Ikusleak mututuak
+bbb.users.roomLocked.text = Ikusleak blokeatuak
+bbb.users.pushToTalk.toolTip = Hitz egin
+bbb.users.pushToMute.toolTip = Zure burua mututu
 bbb.users.muteMeBtnTxt.talk = Eman hitza
 bbb.users.muteMeBtnTxt.mute = Mututu
 bbb.users.muteMeBtnTxt.muted = Mutututa
 bbb.users.muteMeBtnTxt.unmuted = Hitza emanda
-bbb.users.usersGrid.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.contextmenu.exportusers = Erabiltzaileen izena kopiatu
 bbb.users.usersGrid.accessibilityName = Erabiltzaile-zerrenda. Erabili geziak nabigatzeko.
 bbb.users.usersGrid.nameItemRenderer = Izena
-bbb.users.usersGrid.nameItemRenderer.youIdentifier = you
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = zu
 bbb.users.usersGrid.statusItemRenderer = Egoera
-bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Aurkezlea bihurtzeko sakatu
 bbb.users.usersGrid.statusItemRenderer.presenter = Aurkezlea
 bbb.users.usersGrid.statusItemRenderer.moderator = Moderatzailea
-bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Garbitu egoera
 bbb.users.usersGrid.statusItemRenderer.viewer = Ikuslea
-bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
-bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Web-kamera partekatzen
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Aurkezlea da
 bbb.users.usersGrid.mediaItemRenderer = Media
 bbb.users.usersGrid.mediaItemRenderer.talking = Hizketan
-bbb.users.usersGrid.mediaItemRenderer.webcam = Web-kamera parketatu da
+bbb.users.usersGrid.mediaItemRenderer.webcam = Web-kamera partekatu da
 bbb.users.usersGrid.mediaItemRenderer.webcamBtn = Sakatu web-kamera ikusteko
 bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Sakatu erabiltzaileari hitza emateko
 bbb.users.usersGrid.mediaItemRenderer.pushToMute = Sakatu erabiltzailea mututzeko
-bbb.users.usersGrid.mediaItemRenderer.pushToLock = Lock {0}
-bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Unlock {0}
-bbb.users.usersGrid.mediaItemRenderer.kickUser = Bota erabiltzailea
-bbb.users.usersGrid.mediaItemRenderer.webcam = Web-kamera parketatu da
-bbb.users.usersGrid.mediaItemRenderer.micOff = Mikronofoa off
+bbb.users.usersGrid.mediaItemRenderer.pushToLock = Blokeatu {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Askatu {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Kanporatu {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Web-kamera partekatu da
+bbb.users.usersGrid.mediaItemRenderer.micOff = Mikrofonoa off
 bbb.users.usersGrid.mediaItemRenderer.micOn = Mikrofonoa on
 bbb.users.usersGrid.mediaItemRenderer.noAudio = Audio-hitzaldian ez
-bbb.users.emojiStatus.clear = Clear
-bbb.users.emojiStatus.clear.toolTip = Clear status
-bbb.users.emojiStatus.close = Close
-bbb.users.emojiStatus.close.toolTip = Close status popup
-bbb.users.emojiStatus.raiseHand = Raise hand status
-bbb.users.emojiStatus.happy = Happy status
-bbb.users.emojiStatus.smile = Smile status
-bbb.users.emojiStatus.sad = Sad status
-bbb.users.emojiStatus.confused = Confused status
-bbb.users.emojiStatus.neutral = Neutral status
-bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.clear = Garbitu
+bbb.users.emojiStatus.clear.toolTip = Garbitu egoera
+bbb.users.emojiStatus.close = Itxi
+bbb.users.emojiStatus.close.toolTip = Itxi egoeraren leihoa
+bbb.users.emojiStatus.raiseHand = Eskua altxatu egoera
+bbb.users.emojiStatus.happy = Pozik egoera
+bbb.users.emojiStatus.smile = Irribarretsu egoera
+bbb.users.emojiStatus.sad = Betilun egoera
+bbb.users.emojiStatus.confused = Nahastuta egoera
+bbb.users.emojiStatus.neutral = Neutral egoera
+bbb.users.emojiStatus.away = Urrun egoera
+bbb.users.emojiStatus.thumbsUp = Hatz-lodi  gora egoera
+bbb.users.emojiStatus.thumbsDown = Hatz-lodi behera egoera
+bbb.users.emojiStatus.applause = Txalo egoera
 bbb.presentation.title = Aurkezpena
-bbb.presentation.titleWithPres = Presentation\: {0}
-bbb.presentation.quickLink.label = Presentation Window
-bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width
-bbb.presentation.fitToPage.toolTip = Fit Presentation To Page
-bbb.presentation.uploadPresBtn.toolTip = Upload Presentation
+bbb.presentation.titleWithPres = Aurkezpena\: {0}
+bbb.presentation.quickLink.label = Aurkezpenaren leihoa
+bbb.presentation.fitToWidth.toolTip = Doitu zabaleran aurkezpena
+bbb.presentation.fitToPage.toolTip = Doitu orrialdean aurkezpena
+bbb.presentation.uploadPresBtn.toolTip = Igo aurkezpena
 bbb.presentation.backBtn.toolTip = Aurreko diapositiba
-bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.accessibilityName = {0}. diapositiba, {1}-tik 
 bbb.presentation.btnSlideNum.toolTip = Sakatu diapositiba bat aukeratzeko
 bbb.presentation.forwardBtn.toolTip = Hurrengo diapositiba
 bbb.presentation.maxUploadFileExceededAlert = Errorea\: Fitxategia baimendutakoa baino handiagoa da.
-bbb.presentation.uploadcomplete = Igoera osatuta. Mesedez, itxaroan dokumentua bihurtu arte.
+bbb.presentation.uploadcomplete = Igoera osatu da. Mesedez, itxaron dokumentua bihurtu arte.
 bbb.presentation.uploaded = igota.
 bbb.presentation.document.supported = Igotako dokumentua onargarria da. Hasi egin da bihurtzen...
 bbb.presentation.document.converted = Egoki bihurtu da office dokumentua.
-bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.document.convert.failed = Errorea\: Office dokumentua ezin da bihurtu
 bbb.presentation.error.io = IO Errorea\: Mesedez, jarri harremanetan kudeatzailearekin
 bbb.presentation.error.security = Segurtasun-errorea\: mesedez, jarri harremanetan kudeatzailearekin.
 bbb.presentation.error.convert.notsupported = Errorea\: igotako dokumentua ez da egokia. Mesedez, igo fitxategi bateragarria.
@@ -205,8 +204,8 @@ bbb.presentation.error.convert.maxnbpagereach = Errorea\: igotako dokumentuak or
 bbb.presentation.converted = {0}tik {1} diapositiba bihurtuta.
 bbb.presentation.ok = ADOS
 bbb.presentation.slider = Aurkezpen-zoom maila
-bbb.presentation.slideloader.starttext = Slide text start
-bbb.presentation.slideloader.endtext = Slide text end
+bbb.presentation.slideloader.starttext = Diapositibaren testua - hasiera
+bbb.presentation.slideloader.endtext = Diapositibaren testua - amaiera
 bbb.presentation.uploadwindow.presentationfile = Aurkezpen-fitxategia
 bbb.presentation.uploadwindow.pdf = PDF
 bbb.presentation.uploadwindow.word = WORD
@@ -217,7 +216,7 @@ bbb.presentation.minimizeBtn.accessibilityName = Txikitu aurkezpen-leihoa
 bbb.presentation.maximizeRestoreBtn.accessibilityName = Handitu aurkezpen-leihoa
 bbb.presentation.closeBtn.accessibilityName = Itxi aurkezpen-leihoa
 bbb.fileupload.title = Gehitu fitxategiak zure aurkezpenera
-bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.lblFileName.defaultText = Fitxategirik ez duzu hautatu
 bbb.fileupload.selectBtn.label = Aukeratu fitxategia
 bbb.fileupload.selectBtn.toolTip = Ireki leihoa fitxategia aukeratzeko
 bbb.fileupload.uploadBtn = Igo
@@ -229,43 +228,43 @@ bbb.fileupload.okCancelBtn = Itxi
 bbb.fileupload.okCancelBtn.toolTip = Itxi fitxategia igotzeko leihoa
 bbb.fileupload.genThumbText = Koadro txikiak sortzen...
 bbb.fileupload.progBarLbl = Aurrerapena\:
-bbb.fileupload.fileFormatHint = Upload any office document or Portable Document Format (PDF) file.  For best results upload PDF.
+bbb.fileupload.fileFormatHint = Igo edozein dokumentu Office edo Portable Document Format (PDF). Emaitza hobeago izateko igo PDFa.
 bbb.chat.title = Txata
-bbb.chat.quickLink.label = Chat Window
+bbb.chat.quickLink.label = Txataren leihoa
 bbb.chat.cmpColorPicker.toolTip = Testu-kolorea
-bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.input.accessibilityName = Txat-mezuak editatzeko eremua
 bbb.chat.sendBtn = Bidali
 bbb.chat.sendBtn.toolTip = Bidali mezua
 bbb.chat.sendBtn.accessibilityName = Bidali txat-mezua
-bbb.chat.contextmenu.copyalltext = Copy All Text
+bbb.chat.contextmenu.copyalltext = Testu guztiak kopiatu
 bbb.chat.publicChatUsername = Guztia
-bbb.chat.optionsTabName = Options
+bbb.chat.optionsTabName = Aukerak
 bbb.chat.privateChatSelect = Aukeratu lagun bat harekin txatean pribatuan aritzeko
-bbb.chat.private.userLeft = The user has left.
-bbb.chat.private.userJoined = The user has joined.
-bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
-bbb.chat.usersList.toolTip = Select User To Open Private Chat
-bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
+bbb.chat.private.userLeft = Erabiltzailea joan da saio honetatik
+bbb.chat.private.userJoined = Erabiltzailea sartu da
+bbb.chat.private.closeMessage = Fitxa hau itxi daiteke tekla konbinazioa erabiliz {0}.
+bbb.chat.usersList.toolTip = Aukeratu erabiltzailea, txat pribatu bat zabaltzeko
+bbb.chat.usersList.accessibilityName = Hautatu erabiltzailea txat pribatu bat zabaltzeko. Gezi-teklak erabili nabigatzeko. 
 bbb.chat.chatOptions = Txat-aukerak
-bbb.chat.fontSize = Txat-mezua Letra-tamaina
-bbb.chat.cmbFontSize.toolTip = Select Chat Message Font Size
+bbb.chat.fontSize = Txat-mezuaren letra-tamaina
+bbb.chat.cmbFontSize.toolTip = Aukeratu txat-mezuaren letra tamaina
 bbb.chat.messageList = Mezu-kutxa
 bbb.chat.minimizeBtn.accessibilityName = Txikitu txat-leihoa
 bbb.chat.maximizeRestoreBtn.accessibilityName = Handitu txat-leihoa
 bbb.chat.closeBtn.accessibilityName = Itxi txat-leihoa
-bbb.chat.chatTabs.accessibleNotice = New messages in this tab.
-bbb.chat.chatMessage.systemMessage = System
-bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+bbb.chat.chatTabs.accessibleNotice = Mezu berriak fitxa honetan.
+bbb.chat.chatMessage.systemMessage = Sistema
+bbb.chat.chatMessage.tooLong = Mezuak {0} karaktere gehiegi ditu
 bbb.publishVideo.changeCameraBtn.labelText = Aldatu kamera
 bbb.publishVideo.changeCameraBtn.toolTip = Sakatu kamera aldatzeko leihoa irekitzeko
-bbb.publishVideo.cmbResolution.tooltip = Aukeratu web-kamaren erresoluzioa
+bbb.publishVideo.cmbResolution.tooltip = Aukeratu web-kameraren erresoluzioa
 bbb.publishVideo.startPublishBtn.labelText = Hasi partekatzen
 bbb.publishVideo.startPublishBtn.toolTip = Hasi zure web-kamera partekatzen
-bbb.publishVideo.startPublishBtn.errorName = Can't share webcam. Reason\: {0}
-bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
-bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.publishVideo.startPublishBtn.errorName = Web-kamera ezin dut partekatu. Arrazoia\: {0}
+bbb.webcamPermissions.chrome.title = Chrome web-kameraren baimenak
+bbb.webcamPermissions.chrome.message1 = Sakatu "Baimendu" Chrome-ri baimenak emateko zure web-kamera erabili ahal izateko.
 bbb.videodock.title = Bideoa
-bbb.videodock.quickLink.label = Webcams Window
+bbb.videodock.quickLink.label = Web-kameraren leihoa
 bbb.video.minimizeBtn.accessibilityName = Txikitu bideo-leihoa
 bbb.video.maximizeRestoreBtn.accessibilityName = Handitu bideo-leihoa
 bbb.video.controls.muteButton.toolTip = Mututu edo hitza eman {0}
@@ -278,48 +277,81 @@ bbb.video.publish.hint.waitingApproval = Onartzeko zain
 bbb.video.publish.hint.videoPreview = Bideoaren aurrebista
 bbb.video.publish.hint.openingCamera = Kamera zabaltzen...
 bbb.video.publish.hint.cameraDenied = Kamerarako sarbidea ukatuta
-bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.cameraIsBeingUsed = Ezin izan da zabaldu zure web-kamera - Litekeena da beste aplikazio batek erabiltzea.
 bbb.video.publish.hint.publishing = Argitaratzen...
 bbb.video.publish.closeBtn.accessName = Itxi web-kameraren ezarpenen leihoa
 bbb.video.publish.closeBtn.label = Utzi
 bbb.video.publish.titleBar = Argitaratu web-kameraren leihoa
-bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Mahaigaina partekatzen\: aurkezlearen aurrebista
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Pantaila osoa
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Eremua
-bbb.desktopPublish.stop.tooltip = Itxi pantailaren partekatzea
-bbb.desktopPublish.stop.label = Itxi
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Ezin duzu leiho hau handitu.
-bbb.desktopPublish.closeBtn.toolTip = Eten partekatzea eta itxi
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Txikitu
-bbb.desktopPublish.minimizeBtn.accessibilityName = Txikitu mahaigaina partekatzeko leihoa
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Handitu mahaigaina partekatzeko leihoa
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Mahaigaina partekatzen
-bbb.desktopView.fitToWindow = Doitu leihoan
-bbb.desktopView.actualSize = Erakutsi oraingo tamaina
-bbb.desktopView.minimizeBtn.accessibilityName = Txikitu mahaigaina partekatzea ikusteko leihoa
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Handitu mahaigaina partekatzea ikusteko leihoa
-bbb.desktopView.closeBtn.accessibilityName = Itxi mahaigaina partekatzea ikusteko leihoa
-bbb.toolbar.phone.toolTip.start = Share Your Microphone
-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.video.streamClose.toolTip = Itxi emanaldi honetarako\: {0}
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Lehio hau ezin da maximizatu
+bbb.screensharePublish.closeBtn.toolTip = Gelditu partekatzen eta itxi
+bbb.screensharePublish.minimizeBtn.toolTip = Minimizatu
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Hasi
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Doitu leihoarekiko
+bbb.screenshareView.actualSize = Erakutsi oraingo tamaina
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
+bbb.toolbar.phone.toolTip.start = Partekatu zure mikrofonoa
+bbb.toolbar.phone.toolTip.stop = Ez partekatu zure mikrofonoa
+bbb.toolbar.phone.toolTip.mute = Gelditu entzuten konferentzia
+bbb.toolbar.phone.toolTip.unmute = Hasi entzuten konferentzia
+bbb.toolbar.phone.toolTip.nomic = Mikrofonorik ez da aurkitu
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
+bbb.toolbar.video.toolTip.start = Partekatu zure web-kamera
+bbb.toolbar.video.toolTip.stop = Ez partekatu zure web-kamera
 bbb.layout.addButton.toolTip = Gehitu pertsonalizatutako diseinua zerrendara
-bbb.layout.broadcastButton.toolTip = Apply Current Layout to All Viewers
-bbb.layout.combo.toolTip = Change Your Layout
+bbb.layout.broadcastButton.toolTip = Ikusle guztientzat ezarri dagoen diseinua
+bbb.layout.combo.toolTip = Aldatu diseinua
 bbb.layout.loadButton.toolTip = Bilatu diseinuak fitxategi batean
 bbb.layout.saveButton.toolTip = Gorde diseinuak fitxategi batean
 bbb.layout.lockButton.toolTip = Blokeatu diseinua
@@ -329,13 +361,14 @@ bbb.layout.combo.customName = Pertsonalizatu diseinua
 bbb.layout.combo.remote = Urrutikoa
 bbb.layout.save.complete = Diseinuak egoki gorde dira
 bbb.layout.load.complete = Diseinuak egoki aurkitu dira
-bbb.layout.load.failed = Unable to load the 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.load.failed = Ezin dira diseinuak kargatu
+bbb.layout.name.defaultlayout = Diseinu lehenetsia
+bbb.layout.name.closedcaption = Azpitituluak
+bbb.layout.name.videochat = Bideo-txat
+bbb.layout.name.webcamsfocus = Web-kamera
+bbb.layout.name.presentfocus = Aurkezpena
+bbb.layout.name.lectureassistant = Eskola laguntzailea
+bbb.layout.name.lecture = Mintzaldi
 bbb.highlighter.toolbar.pencil = Lapitza
 bbb.highlighter.toolbar.pencil.accessibilityName = Aldatu arbelerako kurtsorea eta ipini lapitza
 bbb.highlighter.toolbar.ellipse = Zirkulua
@@ -344,38 +377,39 @@ bbb.highlighter.toolbar.rectangle = Lauki zuzena
 bbb.highlighter.toolbar.rectangle.accessibilityName = Aldatu arbelerako kurtsorea eta ipini lauki zuzena
 bbb.highlighter.toolbar.panzoom = Panoramikoa eta zoom-a
 bbb.highlighter.toolbar.panzoom.accessibilityName = Aldatu arbelerako kurtsorea eta ipini panoramikoa eta zoom-a
-bbb.highlighter.toolbar.clear = Clear All Annotations
+bbb.highlighter.toolbar.clear = Ezabatu ohar guztiak
 bbb.highlighter.toolbar.clear.accessibilityName = Garbitu arbela
-bbb.highlighter.toolbar.undo = Undo Annotation
+bbb.highlighter.toolbar.undo = \ Desegin
 bbb.highlighter.toolbar.undo.accessibilityName = Desegin arbelerako azken itxura
 bbb.highlighter.toolbar.color = Aukeratu kolorea
-bbb.highlighter.toolbar.color.accessibilityName = Arbelerako marka margotzeko kolerea
+bbb.highlighter.toolbar.color.accessibilityName = Arbelerako marka margotzeko kolorea
 bbb.highlighter.toolbar.thickness = Aldatu lodiera
-bbb.highlighter.toolbar.thickness.accessibilityName = Arbelea margotzeko zabalera
-bbb.logout.title = Logged Out
+bbb.highlighter.toolbar.thickness.accessibilityName = Arbela margotzeko zabalera
+bbb.logout.title = Saioa bukatu du
 bbb.logout.button.label = ADOS
 bbb.logout.appshutdown = Zerbitzariaren aplikazioa itxi egin da
 bbb.logout.asyncerror = Async errorea gertatu da
 bbb.logout.connectionclosed = Itxi egin da zerbitzariarekiko konexioa
-bbb.logout.connectionfailed = The connection to the server has ended
-bbb.logout.rejected = Zerbitzariarekiko konexioa baztertu egin da
+bbb.logout.connectionfailed = Amaitu da zerbitzariarekiko konexioa
+bbb.logout.rejected = Baztertu da zerbitzariarekiko konexioa
 bbb.logout.invalidapp = red5 aplikazioa ez da existitzen
-bbb.logout.unknown = Zure berezioak galdu du zerbitzari honekiko konexioa
+bbb.logout.unknown = Zure bezeroak galdu du zerbitzari honekiko konexioa
 bbb.logout.usercommand = Irten egin zara hitzalditik
-bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
-bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
-bbb.logout.refresh.label = Reconnect
-bbb.logout.confirm.title = Confirm Logout
-bbb.logout.confirm.message = Are you sure you want to log out?
-bbb.logout.confirm.yes = Yes
-bbb.logout.confirm.no = No
-bbb.connection.failure=Detected Connectivity Problems
-bbb.connection.reconnecting=Reconnecting
-bbb.connection.reestablished=Connection reestablished
+bbb.logour.breakoutRoomClose = Your browser window will be closed
+bbb.logout.ejectedFromMeeting = Moderatzaile batek bota zaitu bileratik
+bbb.logout.refresh.message = Saiotik nahi gabe atera bazara sakatu beheko botoia berriro konektatzeko.
+bbb.logout.refresh.label = Berriro konektatu
+bbb.logout.confirm.title = Baieztatu zure saio bukatu nahi duzula
+bbb.logout.confirm.message = Ziur zaude zure saio bukatu nahi duzula?
+bbb.logout.confirm.yes = Bai
+bbb.logout.confirm.no = Ez
+bbb.connection.failure=Konexio arazoak  badaude
+bbb.connection.reconnecting=Berriro konektatzen
+bbb.connection.reestablished=Konexioa ezarri da berriro
 bbb.connection.bigbluebutton=BigBlueButton
 bbb.connection.sip=SIP
-bbb.connection.video=Video
-bbb.connection.deskshare=Deskshare
+bbb.connection.video=Bideoa
+bbb.connection.deskshare=Idazmahaia partekatu
 bbb.notes.title = Oharrak
 bbb.notes.cmpColorPicker.toolTip = Testuaren kolorea
 bbb.notes.saveBtn = Gorde
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Gorde oharra
 bbb.settings.deskshare.instructions = Lehio zabalgarrian Baimendu sakatu mahaigainaren partekatzea ongi funtzionatzen ari dela baieztatzeko.
 bbb.settings.deskshare.start = Egiaztatu mahaigainaren partekatzea
 bbb.settings.voice.volume = Mikrofonoaren jarduera
-bbb.settings.java.label = Errorea Java bertsioan
-bbb.settings.java.text = Java {0} bertsioa duzu instalatuta eta gutxienez {1} bertsioa behar duzu BigBlueButton-en mahaigaina konpartitzeko funtzioa erabiltzeko. Sakatu beheko botoiari Java JRE bertsio berriagoa instalatzeko.
-bbb.settings.java.command = Instalatu Java berriagoa
 bbb.settings.flash.label = Errorea Flash bertsioan
 bbb.settings.flash.text = Flash {0} duzu instalatuta, baina gutxienez {1} bertsioa behar duzu BigBluebutton behar bezala ibiltzeko. Sakatu beheko botoiari Adobe Flash bertsio berriagoa instaltzeko.
 bbb.settings.flash.command = Instalatu Flash berriagoa
@@ -404,8 +435,31 @@ ltbcustom.bbb.highlighter.toolbar.text = Testua
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Aldatu arbelerako kurtsorea eta ipini testua
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Testuaren kolorea
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Letra-tamaina
+bbb.caption.window.title = Azpitituluak
+bbb.caption.window.titleBar = Azpitituluen leihoaren tituluaren barra
+bbb.caption.window.minimizeBtn.accessibilityName = Minimizatu Azpitituluen leihoa
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximizatu Azpitituluen leihoa
+bbb.caption.transcript.noowner = Bat ere ez
+bbb.caption.transcript.youowner = Zu
+bbb.caption.transcript.pastewarning.title = Azpititulua itsasteko alerta
+bbb.caption.transcript.pastewarning.text = {0} baino karaktere gehiagorik ezin duzu itsasi. {1} karaktere itsasi duzu. 
+bbb.caption.option.label = Aukerak
+bbb.caption.option.language = Hizkuntza\:
+bbb.caption.option.language.tooltip = Aukeratu azpitituluen hizkuntza
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Jabetza hartu
+bbb.caption.option.takeowner.tooltip = Hautatu den hizkuntzaren jabegoa hartu
+bbb.caption.option.fontfamily = Letra-tipo familia\:
+bbb.caption.option.fontfamily.tooltip = Letra-tipo familia
+bbb.caption.option.fontsize = Letra-tipoaren tamaina\:
+bbb.caption.option.fontsize.tooltip = Letra-tipoaren tamaina
+bbb.caption.option.backcolor = Atzealdeko kolorea\:
+bbb.caption.option.backcolor.tooltip = Atzealdeko kolorea
+bbb.caption.option.textcolor = Testuaren kolorea\:
+bbb.caption.option.textcolor.tooltip = Testuaren kolorea
 
-bbb.accessibility.clientReady = Ready
+
+bbb.accessibility.clientReady = Prest
 
 bbb.accessibility.chat.chatBox.reachedFirst = Lehenengo mezura iritsi zara
 bbb.accessibility.chat.chatBox.reachedLatest = Azken mezura iritsi zara
@@ -413,9 +467,9 @@ bbb.accessibility.chat.chatBox.navigatedFirst =  Lehenengo mezura joan zara
 bbb.accessibility.chat.chatBox.navigatedLatest = Azken mezura joan zara
 bbb.accessibility.chat.chatBox.navigatedLatestRead = Irakurri duzun azken mezura joan zara
 bbb.accessibility.chat.chatwindow.input = Txat-irteera
-bbb.accessibility.chat.chatwindow.audibleChatNotification = Audible Chat Notification
+bbb.accessibility.chat.chatwindow.audibleChatNotification = Txat-jakinarazpen entzungarria
 
-bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+bbb.accessibility.chat.initialDescription = Erabili gezi-teklak mezuen artean nabigatzeko.
 
 bbb.accessibility.notes.notesview.input = Ohar-sarrera
 
@@ -424,25 +478,25 @@ bbb.shortcuthelp.minimizeBtn.accessibilityName = Txikitu lasterbideen leihoa
 bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Handitu lasterbideen leihoa
 bbb.shortcuthelp.closeBtn.accessibilityName = Itxi lasterbideen leihoa
 bbb.shortcuthelp.dropdown.general = Lasterbide orokorrak
-bbb.shortcuthelp.dropdown.presentation = Aukerpenaren lasterbideak
+bbb.shortcuthelp.dropdown.presentation = Aurkezpenaren lasterbideak
 bbb.shortcuthelp.dropdown.chat = Txataren lasterbideak
 bbb.shortcuthelp.dropdown.users = Erabiltzaileen lasterbideak
-bbb.shortcuthelp.headers.shortcut = Shortcut
-bbb.shortcuthelp.headers.function = Function
+bbb.shortcuthelp.headers.shortcut = Laster-tekla
+bbb.shortcuthelp.headers.function = Funtzioa
 
 bbb.shortcutkey.general.minimize = 189
 bbb.shortcutkey.general.minimize.function = Txikitu oraingo leihoa
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Handitu oraingo leihoa
 
-bbb.shortcutkey.flash.exit = 81
-bbb.shortcutkey.flash.exit.function = Fokalizatu Flash leihoan\n
+bbb.shortcutkey.flash.exit = 79
+bbb.shortcutkey.flash.exit.function = Fokuratu Flash leihotik at\n
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mututu eta hitz eman zure mikrofonoari
 bbb.shortcutkey.chat.chatinput = 73
-bbb.shortcutkey.chat.chatinput.function = Fokalizatu txataren irteera-eremuan
+bbb.shortcutkey.chat.chatinput.function = Fokuratu txataren irteera-eremuan
 bbb.shortcutkey.present.focusslide = 67
-bbb.shortcutkey.present.focusslide.function = Fokalizatu aurkezpen-diapositiban
+bbb.shortcutkey.present.focusslide.function = Fokuratu aurkezpen-diapositiban
 bbb.shortcutkey.whiteboard.undo = 90
 bbb.shortcutkey.whiteboard.undo.function = Desegin arbelerako azken marka
 
@@ -457,15 +511,11 @@ bbb.shortcutkey.focus.chat.function = Aldatu fokoa txat-leihoari
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Zabaldu mahaigaina partekatzeko leihoa
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ireki mikrofonoaren ezarpenen leihoa
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Ireki web-kamera partekatzeko leihoa
 
 bbb.shortcutkey.shortcutWindow = 72
-bbb.shortcutkey.shortcutWindow.function = Zabaldu/fokalizatu lastebideen laguntza-leihoa
+bbb.shortcutkey.shortcutWindow.function = Zabaldu/fokuratu lasterbideen laguntza-leihoan
 bbb.shortcutkey.logout = 76
 bbb.shortcutkey.logout.function = Utzi bilera hau
 bbb.shortcutkey.raiseHand = 82
@@ -480,35 +530,35 @@ bbb.shortcutkey.present.select.function = Ikusi diapositiba guztiak
 bbb.shortcutkey.present.next = 69
 bbb.shortcutkey.present.next.function = Joan hurrengo diapositibara
 bbb.shortcutkey.present.fitWidth = 70
-bbb.shortcutkey.present.fitWidth.function = Doitu diapostibak zabalera
+bbb.shortcutkey.present.fitWidth.function = Doitu diapositibak zabalera
 bbb.shortcutkey.present.fitPage = 80
 bbb.shortcutkey.present.fitPage.function = Egokitu diapositiba orrira
 
 bbb.shortcutkey.users.makePresenter = 80
 bbb.shortcutkey.users.makePresenter.function = Ezarri aukeratutako erabiltzailea aurkezle gisa
 bbb.shortcutkey.users.kick = 75
-bbb.shortcutkey.users.kick.function = Bota biletatik aukeratutako pertsona
+bbb.shortcutkey.users.kick.function = Bota bileratik aukeratutako pertsona
 bbb.shortcutkey.users.mute = 83
 bbb.shortcutkey.users.mute.function = Mututu edo hitza eman aukeratutako erabiltzaileari
 bbb.shortcutkey.users.muteall = 65
 bbb.shortcutkey.users.muteall.function = Mututu edo hitza eman erabiltzaile guztiei
 bbb.shortcutkey.users.focusUsers = 85
-bbb.shortcutkey.users.focusUsers.function = Fokalizatu erabiltzaile-zerrendan
+bbb.shortcutkey.users.focusUsers.function = Fokuratu erabiltzaile-zerrendan
 bbb.shortcutkey.users.muteAllButPres = 65
 bbb.shortcutkey.users.muteAllButPres.function = Mututu edozein Aurkezlea izan ezik
 
 bbb.shortcutkey.chat.focusTabs = 89
-bbb.shortcutkey.chat.focusTabs.function = Fokalizatu txat-fitxetan
+bbb.shortcutkey.chat.focusTabs.function = Fokuratu txat-fitxetan
 bbb.shortcutkey.chat.focusBox = 66
-bbb.shortcutkey.chat.focusBox.function = Fokalizatu txat-kutxan
+bbb.shortcutkey.chat.focusBox.function = Fokuratu txat-kutxan
 bbb.shortcutkey.chat.changeColour = 67
-bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.
+bbb.shortcutkey.chat.changeColour.function = Fokuratu letraren koloreko aukeratzailean.
 bbb.shortcutkey.chat.sendMessage = 83
 bbb.shortcutkey.chat.sendMessage.function = Bidali txat-mezua
 bbb.shortcutkey.chat.closePrivate = 69
-bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.closePrivate.function = Itxi txat-pribatuaren fitxa
 bbb.shortcutkey.chat.explanation = ---
-bbb.shortcutkey.chat.explanation.function = Mezuetara joateko, txat-kutxan fokalizatu behar duzu.
+bbb.shortcutkey.chat.explanation.function = Mezuetara joateko, txat-kutxan fokuratu behar duzu.
 
 bbb.shortcutkey.chat.chatbox.advance = 32
 bbb.shortcutkey.chat.chatbox.advance.function = Joan hurrengo mezura
@@ -523,21 +573,21 @@ bbb.shortcutkey.chat.chatbox.gofirst.function = Joan lehenengo mezura
 bbb.shortcutkey.chat.chatbox.goread = 75
 bbb.shortcutkey.chat.chatbox.goread.function = Joan irakurri duzun azken mezura
 bbb.shortcutkey.chat.chatbox.debug = 71
-bbb.shortcutkey.chat.chatbox.debug.function = Aldi baterakoak garbitzeko azkar-bidea
+bbb.shortcutkey.chat.chatbox.debug.function = Aldi baterakoak garbitzeko laster-tekla
 
-bbb.polling.startButton.tooltip = Start a poll
-bbb.polling.startButton.label = Start Poll
+bbb.polling.startButton.tooltip = Sortu inkesta bat
+bbb.polling.startButton.label = Sortu inkesta
 bbb.polling.publishButton.label = Argitaratu
 bbb.polling.closeButton.label = Itxi
-bbb.polling.pollModal.title = Live Poll Results
-bbb.polling.customChoices.title = Enter Polling Choices
-bbb.polling.respondersLabel.novotes = Waiting for responses
-bbb.polling.respondersLabel.text = {0} Users Responded
-bbb.polling.respondersLabel.finished = Done
-bbb.polling.answer.Yes = Yes
-bbb.polling.answer.No = No
-bbb.polling.answer.True = True
-bbb.polling.answer.False = False
+bbb.polling.pollModal.title = Inkestaren emaitzak zuzenean
+bbb.polling.customChoices.title = Sartu inkestaren aukerak
+bbb.polling.respondersLabel.novotes = Erantzunen zain
+bbb.polling.respondersLabel.text = {0} erabiltzaile erantzun dute
+bbb.polling.respondersLabel.finished = Egina
+bbb.polling.answer.Yes = Bai
+bbb.polling.answer.No = Ez
+bbb.polling.answer.True = Egiazkoa
+bbb.polling.answer.False = Faltsua
 bbb.polling.answer.A = A
 bbb.polling.answer.B = B
 bbb.polling.answer.C = C
@@ -545,43 +595,76 @@ bbb.polling.answer.D = D
 bbb.polling.answer.E = E
 bbb.polling.answer.F = F
 bbb.polling.answer.G = G
-bbb.polling.results.accessible.header = Poll Results.
-bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
+bbb.polling.results.accessible.header = Inkestaren emaitzak
+bbb.polling.results.accessible.answer = "{0}" erantzunak "{1}" boto ditu. 
 
 bbb.publishVideo.startPublishBtn.labelText = Hasi partekatzen
 bbb.publishVideo.changeCameraBtn.labelText = Aldatu kamera
 
-bbb.accessibility.alerts.madePresenter = You are now the Presenter.
-bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+bbb.accessibility.alerts.madePresenter = Aurkezlea zara orain
+bbb.accessibility.alerts.madeViewer = Ikuslea zara orain
 
-bbb.shortcutkey.specialKeys.space = Spacebar
-bbb.shortcutkey.specialKeys.left = Left Arrow
-bbb.shortcutkey.specialKeys.right = Right Arrow
-bbb.shortcutkey.specialKeys.up = Up Arrow
-bbb.shortcutkey.specialKeys.down = Down Arrow
+bbb.shortcutkey.specialKeys.space = Zuriune-barra
+bbb.shortcutkey.specialKeys.left = Ezker-gezia
+bbb.shortcutkey.specialKeys.right = Eskuin-gezia
+bbb.shortcutkey.specialKeys.up = Goi-gezia
+bbb.shortcutkey.specialKeys.down = Behe-gezia
 bbb.shortcutkey.specialKeys.plus = Plus
 bbb.shortcutkey.specialKeys.minus = Minus
 
-bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
-bbb.users.settings.lockAll=Lock All Users
-bbb.users.settings.lockAllExcept=Lock Users Except Presenter
-bbb.users.settings.lockSettings=Lock Viewers ...
-bbb.users.settings.unlockAll=Unlock All Viewers
-bbb.users.settings.roomIsLocked=Locked by default
-bbb.users.settings.roomIsMuted=Muted by default
+bbb.toolbar.videodock.toolTip.closeAllVideos = Bideo guztiak itxi
+bbb.users.settings.lockAll=Blokeatu erabiltzaile guztiak
+bbb.users.settings.lockAllExcept=Blokeatu erabiltzaile guztiak aurkezlea izan ezik
+bbb.users.settings.lockSettings=Blokeatu ikusleak
+bbb.users.settings.breakoutRooms=Talde gelak ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
+bbb.users.settings.unlockAll=Desblokeatu ikusle guztiak
+bbb.users.settings.roomIsLocked=Blokeatuta modu lehenetsian
+bbb.users.settings.roomIsMuted=Mutututa modu lehenetsian
 
-bbb.lockSettings.save = Apply
-bbb.lockSettings.save.tooltip = Apply lock settings
+bbb.lockSettings.save = Aplikatu
+bbb.lockSettings.save.tooltip = Aplikatu blokeatzeko ezarpenak
 bbb.lockSettings.cancel = Utzi
-bbb.lockSettings.cancel.toolTip = Close this window without saving
+bbb.lockSettings.cancel.toolTip = Itxi lehio hau gorde gabe
+
+bbb.lockSettings.moderatorLocking = Moderatzailearen blokeoa
+bbb.lockSettings.privateChat = Txat pribatua
+bbb.lockSettings.publicChat = Txat publikoa
+bbb.lockSettings.webcam = Web-kamera
+bbb.lockSettings.microphone = Mikrofonoa
+bbb.lockSettings.layout = Diseinua
+bbb.lockSettings.title=Blokeatu ikusleak 
+bbb.lockSettings.feature=Ezaugarria
+bbb.lockSettings.locked=\ Blokeatua
+bbb.lockSettings.lockOnJoin=Parte hartzean blokeatu
 
-bbb.lockSettings.moderatorLocking = Moderator locking
-bbb.lockSettings.privateChat = Private Chat
-bbb.lockSettings.publicChat = Public Chat
-bbb.lockSettings.webcam = Webcam
-bbb.lockSettings.microphone = Microphone
-bbb.lockSettings.layout = Layout
-bbb.lockSettings.title=Lock Viewers
-bbb.lockSettings.feature=Feature
-bbb.lockSettings.locked=Locked
-bbb.lockSettings.lockOnJoin=Lock On Join
+bbb.users.breakout.breakoutRooms = Talde gelak
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Gelditzen den denbora kalkulatzen...
+bbb.users.breakout.remainingTimeEnded = Epea amaitu ondoren, talde gela itxiko dugu.
+bbb.users.breakout.rooms = Gelak
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Gela
+bbb.users.breakout.randomAssign = Ausazkoan eran gehitu erabiltzaileak
+bbb.users.breakout.timeLimit = Denbora muga
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutuak
+bbb.users.breakout.record = Grabatu
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Esleitu gabe
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Hasi
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Itxi
+bbb.users.breakout.closeAllRooms = Talde-gela guztiak itxi
+bbb.users.breakout.insufficientUsers = Erabiltzaile kopurua ez da nahiko. Gutxienez erabiltzaile bat gehitu behar duzu gela batera. 
+bbb.users.breakout.openJoinURL = Talde-gela batean parte hartzeko gonbidatu zaituzte\: {0}. (Onartzen baduzu bilera nagusitik kanpo geldituko zara automatikoki)
+bbb.users.breakout.confirm = Baieztatu talde-gelan parte hartzea
+bbb.users.roomsGrid.room = Gela
+bbb.users.roomsGrid.users = Erabiltzaileak
+bbb.users.roomsGrid.action = Ekintza
+bbb.users.roomsGrid.transfer = Audio transferentzia
+bbb.users.roomsGrid.join = Parte hartu
+bbb.users.roomsGrid.noUsers = Erabiltzailerik ez gela honetan
diff --git a/bigbluebutton-client/locale/fa_IR/bbbResources.properties b/bigbluebutton-client/locale/fa_IR/bbbResources.properties
index dc8c2e11f2c8ceb106fe1a74152aa35910a935c9..3754f83123a7cf100de48276613fc21d05e24a0d 100755
--- a/bigbluebutton-client/locale/fa_IR/bbbResources.properties
+++ b/bigbluebutton-client/locale/fa_IR/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
 bbb.mainshell.statusProgress.connecting = در حال اتصال به سرور
 bbb.mainshell.statusProgress.loading = در حال بارگزاری {0} ماژول
 bbb.mainshell.statusProgress.cannotConnectServer = متاسفانه، امکان اتصال به سرور وجود ندارد.
-bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
+bbb.mainshell.copyrightLabel2 = تمامی حقوق برای شرکت bigbluebutton محفوظ است. برای اطلاعات بیشتر به وب سایت www.bigbluebutton.org مراجعه نمایید.
 bbb.mainshell.logBtn.toolTip = باز کردن پنجره تنظیمات میکروفون
 bbb.mainshell.meetingNotFound = جلسه یافت نشد
 bbb.mainshell.invalidAuthToken = توکن احراز هویت نامعتبر
@@ -43,7 +43,7 @@ bbb.micSettings.cancel = انصراف
 bbb.micSettings.connectingtoecho = در حال اتصال
 bbb.micSettings.connectingtoecho.error = خطا در آزمایش اکو\: لطفا با مدیر تماس بگیرید.
 bbb.micSettings.cancel.toolTip = انصراف از شرکت در کنفرانس صوتی
-bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.helpButton = راهنما (باز کردن فیلم های آموزشی در برگه جدید)
 bbb.micSettings.access.title = تنظیمات صدا. تا بسته شدن پنجره، پنجره تنظیمات صدا فعال خواهد ماند
 bbb.micSettings.webrtc.title = پشتیبانی از WebRTC
 bbb.micSettings.webrtc.capableBrowser = مرورگر شما از WebRTC پشتیبانی می کند
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = فلش پلیر
 bbb.clientstatus.flash.message = نسخه پلاگین فلش پلیر شما ({0}) قدیمی است. پیشنهاد می شود آن را به جدید ترین نسخه به روز رسانی کنید
 bbb.clientstatus.webrtc.title = صدا
 bbb.clientstatus.webrtc.message = به منظور کیفیت بهتر صدا، پیشنهاد می شود از مروگر های فایرفاکس یا کروم استفاده کنید
-bbb.clientstatus.java.title = جاوا
-bbb.clientstatus.java.notdetected = نسخه برنامه جاوا تشخیص داده نشد
-bbb.clientstatus.java.notinstalled = برنامه جاوا برای شما نصب نشده است. لطفا  <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>اینجا</a></font> را جهت نصب اخرین نسخه جاوا برای استفاده از امکان اشتراک صفحه کلیک کنید
-bbb.clientstatus.java.oldversion = نسخه جاوای نصب شده قدیمی است. لطفا  <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>اینجا</a></font> را جهت نصب اخرین نسخه جاوا برای استفاده از امکان اشتراک صفحه کلیک کنید
 bbb.window.minimizeBtn.toolTip = کمینه
 bbb.window.maximizeRestoreBtn.toolTip = بیشینه
 bbb.window.closeBtn.toolTip = خروج
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = ارائه
 bbb.presentation.titleWithPres = ارائه\: {0}
 bbb.presentation.quickLink.label = پنجره ارائه
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = بستن جعبه محاوره ای تن
 bbb.video.publish.closeBtn.label = انصراف
 bbb.video.publish.titleBar = اشتراک پنجرع تصاویر
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = اشتراک صفحه\: پيش نمايش ارائه دهنده
-bbb.desktopPublish.fullscreen.tooltip = اشتراک صفحه اصلی
-bbb.desktopPublish.fullscreen.label = تمام صفحه
-bbb.desktopPublish.region.tooltip = اشتراک بخشی از صفحه
-bbb.desktopPublish.region.label = محدوده ی اشتراک گذاری
-bbb.desktopPublish.stop.tooltip = بستن پنجره اشتراک صفحه
-bbb.desktopPublish.stop.label = خروج
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = شما قادر به بیشینه کردن این پنجره نیستید
-bbb.desktopPublish.closeBtn.toolTip = توقف اشتراک گذاری و خروج
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = مرورگر کروم دیگر از اپلت‌های جاوا پشتیبانی نمی کند. باید از مرورگر دیگری برای به اشتراک گذاشتن میزکار خود استفاده کنید (فایرفاکس توصیه می شود)
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = کمینه کردن
-bbb.desktopPublish.minimizeBtn.accessibilityName = کمینه کردن پنجره نمایش اشتراک صفحه
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = بیشینه کردن پنجره نمایش اشتراک صفحه
-bbb.desktopPublish.chromeHint.title = کروم ممکن است به اجازه شما نیاز داشته باشد
-bbb.desktopPublish.chromeHint.message = آیکون plug-ins را انتخاب کنید (گوشه سمت راست، بالای صفحه در کروم) Plug-ins را ازحالت بلاک خارج کنید، سپس دوباره سعی کنید
-bbb.desktopPublish.chromeHint.button = تلاش مجدد
-bbb.desktopView.title = اشتراک میز کار
-bbb.desktopView.fitToWindow = بسط به اندازه ي تمام پنجره
-bbb.desktopView.actualSize = نمایش اندازه واقعی
-bbb.desktopView.minimizeBtn.accessibilityName = کمینه کردن پنجره اشتراک میز کار
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = بیشینه کردن پنجره اشتراک میز کار
-bbb.desktopView.closeBtn.accessibilityName = بستن پنجره نمایش اشتراک صفحه
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = اشتراک میکروفون
 bbb.toolbar.phone.toolTip.stop = توقف اشتراک میکروفون
 bbb.toolbar.phone.toolTip.mute = توقف شنیدن صدای جلسه
 bbb.toolbar.phone.toolTip.unmute = شروع شنیدن صدای جلسه
 bbb.toolbar.phone.toolTip.nomic = میکروفونی شناسایی نشد
-bbb.toolbar.deskshare.toolTip.start = اشتراک میز کار
-bbb.toolbar.deskshare.toolTip.stop = توقف اشتراک میزکار
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = اشتراک دوربین
 bbb.toolbar.video.toolTip.stop = توقف اشتراک دوربین
 bbb.layout.addButton.toolTip = افزودن طرح بندی جدید به لیست
@@ -331,6 +363,7 @@ bbb.layout.save.complete = طرح بندی ها با موفقیت ذخیره ش
 bbb.layout.load.complete = طرح بندی ها با موفقیت بارگزاری شدند
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = طرح بندی پیشفرض
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = گفتگوی تصویری
 bbb.layout.name.webcamsfocus = جلسه تصویری
 bbb.layout.name.presentfocus = جلسه ارائه
@@ -362,6 +395,7 @@ bbb.logout.rejected = اتصال به سرور رد شد
 bbb.logout.invalidapp = برنامه ی red5 موجود نیست
 bbb.logout.unknown = اتصال کلاینت شما از سرور قطع شده است
 bbb.logout.usercommand = شما از گفتگو خارج شدید
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = اگر این خروج به صورت غیر منتظره رخ داده، برای اتصال مجدد دکمه زیر را کلیک کنید.
 bbb.logout.refresh.label = اتصال مجدد
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = ذخیره یادداشت
 bbb.settings.deskshare.instructions = جهت اطمینان از کارکرد صحیح اشتراک گذاری صفحه در کادر ظاهر شده روی پذیرفتن کلیک کنید
 bbb.settings.deskshare.start = بررسی وضعیت اشتراک صفحه
 bbb.settings.voice.volume = فعالیت میکروفون
-bbb.settings.java.label = خطای مربوط به نسخه ی جاوا
-bbb.settings.java.text = نسخه ي جاواي نصب شده توسط شما {0} است، اما حداقل نسخه ي مورد نياز براي استفاده از امکان اشتراک گذاري صفحه {1} است. برای نصب جدید ترين نسخه ي Java JRE روی گزینه ي زير کليک کنيد.
-bbb.settings.java.command = جدید ترین نسخه ی جاوا را نصب کنید
 bbb.settings.flash.label = خطای مربوط به نسخه ی فلش
 bbb.settings.flash.text = نسخه ی نصب شده ی فلش شما {0} است، اما شما برای اجرای درست سیستم حداقل نیازمند نسخه ی {1} هستید. برای نصب آخرین نسخه ی ادوبی فلش پلیر روی دکمه ی زیر کلیک کنید.
 bbb.settings.flash.command = جدیدترین نسخه فلش را نصب کنید
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = متن
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = تبدیل اشاره گر تخته سفید به متن
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = رنگ متن
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = اندازه متن
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = آماده
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = کمینه سازی پنجره کن
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = بیشینه کردن پنجره کنونی
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = غیر فعال کردن پنجره فلش
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = قطع و وصل کردن میکروفون خود
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = انتقال قسمت فعال به پنج
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = باز کردن پنجره اشتراک صفحه
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = باز کردن پنجره تنظیمات میکروفون
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = شروع/قطع شنیدن صدای جلسه
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = باز کردن پنجره اشتراک تصویر
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = بستن تمام دوربین ه
 bbb.users.settings.lockAll=قفل کردن تمام کاربران
 bbb.users.settings.lockAllExcept=قفل کردن تمام کاربران به جز ارائه دهنده
 bbb.users.settings.lockSettings=قفل کردن کاربران...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=باز کردن تمام کاربران
 bbb.users.settings.roomIsLocked=قفل شده به صورت پیش فرض
 bbb.users.settings.roomIsMuted=بی صدا به صورت پیش فرض
@@ -585,3 +637,34 @@ bbb.lockSettings.title=قفل کردن مشاهده کنندگان
 bbb.lockSettings.feature=مشخصه
 bbb.lockSettings.locked=قفل شده
 bbb.lockSettings.lockOnJoin=امکان الحاق شدن را قفل کن
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/fi_FI/bbbResources.properties b/bigbluebutton-client/locale/fi_FI/bbbResources.properties
index a326f6f7cabcf65fc01eff0dd13e73360f2417b5..fcf7ec20c6aa73e044bcc43ec6ab79fd42847ef0 100644
--- a/bigbluebutton-client/locale/fi_FI/bbbResources.properties
+++ b/bigbluebutton-client/locale/fi_FI/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Pienennä
 bbb.window.maximizeRestoreBtn.toolTip = Suurenna
 bbb.window.closeBtn.toolTip = Sulje
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Esitys
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Webkamera ikkuna sulje ikkuna
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Julkaise webbikameran ikkuna
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Työpöydän jako\: Esittelijän esikatselu
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Kokonäyttö
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Alue
-bbb.desktopPublish.stop.tooltip = Sulje näytönjako
-bbb.desktopPublish.stop.label = Sulje
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Et voi maksimoida tätä ikkunaa.
-bbb.desktopPublish.closeBtn.toolTip = Lopeta jakaminen ja sulje
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Pienennä
-bbb.desktopPublish.minimizeBtn.accessibilityName = Pienennä työpöydän jako ikkuna
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Suurenna työpöydän jako ikkuna
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Työpöydän jako
-bbb.desktopView.fitToWindow = Sovita ikkunaan
-bbb.desktopView.actualSize = Näytä oikea koko
-bbb.desktopView.minimizeBtn.accessibilityName = Pienennä työpöydän jako ikkunan esinäyttö
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Suurenna työpöydän jako ikkunan esinäyttö
-bbb.desktopView.closeBtn.accessibilityName = Sulje työpöydän jako ikkunan esinäyttö
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Share Your Webcam
 bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam
 bbb.layout.addButton.toolTip = Lisää muokattu ulkoasu listalle
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Ulkoasut tallennettu onnistuneesti
 bbb.layout.load.complete = Ulkoasut ladattu onnistuneesti
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = Yhteys palvelimeen on hylätty
 bbb.logout.invalidapp = red5 ohjelmaa ei löydy
 bbb.logout.unknown = Selaimesi kadotti yhteyden palvelimeen
 bbb.logout.usercommand = Kirjauduit ulos konferenssista
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Tallenna muistiinpano
 bbb.settings.deskshare.instructions = Klikkaa salliaksesi ponnahdusikkunan joka tarkistaa toimiiko työpöydän jako oikein
 bbb.settings.deskshare.start = Tarkista Työpöydän Jako
 bbb.settings.voice.volume = Mikrofonin aktiviteetti
-bbb.settings.java.label = Java versio virhe
-bbb.settings.java.text = Java {0} on asennettu, mutta tarvitset vähintään version {1} käyttääksesi BigBlueButtonin työpöytäjako ominaisuuksia. Klikkaa alla olevaa nappia asentaaksesi viimeisimmän Java JRE version.
-bbb.settings.java.command = Asenna uusin Java
 bbb.settings.flash.label = Flash versio virhe
 bbb.settings.flash.text = Flash {0} on asennettu, mutta tarvitset vähintään version {1} käyttääksesi BigBlueButtonia oikein.\nKlikkaa alla olevaa nappia asentaaksesi viimeisimmät Adobe Flash version.
 bbb.settings.flash.command = Asenna uusin Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Teksti
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Vaihda valkotaulun kursori tekstiksi
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Tekstin väri
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Fontin koko
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Pienennä nykyinen ikkuna
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Suurenna ikkuna
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Pois Flash ikkunasta
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mykistys ja mykistys pois mikrofonista
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Siirrä kohdistus keskustelu ikkunaan
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Avaa työpöydänjako ikkuna
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Avaa mikrofonin asetusikkuna
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Avaa webkameran jako ikkuna
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/fr_CA/bbbResources.properties b/bigbluebutton-client/locale/fr_CA/bbbResources.properties
index f7a139eeb9ca38f663809b3628fe5e812da8754e..f77e3fae69f0463808d76c73697664e89a35018c 100644
--- a/bigbluebutton-client/locale/fr_CA/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_CA/bbbResources.properties
@@ -52,7 +52,7 @@ bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Cliquer ici pour ne pa
 bbb.micSettings.webrtc.notCapableBrowser = WebRTC n'est pas supporté par votre fureteur. SVP utiliser Google Chrome (version 32 ou ultérieure); ou Mozilla Firefox (version 26 ou ultérieure). Vous pouvez tout de même participer à la conférence audio en utilisant Adobe Flash Player.
 bbb.micSettings.webrtc.connecting = Appel en cours
 bbb.micSettings.webrtc.waitingforice = Connexion en cours
-bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.transferring = Transfert en cours
 bbb.micSettings.webrtc.endingecho = Joindre l'audio
 bbb.micSettings.webrtc.endedecho = Test d'écho terminé.
 bbb.micPermissions.firefox.title = Permissions du microphone de Firefox
@@ -66,22 +66,22 @@ bbb.micWarning.testAgain.label = Tester de nouveau
 bbb.micWarning.message = Votre microphone n'a pas montré d'activité, donc les autres ne pourront probablement pas vous entendre.
 bbb.webrtcWarning.message = Le problème suivant avec WebRTC a été détecté\: {0}. Voulez-vous essayer Flash à la place?
 bbb.webrtcWarning.title = WebRTC Audio Failure
-bbb.webrtcWarning.failedError.1001 = Error 1001\: WebSocket disconnected
-bbb.webrtcWarning.failedError.1002 = Error 1002\: Could not make a WebSocket connection
+bbb.webrtcWarning.failedError.1001 = Erreur 1001\: WebSocket déconnecté
+bbb.webrtcWarning.failedError.1002 = Erreur 1002 \: Impossible d'établir une connexion WebSocket
 bbb.webrtcWarning.failedError.1003 = Erreur 1003\: Version du fureteur non supportée
-bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1004 = Erreur 1004\: Échec sur appel (motif \={0})
 bbb.webrtcWarning.failedError.1005 = Erreur 1005\: Arrêt de l'appel inattendu
-bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
+bbb.webrtcWarning.failedError.1006 = Erreur 1006\: appel a expiré
 bbb.webrtcWarning.failedError.1007 = Erreur 1007\: Echec de la négociation ICE
 bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
 bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
 bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
 bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
 bbb.webrtcWarning.failedError.unknown = Erreur {0}\: Code d'erreur inconnu
-bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
-bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
+bbb.webrtcWarning.failedError.mediamissing = Impossible d'obtenir votre microphone pour un appel WebRTC
+bbb.webrtcWarning.failedError.endedunexpectedly = Le test WebRTC echo a pris fin de façon inattendue
 bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
-bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
+bbb.webrtcWarning.connection.reconnecting = Tentative de reconnexion
 bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
 bbb.mainToolbar.helpBtn = Aide
 bbb.mainToolbar.logoutBtn = Déconnexion
@@ -103,21 +103,17 @@ bbb.mainToolbar.recordBtn..notification.message1 = Vous pouvez enregistrer cette
 bbb.mainToolbar.recordBtn..notification.message2 = Vous devez cliquer sur le bouton Démarrer / Cesser l'enregistrement dans la barre de titre pour débuter / arrêter l’enregistrement.
 bbb.mainToolbar.recordingLabel.recording = (Enregistrement en cours)
 bbb.mainToolbar.recordingLabel.notRecording = N'enregistre pas
-bbb.clientstatus.title = Configuration Notifications
-bbb.clientstatus.notification = Unread notifications
-bbb.clientstatus.close = Close
-bbb.clientstatus.tunneling.title = Firewall
-bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
-bbb.clientstatus.browser.title = Browser Version
-bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
+bbb.clientstatus.title = Notifications de configuration
+bbb.clientstatus.notification = Notifications non lus
+bbb.clientstatus.close = Fermer
+bbb.clientstatus.tunneling.title = Pare-feu
+bbb.clientstatus.tunneling.message = Un pare-feu empêche votre client de se connecter directement sur ​​le port 1935 sur le serveur distant . Recommander se joindre à un réseau moins restrictif pour une connexion plus stable
+bbb.clientstatus.browser.title = Version du navigateur
+bbb.clientstatus.browser.message = Votre navigateur ({0}) ne êtes pas mis à jour. Recommander la mise à jour à la dernière version.
 bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimiser
 bbb.window.maximizeRestoreBtn.toolTip = Maximiser
 bbb.window.closeBtn.toolTip = Fermer
@@ -145,7 +141,7 @@ bbb.users.muteMeBtnTxt.talk = Activer
 bbb.users.muteMeBtnTxt.mute = Assourdir
 bbb.users.muteMeBtnTxt.muted = Assourdit
 bbb.users.muteMeBtnTxt.unmuted = Sourdine désactivée
-bbb.users.usersGrid.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.contextmenu.exportusers = Copier les noms d'utilisateurs
 bbb.users.usersGrid.accessibilityName = Listes d'utilisateurs. Utilisez les flèches pour naviguer.
 bbb.users.usersGrid.nameItemRenderer = Nom
 bbb.users.usersGrid.nameItemRenderer.youIdentifier = vous
@@ -153,10 +149,10 @@ bbb.users.usersGrid.statusItemRenderer = Statut
 bbb.users.usersGrid.statusItemRenderer.changePresenter = Cliquer pour en faire le présentateur
 bbb.users.usersGrid.statusItemRenderer.presenter = Présentateur
 bbb.users.usersGrid.statusItemRenderer.moderator = Modérateur
-bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Effacer le statut
 bbb.users.usersGrid.statusItemRenderer.viewer = Spectateur
 bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
-bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Est le présentateur
 bbb.users.usersGrid.mediaItemRenderer = Média
 bbb.users.usersGrid.mediaItemRenderer.talking = Parler
 bbb.users.usersGrid.mediaItemRenderer.webcam = Partager la webcam
@@ -170,17 +166,20 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Partager la webcam
 bbb.users.usersGrid.mediaItemRenderer.micOff = Micro fermé
 bbb.users.usersGrid.mediaItemRenderer.micOn = Micro ouvert
 bbb.users.usersGrid.mediaItemRenderer.noAudio = Vous n'êtes pas en conférence audio
-bbb.users.emojiStatus.clear = Clear
-bbb.users.emojiStatus.clear.toolTip = Clear status
-bbb.users.emojiStatus.close = Close
+bbb.users.emojiStatus.clear = Effacer
+bbb.users.emojiStatus.clear.toolTip = Effacer le statut
+bbb.users.emojiStatus.close = Fermer
 bbb.users.emojiStatus.close.toolTip = Close status popup
-bbb.users.emojiStatus.raiseHand = Raise hand status
-bbb.users.emojiStatus.happy = Happy status
-bbb.users.emojiStatus.smile = Smile status
-bbb.users.emojiStatus.sad = Sad status
-bbb.users.emojiStatus.confused = Confused status
-bbb.users.emojiStatus.neutral = Neutral status
+bbb.users.emojiStatus.raiseHand = Status main levée
+bbb.users.emojiStatus.happy = Status heureux
+bbb.users.emojiStatus.smile = Status sourire
+bbb.users.emojiStatus.sad = Status triste
+bbb.users.emojiStatus.confused = Status confus
+bbb.users.emojiStatus.neutral = Status neutre
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Présentation
 bbb.presentation.titleWithPres = Présentation\: {0}
 bbb.presentation.quickLink.label = Module présentation
@@ -241,10 +240,10 @@ 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 = The user has left.
-bbb.chat.private.userJoined = The user has joined.
+bbb.chat.private.userLeft = Le participant est parti.
+bbb.chat.private.userJoined = L'utilisateur a rejoint.
 bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
-bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.usersList.toolTip = Sélectionnez le participant pour ouvrir le chat privé
 bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
 bbb.chat.chatOptions = Options de discussions
 bbb.chat.fontSize = Taille de la police
@@ -254,8 +253,8 @@ bbb.chat.minimizeBtn.accessibilityName = Réduire le module de clavardage
 bbb.chat.maximizeRestoreBtn.accessibilityName = Agrandir le module de clavardage
 bbb.chat.closeBtn.accessibilityName = Fermer le module de clavardage
 bbb.chat.chatTabs.accessibleNotice = Nouveaux messages dans cet onglet.
-bbb.chat.chatMessage.systemMessage = System
-bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+bbb.chat.chatMessage.systemMessage = Système
+bbb.chat.chatMessage.tooLong = Ce message a [0] caractère(s)
 bbb.publishVideo.changeCameraBtn.labelText = Changer la webcam
 bbb.publishVideo.changeCameraBtn.toolTip = Ouvrir la fenêtre de changement de webcam
 bbb.publishVideo.cmbResolution.tooltip = Sélectionnez la résolution de la webcam
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Fermer la fenêtre de paramètres pour l
 bbb.video.publish.closeBtn.label = Annuler
 bbb.video.publish.titleBar = Publier la webcam
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Partage de bureau\: Aperçu du présentateur
-bbb.desktopPublish.fullscreen.tooltip = Partager votre écran principal
-bbb.desktopPublish.fullscreen.label = Plein écran
-bbb.desktopPublish.region.tooltip = Partager une partie de l'écran
-bbb.desktopPublish.region.label = Région
-bbb.desktopPublish.stop.tooltip = Fermer le partage d'écran
-bbb.desktopPublish.stop.label = Fermer
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Vous ne pouvez pas agrandir cette fenêtre.
-bbb.desktopPublish.closeBtn.toolTip = Arrêter de partager et fermer
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Réduire
-bbb.desktopPublish.minimizeBtn.accessibilityName = Réduire le module de partage d'écran
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Agrandir le module de partage d'écran
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Partage d'écran
-bbb.desktopView.fitToWindow = Adapter la taille à la fenêtre
-bbb.desktopView.actualSize = Afficher à la taille normale
-bbb.desktopView.minimizeBtn.accessibilityName = Réduire le module de partage d'écran
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Agrandir le module de partage d'écran
-bbb.desktopView.closeBtn.accessibilityName = Fermer le module de partage d'écran
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Recommencer le partage d'écran
+bbb.screensharePublish.restart.label = Recommencer
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Vous ne pouvez pas agrandir cette fenêtre.
+bbb.screensharePublish.closeBtn.toolTip = Arrêter de partager et fermer
+bbb.screensharePublish.minimizeBtn.toolTip = Minimiser
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Aide
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Sélectionez 'OK' pour exécuter
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Acceptez le certificat
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Sélectionez 'OK' pour exécuter
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Acceptez le certificat
+bbb.screensharePublish.shareTypeLabel.text = Partager\:
+bbb.screensharePublish.shareType.fullScreen = Plein écran
+bbb.screensharePublish.shareType.region = Région
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Annuler
+bbb.screensharePublish.startButton.label = Commencer
+bbb.screensharePublish.stopButton.label = Arrêter
+bbb.screenshareView.title = Partage d'écran
+bbb.screenshareView.fitToWindow = Ajuster à la fenêtre
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimiser la fenêtre de partage d'écran
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximiser la fenêtre de partage d'écran
+bbb.screenshareView.closeBtn.accessibilityName = Fermer la fenêtre de partage d'écran
 bbb.toolbar.phone.toolTip.start = Partager votre micro
 bbb.toolbar.phone.toolTip.stop = Cesser de partager votre micro
 bbb.toolbar.phone.toolTip.mute = Cesser d'écouter la conférence
 bbb.toolbar.phone.toolTip.unmute = Démarrer l'écoute la conférence
 bbb.toolbar.phone.toolTip.nomic = Aucun micro détecté
-bbb.toolbar.deskshare.toolTip.start = Partager mon écran
-bbb.toolbar.deskshare.toolTip.stop = Cesser de partager mon écran
+bbb.toolbar.deskshare.toolTip.start = Partager votre écran
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Partager la webcam
 bbb.toolbar.video.toolTip.stop = Cesser de partager la webcam
 bbb.layout.addButton.toolTip = Ajouter la mise en page personnalisée à la liste
@@ -329,8 +361,9 @@ bbb.layout.combo.customName = Mise en page personnalisée
 bbb.layout.combo.remote = Distant
 bbb.layout.save.complete = Les mises en page ont été sauvegardées
 bbb.layout.load.complete = Les mises en page ont été téléchargées
-bbb.layout.load.failed = Unable to load the layouts
+bbb.layout.load.failed = Impossible de charger les mises en page
 bbb.layout.name.defaultlayout = Configuration par défaut
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Clavardage vidéo
 bbb.layout.name.webcamsfocus = Webconférence
 bbb.layout.name.presentfocus = Visioconférence
@@ -357,11 +390,12 @@ bbb.logout.button.label = OK
 bbb.logout.appshutdown = L'application serveur a été arrêté
 bbb.logout.asyncerror = Un erreur de synchronisation est survenu
 bbb.logout.connectionclosed = La connexion au serveur a été fermé
-bbb.logout.connectionfailed = The connection to the server has ended
+bbb.logout.connectionfailed = La connexion au serveur a été fermé
 bbb.logout.rejected = La connexion au serveur a été refusé
 bbb.logout.invalidapp = L'application red5 n'existe pas
 bbb.logout.unknown = Votre client a perdu la connexion au serveur
 bbb.logout.usercommand = Vous êtes maintenant déconnecté de la conférence
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = Si cette fin de session était involontaire, cliquer le bouton ci-bas pour vous reconnecter.
 bbb.logout.refresh.label = Reconnecter
@@ -370,11 +404,11 @@ bbb.logout.confirm.message = Êtes-vous sur de vouloir vous déconnecter?
 bbb.logout.confirm.yes = Oui
 bbb.logout.confirm.no = Non
 bbb.connection.failure=Detected Connectivity Problems
-bbb.connection.reconnecting=Reconnecting
-bbb.connection.reestablished=Connection reestablished
+bbb.connection.reconnecting=Reconnexion en cours
+bbb.connection.reestablished=Connection rétablie
 bbb.connection.bigbluebutton=BigBlueButton
 bbb.connection.sip=SIP
-bbb.connection.video=Video
+bbb.connection.video=Vidéo
 bbb.connection.deskshare=Deskshare
 bbb.notes.title = Notes
 bbb.notes.cmpColorPicker.toolTip = Couleur du texte
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Sauvegarder la note
 bbb.settings.deskshare.instructions = Choisissez Permettre sur la boîte de dialogue qui apparaîtra pour voir si le partage d'écran fonctionne convenablement pour vous
 bbb.settings.deskshare.start = Regarder le partage d'écran
 bbb.settings.voice.volume = Activité du micro
-bbb.settings.java.label = Erreur de la version de Java
-bbb.settings.java.text = Vous avez Java {0} d'installé, mais vous devez avoir au moins la version {1} pour utiliser le partage d'écran de BigBlueButton. Pour installer la version la plus récente de Java JRE, cliquez sur le bouton ci-dessous.
-bbb.settings.java.command = Installer la nouvelle version de Java
 bbb.settings.flash.label = Erreur de la version de Flash
 bbb.settings.flash.text = Vous avez Flash {0} d'installé, mais vous devez avoir au moins la version {1} pour utiliser BigBlueButton convenablement. Pour installer la version la plus récente de Adobe Flash, cliquez sur le bouton ci-dessous.
 bbb.settings.flash.command = Installer la nouvelle version de Flash
@@ -404,8 +435,31 @@ ltbcustom.bbb.highlighter.toolbar.text = Texte
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Changer le curseur du tableau pour du texte
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Couleur du texte
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Taille de la police
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = Aucun
+bbb.caption.transcript.youowner = Vous
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Langue\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Famille de police\:
+bbb.caption.option.fontfamily.tooltip = Famille de police
+bbb.caption.option.fontsize = Taille de police\: 
+bbb.caption.option.fontsize.tooltip = Taille de police
+bbb.caption.option.backcolor = Couleur d'arrière plan\:
+bbb.caption.option.backcolor.tooltip = Couleur d'arrière plan
+bbb.caption.option.textcolor = Couleur du texte\:
+bbb.caption.option.textcolor.tooltip = Couleur du texte
 
-bbb.accessibility.clientReady = Ready
+
+bbb.accessibility.clientReady = Prêt
 
 bbb.accessibility.chat.chatBox.reachedFirst = Vous avez atteint le premier message.
 bbb.accessibility.chat.chatBox.reachedLatest = Vous avez atteint le dernier message.
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Réduire la fenêtre courante
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Agrandir la fenêtre courante
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Enlever le focus de sur la fenêtre de Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Activer et désactiver la sourdine sur votre micro
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Mettre le focus sur le module de clavardag
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Ouvrir le module de partage d'écran
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ouvrir la fenêtre de paramètres audio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Démarrer / cesser l'écoute de la conférence
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Ouvrir le module de webcam
 
@@ -506,7 +556,7 @@ bbb.shortcutkey.chat.changeColour.function = Mettre le focus sur la sélection d
 bbb.shortcutkey.chat.sendMessage = 83
 bbb.shortcutkey.chat.sendMessage.function = Envoyer ce message
 bbb.shortcutkey.chat.closePrivate = 69
-bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.closePrivate.function = Fermer le module de clavardage privé
 bbb.shortcutkey.chat.explanation = ----
 bbb.shortcutkey.chat.explanation.function = Pour la navigation entre les messages, vous devez mettre le focus sur la zone de clavardage.
 
@@ -525,28 +575,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Aller jusqu'au dernier message lu
 bbb.shortcutkey.chat.chatbox.debug = 71
 bbb.shortcutkey.chat.chatbox.debug.function = Raccourci temporaire de débogage 
 
-bbb.polling.startButton.tooltip = Start a poll
-bbb.polling.startButton.label = Start Poll
+bbb.polling.startButton.tooltip = Commencer un sondage
+bbb.polling.startButton.label = Commencer le sondage
 bbb.polling.publishButton.label = Publier
 bbb.polling.closeButton.label = Fermer
-bbb.polling.pollModal.title = Live Poll Results
+bbb.polling.pollModal.title = Résultats de sondage en direct
 bbb.polling.customChoices.title = Enter Polling Choices
 bbb.polling.respondersLabel.novotes = Waiting for responses
 bbb.polling.respondersLabel.text = {0} Users Responded
-bbb.polling.respondersLabel.finished = Done
+bbb.polling.respondersLabel.finished = Terminer
 bbb.polling.answer.Yes = Oui
 bbb.polling.answer.No = Non
-bbb.polling.answer.True = True
-bbb.polling.answer.False = False
+bbb.polling.answer.True = Vrai
+bbb.polling.answer.False = Faux
 bbb.polling.answer.A = A
 bbb.polling.answer.B = B
-bbb.polling.answer.C = C
+bbb.polling.answer.C = D
 bbb.polling.answer.D = D
 bbb.polling.answer.E = E
 bbb.polling.answer.F = F
 bbb.polling.answer.G = G
-bbb.polling.results.accessible.header = Poll Results.
-bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
+bbb.polling.results.accessible.header = Résultats du sondage.
+bbb.polling.results.accessible.answer = Réponse [0] contient [1] vote(s).
 
 bbb.publishVideo.startPublishBtn.labelText = Démarrer le partage
 bbb.publishVideo.changeCameraBtn.labelText = Changer la webcam
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Fermer toutes les vidéos
 bbb.users.settings.lockAll=Verrouiller tous les utilisateurs
 bbb.users.settings.lockAllExcept=Verrouiller tous les utilisateurs sauf le présentateur
 bbb.users.settings.lockSettings=Verrouiller les participants
+bbb.users.settings.breakoutRooms=Salles de discussion…
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Déverrouiller tous les participants
 bbb.users.settings.roomIsLocked=Verrouillé par défaut
 bbb.users.settings.roomIsMuted=Sans son par défaut
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Verrouiller les participants
 bbb.lockSettings.feature=Fonctionnalité
 bbb.lockSettings.locked=Verrouillé
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Salles de discussion
+bbb.users.breakout.updateBreakoutRooms = Mettre à jour les salles de discussion
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Chambres
+bbb.users.breakout.roomsCombo.accessibilityName = Nombre de salles à créer
+bbb.users.breakout.room = Chambre
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Limite de temps
+bbb.users.breakout.durationStepper.accessibilityName = Limite de temps en minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Enregistrer
+bbb.users.breakout.recordCheckbox.accessibilityName = Enregistrer les salles de discussion
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Commencer
+bbb.users.breakout.invite = Inviter
+bbb.users.breakout.close = Fermer
+bbb.users.breakout.closeAllRooms = Fermer toutes les salles de discussion
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Chambre
+bbb.users.roomsGrid.users = Utilisateurs
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Joindre
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/fr_FR/bbbResources.properties b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
index 727c639978226a67778b71651ad2938a5f1aab01..2016346891cdf644580ec162ee8c4736ba631a9e 100644
--- a/bigbluebutton-client/locale/fr_FR/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
@@ -22,7 +22,7 @@ bbb.micSettings.title = Test Audio
 bbb.micSettings.speakers.header = Tester les haut-parleurs
 bbb.micSettings.microphone.header = Tester le microphone
 bbb.micSettings.playSound = Tester les haut-parleurs
-bbb.micSettings.playSound.toolTip = Faites jouer de la musique pour tester vos haut-parleurs
+bbb.micSettings.playSound.toolTip = Jouer de la musique pour tester vos haut-parleurs
 bbb.micSettings.hearFromHeadset = Vous devriez entendre le son dans vos écouteurs et non dans les haut-parleurs.
 bbb.micSettings.speakIntoMic = Si vous utilisez un casque (ou des écouteurs), vous devriez entendre du son dans votre casque -- pas dans vos hauts parleurs.
 bbb.micSettings.echoTestMicPrompt = Ceci est un test audio privé. Dites quelques mots. Pouvez-vous vous entendre ?
@@ -38,11 +38,11 @@ bbb.micSettings.micRecordVolume.toolTip = Choisissez le gain de votre micro
 bbb.micSettings.nextButton = Suivant
 bbb.micSettings.nextButton.toolTip = Démarrer le test d'echo
 bbb.micSettings.join = Rejoindre l'audio
-bbb.micSettings.join.toolTip = Joindre la conférence audio
+bbb.micSettings.join.toolTip = Joindre l'audioconférence
 bbb.micSettings.cancel = Annuler
 bbb.micSettings.connectingtoecho = Connexion
 bbb.micSettings.connectingtoecho.error = Erreur de l'appel de Test. Contactez l'administrateur.
-bbb.micSettings.cancel.toolTip = Annuler rejoindre la conférence audio
+bbb.micSettings.cancel.toolTip = Annuler rejoindre l’audioconférence
 bbb.micSettings.access.helpButton = Aide (ouvrir les tutoriels vidéos dans une nouvelle page)
 bbb.micSettings.access.title = Paramètres audio. Le focus va être gardé sur cette fenêtre jusqu'à ce qu'elle soit fermée.
 bbb.micSettings.webrtc.title = Support WebRTC
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Votre extension Flash Player ({0}) n'est pas à jour. Il est recommandé d'installer la dernière version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Nous vous recommandons d'utiliser Firefox ou Chrome pour une meilleure qualité sonore.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = La version de Java n'a pas été détectée.
-bbb.clientstatus.java.notinstalled = Vous n'avez pas Java d'installé, veuillez cliquer <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ICI</a></font> pour installer la dernière version de Java et utiliser la fonctionnalité de partage d'écran.
-bbb.clientstatus.java.oldversion = Vous avez une ancienne version de Java d'installée, veuillez cliquer <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ICI</a></font> pour installer la dernière version de Java et utiliser la fonctionnalité de partage d'écran.
 bbb.window.minimizeBtn.toolTip = Réduire
 bbb.window.maximizeRestoreBtn.toolTip = Agrandir
 bbb.window.closeBtn.toolTip = Fermer
@@ -169,18 +165,21 @@ bbb.users.usersGrid.mediaItemRenderer.kickUser = Éjecter {0}
 bbb.users.usersGrid.mediaItemRenderer.webcam = Partager la webcam
 bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone actif
 bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone inactif
-bbb.users.usersGrid.mediaItemRenderer.noAudio = Vous n'êtes pas en conférence audio
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Vous n'êtes pas en audioconférence
 bbb.users.emojiStatus.clear = Supprimer
 bbb.users.emojiStatus.clear.toolTip = Pas de statut
 bbb.users.emojiStatus.close = Fermer
 bbb.users.emojiStatus.close.toolTip = Fermer la fenêtre de statut
-bbb.users.emojiStatus.raiseHand = Statut main levée
+bbb.users.emojiStatus.raiseHand = Lever la main
 bbb.users.emojiStatus.happy = Statut content
 bbb.users.emojiStatus.smile = Statut souriant
 bbb.users.emojiStatus.sad = Statut triste
 bbb.users.emojiStatus.confused = Statut confus
 bbb.users.emojiStatus.neutral = Statut neutre
 bbb.users.emojiStatus.away = Statut ailleurs
+bbb.users.emojiStatus.thumbsUp = Pouce vers le haut
+bbb.users.emojiStatus.thumbsDown = Pouce vers le bas
+bbb.users.emojiStatus.applause = Applaudissements
 bbb.presentation.title = Présentation
 bbb.presentation.titleWithPres = Présentation \: {0}
 bbb.presentation.quickLink.label = Fenêtre présentation
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Fermer la fenêtre de paramètres pour l
 bbb.video.publish.closeBtn.label = Annuler
 bbb.video.publish.titleBar = Publier la webcam
 bbb.video.streamClose.toolTip = Fermer le flux pour \: {0}
-bbb.desktopPublish.title = Partage de bureau \: aperçu du présentateur
-bbb.desktopPublish.fullscreen.tooltip = Partager l'intégralité de votre écran
-bbb.desktopPublish.fullscreen.label = Plein écran
-bbb.desktopPublish.region.tooltip = Partager une partie de votre écran
-bbb.desktopPublish.region.label = Région
-bbb.desktopPublish.stop.tooltip = Fermer le partage d'écran
-bbb.desktopPublish.stop.label = Fermer
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Vous ne pouvez pas agrandir cette fenêtre.
-bbb.desktopPublish.closeBtn.toolTip = Arrêter de partager et fermer
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Le partage d'écran n'est pas supporté actuellement par Chrome sous Mac OS X. Vous devez utiliser un autre navigateur (nous recommandons FireFox) pour le partage d'écran.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome ne supporte plus les Applets Java. Vous devez utiliser un autre navigateur (Firefox recommandé) pour partager votre écran.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge ne supporte pas les Applets Java. Vous devez utiliser un navigateur web différent (nous recommandons Firefox) pour le partage d'écran.
-bbb.desktopPublish.minimizeBtn.toolTip = Réduire
-bbb.desktopPublish.minimizeBtn.accessibilityName = Réduire la fenêtre de partage d'écran
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Agrandir la fenêtre de partage d'écran
-bbb.desktopPublish.chromeHint.title = Chrome peut avoir besoin de votre permission.
-bbb.desktopPublish.chromeHint.message = Sélectionnez l'icône d'extension (en haut à droite de Chrome), débloquez les extensions, et sélectionnez 'Réessayer'.
-bbb.desktopPublish.chromeHint.button = Réessayer
-bbb.desktopView.title = Partage d'écran
-bbb.desktopView.fitToWindow = Adapter la taille à la fenêtre
-bbb.desktopView.actualSize = Afficher à la taille normale
-bbb.desktopView.minimizeBtn.accessibilityName = Réduire la fenêtre de partage d'écran
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Agrandir la fenêtre de partage d'écran
-bbb.desktopView.closeBtn.accessibilityName = Fermer la fenêtre de partage d'écran
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Mettre en pause le partage d'écran
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Redémarrer le partage d'écran
+bbb.screensharePublish.restart.label = Redémarrer
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Vous ne pouvez pas agrandir cette fenêtre.
+bbb.screensharePublish.closeBtn.toolTip = Arrêter le partage et fermer
+bbb.screensharePublish.minimizeBtn.toolTip = Réduire
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = Les étapes ci-dessous vous guideront pour démarrer le partage d’écran (nécessite Java).
+bbb.screensharePublish.helpButton.toolTip = AIde
+bbb.screensharePublish.helpButton.accessibilityName = Aide (Ouvre le tutoriel dans une nouvelle fenêtre)
+bbb.screensharePublish.helpText.PCIE1 = 1. Choisir 'Ouvrir'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accepter le certificat
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Cliquer 'OK' pour lancer
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accepter le certificat
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Localiser 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Cliquer pour ouvrir
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accepter le certificat
+bbb.screensharePublish.helpText.MacSafari1 = 1. Localiser 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Sélectionnez 'Afficher dans le Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Faire un clic droit et sélectionner 'Ouvrir'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Sélectionnez 'Ouvrir' (si vous y êtes invité)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choisissez 'Enregistrer le fichier' (si demandé)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Sélectionnez 'Afficher dans le Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Faire un clic droit et sélectionner 'Ouvrir'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Sélectionnez 'Ouvrir' (si vous y êtes invité)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Localiser 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Sélectionnez 'Afficher dans le Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Faire un clic droit et sélectionner 'Ouvrir'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Sélectionnez 'Ouvrir' (si vous y êtes invité)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Cliquer 'OK' pour lancer
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accepter le certificat
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Localiser 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Cliquer pour ouvrir
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accepter le certificat
+bbb.screensharePublish.shareTypeLabel.text = Partage\:
+bbb.screensharePublish.shareType.fullScreen = Plein écran
+bbb.screensharePublish.shareType.region = Partie
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Démarrage du partage d'écran non détecté.
+bbb.screensharePublish.restartFailed.label = Redémarrage du partage d'écran non détecté.
+bbb.screensharePublish.jwsCrashed.label = L'application de partage d'écran s'est fermée de façon inattendue
+bbb.screensharePublish.commonErrorMessage.label = Choisir 'Annuler' et réessayer
+bbb.screensharePublish.cancelButton.label = Annuler
+bbb.screensharePublish.startButton.label = Démarrer
+bbb.screensharePublish.stopButton.label = Arrêter
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Adapter la taille à la fenêtre
+bbb.screenshareView.actualSize = Présenter la taille actuelle
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Partager votre microphone
 bbb.toolbar.phone.toolTip.stop = Arrêter le partage de votre microphone
 bbb.toolbar.phone.toolTip.mute = Stopper l'écoute de la conférence
 bbb.toolbar.phone.toolTip.unmute = Démarrer l'écoute de la conférence
 bbb.toolbar.phone.toolTip.nomic = Aucun microphone détecté
-bbb.toolbar.deskshare.toolTip.start = Partager votre écran
-bbb.toolbar.deskshare.toolTip.stop = Arrêter le partage de votre écran
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Partager votre webcam
 bbb.toolbar.video.toolTip.stop = Arrêter le partage de votre webcam
 bbb.layout.addButton.toolTip = Ajouter la mise en page personnalisée à la liste
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Les mises en page ont été sauvegardées avec succè
 bbb.layout.load.complete = Les mises en page ont été chargées avec succès
 bbb.layout.load.failed = Impossible de charger les mises en pages
 bbb.layout.name.defaultlayout = Mise en page par défaut
+bbb.layout.name.closedcaption = Sous-titrage pour sourds et malentendants
 bbb.layout.name.videochat = Discussion Vidéo
 bbb.layout.name.webcamsfocus = Réunion Webcam
 bbb.layout.name.presentfocus = Réunion Présentation
@@ -362,6 +395,7 @@ bbb.logout.rejected = La connexion au serveur a été refusée
 bbb.logout.invalidapp = L'application red5 n'existe pas
 bbb.logout.unknown = Votre client a perdu la connexion au serveur
 bbb.logout.usercommand = Vous êtes maintenant déconnecté de la conférence
+bbb.logour.breakoutRoomClose = La fenêtre de votre navigateur va se fermer
 bbb.logout.ejectedFromMeeting = Un modérateur vous a éjecté de la conférence.
 bbb.logout.refresh.message = Si cette déconnexion était inattendue, cliquez sur le bouton ci-dessous pour vous reconnecter.
 bbb.logout.refresh.label = Se reconnecter
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Sauvegarder la note
 bbb.settings.deskshare.instructions = Cliquez sur Autoriser sur l'invite qui s'affiche pour vérifier que le partage d'écran fonctionne correctement pour vous
 bbb.settings.deskshare.start = Vérifier le partage d'écran
 bbb.settings.voice.volume = Activité du microphone
-bbb.settings.java.label = Erreur de version Java
-bbb.settings.java.text = Vous avez Java {0} installé, mais la version {1} minimum est requise pour utiliser le partage d'écran de BigBlueButton. Pour installer la version la plus récente de Java JRE, cliquez sur le bouton ci-dessous.
-bbb.settings.java.command = Installer la dernière version de Java
 bbb.settings.flash.label = Erreur de version Flash
 bbb.settings.flash.text = Vous avez Flash {0} installé, mais la version {1} minimum est requise pour BigBlueButton.  Cliquez sur le bouton ci-dessous pour installer la dernière version d'Adobe Flash.
 bbb.settings.flash.command = Installer la dernière version de Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Texte
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Changer le curseur du tableau pour du texte
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Couleur du texte
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Taille de caractère
+bbb.caption.window.title = Sous-titrage pour sourds et malentendants
+bbb.caption.window.titleBar = Barre de Titre Sous-titrage pour sourds et malentendants
+bbb.caption.window.minimizeBtn.accessibilityName = Réduire la fenêtre de Sous-titrage pour sourds et malentendats
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Barre de Titre Sous-titrage pour sourds et malentendats
+bbb.caption.transcript.noowner = Aucun
+bbb.caption.transcript.youowner = Vous
+bbb.caption.transcript.pastewarning.title = Avertissement de collage de sous-titre
+bbb.caption.transcript.pastewarning.text = Impossible de coller plus de {0} caractères. Vous avez collé {1} caractères.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Langue\:
+bbb.caption.option.language.tooltip = Sélectionner la Langue de Sous-titrage
+bbb.caption.option.language.accessibilityName = Sélectionnez une langue de sous-titrage. Utilisez les touches flèches pour naviguer.
+bbb.caption.option.takeowner = Prendre le Contrôle
+bbb.caption.option.takeowner.tooltip = Prendre le Contrôle de la Langue Sélectionnée
+bbb.caption.option.fontfamily = Famille police\:
+bbb.caption.option.fontfamily.tooltip = Famille police\:
+bbb.caption.option.fontsize = Taille de caractère\:
+bbb.caption.option.fontsize.tooltip = Taille de caractère
+bbb.caption.option.backcolor = Couleur d'arrière-plan\:
+bbb.caption.option.backcolor.tooltip = Couleur d'arrière-plan
+bbb.caption.option.textcolor = Couleur du texte\:
+bbb.caption.option.textcolor.tooltip = Couleur du texte
+
 
 bbb.accessibility.clientReady = Prêt
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Réduire la fenêtre courante
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Agrandir la fenêtre courante
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Enlever le focus de la fenêtre de Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Activer et désactiver votre microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Mettre le focus sur la fenêtre de discuss
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Ouvrir la fenêtre de partage d'écran
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ouvrir la fenêtre de paramètres audio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Démarrer/Arrêter l'écoute de la conférence
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Ouvrir la fenêtre de partage de la webcam
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Fermer toutes les vidéos
 bbb.users.settings.lockAll=Verrouiller tous les utilisateurs
 bbb.users.settings.lockAllExcept=Verrouiller tous les utilisateurs sauf le présentateur
 bbb.users.settings.lockSettings=Verrouiller les participants ...
+bbb.users.settings.breakoutRooms=Mettre les salles en pause  ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Envoyer les invitations pour les Salles de Groupe
 bbb.users.settings.unlockAll=Déverrouiller tous les participants
 bbb.users.settings.roomIsLocked=Verrouillé par défaut
 bbb.users.settings.roomIsMuted=Rendre silencieux par défaut
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Verrouiller les participants
 bbb.lockSettings.feature=Fonctionnalité
 bbb.lockSettings.locked=Verrouillé
 bbb.lockSettings.lockOnJoin=Verrouiller à la connexion
+
+bbb.users.breakout.breakoutRooms = Mettre les salles en pause
+bbb.users.breakout.updateBreakoutRooms = Mettre à jour les Salles de Groupe
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} restant</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} restant</b>
+bbb.users.breakout.calculatingRemainingTime = Calcul du temps restant...
+bbb.users.breakout.remainingTimeEnded = Temps écoulé, la salle de groupe va se fermer.
+bbb.users.breakout.rooms = Salles
+bbb.users.breakout.roomsCombo.accessibilityName = Nombre de salles à créer
+bbb.users.breakout.room = Salle
+bbb.users.breakout.randomAssign = Affecter les utilisateurs  aléatoirement 
+bbb.users.breakout.timeLimit = Limite de temps
+bbb.users.breakout.durationStepper.accessibilityName = Limite de temps en minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Enregistrer
+bbb.users.breakout.recordCheckbox.accessibilityName = Enregistrer les salles de groupe
+bbb.users.breakout.notAssigned = Non attribuée
+bbb.users.breakout.dragAndDropToolTip = Astuce\: Vous pouvez glisser-déposer les utilisateurs entre les salles
+bbb.users.breakout.start = Démarrer
+bbb.users.breakout.invite = Inviter
+bbb.users.breakout.close = Fermer
+bbb.users.breakout.closeAllRooms = Fermer Toutes les Salles de Groupe
+bbb.users.breakout.insufficientUsers = Nombre d'utilisateurs insuffisant. Vous devriez ajouter au moins un utilisateur par salle
+bbb.users.breakout.openJoinURL = Vous êtes invité à rejoindre la Salle de Groupe {0}\n(En acceptant, vous quitterez automatiquement l’audioconférence)
+bbb.users.breakout.confirm = Confirmer Joindre Salle de Goupe
+bbb.users.roomsGrid.room = Salle
+bbb.users.roomsGrid.users = Utilisateurs
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transférer l'audio
+bbb.users.roomsGrid.join = Rejoindre
+bbb.users.roomsGrid.noUsers = Pas d'utilisateurs dans cette salle
diff --git a/bigbluebutton-client/locale/gl/bbbResources.properties b/bigbluebutton-client/locale/gl/bbbResources.properties
new file mode 100644
index 0000000000000000000000000000000000000000..58663b57531fcf74290462d4c3fe4ab11db39227
--- /dev/null
+++ b/bigbluebutton-client/locale/gl/bbbResources.properties
@@ -0,0 +1,670 @@
+bbb.mainshell.locale.version = 0.9.0
+bbb.mainshell.statusProgress.connecting = Connecting to the server
+bbb.mainshell.statusProgress.loading = Loading {0} modules
+bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
+bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
+bbb.mainshell.logBtn.toolTip = Open Log Window
+bbb.mainshell.meetingNotFound = Meeting Not Found
+bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
+bbb.mainshell.notification.tunnelling = Tunnelling
+bbb.mainshell.notification.webrtc = WebRTC Audio
+bbb.oldlocalewindow.reminder1 = You may have an old language translations of BigBlueButton.
+bbb.oldlocalewindow.reminder2 = Please clear your browser's cache and try again.
+bbb.oldlocalewindow.windowTitle = Warning\: Old Language Translations
+bbb.audioSelection.title = How do you want to join the audio?
+bbb.audioSelection.btnMicrophone.label = Microphone
+bbb.audioSelection.btnMicrophone.toolTip = Join the audio with your microphone
+bbb.audioSelection.btnListenOnly.label = Listen Only
+bbb.audioSelection.btnListenOnly.toolTip = Join the audio as listen only
+bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial\: {0} then enter {1} as the conference pin number.
+bbb.micSettings.title = Audio Test
+bbb.micSettings.speakers.header = Test Speakers
+bbb.micSettings.microphone.header = Test Microphone
+bbb.micSettings.playSound = Test Speakers
+bbb.micSettings.playSound.toolTip = Play music to test your speakers
+bbb.micSettings.hearFromHeadset = You should hear audio in your headset, not your computer speakers.
+bbb.micSettings.speakIntoMic = If you are using a headset (or earbuds), you should hear the audio from your headset -- not from your computer speakers.
+bbb.micSettings.echoTestMicPrompt = This is a private echo test.  Speak a few words.  Did you hear audio?
+bbb.micSettings.echoTestAudioYes = Yes
+bbb.micSettings.echoTestAudioNo = No
+bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic.
+bbb.micSettings.recommendHeadset = Use a headset with a microphone for best audio experience.
+bbb.micSettings.changeMic = Test or Change Microphone
+bbb.micSettings.changeMic.toolTip = Open the Flash Player microphone settings dialog box
+bbb.micSettings.comboMicList.toolTip = Select a microphone
+bbb.micSettings.micRecordVolume.label = Gain
+bbb.micSettings.micRecordVolume.toolTip = Set your microphone gain
+bbb.micSettings.nextButton = Next
+bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.join = Join Audio
+bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.cancel = Cancel
+bbb.micSettings.connectingtoecho = Connecting
+bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
+bbb.micSettings.cancel.toolTip = Cancel joining the audio conference
+bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.title = Audio Settings. Focus will remain in this audio settings window until the window is closed.
+bbb.micSettings.webrtc.title = WebRTC Support
+bbb.micSettings.webrtc.capableBrowser = Your browser supports WebRTC.
+bbb.micSettings.webrtc.capableBrowser.dontuseit = Click not to use WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Click here if you don't want to use the WebRTC technology (recommended if you have problems using it).
+bbb.micSettings.webrtc.notCapableBrowser = WebRTC is not supported in your browser. Please use Google Chrome (version 32 or greater); or Mozilla Firefox (version 26 or greater). You will still be able to join the voice conference using the Adobe Flash Platform.
+bbb.micSettings.webrtc.connecting = Calling
+bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.endingecho = Joining audio
+bbb.micSettings.webrtc.endedecho = Echo test ended.
+bbb.micPermissions.firefox.title = Firefox Microphone Permissions
+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.chrome.title = Chrome Microphone Permissions
+bbb.micPermissions.chrome.message1 = Click Allow to give Chrome permission to use your microphone.
+bbb.micWarning.title = Audio Warning
+bbb.micWarning.joinBtn.label = Join anyway
+bbb.micWarning.testAgain.label = Test again
+bbb.micWarning.message = Your microphone did not show any activity, others probably won't be able to hear you during the session.
+bbb.webrtcWarning.message = Detected the following WebRTC issue\: {0}. Do you want to try Flash instead?
+bbb.webrtcWarning.title = WebRTC Audio Failure
+bbb.webrtcWarning.failedError.1001 = Error 1001\: WebSocket disconnected
+bbb.webrtcWarning.failedError.1002 = Error 1002\: Could not make a WebSocket connection
+bbb.webrtcWarning.failedError.1003 = Error 1003\: Browser version not supported
+bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1005 = Error 1005\: Call ended unexpectedly
+bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
+bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
+bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
+bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.unknown = Error {0}\: Unknown error code
+bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
+bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
+bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
+bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
+bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
+bbb.mainToolbar.helpBtn = Help
+bbb.mainToolbar.logoutBtn = Logout
+bbb.mainToolbar.logoutBtn.toolTip = Log Out
+bbb.mainToolbar.langSelector = Select language
+bbb.mainToolbar.settingsBtn = Settings
+bbb.mainToolbar.settingsBtn.toolTip = Open Settings
+bbb.mainToolbar.shortcutBtn = Shortcut Keys
+bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Keys Window
+bbb.mainToolbar.recordBtn.toolTip.start = Start recording
+bbb.mainToolbar.recordBtn.toolTip.stop = Stop recording
+bbb.mainToolbar.recordBtn.toolTip.recording = The session is being recorded
+bbb.mainToolbar.recordBtn.toolTip.notRecording = The session isn't being recorded
+bbb.mainToolbar.recordBtn.confirm.title = Confirm recording
+bbb.mainToolbar.recordBtn.confirm.message.start = Are you sure you want to start recording the session?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Are you sure you want to stop recording the session?
+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.clientstatus.title = Configuration Notifications
+bbb.clientstatus.notification = Unread notifications
+bbb.clientstatus.close = Close
+bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
+bbb.clientstatus.browser.title = Browser Version
+bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
+bbb.clientstatus.flash.title = Flash Player
+bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
+bbb.clientstatus.webrtc.title = Audio
+bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
+bbb.window.minimizeBtn.toolTip = Minimize
+bbb.window.maximizeRestoreBtn.toolTip = Maximize
+bbb.window.closeBtn.toolTip = Close
+bbb.videoDock.titleBar = Webcam Window Title Bar
+bbb.presentation.titleBar = Presentation Window Title Bar
+bbb.chat.titleBar = Chat Window Title Bar
+bbb.users.title = Users{0} {1}
+bbb.users.titleBar = Users Window title bar
+bbb.users.quickLink.label = Users Window
+bbb.users.minimizeBtn.accessibilityName = Minimize the Users Window
+bbb.users.maximizeRestoreBtn.accessibilityName = Maximize the Users Window
+bbb.users.settings.buttonTooltip = Settings
+bbb.users.settings.audioSettings = Audio Test
+bbb.users.settings.webcamSettings = Webcam Settings
+bbb.users.settings.muteAll = Mute All Users
+bbb.users.settings.muteAllExcept = Mute All Users Except Presenter
+bbb.users.settings.unmuteAll = Unmute All Users
+bbb.users.settings.clearAllStatus = Clear all status icons
+bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.roomMuted.text = Viewers Muted
+bbb.users.roomLocked.text = Viewers Locked
+bbb.users.pushToTalk.toolTip = Talk
+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.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.accessibilityName = Users List. Use the arrow keys to navigate.
+bbb.users.usersGrid.nameItemRenderer = Name
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = you
+bbb.users.usersGrid.statusItemRenderer = Status
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
+bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
+bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.mediaItemRenderer.talking = Talking
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+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.pushToLock = Lock {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Unlock {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off
+bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
+bbb.users.emojiStatus.clear = Clear
+bbb.users.emojiStatus.clear.toolTip = Clear status
+bbb.users.emojiStatus.close = Close
+bbb.users.emojiStatus.close.toolTip = Close status popup
+bbb.users.emojiStatus.raiseHand = Raise hand status
+bbb.users.emojiStatus.happy = Happy status
+bbb.users.emojiStatus.smile = Smile status
+bbb.users.emojiStatus.sad = Sad status
+bbb.users.emojiStatus.confused = Confused status
+bbb.users.emojiStatus.neutral = Neutral status
+bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
+bbb.presentation.title = Presentation
+bbb.presentation.titleWithPres = Presentation\: {0}
+bbb.presentation.quickLink.label = Presentation Window
+bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width
+bbb.presentation.fitToPage.toolTip = Fit Presentation To Page
+bbb.presentation.uploadPresBtn.toolTip = Upload Presentation
+bbb.presentation.backBtn.toolTip = Previous slide
+bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.toolTip = Select a slide
+bbb.presentation.forwardBtn.toolTip = Next slide
+bbb.presentation.maxUploadFileExceededAlert = Error\: The file is bigger than what's allowed.
+bbb.presentation.uploadcomplete = Upload completed. Please wait while we convert the document.
+bbb.presentation.uploaded = uploaded.
+bbb.presentation.document.supported = The uploaded document is supported. Starting to convert...
+bbb.presentation.document.converted = Successfully converted the office document.
+bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.io = IO Error\: Please contact administrator.
+bbb.presentation.error.security = Security Error\: Please contact administrator.
+bbb.presentation.error.convert.notsupported = Error\: The uploaded document is unsupported. Please upload a compatible file.
+bbb.presentation.error.convert.nbpage = Error\: Failed to determine the number of pages in the uploaded document.
+bbb.presentation.error.convert.maxnbpagereach = Error\: The uploaded document has too many pages.
+bbb.presentation.converted = Converted {0} of {1} slides.
+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.uploadwindow.presentationfile = Presentation file
+bbb.presentation.uploadwindow.pdf = PDF
+bbb.presentation.uploadwindow.word = WORD
+bbb.presentation.uploadwindow.excel = EXCEL
+bbb.presentation.uploadwindow.powerpoint = POWERPOINT
+bbb.presentation.uploadwindow.image = IMAGE
+bbb.presentation.minimizeBtn.accessibilityName = Minimize the Presentation Window
+bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximize the Presentation Window
+bbb.presentation.closeBtn.accessibilityName = Close the Presentation Window
+bbb.fileupload.title = Add Files to Your Presentation
+bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.selectBtn.label = Select File
+bbb.fileupload.selectBtn.toolTip = Open dialog box to select a file
+bbb.fileupload.uploadBtn = Upload
+bbb.fileupload.uploadBtn.toolTip = Upload the selected file
+bbb.fileupload.deleteBtn.toolTip = Delete Presentation
+bbb.fileupload.showBtn = Show
+bbb.fileupload.showBtn.toolTip = Show Presentation
+bbb.fileupload.okCancelBtn = Close
+bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
+bbb.fileupload.genThumbText = Generating thumbnails..
+bbb.fileupload.progBarLbl = Progress\:
+bbb.fileupload.fileFormatHint = Upload any office document or Portable Document Format (PDF) file.  For best results upload PDF.
+bbb.chat.title = Chat
+bbb.chat.quickLink.label = Chat Window
+bbb.chat.cmpColorPicker.toolTip = Text Color
+bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.sendBtn = Send
+bbb.chat.sendBtn.toolTip = Send Message
+bbb.chat.sendBtn.accessibilityName = Send chat message
+bbb.chat.contextmenu.copyalltext = Copy All Text
+bbb.chat.publicChatUsername = Public
+bbb.chat.optionsTabName = Options
+bbb.chat.privateChatSelect = Select a person to chat with privately
+bbb.chat.private.userLeft = The user has left.
+bbb.chat.private.userJoined = The user has joined.
+bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
+bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
+bbb.chat.chatOptions = Chat Options
+bbb.chat.fontSize = Chat Message Font Size
+bbb.chat.cmbFontSize.toolTip = Select Chat Message Font Size
+bbb.chat.messageList = Message Box
+bbb.chat.minimizeBtn.accessibilityName = Minimize the Chat Window
+bbb.chat.maximizeRestoreBtn.accessibilityName = Maximize the Chat Window
+bbb.chat.closeBtn.accessibilityName = Close the Chat Window
+bbb.chat.chatTabs.accessibleNotice = New messages in this tab.
+bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
+bbb.publishVideo.cmbResolution.tooltip = Select a webcam resolution
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.startPublishBtn.toolTip = Start sharing your webcam
+bbb.publishVideo.startPublishBtn.errorName = Can't share webcam. Reason\: {0}
+bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
+bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.videodock.title = Webcams
+bbb.videodock.quickLink.label = Webcams Window
+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.controls.privateChatBtn.toolTip = Chat with {0}
+bbb.video.publish.hint.noCamera = No webcam available
+bbb.video.publish.hint.cantOpenCamera = Can't open your webcam
+bbb.video.publish.hint.waitingApproval = Waiting for approval
+bbb.video.publish.hint.videoPreview = Webcam preview
+bbb.video.publish.hint.openingCamera = Opening webcam...
+bbb.video.publish.hint.cameraDenied = Webcam access denied
+bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.publishing = Publishing...
+bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
+bbb.video.publish.closeBtn.label = Cancel
+bbb.video.publish.titleBar = Publish Webcam Window
+bbb.video.streamClose.toolTip = Close stream for\: {0}
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
+bbb.toolbar.phone.toolTip.start = Share Your Microphone
+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 Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
+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 = Unable to load the layouts
+bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
+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.highlighter.toolbar.pencil = Pencil
+bbb.highlighter.toolbar.pencil.accessibilityName = Switch whiteboard cursor to pencil
+bbb.highlighter.toolbar.ellipse = Circle
+bbb.highlighter.toolbar.ellipse.accessibilityName = Switch whiteboard cursor to circle
+bbb.highlighter.toolbar.rectangle = Rectangle
+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 = Select Color
+bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
+bbb.highlighter.toolbar.thickness = Change Thickness
+bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
+bbb.logout.title = Logged Out
+bbb.logout.button.label = OK
+bbb.logout.appshutdown = The server app has been shut down
+bbb.logout.asyncerror = An Async Error occured
+bbb.logout.connectionclosed = The connection to the server has been closed
+bbb.logout.connectionfailed = The connection to the server has ended
+bbb.logout.rejected = The connection to the server has been rejected
+bbb.logout.invalidapp = The red5 app does not exist
+bbb.logout.unknown = Your client has lost connection with the server
+bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
+bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
+bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
+bbb.logout.refresh.label = Reconnect
+bbb.logout.confirm.title = Confirm Logout
+bbb.logout.confirm.message = Are you sure you want to log out?
+bbb.logout.confirm.yes = Yes
+bbb.logout.confirm.no = No
+bbb.connection.failure=Detected Connectivity Problems
+bbb.connection.reconnecting=Reconnecting
+bbb.connection.reestablished=Connection reestablished
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Deskshare
+bbb.notes.title = Notes
+bbb.notes.cmpColorPicker.toolTip = Text Color
+bbb.notes.saveBtn = Save
+bbb.notes.saveBtn.toolTip = Save Note
+bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
+bbb.settings.deskshare.start = Check Desktop Sharing
+bbb.settings.voice.volume = Microphone Activity
+bbb.settings.flash.label = Flash version error
+bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
+bbb.settings.flash.command = Install newest Flash
+bbb.settings.isight.label = iSight webcam error
+bbb.settings.isight.text = If you have problems with your iSight webcam, it may be because you are running OS X 10.6.5, which is known to have a problem with Flash capturing video from the iSight webcam. \n To correct this, the link below will install a newer version of Flash player, or update your Mac to the newest version
+bbb.settings.isight.command = Install Flash 10.2 RC2
+bbb.settings.warning.label = Warning
+bbb.settings.warning.close = Close this Warning
+bbb.settings.noissues = No outstanding issues have been detected.
+bbb.settings.instructions = Accept the Flash prompt that asks you for webcam permissions. If the output matches what is expected, your browser has been set up correctly. Other potentials issues are below. Examine them to find a possible solution.
+ltbcustom.bbb.highlighter.toolbar.triangle = Triangle
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Switch whiteboard cursor to triangle
+ltbcustom.bbb.highlighter.toolbar.line = Line
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Switch whiteboard cursor to line
+ltbcustom.bbb.highlighter.toolbar.text = Text
+ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
+ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
+ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
+
+bbb.accessibility.clientReady = Ready
+
+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.chatwindow.audibleChatNotification = Audible Chat Notification
+
+bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+
+bbb.accessibility.notes.notesview.input = Notes input
+
+bbb.shortcuthelp.title = Shortcut Keys
+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.dropdown.general = Global shortcuts
+bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
+bbb.shortcuthelp.dropdown.chat = Chat shortcuts
+bbb.shortcuthelp.dropdown.users = Users shortcuts
+bbb.shortcuthelp.headers.shortcut = Shortcut
+bbb.shortcuthelp.headers.function = Function
+
+bbb.shortcutkey.general.minimize = 189
+bbb.shortcutkey.general.minimize.function = Minimize current window
+bbb.shortcutkey.general.maximize = 187
+bbb.shortcutkey.general.maximize.function = Maximize current window
+
+bbb.shortcutkey.flash.exit = 79
+bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
+bbb.shortcutkey.chat.chatinput = 73
+bbb.shortcutkey.chat.chatinput.function = Focus the chat input field
+bbb.shortcutkey.present.focusslide = 67
+bbb.shortcutkey.present.focusslide.function = Focus the presentation slide
+bbb.shortcutkey.whiteboard.undo = 90
+bbb.shortcutkey.whiteboard.undo.function = Undo last whiteboard mark
+
+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.presentation = 51
+bbb.shortcutkey.focus.presentation.function = Move focus to the Presentation window
+bbb.shortcutkey.focus.chat = 52
+bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
+
+bbb.shortcutkey.share.desktop = 68
+bbb.shortcutkey.share.desktop.function = Open desktop sharing window
+bbb.shortcutkey.share.webcam = 66
+bbb.shortcutkey.share.webcam.function = Open webcam sharing window
+
+bbb.shortcutkey.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Open/focus to shortcut help window
+bbb.shortcutkey.logout = 76
+bbb.shortcutkey.logout.function = Log out of this meeting
+bbb.shortcutkey.raiseHand = 82
+bbb.shortcutkey.raiseHand.function = Raise your hand
+
+bbb.shortcutkey.present.upload = 85
+bbb.shortcutkey.present.upload.function = Upload presentation
+bbb.shortcutkey.present.previous = 65
+bbb.shortcutkey.present.previous.function = Go to previous slide
+bbb.shortcutkey.present.select = 83
+bbb.shortcutkey.present.select.function = View all slides
+bbb.shortcutkey.present.next = 69
+bbb.shortcutkey.present.next.function = Go to next slide
+bbb.shortcutkey.present.fitWidth = 70
+bbb.shortcutkey.present.fitWidth.function = Fit slides to width
+bbb.shortcutkey.present.fitPage = 80
+bbb.shortcutkey.present.fitPage.function = Fit slides to page
+
+bbb.shortcutkey.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Mute or unmute selected person
+bbb.shortcutkey.users.muteall = 65
+bbb.shortcutkey.users.muteall.function = Mute or unmute all users
+bbb.shortcutkey.users.focusUsers = 85
+bbb.shortcutkey.users.focusUsers.function = Focus to users list
+bbb.shortcutkey.users.muteAllButPres = 65
+bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
+
+bbb.shortcutkey.chat.focusTabs = 89
+bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
+bbb.shortcutkey.chat.focusBox = 66
+bbb.shortcutkey.chat.focusBox.function = Focus to chat box
+bbb.shortcutkey.chat.changeColour = 67
+bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.
+bbb.shortcutkey.chat.sendMessage = 83
+bbb.shortcutkey.chat.sendMessage.function = Send chat message
+bbb.shortcutkey.chat.closePrivate = 69
+bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.explanation = ----
+bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+
+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.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.polling.startButton.tooltip = Start a poll
+bbb.polling.startButton.label = Start Poll
+bbb.polling.publishButton.label = Publish
+bbb.polling.closeButton.label = Close
+bbb.polling.pollModal.title = Live Poll Results
+bbb.polling.customChoices.title = Enter Polling Choices
+bbb.polling.respondersLabel.novotes = Waiting for responses
+bbb.polling.respondersLabel.text = {0} Users Responded
+bbb.polling.respondersLabel.finished = Done
+bbb.polling.answer.Yes = Yes
+bbb.polling.answer.No = No
+bbb.polling.answer.True = True
+bbb.polling.answer.False = False
+bbb.polling.answer.A = A
+bbb.polling.answer.B = B
+bbb.polling.answer.C = C
+bbb.polling.answer.D = D
+bbb.polling.answer.E = E
+bbb.polling.answer.F = F
+bbb.polling.answer.G = G
+bbb.polling.results.accessible.header = Poll Results.
+bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
+
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+
+bbb.accessibility.alerts.madePresenter = You are now the Presenter.
+bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+
+bbb.shortcutkey.specialKeys.space = Spacebar
+bbb.shortcutkey.specialKeys.left = Left Arrow
+bbb.shortcutkey.specialKeys.right = Right Arrow
+bbb.shortcutkey.specialKeys.up = Up Arrow
+bbb.shortcutkey.specialKeys.down = Down Arrow
+bbb.shortcutkey.specialKeys.plus = Plus
+bbb.shortcutkey.specialKeys.minus = Minus
+
+bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
+bbb.users.settings.lockAll=Lock All Users
+bbb.users.settings.lockAllExcept=Lock Users Except Presenter
+bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
+bbb.users.settings.unlockAll=Unlock All Viewers
+bbb.users.settings.roomIsLocked=Locked by default
+bbb.users.settings.roomIsMuted=Muted by default
+
+bbb.lockSettings.save = Apply
+bbb.lockSettings.save.tooltip = Apply lock settings
+bbb.lockSettings.cancel = Cancel
+bbb.lockSettings.cancel.toolTip = Close this window without saving
+
+bbb.lockSettings.moderatorLocking = Moderator locking
+bbb.lockSettings.privateChat = Private Chat
+bbb.lockSettings.publicChat = Public Chat
+bbb.lockSettings.webcam = Webcam
+bbb.lockSettings.microphone = Microphone
+bbb.lockSettings.layout = Layout
+bbb.lockSettings.title=Lock Viewers
+bbb.lockSettings.feature=Feature
+bbb.lockSettings.locked=Locked
+bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/gl_ES/bbbResources.properties b/bigbluebutton-client/locale/gl_ES/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/gl_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/gl_ES/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/he_IL/bbbResources.properties b/bigbluebutton-client/locale/he_IL/bbbResources.properties
index b8a185e86fe9cf3bd2e9feba6760a92f703fb406..96eb063cb16bb004039bbe8acb8d295a78d4db4f 100644
--- a/bigbluebutton-client/locale/he_IL/bbbResources.properties
+++ b/bigbluebutton-client/locale/he_IL/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = מזעור
 bbb.window.maximizeRestoreBtn.toolTip = הגדלה
 bbb.window.closeBtn.toolTip = סגירה
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = מצגת
 bbb.presentation.titleWithPres = הצגה\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = ביטול
 bbb.video.publish.titleBar = פרסם את חלון המצלמה
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = תצוגת שולחן עבודה\: תצוגת מנחה
-bbb.desktopPublish.fullscreen.tooltip = שתף המסך הראשי שלך
-bbb.desktopPublish.fullscreen.label = מסך מלא
-bbb.desktopPublish.region.tooltip = שתף חלק של המסך שלך
-bbb.desktopPublish.region.label = אזור
-bbb.desktopPublish.stop.tooltip = סגור שיתוף מסך
-bbb.desktopPublish.stop.label = סגור
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = אינך יכול להגדיל חלון זה
-bbb.desktopPublish.closeBtn.toolTip = הפסק שיתוף וסגור חלון זה
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = מזער חלון זה
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = שיתוף שולחן עבודה
-bbb.desktopView.fitToWindow = התאם גודל לחלון
-bbb.desktopView.actualSize = הצג גודל אמיתי
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = נדחה הקשר מהשרת המרוחק
 bbb.logout.invalidapp = אפליקצית רד5 לא קיימת
 bbb.logout.unknown = הלקוח איבד קשר עם השרת
 bbb.logout.usercommand = נותקת מהוועידה
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = לחץ על Allow בחלון שיקפוץ כדי לבדוק האם שיתוף שולחן העבודה עובד בצורה תקינה אצלך
 bbb.settings.deskshare.start = בדוק את שיתוף שולחן העבודה
 bbb.settings.voice.volume = פעילות מיקרופון
-bbb.settings.java.label = שגיאת גרסת ג'אווה
-bbb.settings.java.text = אצלך מותקנת גירסה {0}, אבל דרושה לפחות גירסה {1} של ג'אווה על מנת להפעיל את שיתוף שולחן העבודה של BighBlueButton.\nלחץ על הכפתור למטה על מנת להתקין את הגרסה החדשה ביותר של ג'אווה
-bbb.settings.java.command = התקן גירסה עדכנית של ג'אווה
 bbb.settings.flash.label = שגיאה בגרסת פלאש
 bbb.settings.flash.text = אצלך מותקנת גירסה {0}, אבל דרושה לפחות גירסה {1} של פלאש על מנת להפעיל את BighBlueButton.\nלחץ על הכפתור למטה על מנת להתקין את הגרסה החדשה ביותר של פלאש
 bbb.settings.flash.command = התקן גרסה עדכנית של פלאש
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/hr_HR/bbbResources.properties b/bigbluebutton-client/locale/hr_HR/bbbResources.properties
index 2ddc67f76ebeb978f29aafc74a8f5c9561b8baac..1c706ae6b707191a4dc9c66ecbb36248d9ef832b 100644
--- a/bigbluebutton-client/locale/hr_HR/bbbResources.properties
+++ b/bigbluebutton-client/locale/hr_HR/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Tvoj Flash Player plugin ({0}) nije ažuriran. Preporučuje se ažuriranje na najnoviju verziju.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Preporučuje se korištenje Firefoxa ili Chromea za bolji audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java verzija nije detektirana.
-bbb.clientstatus.java.notinstalled = Nemaš instaliranu Javu, klikni <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>OVDJE</a></font> kako bi instalirao/la najnoviju Javu da bi koristio/la dijeljenje desktopa.
-bbb.clientstatus.java.oldversion = Imaš instaliranu stau javu, molim klikni <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>OVDJE</a></font> kako bi instalirao najnoviju Javu da bi koristio mogućnost dijeljenja desktopa.
 bbb.window.minimizeBtn.toolTip = Smanji
 bbb.window.maximizeRestoreBtn.toolTip = Povećaj
 bbb.window.closeBtn.toolTip = Zatvori
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Tužan status
 bbb.users.emojiStatus.confused = Zbunjen status
 bbb.users.emojiStatus.neutral = Neutralan status
 bbb.users.emojiStatus.away = Odsutan status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentacija
 bbb.presentation.titleWithPres = Prezentacija
 bbb.presentation.quickLink.label = Prozor "Prezentacija"
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Zatvorite dijaloški okvir za podešavan
 bbb.video.publish.closeBtn.label = Otkaži
 bbb.video.publish.titleBar = Objavi prozor web kamere
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Podijeli radnu ploču\: Prezentatorov pregled
-bbb.desktopPublish.fullscreen.tooltip = Podijeli svoj glavni ekran
-bbb.desktopPublish.fullscreen.label = Cijeli prozor
-bbb.desktopPublish.region.tooltip = Podijeli dio svog ekrana
-bbb.desktopPublish.region.label = Oblast
-bbb.desktopPublish.stop.tooltip = Zatvori podjelu radne ploče
-bbb.desktopPublish.stop.label = Zatvori
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Ne možeš uvećati ovaj prozor.
-bbb.desktopPublish.closeBtn.toolTip = Prekini podjelu radne ploče i zatvori prozor.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome više ne podržava Java Applete. Moraš koristiti drugi web preglednik (Firefox preporučen) kako bi dijelio svoj desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge ne podržava Java Applete. Moraš koristiti drugi web preglednik (preporučujemo Firefox) kako bi dijelio svoj desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Smanji ovaj prozor.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Smanji prozor za podjelu radne ploče.
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Povećaj prozor za podjelu radne ploče
-bbb.desktopPublish.chromeHint.title = Chrome izgleda treba tvoje dopuštenje.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Pokušaj opet
-bbb.desktopView.title = Podjela radne ploče
-bbb.desktopView.fitToWindow = Prilagodi prozoru
-bbb.desktopView.actualSize = Prikaži trenutnu veličinu
-bbb.desktopView.minimizeBtn.accessibilityName = Smanji prozor za pregled podjele radne ploče
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Povećaj prozor za pregled podjele radne ploče
-bbb.desktopView.closeBtn.accessibilityName = Zatvorite prozor za pregled podjele radne ploče
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Podijeli svoj mikrofon
 bbb.toolbar.phone.toolTip.stop = Prestani sa dijeljenjem svog mikrofona
 bbb.toolbar.phone.toolTip.mute = Prestani slušati konferenciju
 bbb.toolbar.phone.toolTip.unmute = Počni slušati konferenciju
 bbb.toolbar.phone.toolTip.nomic = Mikrofon nije detektiran
-bbb.toolbar.deskshare.toolTip.start = Podijeli svoj desktop
-bbb.toolbar.deskshare.toolTip.stop = Prestani sa dijeljenjem svog desktopa
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Podijeli svoju video kameru
 bbb.toolbar.video.toolTip.stop = Prestani dijeliti svoju video kameru
 bbb.layout.addButton.toolTip = Dodajte prilagođeni raspored elemenata na listu
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Rasporedi su uspješno sačuvani
 bbb.layout.load.complete = Rasporedi su uspješno učitani
 bbb.layout.load.failed = Nemoguće je učitati layoute
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Sastanak
 bbb.layout.name.presentfocus = Prezentacijski Sastanak
@@ -362,6 +395,7 @@ bbb.logout.rejected = Veza sa serverom odbačena
 bbb.logout.invalidapp = red5 aplikacija ne postoji
 bbb.logout.unknown = Izgubljena veza sa serverom
 bbb.logout.usercommand = Uspješno ste izašli iz konferencije
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Moderator te je izbacio sa sastanka.
 bbb.logout.refresh.message = Ako je ova odjava bila neočekivana klikni gumb ispod kako bi se ponovo povezao.
 bbb.logout.refresh.label = Ponovo se poveži
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Sačuvaj bilješke
 bbb.settings.deskshare.instructions = Odaberite opciju "Dopusti" kako biste provjerili da li dijeljenje radne ploče funkcioniše kako treba
 bbb.settings.deskshare.start = Provjerite dijeljenje radne ploče
 bbb.settings.voice.volume = Status mikrofona
-bbb.settings.java.label = Greška u verziji Jave
-bbb.settings.java.text = Imate instaliranu Java verziju {0}. Da biste mogli koristiti opciju dijeljenja radne ploče morate instalirati najmanje verziju {1}. Klikom na dugme ispod, možete instalirati noviju verziju Java JRE. 
-bbb.settings.java.command = Instaliraj noviju verziju Jave
 bbb.settings.flash.label = Greška u verziji Flash-a 
 bbb.settings.flash.text = Imate instaliranu Flash verziju {0}. Da biste mogli koristiti BigBlueButton morate instalirati najmanje verziju {1}. Klikom na dugme ispod možete instalirati noviju verziju Adobe Flash-a. 
 bbb.settings.flash.command = Instaliraj noviju verziju Flash-a
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekst
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Promijenite kursor u tekst
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Boja teksta
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Veličina fonta
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Spreman
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Smanji trenutni prozor
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Povećaj trenutni prozor
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Izađite iz Flash prozora
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Isključivanje i uključivanje mikrofona
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Prijeđi na prozor "Ćaskanje"
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Otvori prozor za dijeljenje radne ploče
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Otvori prozor za podešavanje zvuka
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Počni/Prestani slušati konferenciju
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Otvori prozor za dijeljenje web kamere
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Zatvori sve video klipove
 bbb.users.settings.lockAll=Zaključaj sve korisnike
 bbb.users.settings.lockAllExcept=Zaključaj sve korisnike osim prezentatora
 bbb.users.settings.lockSettings=Zaključaj gledatelje...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Odključaj sve gledatelje
 bbb.users.settings.roomIsLocked=Zaključano po zadanim postavkama
 bbb.users.settings.roomIsMuted=Utišano po zadanim postavkama
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Zaključaj Gledatelje
 bbb.lockSettings.feature=Mogućnost
 bbb.lockSettings.locked=Zaključano
 bbb.lockSettings.lockOnJoin=Zaključaj pri pridruživanju
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/hu_HU/bbbResources.properties b/bigbluebutton-client/locale/hu_HU/bbbResources.properties
index bd8f8994421c97dffb28b01d8d597869841a9500..3d2c4c3e33e49bb9f4bc21d9de0ba3f1ec5ac8a2 100644
--- a/bigbluebutton-client/locale/hu_HU/bbbResources.properties
+++ b/bigbluebutton-client/locale/hu_HU/bbbResources.properties
@@ -93,11 +93,11 @@ bbb.mainToolbar.shortcutBtn = Gyorsbillentyűk
 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
-bbb.mainToolbar.recordBtn.toolTip.notRecording = A felvétel nem kerül rögzítésre
+bbb.mainToolbar.recordBtn.toolTip.recording = A találkozót felvesszük
+bbb.mainToolbar.recordBtn.toolTip.notRecording = A találkozót nem vesszük fel
 bbb.mainToolbar.recordBtn.confirm.title = Felvétel jóváhagyása
-bbb.mainToolbar.recordBtn.confirm.message.start = Biztos indítja a felvétel rögzítését?
-bbb.mainToolbar.recordBtn.confirm.message.stop = Biztos leállítja a felvétel rögzítését?
+bbb.mainToolbar.recordBtn.confirm.message.start = Biztos indítja a találkozó felvételét?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Biztos leállítja a találkozó felvételét?
 bbb.mainToolbar.recordBtn..notification.title = Megjegyzés a felvételhez
 bbb.mainToolbar.recordBtn..notification.message1 = Ezt a találkozót rögzítheti.
 bbb.mainToolbar.recordBtn..notification.message2 = A címsorban lévő Felvétel indítása/leállítása gombra kell kattintani a felvétel elkezdéséhez és befejezéséhez.
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Flash Player-e ({0}) elavult. Javasoljuk, hogy frissítsen a legújabb verzióra.
 bbb.clientstatus.webrtc.title = Hang
 bbb.clientstatus.webrtc.message = Jobb hangátvitel eléréséhez Firefox vagy Chrome használatát javasoljuk.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java verziót nem lehet megállapítani.
-bbb.clientstatus.java.notinstalled = Nincs Java telepítve. <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>Kattintson ide</a></font> a legújabb Java telepítéséhez, hogy használhassa az Asztal megosztását.
-bbb.clientstatus.java.oldversion = Régi Java van telepítve. <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>Kattintson ide</a></font> a legújabb Java telepítéséhez, hogy használhassa az Asztal megosztását.
 bbb.window.minimizeBtn.toolTip = Kis méret
 bbb.window.maximizeRestoreBtn.toolTip = Teljes méret
 bbb.window.closeBtn.toolTip = Bezárás
@@ -135,8 +131,8 @@ bbb.users.settings.webcamSettings = Webkamera beállítások
 bbb.users.settings.muteAll = Összes felhasználó némítása
 bbb.users.settings.muteAllExcept = Összes felhasználó némítása, előadó kivételével
 bbb.users.settings.unmuteAll = Mindenki hangosítása
-bbb.users.settings.clearAllStatus = Összes állapotikon törlése
-bbb.users.emojiStatusBtn.toolTip = Állapotikonom frissítése
+bbb.users.settings.clearAllStatus = Összes állapot törlése
+bbb.users.emojiStatusBtn.toolTip = Állapotom módosítása
 bbb.users.roomMuted.text = Résztvevők némítva
 bbb.users.roomLocked.text = Résztvevők zárolva
 bbb.users.pushToTalk.toolTip = Kattintson, hogy beszélhessen
@@ -173,14 +169,17 @@ bbb.users.usersGrid.mediaItemRenderer.noAudio = Nincs beszélgetésben
 bbb.users.emojiStatus.clear = Törlés
 bbb.users.emojiStatus.clear.toolTip = Állapot törlése
 bbb.users.emojiStatus.close = Bezárás
-bbb.users.emojiStatus.close.toolTip = Állapot-felugró bezárása
-bbb.users.emojiStatus.raiseHand = Jelentkezési állapot
-bbb.users.emojiStatus.happy = Boldog állapot
-bbb.users.emojiStatus.smile = Mosolygós állapot
-bbb.users.emojiStatus.sad = Szomorú állapot
-bbb.users.emojiStatus.confused = Összezavarodott állapot
-bbb.users.emojiStatus.neutral = Semleges állapot
-bbb.users.emojiStatus.away = Távollévő állapot
+bbb.users.emojiStatus.close.toolTip = Állapotfelugró bezárása
+bbb.users.emojiStatus.raiseHand = Jelentkezem
+bbb.users.emojiStatus.happy = Boldog vagyok
+bbb.users.emojiStatus.smile = Mosolygok
+bbb.users.emojiStatus.sad = Szomorú vagyok
+bbb.users.emojiStatus.confused = Összezavarodott vagyok
+bbb.users.emojiStatus.neutral = Semleges vagyok
+bbb.users.emojiStatus.away = Nem vagyok a gépnél
+bbb.users.emojiStatus.thumbsUp = Tetszik
+bbb.users.emojiStatus.thumbsDown = Nem tetszik
+bbb.users.emojiStatus.applause = Éljenzek
 bbb.presentation.title = Prezentáció
 bbb.presentation.titleWithPres = Prezentáció\: {0}
 bbb.presentation.quickLink.label = Prezentáció ablak
@@ -233,10 +232,10 @@ bbb.fileupload.fileFormatHint = Bármilyen formátumú dokumentumot feltölthet,
 bbb.chat.title = Csevegés
 bbb.chat.quickLink.label = Csevegés ablak
 bbb.chat.cmpColorPicker.toolTip = Betűszín
-bbb.chat.input.accessibilityName = Csevegés üzenet szerkesztő mező
+bbb.chat.input.accessibilityName = Csevegésüzenet-szerkesztő mező
 bbb.chat.sendBtn = Küldés
 bbb.chat.sendBtn.toolTip = Üzenet küldése
-bbb.chat.sendBtn.accessibilityName = Csevegés üzenet küldése
+bbb.chat.sendBtn.accessibilityName = Csevegésü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ások
@@ -246,8 +245,8 @@ bbb.chat.private.userJoined = A felhasználó csatlakozott.
 bbb.chat.private.closeMessage = {0} billentyűkombinációval zárhatja be ezt a fület.
 bbb.chat.usersList.toolTip = Válasszon felhasználót privát csevegés megnyitásához
 bbb.chat.usersList.accessibilityName = Válasszon felhasználót a privát csevegés megnyitásához. Navigálni a nyilakkal tud. 
-bbb.chat.chatOptions = Csevegés beállítások
-bbb.chat.fontSize = Csevegés üzenetek betűmérete
+bbb.chat.chatOptions = Csevegés beállításai
+bbb.chat.fontSize = Csevegésüzenetek betűmérete
 bbb.chat.cmbFontSize.toolTip = Válasszon betűméretet a csevegéshez
 bbb.chat.messageList = Ãœzenet ablak
 bbb.chat.minimizeBtn.accessibilityName = Csevegés ablak kis méretűre
@@ -284,30 +283,63 @@ 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.video.streamClose.toolTip = Folyam lezárása\: {0}
-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
-bbb.desktopPublish.region.label = Rész
-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 Chrome használatával a képernyőmegosztás nem támogatott. Képernyő megosztásához másik böngészőt használj (Firefox-ot javasoljuk).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome már nem támogatja a Java modult. Képernyőmegosztáshoz másik böngészőt használj (Firefox-ot javasoljuk).
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge nem támogatja a Java Applet-eket. Az asztal megosztásához másik böngészőt kell használnia (Firefox-ot javasoljuk).
-bbb.desktopPublish.minimizeBtn.toolTip = Kis méret
-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.chromeHint.title = Chrome böngészőjének szüksége lehet az Ön engedélyére.
-bbb.desktopPublish.chromeHint.message = Válassza ki a bővítmény ikont (Chrome jobb felső sarka), oldja fel a bővítményeket, majd válassza 'Újra' gombot.
-bbb.desktopPublish.chromeHint.button = Újra
-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.screensharePublish.title = Képernyőmegosztás\: Előadó nézete
+bbb.screensharePublish.pause.tooltip = Képernyőmegosztás szüneteltetése
+bbb.screensharePublish.pause.label = Szüneteltetés
+bbb.screensharePublish.restart.tooltip = Képernyőmegosztás újraindítása
+bbb.screensharePublish.restart.label = Újraindítás
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Ezt az ablakot nem lehet nagyméretűre állítani
+bbb.screensharePublish.closeBtn.toolTip = Megosztás leállítása és bezárás
+bbb.screensharePublish.minimizeBtn.toolTip = Kis méret
+bbb.screensharePublish.minimizeBtn.accessibilityName = Képernyőmegosztás-közzétett ablak kis méretűvé
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Képernyőmegosztás-közzétett ablak teljes méretűvé
+bbb.screensharePublish.commonHelpText.text = Az alábbi lépések végigvezetik a képernyőmegosztás telepítésének lépésein (java szükséges).
+bbb.screensharePublish.helpButton.toolTip = Súgó
+bbb.screensharePublish.helpButton.accessibilityName = Súgó (Bemutató megnyitása új ablakban)
+bbb.screensharePublish.helpText.PCIE1 = 1. Válassza a 'Megnyitás'-t
+bbb.screensharePublish.helpText.PCIE2 = 2. Fogadja el a tanúsítványt
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Futtatáshoz kattintson az 'OK'-ra
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Fogadja el a tanúsítványt
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Keresse meg a 'screenshare.jnlp' helyét
+bbb.screensharePublish.helpText.PCChrome2 = 2. Kattintson a megnyitásához
+bbb.screensharePublish.helpText.PCChrome3 = 3. Fogadja el a tanúsítványt
+bbb.screensharePublish.helpText.MacSafari1 = 1. Keresse meg a 'screenshare.jnlp' fájlt
+bbb.screensharePublish.helpText.MacSafari2 = 2. Válassza ki a 'Show in Finder'-t
+bbb.screensharePublish.helpText.MacSafari3 = 3. Kattintson jobb egérrel, majd válassza ki a 'Megnyitás'-t
+bbb.screensharePublish.helpText.MacSafari4 = 4. Válassza a 'Megnyitás'-t (ha szükséges)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Válassza ki a 'Fájl mentése' opciót (ha szükséges)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Válassza ki a 'Show in Finder'-t
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Kattintson jobb egérrel, majd válassza ki a 'Megnyitás'-t
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Válassza a 'Megnyitás'-t (ha szükséges)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Keresse meg a 'screenshare.jnlp' fájlt
+bbb.screensharePublish.helpText.MacChrome2 = 2. Válassza ki a 'Show in Finder'-t
+bbb.screensharePublish.helpText.MacChrome3 = 3. Kattintson jobb egérrel, majd válassza ki a 'Megnyitás'-t
+bbb.screensharePublish.helpText.MacChrome4 = 4. Válassza a 'Megnyitás'-t (ha szükséges)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Futtatáshoz kattintson az 'OK'-ra
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Fogadja el a tanúsítványt
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Keresse meg a 'screenshare.jnlp' helyét
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Kattintson a megnyitásához
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Fogadja el a tanúsítványt
+bbb.screensharePublish.shareTypeLabel.text = Megosztás\:
+bbb.screensharePublish.shareType.fullScreen = Teljes képernyő
+bbb.screensharePublish.shareType.region = Régió
+bbb.screensharePublish.pauseMessage.label = A képernyőmegosztás pillanatnyilag szünetel.
+bbb.screensharePublish.startFailed.label = Képernyőmegosztás indulását nem érzékeltük.
+bbb.screensharePublish.restartFailed.label = Képernyőmegosztás újraindulását nem érzékeltük.
+bbb.screensharePublish.jwsCrashed.label = A képernyőmegosztó alkalmazás váratlanul bezáródott.
+bbb.screensharePublish.commonErrorMessage.label = Válaszd a 'Mégsem'-et és próbáld újra.
+bbb.screensharePublish.cancelButton.label = Mégsem
+bbb.screensharePublish.startButton.label = Indítás
+bbb.screensharePublish.stopButton.label = Leállítás
+bbb.screenshareView.title = Képernyőm megosztása
+bbb.screenshareView.fitToWindow = Ablakhoz igazítás
+bbb.screenshareView.actualSize = Eredeti méret
+bbb.screenshareView.minimizeBtn.accessibilityName = Képernyőmegosztás-betekintő ablak kis méretűvé
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Képernyőmegosztás-betekintő ablak teljes méretűvé
+bbb.screenshareView.closeBtn.accessibilityName = Képernyőmegosztás-betekintő 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 = Találkozó hangjának kikapcsolása
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Elrendezés sikeresen mentve
 bbb.layout.load.complete = Elrendezés sikeres betöltve
 bbb.layout.load.failed = Nem sikerült az elrendezést betölteni
 bbb.layout.name.defaultlayout = Alapértelmezett elrendezés
+bbb.layout.name.closedcaption = Felirat
 bbb.layout.name.videochat = Videobeszélgetés
 bbb.layout.name.webcamsfocus = Webkamerás előadás
 bbb.layout.name.presentfocus = Prezentációs előadás
@@ -362,6 +395,7 @@ bbb.logout.rejected = A szerverrel a kapcsolat elutasítva
 bbb.logout.invalidapp = A "red5" programkomponens nem található
 bbb.logout.unknown = Kapcsolat a szerverrel megszakadt
 bbb.logout.usercommand = Kijelentkezett a beszélgetésből
+bbb.logour.breakoutRoomClose = Böngészője ablakát bezárjuk
 bbb.logout.ejectedFromMeeting = Egy moderátor kitett az előadásról.
 bbb.logout.refresh.message = Amennyiben kilépése nem szándékos volt, kattintson az újracsatlakozás gombra.
 bbb.logout.refresh.label = Újracsatlakozás
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Jegyzet mentése
 bbb.settings.deskshare.instructions = Kattintson az engedélyezésre, hogy kiderüljön, a képernyőmegosztás hibátlanul fut-e.
 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. 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.
 bbb.settings.flash.command = Telepítse a legújabb Flash verziót.
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Szöveg
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Rajztábla kurzora legyen szöveg
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Szöveg színe
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Betűméret
+bbb.caption.window.title = Felirat
+bbb.caption.window.titleBar = Felirat ablakcímsorának bezárása
+bbb.caption.window.minimizeBtn.accessibilityName = Felirat ablak kis méretűre
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Felirat ablak teljes méretűre
+bbb.caption.transcript.noowner = Senki
+bbb.caption.transcript.youowner = én
+bbb.caption.transcript.pastewarning.title = Felirat beillesztési figyelmeztetés 
+bbb.caption.transcript.pastewarning.text = {0} karakternél hosszabb szöveg nem illeszthető be. Beillesztendő szövege {1} karakter.
+bbb.caption.option.label = Beállitások
+bbb.caption.option.language = Nyelv\:
+bbb.caption.option.language.tooltip = Felirat nyelvének kiválasztása
+bbb.caption.option.language.accessibilityName = Válassza ki a felirat nyelvét. Navigálni a nyilakkal tud.
+bbb.caption.option.takeowner = Tulajdonos cseréje
+bbb.caption.option.takeowner.tooltip = Kiválaszott nyelv tulajdonosának cseréje
+bbb.caption.option.fontfamily = Betűtípus\:
+bbb.caption.option.fontfamily.tooltip = Betűtípus
+bbb.caption.option.fontsize = Betűméret\:
+bbb.caption.option.fontsize.tooltip = Betűméret
+bbb.caption.option.backcolor = Háttérszín\:
+bbb.caption.option.backcolor.tooltip = Háttérszín
+bbb.caption.option.textcolor = Betűszín\:
+bbb.caption.option.textcolor.tooltip = Betűszín
+
 
 bbb.accessibility.clientReady = Kész
 
@@ -413,9 +467,9 @@ bbb.accessibility.chat.chatBox.navigatedFirst =  Első üzenetre ugrott.
 bbb.accessibility.chat.chatBox.navigatedLatest = Utolsó üzenetre ugrott.
 bbb.accessibility.chat.chatBox.navigatedLatestRead = Utolsó olvasott üzenetre ugrott.
 bbb.accessibility.chat.chatwindow.input = Csevegés írása
-bbb.accessibility.chat.chatwindow.audibleChatNotification = Hallható csevegés figyelmeztetés
+bbb.accessibility.chat.chatwindow.audibleChatNotification = Hallható csevegésfigyelmeztetés
 
-bbb.accessibility.chat.initialDescription = A nyilakat használja a csevegés üzenetek közötti navigáláshoz.
+bbb.accessibility.chat.initialDescription = A nyilakat használja a csevegésüzenetek közötti navigáláshoz.
 
 bbb.accessibility.notes.notesview.input = Jegyzet bevitele
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Kis méret
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Teljes méret
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Fókusz elvétele a Flash ablakból
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mikrofonom némítása/hangosítása
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Fókusz mozgatása a Csevegés ablakra
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Képernyőm megosztása
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Hangbeállítások megnyitása
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Találkozó hangjának be-/kikapcsolása
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Webkamerám bekapcsolása
 
@@ -504,7 +554,7 @@ bbb.shortcutkey.chat.focusBox.function = Fókusz a Csevegés ablakra
 bbb.shortcutkey.chat.changeColour = 67
 bbb.shortcutkey.chat.changeColour.function = Fókusz a betűszínre választóra.
 bbb.shortcutkey.chat.sendMessage = 83
-bbb.shortcutkey.chat.sendMessage.function = Csevegés üzenet küldése
+bbb.shortcutkey.chat.sendMessage.function = Csevegésüzenet küldése
 bbb.shortcutkey.chat.closePrivate = 69
 bbb.shortcutkey.chat.closePrivate.function = Privát csevegés fül bezárása
 bbb.shortcutkey.chat.explanation = ---
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Összes videó bezárása
 bbb.users.settings.lockAll=Összes felhasználó zárolása
 bbb.users.settings.lockAllExcept=Előadó kivételével az összes felhasználó zárolása
 bbb.users.settings.lockSettings=Résztvevők zárolása ...
+bbb.users.settings.breakoutRooms=Csapatszobák ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Csapatszobák meghívóinak küldése ...
 bbb.users.settings.unlockAll=Összes résztvevő zárolásának feloldása
 bbb.users.settings.roomIsLocked=Alapértelmezetten zárolva
 bbb.users.settings.roomIsMuted=Alapértelmezetten némítva
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Résztvevők zárolása
 bbb.lockSettings.feature=Tulajdonság
 bbb.lockSettings.locked=Zárolt
 bbb.lockSettings.lockOnJoin=Csatlakozáskor zárolás
+
+bbb.users.breakout.breakoutRooms = Csapatszobák
+bbb.users.breakout.updateBreakoutRooms = Csapatszobák frissítése
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} van még hátra</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} van még hátra</b>
+bbb.users.breakout.calculatingRemainingTime = Hátralévő idő számítása...
+bbb.users.breakout.remainingTimeEnded = Az idő lejárt, a csapatszoba bezárul.
+bbb.users.breakout.rooms = Szobák
+bbb.users.breakout.roomsCombo.accessibilityName = Létrehozandó szobák száma
+bbb.users.breakout.room = Szoba
+bbb.users.breakout.randomAssign = Véletlenszerűen rendeljen hozzá felhasználókat
+bbb.users.breakout.timeLimit = Időkorlát
+bbb.users.breakout.durationStepper.accessibilityName = Időkorlát percben
+bbb.users.breakout.minutes = perc
+bbb.users.breakout.record = Felvétel
+bbb.users.breakout.recordCheckbox.accessibilityName = Csapatszobák felvételének rögzítése
+bbb.users.breakout.notAssigned = Nincs hozzárendelve
+bbb.users.breakout.dragAndDropToolTip = Tipp\: Fogd-és-vidd módszerrel mozgathatja a felhasználókat a szobák között
+bbb.users.breakout.start = Indítás
+bbb.users.breakout.invite = Meghívás
+bbb.users.breakout.close = Bezárás
+bbb.users.breakout.closeAllRooms = Összes csapatszoba bezárása
+bbb.users.breakout.insufficientUsers = Nincs elegendő számú felhasználó. Legalább egy felhasználó szükséges minden csapatszobára.
+bbb.users.breakout.openJoinURL = Meghívták egy csapatszobába {0}\n(Ha elfogadja, automatikusan elhagyja a beszélgetést)
+bbb.users.breakout.confirm = Csapatszobába csatlakozás jóváhagyása
+bbb.users.roomsGrid.room = Szoba
+bbb.users.roomsGrid.users = Felhasználók
+bbb.users.roomsGrid.action = Művelet
+bbb.users.roomsGrid.transfer = Hang átvitele
+bbb.users.roomsGrid.join = Csatlakozás
+bbb.users.roomsGrid.noUsers = Egy felhasználó sincs ebben a szobában
diff --git a/bigbluebutton-client/locale/hy_AM/bbbResources.properties b/bigbluebutton-client/locale/hy_AM/bbbResources.properties
index 2d2fc8cd09b5347b3fefbfe9ccfee5e757d8c7a7..4c1c23ee508ce5a14b7838e471e69632638c6634 100644
--- a/bigbluebutton-client/locale/hy_AM/bbbResources.properties
+++ b/bigbluebutton-client/locale/hy_AM/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Ձեր Flash Player plugin ({0}) հնացած է; Խորհուրդ են տալիս թարմացնելու այն մինջեւ վերջին տարբերակը.
 bbb.clientstatus.webrtc.title = Ձայն
 bbb.clientstatus.webrtc.message = Ô½Õ¸Ö€Õ°Õ¸Ö‚Ö€Õ¤ Õ¥Õ¶ Õ¿Õ¡Õ¬Õ«Õ½ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¯Õ¡Õ´ Firefox Õ¯Õ¡Õ´ Chrome Õ¡Õ¾Õ¥Õ¬Õ« Õ¬Õ¡Õ¾ Õ¡Õ¸Ö‚Õ¤Õ«Õ¸Õ« Õ°Õ¡Õ´Õ¡Ö€.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java- Õ« Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Õ¹Õ« Õ°Õ¡ÕµÕ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¾Õ¥Õ¬\:
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Փոքրացնել
 bbb.window.maximizeRestoreBtn.toolTip = Մեծացնել
 bbb.window.closeBtn.toolTip = Õ“Õ¡Õ¯Õ¥Õ¬
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Õ¿Õ­Õ¸Ö‚Ö€ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
 bbb.users.emojiStatus.confused = Õ°Õ¸Ö‚Õ¦Õ¾Õ¡Õ® Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
 bbb.users.emojiStatus.neutral = Õ†Õ¥ÕµÕ¿Ö€Õ¡Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯
 bbb.users.emojiStatus.away = բացակա կարգավիճակ
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Õ‡Õ¶Õ¸Õ¥Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½
 bbb.presentation.titleWithPres = Õ‡Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½\: {0}
 bbb.presentation.quickLink.label = Õ‡Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Փակել վեբ խցիկի կարգա
 bbb.video.publish.closeBtn.label = Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
 bbb.video.publish.titleBar = Հրատարակել վեբ խցիկի պատուհանը
 bbb.video.streamClose.toolTip = Õ“Õ¡Õ¯Õ¥Õ¬ Õ°Õ¸Õ½Ö„Õ¨ {0} -Õ« Õ°Õ¡Õ´Õ¡Ö€\: 
-bbb.desktopPublish.title = Էկրանի բաշխում։ Ներկայացնողի նախադիտում
-bbb.desktopPublish.fullscreen.tooltip = Բաշխել Ձեր ամբողջ Էկրանը
-bbb.desktopPublish.fullscreen.label = Ô±Õ´Õ¢Õ¸Õ²Õ» Õ§Õ¯Ö€Õ¡Õ¶Õ¸Õ¾ Õ´Õ¥Õ¯
-bbb.desktopPublish.region.tooltip = Ô²Õ¡Õ·Õ­Õ¥Õ¬ Õ§Õ¯Ö€Õ¡Õ¶Õ« Õ´Õ« Õ´Õ¡Õ½Õ¨
-bbb.desktopPublish.region.label = Õ„Õ¡Ö€Õ¦
-bbb.desktopPublish.stop.tooltip = Õ“Õ¡Õ¯Õ¥Õ¬ Õ§Õ¯Ö€Õ¡Õ¶Õ« Õ¢Õ¡Õ·Õ­Õ¸Ö‚Õ´Õ¨
-bbb.desktopPublish.stop.label = Õ“Õ¡Õ¯Õ¥Õ¬
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Դուք չեք կարող մեծացնել այս պատուհանը
-bbb.desktopPublish.closeBtn.toolTip = Վերջացնել բաշխումը և փակել
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome Õ¡ÕµÕ¬Õ¥Ö‚Õ½ Õ¹Õ« Õ¡Õ·Õ­Õ¡Õ¿Õ¸Ö‚Õ´ Java applets Õ¶Õ¥Ö€Õ« Õ°Õ¥Õ¿. Ô´Õ¸Ö‚Ö„ ÕºÕ¥Õ¿Ö„ Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ Õ¡ÕµÕ¬ Õ¾Õ¥Õ¢ Õ¢Ö€Õ¡Õ¸Ö‚Õ¦Õ¥Ö€ ( Õ­Õ¸Ö€Õ°Õ¸Ö‚Ö€Õ¤ Õ¿Ö€Õ¾Õ¸Ö‚Õ´ Firefox).
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Փոքրացնել
-bbb.desktopPublish.minimizeBtn.accessibilityName = Փոքրացնել էկրանի բաշխման պատուհանը
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Մեծացնել էկրանի բաշխման պատուհանը
-bbb.desktopPublish.chromeHint.title = Chrome- Õ«Õ¶ ÕºÕ¥Õ¿Ö„ Õ§ Õ±Õ¥Ö€ Õ©Õ¸Ö‚ÕµÕ¬Õ¿Õ¾Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Ô¿Ö€Õ¯Õ¶Õ¥Õ¬
-bbb.desktopView.title = Ô·Õ¯Ö€Õ¡Õ¶Õ« Õ¢Õ¡Õ·Õ­Õ¸Ö‚Õ´
-bbb.desktopView.fitToWindow = Տեղավորել ամբողջ պատուհանով մեկ
-bbb.desktopView.actualSize = Ցույց տալ իրական չափը
-bbb.desktopView.minimizeBtn.accessibilityName = Փոքրացնել էկրանի բաշխման ցուցադրման պատուհանը
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Մեծացնել էկրանի բաշխման ցուցադրման պատուհանը
-bbb.desktopView.closeBtn.accessibilityName = Փակել էկրանի բաշխման ցուցադրման պատուհանը
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Միացնել խոսափողը
 bbb.toolbar.phone.toolTip.stop = Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ­Õ¸Õ½Õ¡ÖƒÕ¸Õ²Õ¨
 bbb.toolbar.phone.toolTip.mute = Դադարեցնել լսել կոնֆերանսը
 bbb.toolbar.phone.toolTip.unmute = Սկսել լսել կոնֆերանսը
 bbb.toolbar.phone.toolTip.nomic = Ô½Õ¸Õ½Õ¡ÖƒÕ¸Õ² Õ¹Õ« Õ°Õ¡Õ¿Õ¶Õ¡Õ¢Õ¥Ö€Õ¾Õ¥Õ¬
-bbb.toolbar.deskshare.toolTip.start = Ô²Õ¡Õ·Õ­Õ¥Õ¬ Ô·Õ¯Ö€Õ¡Õ¶Õ¨
-bbb.toolbar.deskshare.toolTip.stop = Դադարեցնել էկրանի բաշխումը
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Բաշխել իմ վեբ խցիկը
 bbb.toolbar.video.toolTip.stop = Դադարեցնել իմ վեբ խցիկը բաշխումը
 bbb.layout.addButton.toolTip = Ավելացնել նոր տեսքի նախագիծ ցանկի մեջ
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Տեսքի նախագիծը գրանցված է
 bbb.layout.load.complete = Տեսքի նախագիծը բեռնված է
 bbb.layout.load.failed = Õ¡Õ¶Õ°Õ¶Õ¡Ö€ Õ§ Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¤Õ¡Õ½Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶
 bbb.layout.name.defaultlayout = Ô¼Õ¼Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¾Õ¸Õ² Õ¤Õ¡Õ½Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Վիդեո զրույց
 bbb.layout.name.webcamsfocus = Webcam Õ°Õ¡Õ¶Õ¤Õ«ÕºÕ¸Ö‚Õ´
 bbb.layout.name.presentfocus = Õ‡Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ¶Õ¤Õ«ÕºÕ¸Ö‚Õ´
@@ -362,6 +395,7 @@ bbb.logout.rejected = Միացումը սերվերին մերժվեց
 bbb.logout.invalidapp = RED5 Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¹Õ¸Ö‚Õ¶Õ«
 bbb.logout.unknown = Դուք կորցրեցիք միացումը սերվերին
 bbb.logout.usercommand = Դուք լքեցիք կոնֆերանսը
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Õ´Õ¸Õ¤Õ¥Ö€Õ¡Õ¿Õ¸Ö€ Õ±Õ¥Õ¦ Õ¤Õ¸Ö‚Ö€Õ½ Õ§ Õ°Õ¡Õ¶Õ¥Õ¬.
 bbb.logout.refresh.message = Եթե անջատումը կատարվել է ձեզնից անկախ, սխմեք ներքևում գտնվող կոճակը, կապը վերականգնելու համար
 bbb.logout.refresh.label = Վերականգնել միացումը
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ Õ¶Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨
 bbb.settings.deskshare.instructions = Սեղմեք թույլատրել կոճակը հայտնվող պատուհանի վրա, որպեսզի համոզվեք, որ էկրանի բաշխումը ընթանում է ճիշտ
 bbb.settings.deskshare.start = Ô¸Õ¶Õ¿Ö€Õ¥Õ¬ Ô·Õ¯Ö€Õ¡Õ¶Õ« Õ¢Õ¡Õ·Õ­Õ¸Ö‚Õ´Õ¨
 bbb.settings.voice.volume = Ô½Õ¸Õ½Õ¡ÖƒÕ¸Õ²Õ« Õ¡Õ¯Õ¿Õ«Õ¾Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
-bbb.settings.java.label = Java-Õ« Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ« Õ½Õ­Õ¡Õ¬
-bbb.settings.java.text = Ձեր մոտ տեղադրված է Java {0}, բայց Ձեզ անհրաժեշտ է առնվազն Java {1} Էկրանի բաշխման հնարավորության օգտագործման համար։ Ստորին կոճակը սեղմելով Դուք կտեղադրեք նորագույն Java JRE տարբերակը։
-bbb.settings.java.command = Տեղադրել նորագույն Java
 bbb.settings.flash.label = Flash -Õ« Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ« Õ½Õ­Õ¡Õ¬
 bbb.settings.flash.text = Ձեր մոտ տեղադրված է Flash {0}, բայց Ձեզ անհրաժեշտ է առնվազն Flash {1} օգտագործման համար։ Ստորին կոճակը սեղմելով Դուք կտեղադրեք նորագույն Adobe Flash տարբերակը։
 bbb.settings.flash.command = Տեղադրել նորագույն Adobe Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Տեքստ
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Õ“Õ¸Õ­Õ¥Õ¬ Õ£Ö€Õ¡Õ¿Õ¡Õ­Õ¿Õ¡Õ¯Õ« Õ¯Õ¸Ö‚Ö€Õ½Õ¸Ö€Õ¨ Õ¿Õ¥Ö„Õ½Õ¿Õ«
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Տեքստի գույնը
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Տառաշարի չափը
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = ÕŠÕ¡Õ¿Ö€Õ¡Õ½Õ¿
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Փոքրացնել ներկա պատ
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Մեծացնել ներկա պատուհանը
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Ô¼Ö„Õ¥Õ¬ Flash -Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Միացնել կամ անջատել Ձեր խոսափողը
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Անցնել զրուցարանի պատո
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Բացել էկրանի բաշխման պատուհանին
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Բացել ձայնի կարգաբերումների պատուհանը
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Սկսել/Դադարեցնել լսել կոնֆերանսը
 bbb.shortcutkey.share.webcam = 6
 bbb.shortcutkey.share.webcam.function = Բացել տեսախցիկի բաշխման պատուհանը
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Õ“Õ¡Õ¯Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ ÕºÕ¡Õ¿Õ¸Ö‚
 bbb.users.settings.lockAll=Արգելափակել բոլոր մասնակիցներին
 bbb.users.settings.lockAllExcept=Արգելափակել բոլոր մասնակիցներին, բացի ներկայացնողից
 bbb.users.settings.lockSettings=Ամրացնել մասնակիցների կարգավիճակը
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Հանել արգելափակումը բոլոր մասնակիցներից
 bbb.users.settings.roomIsLocked=Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ¨Õ½Õ¿ Õ¶Õ¡Õ­Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«
 bbb.users.settings.roomIsMuted=Ô½Õ¸Õ½Õ¡ÖƒÕ¸Õ²Õ¶Õ¥Ö€Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¡Õ® Õ¥Õ¶, Õ¨Õ½Õ¿ Õ¶Õ¡Õ­Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« 
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Ամրագրել մասնակիցների կարգավի
 bbb.lockSettings.feature=Õ€Õ¡Õ¾Õ¥Õ¬ÕµÕ¡Õ¬ Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€
 bbb.lockSettings.locked=Ô±Õ´Ö€Õ¡Õ£Ö€Õ¾Õ¡Õ® Õ§
 bbb.lockSettings.lockOnJoin=Միանալուց արգելափակել
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/id_ID/bbbResources.properties b/bigbluebutton-client/locale/id_ID/bbbResources.properties
index 3aac63fdfaa64ec34864fc5147957b3edf5eb4e0..aa7a5035085c287e2e7b33d9b6ca4f0ec403803f 100644
--- a/bigbluebutton-client/locale/id_ID/bbbResources.properties
+++ b/bigbluebutton-client/locale/id_ID/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Player Flash
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Disarankan menggunakan Firefox atau Chrome agar kualitas suara lebih baik.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Versi java tidak terdeteksi.
-bbb.clientstatus.java.notinstalled = Anda tidak memiliki Java terpasang, silakan klik <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>DI SINI</a></font> untuk memasang java terbaru bila ingin menggunakan fitur berbagi desktop.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimalkan
 bbb.window.maximizeRestoreBtn.toolTip = Maksimalkan
 bbb.window.closeBtn.toolTip = Tutup
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Status sedih
 bbb.users.emojiStatus.confused = Status bingung
 bbb.users.emojiStatus.neutral = Status netral
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentasi
 bbb.presentation.titleWithPres = Presentasi\: {0}
 bbb.presentation.quickLink.label = Jendela Presentasi
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Tutup kotak dialog pengaturan kamera
 bbb.video.publish.closeBtn.label = Batal
 bbb.video.publish.titleBar = Siarkan Jendela Kamera
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Berbagi Desktop\: Pratinjau Presenter
-bbb.desktopPublish.fullscreen.tooltip = Bagikan Layar Utama Anda
-bbb.desktopPublish.fullscreen.label = Layar Penuh
-bbb.desktopPublish.region.tooltip = Bagikan Sebagian Layar Anda
-bbb.desktopPublish.region.label = Bagian
-bbb.desktopPublish.stop.tooltip = Tutup layar berbagi
-bbb.desktopPublish.stop.label = Tutup
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Anda tidak dapat memaksimalkan jendela ini.
-bbb.desktopPublish.closeBtn.toolTip = Berhenti berbagi dan tutup jendela ini.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Berbagi desktop saat ini tidak didukung di Chrome yang berjalan di bawah Mac OS X. Anda harus menggunakan peramban web lainnya (direkomendasikan Firefox) untuk membagikan desktop Anda.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimalkan jendela ini.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Kecilkan Jendela Penyiaran Berbagi Desktop
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maksimalkan Jendela Penyiaran Berbagi Desktop
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Ulangi
-bbb.desktopView.title = Berbagi Desktop
-bbb.desktopView.fitToWindow = Sesuaikan ke jendela
-bbb.desktopView.actualSize = Tampilkan ukuran sebenarnya
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Bagikan Mikrofon Anda
 bbb.toolbar.phone.toolTip.stop = Berhenti Membagikan Mikrofon Anda
 bbb.toolbar.phone.toolTip.mute = Berhenti mendengarkan konferensi
 bbb.toolbar.phone.toolTip.unmute = Mulai mendengarkan konferensi
 bbb.toolbar.phone.toolTip.nomic = Tidak ada mikrofon yang terdeteksi
-bbb.toolbar.deskshare.toolTip.start = Bagikan Desktop Anda
-bbb.toolbar.deskshare.toolTip.stop = Berhenti Membagikan Desktop Anda
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Bagikan Kamera Anda
 bbb.toolbar.video.toolTip.stop = Berhenti Membagikan Kamera Anda
 bbb.layout.addButton.toolTip = Tambahkan tata letak kastem ke dalam daftar
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Tata letak berhasil disimpan
 bbb.layout.load.complete = Tata letak berhasil dimuat
 bbb.layout.load.failed = Tidak dapat memuat tata letak
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Obrolan Video
 bbb.layout.name.webcamsfocus = Pertemuan Menggunakan Kamera
 bbb.layout.name.presentfocus = Pertemuan Presentasi
@@ -362,6 +395,7 @@ bbb.logout.rejected = Hubungan ke server ditolak
 bbb.logout.invalidapp = Aplikasi red5 belum terpasang
 bbb.logout.unknown = Klien anda telah kehilangan hubungan ke server.
 bbb.logout.usercommand = Anda telah keluar dari konferensi
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Moderator telah mengeluarkan Anda dari pertemuan.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Simpan Catatan
 bbb.settings.deskshare.instructions = Klik Ijinkan pada jendela pop up untuk memeriksa jika berbagi desktop berjalan sebagaimana mestinya.
 bbb.settings.deskshare.start = Periksa fitur Berbagi Desktop.
 bbb.settings.voice.volume = Aktifitas Mikrofon
-bbb.settings.java.label = Versi Java bermasalah
-bbb.settings.java.text = Anda memiliki Java {0} yang terpasang, tapi anda membutuhkan paling tidak versi {1} untuk dapat menggunakan fitur berbagi desktop. Klik pada tombol di bawah untuk memasang versi Java JRE terbaru.
-bbb.settings.java.command = Pasang Java terbaru
 bbb.settings.flash.label = Kesalahan pada versi Flash
 bbb.settings.flash.text = Anda sudah memiliki Flash {0} yang terpasang, tapi anda membutuhkan paling tidak versi {1} untuk dapat menjalankan BigBlueButton dengan baik. Klik tombol di bawah untuk memasang versi Adobe Flash terbaru.
 bbb.settings.flash.command = Pasang Flash yang terbaru
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Teks
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Ganti kursor papan tulis ke teks
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Warna teks
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Ukuran huruf
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Siap
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Bungkam atau Bunyikan mikrofon Anda
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Pindahkan fokus ke jendela Chat
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Buka jendela berbagi desktop
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Buka jendela pengaturan audio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Mulai/Hentikan mendengarkan konferensi
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Buka jendela berbagi kamera
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Tutup semua video
 bbb.users.settings.lockAll=Kunci Semua Pengguna
 bbb.users.settings.lockAllExcept=Kunci Pengguna Kecuali Presenter
 bbb.users.settings.lockSettings=Kunci Pemirsa ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Buka Kunci Semua Pemirsa
 bbb.users.settings.roomIsLocked=Kunci secara baku
 bbb.users.settings.roomIsMuted=Dibungkam secara baku
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Kunci Pemirsa
 bbb.lockSettings.feature=Fitur
 bbb.lockSettings.locked=Terkunci
 bbb.lockSettings.lockOnJoin=Kunci Saat Bergabung
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/it_IT/bbbResources.properties b/bigbluebutton-client/locale/it_IT/bbbResources.properties
index eb7b941a9eba02eafa01d932b8d035722a6b4940..c57ba9751d8d308a30b3b800d2d29c3e8bcd1051 100644
--- a/bigbluebutton-client/locale/it_IT/bbbResources.properties
+++ b/bigbluebutton-client/locale/it_IT/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = La versione di Flash Player ({0}) non è aggiornata. Si raccomanda l'aggiornamento alla versione più recente.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Per migliori prestazioni audio, si consiglia l'uso di Firefox o Chrome come browser.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Non è stata rilevata nessuna versione di Java.
-bbb.clientstatus.java.notinstalled = Non hai istallato Java, clicca qui <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> per istallare l'ultima versione di Java per utilizzare la funzionalità di condivisione del Desktop.
-bbb.clientstatus.java.oldversion = Hai istallata una versione obsoleta di Java, clicca qui <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> per istallare l'ultima versione di Java per utilizzare la funzionalità di condivisione del Desktop.
 bbb.window.minimizeBtn.toolTip = Minimizza
 bbb.window.maximizeRestoreBtn.toolTip = Massimizza
 bbb.window.closeBtn.toolTip = Chiudi
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Triste
 bbb.users.emojiStatus.confused = Confuso
 bbb.users.emojiStatus.neutral = Neutrale
 bbb.users.emojiStatus.away = Distratto
+bbb.users.emojiStatus.thumbsUp = Mi piace\!
+bbb.users.emojiStatus.thumbsDown = Non mi piace\!
+bbb.users.emojiStatus.applause = Bravo\!
 bbb.presentation.title = Presentazione
 bbb.presentation.titleWithPres = Presentazione\: {0}
 bbb.presentation.quickLink.label = Finestra Presentazione
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Chiudi la finestra di configurazione del
 bbb.video.publish.closeBtn.label = Annulla
 bbb.video.publish.titleBar = Condividi la finestra della videocamera
 bbb.video.streamClose.toolTip = Ferma il flusso video a \: {0}
-bbb.desktopPublish.title = Desktop condiviso \: anteprima
-bbb.desktopPublish.fullscreen.tooltip = Condividi il tuo schermo principale
-bbb.desktopPublish.fullscreen.label = Schermo intero
-bbb.desktopPublish.region.tooltip = Condividi una parte del tuo schermo
-bbb.desktopPublish.region.label = Area
-bbb.desktopPublish.stop.tooltip = Chiudi la condivisione dello schermo
-bbb.desktopPublish.stop.label = Chiudi
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Non puoi massimizzare questa finestra
-bbb.desktopPublish.closeBtn.toolTip = Interrompi la condivisione e chiudi questa finestra
-bbb.desktopPublish.chromeOnMacUnsupportedHint = La condivisione del desktop, non è attualmente supportata da Chrome su Mac OS X. È necessario utilizzare un browser diverso per condividere il desktop (è consigliato Firefox).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome non supporta più applet Java. È necessario utilizzare un browser differente per condividere il desktop (è consigliato Firefox).
-bbb.desktopPublish.edgePluginUnsupportedHint = Windows Edge non supporta le applet Java. È necessario utilizzare un browser web diverso per condividere il desktop (è consigliato Firefox).
-bbb.desktopPublish.minimizeBtn.toolTip = Riduci questa finestra
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizza la finestra di Condivisione del desktop
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Massimizza la finestra di Condivisione del desktop
-bbb.desktopPublish.chromeHint.title = Potrebbe essere necessario autorizzare i permessi a Chrome.
-bbb.desktopPublish.chromeHint.message = Attaverso l'icona dei plug-ins (in alto a destra su Chrome), autorizzare il plug-in e poi premere Riprova.
-bbb.desktopPublish.chromeHint.button = Riprova
-bbb.desktopView.title = Condivisione del desktop
-bbb.desktopView.fitToWindow = Adatta alla finestra
-bbb.desktopView.actualSize = Visualizza dimensione reale
-bbb.desktopView.minimizeBtn.accessibilityName = Minimizza la finestra di Visualizzazione del desktop remoto
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Massimizza la finestra di Visualizzazione del desktop remoto
-bbb.desktopView.closeBtn.accessibilityName = Chiudi la finestra di Visualizzazione del desktop remoto
+bbb.screensharePublish.title = Condivisione dello schermo\: Anteprima del Conduttore
+bbb.screensharePublish.pause.tooltip = Metti in pausa la condivisione dello schermo
+bbb.screensharePublish.pause.label = Metti in pausa
+bbb.screensharePublish.restart.tooltip = Riavvia la condivisione dello schermo
+bbb.screensharePublish.restart.label = Riavvia
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Puoi ingrandire questa finestra
+bbb.screensharePublish.closeBtn.toolTip = Interrompi la consivisione e chiudi
+bbb.screensharePublish.minimizeBtn.toolTip = Minimizza
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = I passi seguenti vi guideranno ad avviare la condivisione dello schermo (è richiesto Java).
+bbb.screensharePublish.helpButton.toolTip = Giuda
+bbb.screensharePublish.helpButton.accessibilityName = Guida (si apre l'esercitazione in una nuova finestra)
+bbb.screensharePublish.helpText.PCIE1 = 1. Selezionare 'Apri'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accettare il certificato
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Cliccare 'OK' per iniziare
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accettare il certificato
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Individuare 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Fare click per aprire
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accettare il certificato
+bbb.screensharePublish.helpText.MacSafari1 = 1. Individuare 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Selezionare 'Visualizza in ricerca'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Cliccare con il pulsante destro e selezionare 'Apri'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Selezionare 'Apri' (se richiesto)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Selezionare 'Salva' (se richiesto)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Selezionare 'Visualizza in ricerca'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Cliccare con il pulsante destro e selezionare 'Apri'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Selezionare 'Apri' (se richiesto)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Individuare 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Selezionare 'Visualizza in ricerca'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Cliccare con il pulsante destro e selezionare 'Apri'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Selezionare 'Apri' (se richiesto)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Premere 'OK' per iniziare
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accettare il certificato
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Localizzare il file 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Cliccare per aprire
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accettare il certificato
+bbb.screensharePublish.shareTypeLabel.text = Condividi\:
+bbb.screensharePublish.shareType.fullScreen = Schermo intero
+bbb.screensharePublish.shareType.region = Regione
+bbb.screensharePublish.pauseMessage.label = La condivisione dello schermo è in pausa
+bbb.screensharePublish.startFailed.label = La condivisione dello schermo non è stata avviata.
+bbb.screensharePublish.restartFailed.label = La condivisione dello schermo non è stata riavviata.
+bbb.screensharePublish.jwsCrashed.label = La condivisione dello schermo si è chiusa in modo anomalo.
+bbb.screensharePublish.commonErrorMessage.label = Selezionare 'Cancella' e riprova.
+bbb.screensharePublish.cancelButton.label = Cancella
+bbb.screensharePublish.startButton.label = Inizia
+bbb.screensharePublish.stopButton.label = Ferma
+bbb.screenshareView.title = Condivisione dello schermo
+bbb.screenshareView.fitToWindow = Adatta alla finestra
+bbb.screenshareView.actualSize = Visualizza alla grandezza attuale
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Attiva la condivisione del tuo microfono
 bbb.toolbar.phone.toolTip.stop = Ferma la condivisione del tuo microfono
 bbb.toolbar.phone.toolTip.mute = Smetti di ascoltare la conferenza
 bbb.toolbar.phone.toolTip.unmute = Inizia ad ascoltare la conferenza
 bbb.toolbar.phone.toolTip.nomic = Nessun microfono individuato.
-bbb.toolbar.deskshare.toolTip.start = Attiva la condivisione del tuo Desktop
-bbb.toolbar.deskshare.toolTip.stop = Ferma la condivisione del tuo Desktop
+bbb.toolbar.deskshare.toolTip.start = Condividi il tuo schermo
+bbb.toolbar.deskshare.toolTip.stop = Ferma la condivisione dello schermo
 bbb.toolbar.video.toolTip.start = Attiva la condivisione della tua Webcam
 bbb.toolbar.video.toolTip.stop = Ferma la condivisione della tua Webcam
 bbb.layout.addButton.toolTip = Aggiungi il layout personalizzato alla lista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layout correttamente salvato
 bbb.layout.load.complete = Layout correttamente caricato
 bbb.layout.load.failed = Impossibile caricare il layout
 bbb.layout.name.defaultlayout = Layout base
+bbb.layout.name.closedcaption = Didascalie
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Video Conferenza
 bbb.layout.name.presentfocus = Presentazione
@@ -362,6 +395,7 @@ bbb.logout.rejected = La connessione al server è stata respinta
 bbb.logout.invalidapp = L'applicazione red5 non esiste
 bbb.logout.unknown = Hai perso la connessione con il server
 bbb.logout.usercommand = Sei uscito dalla conferenza
+bbb.logour.breakoutRoomClose = La finestra del browser verrà chiusa
 bbb.logout.ejectedFromMeeting = Un moderatore ti ha espulso dalla conferenza.
 bbb.logout.refresh.message = Clicca su questo pulsante per riconnettersi alla conferenza.
 bbb.logout.refresh.label = Riconnetti
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Salva Note
 bbb.settings.deskshare.instructions = Clicca Permetti alla richiesta di controllo del corretto funzionamento della condivisione del desktop
 bbb.settings.deskshare.start = Effettua un test della condivisione del desktop
 bbb.settings.voice.volume = Attività del microfono
-bbb.settings.java.label = Errore di versione Java
-bbb.settings.java.text = Hai Java {0} installato nel tuo pc, ma ti serve almeno la versione {1} per usare la funzione di condivisione dello schermo di BigBlueButton. Clicca sul pulsante sottostante per installare la nuova versione di Java JRE.
-bbb.settings.java.command = Installa una versione più recente di Java
 bbb.settings.flash.label = Errore di versione Flash
 bbb.settings.flash.text = Hai Flash {0} installato nel tuo pc, ma ti serve almeno la versione {1} affinché BigBlueButton possa funzionare correttamente. Clicca sul pulsante sottostante per installare la versione più recente di Adobe Flash.
 bbb.settings.flash.command = Installa una versione più recente di Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Testo
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Cambia il cursore in Testo
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Colore del Testo
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Grandezza Carattere
+bbb.caption.window.title = Didascalie
+bbb.caption.window.titleBar = Barra del titolo della finestra delle Didascalie
+bbb.caption.window.minimizeBtn.accessibilityName = Minimizza la finestra delle Didascalie
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Massimizza la finestra delle Didascalie
+bbb.caption.transcript.noowner = Nessun controllo
+bbb.caption.transcript.youowner = Tuo controllo
+bbb.caption.transcript.pastewarning.title = Avviso di incollatura didascalia
+bbb.caption.transcript.pastewarning.text = Non si possono incollare più di {0} caratteri. Hai incollato {1} caratteri.
+bbb.caption.option.label = Opzioni
+bbb.caption.option.language = Lingua\:
+bbb.caption.option.language.tooltip = Seleziona la lingua delle Didascalie
+bbb.caption.option.language.accessibilityName = Seleziona la lingua della didascalia. Usa i tasti freccia per navigare.
+bbb.caption.option.takeowner = Prendi il controllo
+bbb.caption.option.takeowner.tooltip = Prendi il controllo della lingua selezionata
+bbb.caption.option.fontfamily = Tipo dei caratteri\:
+bbb.caption.option.fontfamily.tooltip = Tipo dei caratteri
+bbb.caption.option.fontsize = Grandezza dei caratteri\:
+bbb.caption.option.fontsize.tooltip = Grandezza di caratteri
+bbb.caption.option.backcolor = Colore dello sfondo\:
+bbb.caption.option.backcolor.tooltip = Colore dello sfondo
+bbb.caption.option.textcolor = Colore del testo\:
+bbb.caption.option.textcolor.tooltip = Colore del testo
+
 
 bbb.accessibility.clientReady = Pronto
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimizza la finestra corrente
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Massimizza la finestra corrente
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Esci dalla finestra Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Blocca/Sblocca il tuo microfono
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Attiva la finestra della chat
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Apri la finestra di condivisione del desktop
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Apri la finestra delle Impostazioni Audio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Inizia/Smetti di ascoltare la conferenza
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Apri la finestra delle Impostazioni Videocamera
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Chiudi tutte le videocamere
 bbb.users.settings.lockAll=Blocca tutti i partecipanti
 bbb.users.settings.lockAllExcept=Blocca i partecipanti eccetto il conduttore
 bbb.users.settings.lockSettings=Blocca le impostazioni dei partecipanti
+bbb.users.settings.breakoutRooms=Interrompere la sessione ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Invia inviti di partecipazione ...
 bbb.users.settings.unlockAll=Sblocca le impostazioni dei partecipanti
 bbb.users.settings.roomIsLocked=Bloccato per impostazione
 bbb.users.settings.roomIsMuted=Mutato per impostazione
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Blocca le impostazioni dei partecipanti
 bbb.lockSettings.feature=Caratteristiche
 bbb.lockSettings.locked=Bloccato.
 bbb.lockSettings.lockOnJoin=Blocco collegamento
+
+bbb.users.breakout.breakoutRooms = Interrompere le sessioni
+bbb.users.breakout.updateBreakoutRooms = Aggiornamento delle sessioni in corso
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} rimanente</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} rimanente</b>
+bbb.users.breakout.calculatingRemainingTime = Calcolo tempo rimanente...
+bbb.users.breakout.remainingTimeEnded = Tempo scaduto, la sessione viene interrotta.
+bbb.users.breakout.rooms = Sessioni
+bbb.users.breakout.roomsCombo.accessibilityName = Numero di sessioni da creare
+bbb.users.breakout.room = Sessione
+bbb.users.breakout.randomAssign = Assegna gli utenti in maniera casuale
+bbb.users.breakout.timeLimit = Limite di tempo
+bbb.users.breakout.durationStepper.accessibilityName = Tempo limite in minuti
+bbb.users.breakout.minutes = Minuti
+bbb.users.breakout.record = Registra
+bbb.users.breakout.recordCheckbox.accessibilityName = Interruzione della registrazione della sessione
+bbb.users.breakout.notAssigned = Non assegnato
+bbb.users.breakout.dragAndDropToolTip = Tip\: È possibile trascinare e rilasciare gli utenti tra le sessioni
+bbb.users.breakout.start = Inizio
+bbb.users.breakout.invite = Invito
+bbb.users.breakout.close = Fine
+bbb.users.breakout.closeAllRooms = Chiudi tutte le sessioni
+bbb.users.breakout.insufficientUsers = Utenti insufficienti. Si dovrebbe mettere almeno un utente per ogni sessione.
+bbb.users.breakout.openJoinURL = Sei stato invitato a partecipare alla sessione {0}\n(confermando l'invito, verrai collegato automaticamente in audio)
+bbb.users.breakout.confirm = Conferma di collegamento alla sessione
+bbb.users.roomsGrid.room = Sessione
+bbb.users.roomsGrid.users = Utenti
+bbb.users.roomsGrid.action = Azione
+bbb.users.roomsGrid.transfer = Collegamento Audio
+bbb.users.roomsGrid.join = Collega
+bbb.users.roomsGrid.noUsers = Non ci sono utenti in questa sessione
diff --git a/bigbluebutton-client/locale/ja_JP/bbbResources.properties b/bigbluebutton-client/locale/ja_JP/bbbResources.properties
index f7a13abadfffb1f6657fa2cd709ebf01081e3b83..8273c97c5a87c99a34ce7983f493534c7b35296e 100644
--- a/bigbluebutton-client/locale/ja_JP/bbbResources.properties
+++ b/bigbluebutton-client/locale/ja_JP/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = あなたの Flash Player plugin ({0}) は旧版です。最新版へ更新してください
 bbb.clientstatus.webrtc.title = オーディオ
 bbb.clientstatus.webrtc.message = 音質改善には Firefox か Chrome がお薦めです
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java ヴァージョンが見つかりません
-bbb.clientstatus.java.notinstalled = Java がインストールされていません。 <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>こちらから</a></font> 最新版を入手してデスクトップシェアをお試しください
-bbb.clientstatus.java.oldversion = お使いのJavaが古いので、 <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>こちらから</a></font> 最新版を入手してデスクトップシェアをお試しください
 bbb.window.minimizeBtn.toolTip = 最小化
 bbb.window.maximizeRestoreBtn.toolTip = 最大化
 bbb.window.closeBtn.toolTip = クローズ
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = 悲しむ
 bbb.users.emojiStatus.confused = æ··ä¹±
 bbb.users.emojiStatus.neutral = 普通
 bbb.users.emojiStatus.away = 投げやり
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = プレゼンテーション
 bbb.presentation.titleWithPres = プレゼンテーション [0]
 bbb.presentation.quickLink.label = プレゼンテーションウインドウ
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = ウェブカメラウィンドウ ウィ
 bbb.video.publish.closeBtn.label = キャンセル
 bbb.video.publish.titleBar = ウェブカメラウィンドウを公開
 bbb.video.streamClose.toolTip = 配信停止\: {0}
-bbb.desktopPublish.title = デスクトップ共有：プレゼンターのプレビュー
-bbb.desktopPublish.fullscreen.tooltip = メイン画像をシェア
-bbb.desktopPublish.fullscreen.label = フルスクリーン
-bbb.desktopPublish.region.tooltip = スクリーンの一部をシェア
-bbb.desktopPublish.region.label = 範囲
-bbb.desktopPublish.stop.tooltip = 画面共有を閉じる
-bbb.desktopPublish.stop.label = クローズ
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = このウィンドウを最大化することはできません。
-bbb.desktopPublish.closeBtn.toolTip = 共有を停止し、閉じる
-bbb.desktopPublish.chromeOnMacUnsupportedHint = デスクトップシェアリングはお使いの Mac OS X上のChromeでは現在、サポートされていません。(Firefox 等の)他のブラウザを使用してください。
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome では Java アプレットを使用できません。デスクトップシェアには、(Firefox等の)他のブラウザを使う必要があります。
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge は Java アプレットをサポートしていません。(Firefox) 等の他のブラウザでデスクトップを共有できます
-bbb.desktopPublish.minimizeBtn.toolTip = 最小化
-bbb.desktopPublish.minimizeBtn.accessibilityName = デスクトップ共有の公開ウィン​​ドウを最小化
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = デスクトップ共有の公開ウィン​​ドウを最大化
-bbb.desktopPublish.chromeHint.title = Chrome が許可を求めています
-bbb.desktopPublish.chromeHint.message = プラグインアイコンを選択し(Chromeでは右上部)、プラグインを解除し、'再試行'を選択してください
-bbb.desktopPublish.chromeHint.button = 再試行
-bbb.desktopView.title = デスクトップ共有
-bbb.desktopView.fitToWindow = ウィンドウに合わせる
-bbb.desktopView.actualSize = 実際のサイズを表示します
-bbb.desktopView.minimizeBtn.accessibilityName = デスクトップ共有の表示ウィンドウを最小化
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = デスクトップ共有ビューウィンドウを最大化
-bbb.desktopView.closeBtn.accessibilityName = デスクトップ共有ビューウィンドウを閉じます
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = あなたのマイク音声を公開
 bbb.toolbar.phone.toolTip.stop = マイクでの講壇を停止
 bbb.toolbar.phone.toolTip.mute = カンファレンスを無音にします
 bbb.toolbar.phone.toolTip.unmute = カンファレンスを公聴します
 bbb.toolbar.phone.toolTip.nomic = マイクが見つかりません
-bbb.toolbar.deskshare.toolTip.start = デスクトップをシェア
-bbb.toolbar.deskshare.toolTip.stop = シェア中のデスクトップを停止
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = ウェブカム画像を公開
 bbb.toolbar.video.toolTip.stop = ウェブカム画像を停止
 bbb.layout.addButton.toolTip = リストにカスタムレイアウトを追加
@@ -331,6 +363,7 @@ bbb.layout.save.complete = レイアウトは正常に保存されました
 bbb.layout.load.complete = レイアウトは正常に読み込まれました
 bbb.layout.load.failed = レイアウトを読み込めません
 bbb.layout.name.defaultlayout = デフォルトレイアウト
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = ビデオチャット
 bbb.layout.name.webcamsfocus = ウェブカムミーティング
 bbb.layout.name.presentfocus = プレゼンテーションミーティング
@@ -362,6 +395,7 @@ bbb.logout.rejected = サーバーへの接続が拒否されました
 bbb.logout.invalidapp = RED5アプリが存在しません
 bbb.logout.unknown = あなたのクライアントは、サーバとの接続を失いました
 bbb.logout.usercommand = あなたは、会議からログアウトしました
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = モデレーターにより退出されました
 bbb.logout.refresh.message = このログアウトは不意かもしれません。下のボタンで再接続してください
 bbb.logout.refresh.label = 再コネクト
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = メモを保存します
 bbb.settings.deskshare.instructions = デスクトップ共有が正常に動作していることをチェックするプロンプトがポップアップしたら、[許可]をクリック
 bbb.settings.deskshare.start = デスクトップ共有をチェック
 bbb.settings.voice.volume = マイクのアクティビティ
-bbb.settings.java.label = Javaのバージョンエラー
-bbb.settings.java.text = Javaの{0}がインストールされてますが、BigBlueButtonのデスクトップ共有機能を使用するには少なくともバージョン{1}を必要が必要です。最新のJava JREのバージョンをインストールするには、下のボタンをクリックします。
-bbb.settings.java.command = 最新のJavaをインストールします
 bbb.settings.flash.label = フラッシュバージョンエラー
 bbb.settings.flash.text = Flash {0}がインストールされていますが、正しくBigBlueButtonを実行するには、少なくともバージョン{1}を必要とします。最新のAdobe Flashバージョンをインストールするには、下のボタンをクリックします。
 bbb.settings.flash.command = 最新のFlashをインストール
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = テキスト
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = テキストにホワイトボードカーソルを切り替える
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = テキストの色
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = フォントサイズ
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = 準備完了
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = 現在のウィンドウを最小化
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = 現在のウィンドウを最大化
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = フラッシュ窓からフォーカス
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = マイクをミュートとミュート解除
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = チャットウィンドウにフォーカ
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = オープンデスクトップ共有ウィンドウ
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = マイクの設定ウィンドウを開きます
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = カンファレンス音声の開始/停止
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = オープンウェブカメラの共有ウィンドウ
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = 全てのビデオをクローズ
 bbb.users.settings.lockAll=全員を固定
 bbb.users.settings.lockAllExcept=プレゼンターをのぞく全てを固定
 bbb.users.settings.lockSettings=閲覧者を固定
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=全ての閲覧者の固定を解除
 bbb.users.settings.roomIsLocked=デフォルトで固定
 bbb.users.settings.roomIsMuted=デフォルトでミュート
@@ -585,3 +637,34 @@ bbb.lockSettings.title=閲覧者固定
 bbb.lockSettings.feature=機能
 bbb.lockSettings.locked=固定済み
 bbb.lockSettings.lockOnJoin=参加を固定
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ka_GE/bbbResources.properties b/bigbluebutton-client/locale/ka_GE/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/ka_GE/bbbResources.properties
+++ b/bigbluebutton-client/locale/ka_GE/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
index bde07fcc31235120b6be8dce53c24d27f0dbef82..e58a64bbdfdd138552697d49dfbd82dc328bec89 100644
--- a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Презентация
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/km_KH/bbbResources.properties b/bigbluebutton-client/locale/km_KH/bbbResources.properties
index b0abb1b6eb4d891806b5ad0e01d4696183167557..c845e66f604d32c347c08702cd2bd3d468c78395 100644
--- a/bigbluebutton-client/locale/km_KH/bbbResources.properties
+++ b/bigbluebutton-client/locale/km_KH/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = បង្រួមផ្ទាំង
 bbb.window.maximizeRestoreBtn.toolTip = ពង្រីកផ្ទាំង
 bbb.window.closeBtn.toolTip = បិទ
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = បទបង្ហាញ
 bbb.presentation.titleWithPres = បទបង្ហាញ {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = បិទផ្ទាំងសម្រ
 bbb.video.publish.closeBtn.label = បោះបង់
 bbb.video.publish.titleBar = ផ្សព្វផ្សាយផ្ទាំងវេបខេម
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = ចែករំលែកផ្ទាំងអេក្រង់៖ ការបង្ហាញជាមុនរបស់អ្នកធ្វើបទបង្ហាញ
-bbb.desktopPublish.fullscreen.tooltip = ចែករំលែកអេក្រង់មេរបស់អ្នក
-bbb.desktopPublish.fullscreen.label = ពេញអេក្រង់
-bbb.desktopPublish.region.tooltip = ចែករំលែកអេក្រង់មួយផ្នែក
-bbb.desktopPublish.region.label = តំបន់
-bbb.desktopPublish.stop.tooltip = បិទការចែកអេក្រង់
-bbb.desktopPublish.stop.label = បិទ
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = អ្នកមិនអាចពង្រីកផ្ទាំងនេះបានទេ។
-bbb.desktopPublish.closeBtn.toolTip = ឈប់ចែករំលែក ហើយបិទ
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = បង្រួមផ្ទាំង
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ko_KR/bbbResources.properties b/bigbluebutton-client/locale/ko_KR/bbbResources.properties
index b5f00cf96fd5cbbdba47c3e2370554cbad51e370..a89de01410505bebbc55dddb4b01807b2f915893 100644
--- a/bigbluebutton-client/locale/ko_KR/bbbResources.properties
+++ b/bigbluebutton-client/locale/ko_KR/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = 축소
 bbb.window.maximizeRestoreBtn.toolTip = 확대
 bbb.window.closeBtn.toolTip = 닫기
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = 프리젠테이션 \# Presentation
 bbb.presentation.titleWithPres = 프레젠테이션\: {0}
 bbb.presentation.quickLink.label = 프레젠테이션 창 
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = 웹캠 설정 대화 상자 닫기
 bbb.video.publish.closeBtn.label = 취소 
 bbb.video.publish.titleBar = 웹캠 창 공개 
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = 화면 공유 \: 화면 미리보기 \# Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = 전체 화면 \# Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = 부분 선택  \# Region
-bbb.desktopPublish.stop.tooltip = 화면 공유 닫기
-bbb.desktopPublish.stop.label = 닫기 \# Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = 화면을 최대화할 수 없습니다. \# You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = 화면 공유를 중지하고 윈도우를 닫습니다. \# Stop sharing and close this window.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = 윈도우를 최소화합니다. \# Minimize this window.
-bbb.desktopPublish.minimizeBtn.accessibilityName = 바탕화면 공유 게시 창 최소화 
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = 바탕화면 공유 게시 창 최대화 
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = 화면 공유
-bbb.desktopView.fitToWindow = 윈도우에 맞게 정렬하기 \# Fit to Window
-bbb.desktopView.actualSize = 실제 화면사이즈로 \# Display actual size
-bbb.desktopView.minimizeBtn.accessibilityName = 바탕화면 공유 보기 창 최소화 
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = 바탕화면 공유 보기 창 최대화 
-bbb.desktopView.closeBtn.accessibilityName = 바탕화면 공유 보기 창 닫기 
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Share Your Webcam
 bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam
 bbb.layout.addButton.toolTip = 사용자 지정 레이아웃을 목록에 추가 
@@ -331,6 +363,7 @@ bbb.layout.save.complete = 레이아웃 저장이 완료되었습니다.
 bbb.layout.load.complete = 레이아웃 가져오기가 완료되었습니다. 
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = 서버 연결이 거부되었습니다.
 bbb.logout.invalidapp = Red5가 설치되지 않았습니다.
 bbb.logout.unknown = 클라이언트가 서버에 대한 연결을 잃었습니다.
 bbb.logout.usercommand = 회의에서 로그아웃 하였습니다.
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = 메모 저장
 bbb.settings.deskshare.instructions = 화면공유 검사창이 뜨면 허가를 클릭하세요.
 bbb.settings.deskshare.start = 화면공유 확인
 bbb.settings.voice.volume = 마이크 켜기
-bbb.settings.java.label = Java 버전 에러
-bbb.settings.java.text = 현재 Java {0} 버젼이 설치되어 있습니다. BigBlueButton 화면공유기능을 사용하자면 최신버젼 {1} 을 설치해야 합니다. 최신버젼 Java JRE을 설치하려면 아래의 단추를 클릭하세요.
-bbb.settings.java.command = 최신 Java  설치
 bbb.settings.flash.label = 플래시 버젼 에러
 bbb.settings.flash.text = 현재 플래시 {0} 이 설치되어 있습니다. BigBlueButton가 정확히 실행되자면 플래시 최신버젼 {1} 을 설치해야 합니다. 최신버젼을 설치하려면 아래의 단추를 클릭하세요.
 bbb.settings.flash.command = 최신 플래시 설치
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = 텍스트
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = 화이트보드 커서를 텍스트로 전환 
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = 텍스트 색 
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = 글꼴 크기 
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = 현재 창 최소화
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = 현재 창 최대화 
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Flash 창 포커스 아웃 
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = 마이크 음소거 및 음소거 해제 
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = 포커스를 채팅 창으로 이동
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = 바탕화면 공유 창 열기 
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = 오디오 설정 창 열기 
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = 웹캠 공유 창 열기 
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/lt_LT/bbbResources.properties b/bigbluebutton-client/locale/lt_LT/bbbResources.properties
index 0a4497e3b908e7e21eae1cacb34778c4aef048cf..f711ab0603f9e2ab2b6997de574f41966a426455 100644
--- a/bigbluebutton-client/locale/lt_LT/bbbResources.properties
+++ b/bigbluebutton-client/locale/lt_LT/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Uždaryti
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentacija
 bbb.presentation.titleWithPres = Prezentacija\: {0}
 bbb.presentation.quickLink.label = Pristatymo langas
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Atšaukti
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Ekrano rodymas kitiems
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Per visÄ… ekranÄ…
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Uždaryti
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Dalinimasis darbalaukiu
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java versijos klaida
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Įdiegti naujesnę Java
 bbb.settings.flash.label = Flash versijos klaida
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekstas
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Teksto spalva
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Å rifto dydis
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/lv_LV/bbbResources.properties b/bigbluebutton-client/locale/lv_LV/bbbResources.properties
index cbb92f7088b6ecf6099fb0cc61dd23da59d48c62..2ac3127c32645c04e78ab200aa7eee2636a9b768 100644
--- a/bigbluebutton-client/locale/lv_LV/bbbResources.properties
+++ b/bigbluebutton-client/locale/lv_LV/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezent?cija
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Darbavirsmas raid?Å¡ana\: Demonstr?t?ja piem?rs
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Pilnekr?ns
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Re?ions
-bbb.desktopPublish.stop.tooltip = Aizv?rt ekr?na raid?Å¡anu
-bbb.desktopPublish.stop.label = Aizv?rt
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Å o logu maksimiz?t nevar.
-bbb.desktopPublish.closeBtn.toolTip = Aptur?t raid?Å¡anu un aizv?rt Å¡o logu.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimiz?t Å¡o logu.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Darbavirsmas raid?Å¡ana
-bbb.desktopView.fitToWindow = Ietilpin?t log?
-bbb.desktopView.actualSize = R?d?t re?laj? izm?r?
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/mk_MK/bbbResources.properties b/bigbluebutton-client/locale/mk_MK/bbbResources.properties
index d00a32185fc1548a11246b20125b853cbadbc0ac..4b4c3304562d3d1e31656916fab7a3664b7b9e83 100644
--- a/bigbluebutton-client/locale/mk_MK/bbbResources.properties
+++ b/bigbluebutton-client/locale/mk_MK/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Вашиот Flash Player приклучок ({0}) е изминат. Препорачано е ажурирање до најновата верзија.
 bbb.clientstatus.webrtc.title = Аудио
 bbb.clientstatus.webrtc.message = Препорачано е користење на Firefox или Chrome за подобро аудио.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java верзијата не е детектирана.
-bbb.clientstatus.java.notinstalled = Вие немате инсталирано Java, Ве молиме кликнете <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ТУКА/a></font>  за да ја инсталирате Java за да ја користете функцијата за споделување на работната површина.
-bbb.clientstatus.java.oldversion = Вие имате инсталирано постара верзија на Java, Ве молиме кликнете <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ТУКА</a></font> за да ја инсталирате најновата верзија на Java за да ја користете функцијата за споделување на работната површина.
 bbb.window.minimizeBtn.toolTip = Намали
 bbb.window.maximizeRestoreBtn.toolTip = Зголеми
 bbb.window.closeBtn.toolTip = Затвори
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Презентација
 bbb.presentation.titleWithPres = Презентација \: {0}
 bbb.presentation.quickLink.label = Презентациски прозорец
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Затворете го прозорец
 bbb.video.publish.closeBtn.label = Откажи
 bbb.video.publish.titleBar = Прозорец за објавување на веб камера
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Споделување на работна површина\: Преглед за презентер
-bbb.desktopPublish.fullscreen.tooltip = Споделете го вашиот главен екран
-bbb.desktopPublish.fullscreen.label = Цел екран
-bbb.desktopPublish.region.tooltip = Споделете дел од Вашиот екран
-bbb.desktopPublish.region.label = Регион
-bbb.desktopPublish.stop.tooltip = Затворете го споделувањето на екран
-bbb.desktopPublish.stop.label = Затвори
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Вие неможете да го максимизирате прозорецот
-bbb.desktopPublish.closeBtn.toolTip = Стопирај споделување и затвори
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Споделувањео на работната површина моментално не е достапно на Chrome кој работи на Mac OS X. Мора да користете различен веб пребатрувач (препорачан Firefox) за да ја споделите Вашата работна површина.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome повеќе не ја подржува Java Applets. Вие морате да користете поинаков веб пребарувач (препорачан Firefox) за споделување на работната површина.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Намали
-bbb.desktopPublish.minimizeBtn.accessibilityName = Минимизирајте го прозорецот за споделување и објавување на работна површина
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Максимизирајте го прозорецот за споделување и објавување на работна површина
-bbb.desktopPublish.chromeHint.title = На Chrome можеби ќе му е потребна Ваша дозвола.
-bbb.desktopPublish.chromeHint.message = Селектирајте ја иконата на приклучокот (во горниот десен агол на Chrome), одблокирајте ги приклучоците, потоа селектирајте 'Обиди се повторно'.
-bbb.desktopPublish.chromeHint.button = Обидете се повторно
-bbb.desktopView.title = Споделување на работна површина
-bbb.desktopView.fitToWindow = Вклопување во прозорец
-bbb.desktopView.actualSize = Прикажи ја актуелната големина
-bbb.desktopView.minimizeBtn.accessibilityName = Минимизирајте го прозорецот за споделување и гледање на работна површина
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Максимизирајте го прозорецот за споделување и гледање на работна површина
-bbb.desktopView.closeBtn.accessibilityName = Затворете го прозорецот за споделување и гледање на работна површина
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Споделете го Вашиот микрофон
 bbb.toolbar.phone.toolTip.stop = Стопирајте го споделувањето на Вашиот микрофон
 bbb.toolbar.phone.toolTip.mute = Стопирајте го слушањето на конференцијата
 bbb.toolbar.phone.toolTip.unmute = Започнете го слушањето на конференцијата
 bbb.toolbar.phone.toolTip.nomic = Не е пронајден микрофон
-bbb.toolbar.deskshare.toolTip.start = Споделете ја Вашата работна површина
-bbb.toolbar.deskshare.toolTip.stop = Стопирајте го споделувањето на Вашата работна површина
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Споделете ја Вашата веб камера
 bbb.toolbar.video.toolTip.stop = Стопирајте го споделувањето на Вашата веб камера
 bbb.layout.addButton.toolTip = Додадете сопствен распоред на листата
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Распоредите беа успешно зачу
 bbb.layout.load.complete = Распоредите беа успешно превземени
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Стандарден распоред
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Видео разговор
 bbb.layout.name.webcamsfocus = Веб камера средба
 bbb.layout.name.presentfocus = Презентациска средба
@@ -362,6 +395,7 @@ bbb.logout.rejected = Конекцијата до серверот е отфрл
 bbb.logout.invalidapp = red5 апликацијата не постои
 bbb.logout.unknown = Вашиот клиент ја изгуби конекцијата со серверот
 bbb.logout.usercommand = Вие се одјавивте од конференцијата
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = Ако оваа одјава беше неочекувана, кликнете на копчето подолу за да се конектирате повторно.
 bbb.logout.refresh.label = Конектирајте се повторно
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Зачувај забелешка
 bbb.settings.deskshare.instructions = Одберете "Дозволи" на предупредувањата што се појавуваат за да се провери дали споделувањето на работната површина работи правилно за Вас
 bbb.settings.deskshare.start = Проверете го споделувањето на работната површина
 bbb.settings.voice.volume = Активност на микрофон
-bbb.settings.java.label = Грешка Јава верзија
-bbb.settings.java.text = Имате Јава {0} инсталирано, но Ви е потребна барем {1} верзијата за користење на споделувањето на работна површина. Копчето подолу ќе ја инсталира најновата Јава верзија
-bbb.settings.java.command = Инсталирајте ја најновата верзија на Јава
 bbb.settings.flash.label = Грешка на Флеш верзија
 bbb.settings.flash.text = Имате Флеш {0} инсталирано, но Ви е потребна барем {1} верзијата за користење на споделувањето на работна површина. Копчето подолу ќе ја инсталира најновата Adobe Flash верзија
 bbb.settings.flash.command = Инсталирајте ја најновата верзија на Флеш
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Текст
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Сменете го курсот на белата табла со текст
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Боја на текст
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Големина на фонт
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Подготвено
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Минимизирајте го се
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Максимизирајте го сегашниот прозорец
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Фокусирајте се надвор од Flash прозорецот
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Вклучете и исклучете звук на Вашиот микрофон
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Преместете го фокусот 
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Отворете споделувачки прозорец
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Отворете прозорец со аудио подесувања
-bbb.shortcutkey.share.pauseRemoteStream = 80 
-bbb.shortcutkey.share.pauseRemoteStream.function = Старт/Стоп на слушањето на конференцијата
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Отворете споделувачки прозорец за веб камера
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Затвори ги сите ви
 bbb.users.settings.lockAll=Заклучи ги сите корисници
 bbb.users.settings.lockAllExcept=Закличи ги корисниците освен презентерот
 bbb.users.settings.lockSettings=Заклучи ги гледачите ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Отклучи ги сите гледачи
 bbb.users.settings.roomIsLocked=Стандардно заклучен
 bbb.users.settings.roomIsMuted=Стандардно исклучен звук
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Заклучи ги гледачите
 bbb.lockSettings.feature=Функција
 bbb.lockSettings.locked=Заклучен
 bbb.lockSettings.lockOnJoin=Заклучување на Приклучување
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ml_IN/bbbResources.properties b/bigbluebutton-client/locale/ml_IN/bbbResources.properties
index 26858ab8a6b0ca27f128d39510f5a327de8c770f..eb9879fea963d79cb8b2ae79f7d220fc80f40f04 100644
--- a/bigbluebutton-client/locale/ml_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/ml_IN/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = അവതരണം
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/mn_MN/bbbResources.properties b/bigbluebutton-client/locale/mn_MN/bbbResources.properties
index 74ee5eb1cca3fabab80fc5d0a6768c27e8dbb723..8d2e4103913b1dbc1472e99e96e7d6955b554741 100644
--- a/bigbluebutton-client/locale/mn_MN/bbbResources.properties
+++ b/bigbluebutton-client/locale/mn_MN/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Таны Flash Player ({0}) шинэчлэгдээгүй байна. Сүүлийн хувилбарыг татахыг санал болгож байна.
 bbb.clientstatus.webrtc.title = Дуу
 bbb.clientstatus.webrtc.message = Дууны чанарыг сайн байлгахын тулд Firefox эсвэл Chrome ашиглахыг санал болгож байна.
-bbb.clientstatus.java.title = Жава
-bbb.clientstatus.java.notdetected = Жава хувилбарыг мэдэгдэхгүй байна
-bbb.clientstatus.java.notinstalled = Таньд Жава байхгүй байна, Сүүлийн Жава суулгахын тулд<font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ЭНД</a></font>  дарна уу.
-bbb.clientstatus.java.oldversion = Таньд хуучин Жава байна, Сүүлийн Жава суулгахын тулд<font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ЭНД</a></font>  дарна уу.
 bbb.window.minimizeBtn.toolTip = Буулгах
 bbb.window.maximizeRestoreBtn.toolTip = Өргөх
 bbb.window.closeBtn.toolTip = Хаах
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Танилцуулга файл
 bbb.presentation.titleWithPres = Танилцуулга файл {0}
 bbb.presentation.quickLink.label = Танилцуулга
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Камер тохиргоо цонхыг
 bbb.video.publish.closeBtn.label = Цуцлах
 bbb.video.publish.titleBar = Камер тавцанг түгээх
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Дэлгэц хуваах\: Танилцуулагч
-bbb.desktopPublish.fullscreen.tooltip = Үндсэн дэлгэцээ хуваах
-bbb.desktopPublish.fullscreen.label = Бүтнээр
-bbb.desktopPublish.region.tooltip = Дэлгэцээ хэсэгчлэн хуваах
-bbb.desktopPublish.region.label = Хэсэгчилэн үзүүлэх
-bbb.desktopPublish.stop.tooltip = Хаах
-bbb.desktopPublish.stop.label = Хаах
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Цонх томрох боломжгүй
-bbb.desktopPublish.closeBtn.toolTip = Хуваалтуудыг зогсоож энэ цонхыг хаах
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Mac OS X -ийн Chrome дээр дэлгэц хамтарч ашиглах боломжгүй. Та өөр веб хөтөч ашиглана уу. ( Firefox-г санал болгож байна).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome Java Applets дэмжихээ болисон. Та өөр веб хөтөч ашиглана уу. ( Firefox-г санал болгож байна).
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Цонхыг нуух
-bbb.desktopPublish.minimizeBtn.accessibilityName = Дэлгэц түгээлтийн тавцанг буулгах
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Дэлгэц түгээлтийн тавцанг өргөх
-bbb.desktopPublish.chromeHint.title = Chrome -д таны эрх хэрэг болох байх
-bbb.desktopPublish.chromeHint.message = Нэмэлтын зургыг сонгоод (Chrome-н баруун дээд булан), нэмэлтийн түгжээг аваад, Дараа нь 'Дахих' сонгоно уу.
-bbb.desktopPublish.chromeHint.button = Дахих
-bbb.desktopView.title = Дэлгэцээ хуваах
-bbb.desktopView.fitToWindow = Цонхонд тохируулах
-bbb.desktopView.actualSize = Үндсэн хэмжээг харуулах
-bbb.desktopView.minimizeBtn.accessibilityName = Дэлгэц түгээлтийн цонхыг буулгах
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Дэлгэц түгээлтийн цонхыг өргөх
-bbb.desktopView.closeBtn.accessibilityName = Дэлгэц түгээлтийн цонхыг хаах
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Микрофоноо тараах
 bbb.toolbar.phone.toolTip.stop = Микрофон тараахыг зогсоох
 bbb.toolbar.phone.toolTip.mute = Уулзалтыг сонсохоо болих
 bbb.toolbar.phone.toolTip.unmute = Уулзалтыг сонсож эхлэх
 bbb.toolbar.phone.toolTip.nomic = Микрофон байхгүй байна
-bbb.toolbar.deskshare.toolTip.start = Миний дэлгэцийг түгээ
-bbb.toolbar.deskshare.toolTip.stop = Дэлгэц түгээлтийг зогсоо
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Камераа тараах
 bbb.toolbar.video.toolTip.stop = Камер тараахыг зогсоох
 bbb.layout.addButton.toolTip = Өөрчилсөн байрлалыг лист рүү нэмэх
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Байрлалууд амжилттай хадгал
 bbb.layout.load.complete = Байрлалууд амжилттай уншигдлаа
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Заямал байршил
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Видео чат
 bbb.layout.name.webcamsfocus = Камертай уулзалт
 bbb.layout.name.presentfocus = Танилцуулгатай уулзалт
@@ -362,6 +395,7 @@ bbb.logout.rejected = Серверийн холболт буцаагдлаа
 bbb.logout.invalidapp = Ред5 про байхгүй байна
 bbb.logout.unknown = Та серверээс холбоо тасарлаа
 bbb.logout.usercommand = Та конференсээс гарлаа
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = Хэрвээ гэнэт гарсан бол доорх товчлуурыг дарж эргэн холбогдоно уу
 bbb.logout.refresh.label = Дахин холбогдох
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Тэмдэглэл хадгалах
 bbb.settings.deskshare.instructions = Поп ап ийг зөвшөөрч Дэлгэц түгээлтийг эхлүүлнэ үү 
 bbb.settings.deskshare.start = Дэлгэц хуваах функцийг шалгах
 bbb.settings.voice.volume = Микрофонийн идэвхи
-bbb.settings.java.label = Жава вершин алдаа
-bbb.settings.java.text = Таньд жава {0} суусан байна, гэвч таньд доор хаяж {1} суусан байж дэлгэц хуваах функцийг ашиглана. Энд байгаа товчлуурыг дараад жава татаж авна уу.
-bbb.settings.java.command = Шинэ Жава суулгах
 bbb.settings.flash.label = Флаш хувилбарийн алдаа
 bbb.settings.flash.text = Таньд флаш {0} суусан байна, гэвч таньд доор хаяж {1} суусан байж BigBlueButton ийг ажиллуулана. Энд дараад Флаш татаж авна уу.
 bbb.settings.flash.command = Шинэ Флаш суулгах
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Текст
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Курсорийг Текст шилжүүлэх
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Текст өнгө
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Фонт хэмжээ
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Бэлэн
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Уг тавцанг буулгах
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Уг тавцанг өргөх
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Флаш цонхноос фокус гаргах
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Дуугаа хаах эсвэл нээх
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Чат тавцан
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Дэлгэц түгээлт
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Дууны тохиргоо
-bbb.shortcutkey.share.pauseRemoteStream = 8080
-bbb.shortcutkey.share.pauseRemoteStream.function = Уулзалтыг сонсож эхлэх/дуусгах
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Камер түгээлт
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Бүх Видеог хаах
 bbb.users.settings.lockAll=Бүх хүмүүсийг түгжих
 bbb.users.settings.lockAllExcept=Хөтлөгчөөс бусад хүмүүсийг түгжих
 bbb.users.settings.lockSettings=Цоожлох ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Үзэгчдийг цоожноос мултлах
 bbb.users.settings.roomIsLocked=Түгжигдсэн
 bbb.users.settings.roomIsMuted=Дуу хаагдсан
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Үзэгчдийг цоожлох ...
 bbb.lockSettings.feature=Онцлог
 bbb.lockSettings.locked=Түгжигдсэн
 bbb.lockSettings.lockOnJoin=Холбогдсоны дараа түгжих
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ms_MY/bbbResources.properties b/bigbluebutton-client/locale/ms_MY/bbbResources.properties
index 6c49e2b502764f0f9fdcc1004d1fe139a0d824c3..e0fd4174affcf678a2219a6032aaa343f2985e5b 100644
--- a/bigbluebutton-client/locale/ms_MY/bbbResources.properties
+++ b/bigbluebutton-client/locale/ms_MY/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Kecilkan
 bbb.window.maximizeRestoreBtn.toolTip = Besarkan
 bbb.window.closeBtn.toolTip = Tutup
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Window pembentangan
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Batal
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Skrin penuh
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Wilayah
-bbb.desktopPublish.stop.tooltip = Tutup perkongsian skrin
-bbb.desktopPublish.stop.label = Tutup
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Henti Perkongsian dan Tutup
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Kecilkan
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Perkongsian Desktop
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Paparkan saiz sebenar
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Kongsi Webcam Anda
 bbb.toolbar.video.toolTip.stop = Berhenti Kongsi Webcam Anda
 bbb.layout.addButton.toolTip = Add the custom layout to the list
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = Penyambungan ke server telah ditolak
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Simpan Nota
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Periksa Desktop Sharing
 bbb.settings.voice.volume = Aktiviti Mikrofon
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Instal Java terkini
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Instal Flash yang terkini
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Teks
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Warna Teks
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Saiz font
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ne_NP/bbbResources.properties b/bigbluebutton-client/locale/ne_NP/bbbResources.properties
index e251d229ebae749b11ef26949e5690094b44d345..13ad63de5956e6cd204db4214d6571dcd803b7a7 100644
--- a/bigbluebutton-client/locale/ne_NP/bbbResources.properties
+++ b/bigbluebutton-client/locale/ne_NP/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimaliseer
 bbb.window.maximizeRestoreBtn.toolTip = Maximaliseer
 bbb.window.closeBtn.toolTip = Sluit
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = प्रस्तुती
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Sluit webcam venster
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publiceer webcam venster
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop delen\: voorbeeld voor voorzitter
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Volledig scherm
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Regio
-bbb.desktopPublish.stop.tooltip = Sluit het delen van uw scherm
-bbb.desktopPublish.stop.label = Sluit
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = U kunt dit venster niet maximaliseren.
-bbb.desktopPublish.closeBtn.toolTip = Stop het delen en sluit dit scherm.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimaliseer dit scherm.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimaliseer het desktop delen venster
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximaliseer het desktop delen venster
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Bureaublad delen
-bbb.desktopView.fitToWindow = Schaal naar venster
-bbb.desktopView.actualSize = Geef actuele grootte weer
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = De connectie naar de server is geweigerd
 bbb.logout.invalidapp = De red5 applicatie bestaat niet
 bbb.logout.unknown = Uw toepassing heeft de connectie met de server verbroken
 bbb.logout.usercommand = U bent uitgelogd uit de conferentie
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Klik op toelaten in het pop-up venster dat nakijkt of desktop delen correct werkt voor jou
 bbb.settings.deskshare.start = Controleer desktop delen
 bbb.settings.voice.volume = Microfoon activiteit
-bbb.settings.java.label = Java versie fout
-bbb.settings.java.text = U heeft Java {0} geinstalleerd, maar u moet ten minste versie {1} hebben om de BigBlueButton desktop delen functionaliteit te gebruiken. Klik op de knop hieronder om de recentste versie van de Java JRE te installeren.
-bbb.settings.java.command = Installeer recentste Java
 bbb.settings.flash.label = Flash versie fout
 bbb.settings.flash.text = U heeft Flash {0} geinstalleerd, maar u moet ten minste versie {1} hebben om BigBlueButton te gebruiken. Klik op de knop hieronder om de recentste versie van Adobe Flash te installeren.
 bbb.settings.flash.command = Installeer recentste Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/nl/bbbResources.properties b/bigbluebutton-client/locale/nl/bbbResources.properties
new file mode 100644
index 0000000000000000000000000000000000000000..58663b57531fcf74290462d4c3fe4ab11db39227
--- /dev/null
+++ b/bigbluebutton-client/locale/nl/bbbResources.properties
@@ -0,0 +1,670 @@
+bbb.mainshell.locale.version = 0.9.0
+bbb.mainshell.statusProgress.connecting = Connecting to the server
+bbb.mainshell.statusProgress.loading = Loading {0} modules
+bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
+bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
+bbb.mainshell.logBtn.toolTip = Open Log Window
+bbb.mainshell.meetingNotFound = Meeting Not Found
+bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
+bbb.mainshell.notification.tunnelling = Tunnelling
+bbb.mainshell.notification.webrtc = WebRTC Audio
+bbb.oldlocalewindow.reminder1 = You may have an old language translations of BigBlueButton.
+bbb.oldlocalewindow.reminder2 = Please clear your browser's cache and try again.
+bbb.oldlocalewindow.windowTitle = Warning\: Old Language Translations
+bbb.audioSelection.title = How do you want to join the audio?
+bbb.audioSelection.btnMicrophone.label = Microphone
+bbb.audioSelection.btnMicrophone.toolTip = Join the audio with your microphone
+bbb.audioSelection.btnListenOnly.label = Listen Only
+bbb.audioSelection.btnListenOnly.toolTip = Join the audio as listen only
+bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial\: {0} then enter {1} as the conference pin number.
+bbb.micSettings.title = Audio Test
+bbb.micSettings.speakers.header = Test Speakers
+bbb.micSettings.microphone.header = Test Microphone
+bbb.micSettings.playSound = Test Speakers
+bbb.micSettings.playSound.toolTip = Play music to test your speakers
+bbb.micSettings.hearFromHeadset = You should hear audio in your headset, not your computer speakers.
+bbb.micSettings.speakIntoMic = If you are using a headset (or earbuds), you should hear the audio from your headset -- not from your computer speakers.
+bbb.micSettings.echoTestMicPrompt = This is a private echo test.  Speak a few words.  Did you hear audio?
+bbb.micSettings.echoTestAudioYes = Yes
+bbb.micSettings.echoTestAudioNo = No
+bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic.
+bbb.micSettings.recommendHeadset = Use a headset with a microphone for best audio experience.
+bbb.micSettings.changeMic = Test or Change Microphone
+bbb.micSettings.changeMic.toolTip = Open the Flash Player microphone settings dialog box
+bbb.micSettings.comboMicList.toolTip = Select a microphone
+bbb.micSettings.micRecordVolume.label = Gain
+bbb.micSettings.micRecordVolume.toolTip = Set your microphone gain
+bbb.micSettings.nextButton = Next
+bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.join = Join Audio
+bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.cancel = Cancel
+bbb.micSettings.connectingtoecho = Connecting
+bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
+bbb.micSettings.cancel.toolTip = Cancel joining the audio conference
+bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.title = Audio Settings. Focus will remain in this audio settings window until the window is closed.
+bbb.micSettings.webrtc.title = WebRTC Support
+bbb.micSettings.webrtc.capableBrowser = Your browser supports WebRTC.
+bbb.micSettings.webrtc.capableBrowser.dontuseit = Click not to use WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Click here if you don't want to use the WebRTC technology (recommended if you have problems using it).
+bbb.micSettings.webrtc.notCapableBrowser = WebRTC is not supported in your browser. Please use Google Chrome (version 32 or greater); or Mozilla Firefox (version 26 or greater). You will still be able to join the voice conference using the Adobe Flash Platform.
+bbb.micSettings.webrtc.connecting = Calling
+bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.endingecho = Joining audio
+bbb.micSettings.webrtc.endedecho = Echo test ended.
+bbb.micPermissions.firefox.title = Firefox Microphone Permissions
+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.chrome.title = Chrome Microphone Permissions
+bbb.micPermissions.chrome.message1 = Click Allow to give Chrome permission to use your microphone.
+bbb.micWarning.title = Audio Warning
+bbb.micWarning.joinBtn.label = Join anyway
+bbb.micWarning.testAgain.label = Test again
+bbb.micWarning.message = Your microphone did not show any activity, others probably won't be able to hear you during the session.
+bbb.webrtcWarning.message = Detected the following WebRTC issue\: {0}. Do you want to try Flash instead?
+bbb.webrtcWarning.title = WebRTC Audio Failure
+bbb.webrtcWarning.failedError.1001 = Error 1001\: WebSocket disconnected
+bbb.webrtcWarning.failedError.1002 = Error 1002\: Could not make a WebSocket connection
+bbb.webrtcWarning.failedError.1003 = Error 1003\: Browser version not supported
+bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1005 = Error 1005\: Call ended unexpectedly
+bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
+bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
+bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
+bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.unknown = Error {0}\: Unknown error code
+bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
+bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
+bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
+bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
+bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
+bbb.mainToolbar.helpBtn = Help
+bbb.mainToolbar.logoutBtn = Logout
+bbb.mainToolbar.logoutBtn.toolTip = Log Out
+bbb.mainToolbar.langSelector = Select language
+bbb.mainToolbar.settingsBtn = Settings
+bbb.mainToolbar.settingsBtn.toolTip = Open Settings
+bbb.mainToolbar.shortcutBtn = Shortcut Keys
+bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Keys Window
+bbb.mainToolbar.recordBtn.toolTip.start = Start recording
+bbb.mainToolbar.recordBtn.toolTip.stop = Stop recording
+bbb.mainToolbar.recordBtn.toolTip.recording = The session is being recorded
+bbb.mainToolbar.recordBtn.toolTip.notRecording = The session isn't being recorded
+bbb.mainToolbar.recordBtn.confirm.title = Confirm recording
+bbb.mainToolbar.recordBtn.confirm.message.start = Are you sure you want to start recording the session?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Are you sure you want to stop recording the session?
+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.clientstatus.title = Configuration Notifications
+bbb.clientstatus.notification = Unread notifications
+bbb.clientstatus.close = Close
+bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
+bbb.clientstatus.browser.title = Browser Version
+bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
+bbb.clientstatus.flash.title = Flash Player
+bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
+bbb.clientstatus.webrtc.title = Audio
+bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
+bbb.window.minimizeBtn.toolTip = Minimize
+bbb.window.maximizeRestoreBtn.toolTip = Maximize
+bbb.window.closeBtn.toolTip = Close
+bbb.videoDock.titleBar = Webcam Window Title Bar
+bbb.presentation.titleBar = Presentation Window Title Bar
+bbb.chat.titleBar = Chat Window Title Bar
+bbb.users.title = Users{0} {1}
+bbb.users.titleBar = Users Window title bar
+bbb.users.quickLink.label = Users Window
+bbb.users.minimizeBtn.accessibilityName = Minimize the Users Window
+bbb.users.maximizeRestoreBtn.accessibilityName = Maximize the Users Window
+bbb.users.settings.buttonTooltip = Settings
+bbb.users.settings.audioSettings = Audio Test
+bbb.users.settings.webcamSettings = Webcam Settings
+bbb.users.settings.muteAll = Mute All Users
+bbb.users.settings.muteAllExcept = Mute All Users Except Presenter
+bbb.users.settings.unmuteAll = Unmute All Users
+bbb.users.settings.clearAllStatus = Clear all status icons
+bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.roomMuted.text = Viewers Muted
+bbb.users.roomLocked.text = Viewers Locked
+bbb.users.pushToTalk.toolTip = Talk
+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.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.accessibilityName = Users List. Use the arrow keys to navigate.
+bbb.users.usersGrid.nameItemRenderer = Name
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = you
+bbb.users.usersGrid.statusItemRenderer = Status
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
+bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
+bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.mediaItemRenderer.talking = Talking
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+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.pushToLock = Lock {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Unlock {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off
+bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
+bbb.users.emojiStatus.clear = Clear
+bbb.users.emojiStatus.clear.toolTip = Clear status
+bbb.users.emojiStatus.close = Close
+bbb.users.emojiStatus.close.toolTip = Close status popup
+bbb.users.emojiStatus.raiseHand = Raise hand status
+bbb.users.emojiStatus.happy = Happy status
+bbb.users.emojiStatus.smile = Smile status
+bbb.users.emojiStatus.sad = Sad status
+bbb.users.emojiStatus.confused = Confused status
+bbb.users.emojiStatus.neutral = Neutral status
+bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
+bbb.presentation.title = Presentation
+bbb.presentation.titleWithPres = Presentation\: {0}
+bbb.presentation.quickLink.label = Presentation Window
+bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width
+bbb.presentation.fitToPage.toolTip = Fit Presentation To Page
+bbb.presentation.uploadPresBtn.toolTip = Upload Presentation
+bbb.presentation.backBtn.toolTip = Previous slide
+bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.toolTip = Select a slide
+bbb.presentation.forwardBtn.toolTip = Next slide
+bbb.presentation.maxUploadFileExceededAlert = Error\: The file is bigger than what's allowed.
+bbb.presentation.uploadcomplete = Upload completed. Please wait while we convert the document.
+bbb.presentation.uploaded = uploaded.
+bbb.presentation.document.supported = The uploaded document is supported. Starting to convert...
+bbb.presentation.document.converted = Successfully converted the office document.
+bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.io = IO Error\: Please contact administrator.
+bbb.presentation.error.security = Security Error\: Please contact administrator.
+bbb.presentation.error.convert.notsupported = Error\: The uploaded document is unsupported. Please upload a compatible file.
+bbb.presentation.error.convert.nbpage = Error\: Failed to determine the number of pages in the uploaded document.
+bbb.presentation.error.convert.maxnbpagereach = Error\: The uploaded document has too many pages.
+bbb.presentation.converted = Converted {0} of {1} slides.
+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.uploadwindow.presentationfile = Presentation file
+bbb.presentation.uploadwindow.pdf = PDF
+bbb.presentation.uploadwindow.word = WORD
+bbb.presentation.uploadwindow.excel = EXCEL
+bbb.presentation.uploadwindow.powerpoint = POWERPOINT
+bbb.presentation.uploadwindow.image = IMAGE
+bbb.presentation.minimizeBtn.accessibilityName = Minimize the Presentation Window
+bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximize the Presentation Window
+bbb.presentation.closeBtn.accessibilityName = Close the Presentation Window
+bbb.fileupload.title = Add Files to Your Presentation
+bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.selectBtn.label = Select File
+bbb.fileupload.selectBtn.toolTip = Open dialog box to select a file
+bbb.fileupload.uploadBtn = Upload
+bbb.fileupload.uploadBtn.toolTip = Upload the selected file
+bbb.fileupload.deleteBtn.toolTip = Delete Presentation
+bbb.fileupload.showBtn = Show
+bbb.fileupload.showBtn.toolTip = Show Presentation
+bbb.fileupload.okCancelBtn = Close
+bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
+bbb.fileupload.genThumbText = Generating thumbnails..
+bbb.fileupload.progBarLbl = Progress\:
+bbb.fileupload.fileFormatHint = Upload any office document or Portable Document Format (PDF) file.  For best results upload PDF.
+bbb.chat.title = Chat
+bbb.chat.quickLink.label = Chat Window
+bbb.chat.cmpColorPicker.toolTip = Text Color
+bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.sendBtn = Send
+bbb.chat.sendBtn.toolTip = Send Message
+bbb.chat.sendBtn.accessibilityName = Send chat message
+bbb.chat.contextmenu.copyalltext = Copy All Text
+bbb.chat.publicChatUsername = Public
+bbb.chat.optionsTabName = Options
+bbb.chat.privateChatSelect = Select a person to chat with privately
+bbb.chat.private.userLeft = The user has left.
+bbb.chat.private.userJoined = The user has joined.
+bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
+bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
+bbb.chat.chatOptions = Chat Options
+bbb.chat.fontSize = Chat Message Font Size
+bbb.chat.cmbFontSize.toolTip = Select Chat Message Font Size
+bbb.chat.messageList = Message Box
+bbb.chat.minimizeBtn.accessibilityName = Minimize the Chat Window
+bbb.chat.maximizeRestoreBtn.accessibilityName = Maximize the Chat Window
+bbb.chat.closeBtn.accessibilityName = Close the Chat Window
+bbb.chat.chatTabs.accessibleNotice = New messages in this tab.
+bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
+bbb.publishVideo.cmbResolution.tooltip = Select a webcam resolution
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.startPublishBtn.toolTip = Start sharing your webcam
+bbb.publishVideo.startPublishBtn.errorName = Can't share webcam. Reason\: {0}
+bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
+bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.videodock.title = Webcams
+bbb.videodock.quickLink.label = Webcams Window
+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.controls.privateChatBtn.toolTip = Chat with {0}
+bbb.video.publish.hint.noCamera = No webcam available
+bbb.video.publish.hint.cantOpenCamera = Can't open your webcam
+bbb.video.publish.hint.waitingApproval = Waiting for approval
+bbb.video.publish.hint.videoPreview = Webcam preview
+bbb.video.publish.hint.openingCamera = Opening webcam...
+bbb.video.publish.hint.cameraDenied = Webcam access denied
+bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.publishing = Publishing...
+bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
+bbb.video.publish.closeBtn.label = Cancel
+bbb.video.publish.titleBar = Publish Webcam Window
+bbb.video.streamClose.toolTip = Close stream for\: {0}
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
+bbb.toolbar.phone.toolTip.start = Share Your Microphone
+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 Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
+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 = Unable to load the layouts
+bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
+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.highlighter.toolbar.pencil = Pencil
+bbb.highlighter.toolbar.pencil.accessibilityName = Switch whiteboard cursor to pencil
+bbb.highlighter.toolbar.ellipse = Circle
+bbb.highlighter.toolbar.ellipse.accessibilityName = Switch whiteboard cursor to circle
+bbb.highlighter.toolbar.rectangle = Rectangle
+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 = Select Color
+bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
+bbb.highlighter.toolbar.thickness = Change Thickness
+bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
+bbb.logout.title = Logged Out
+bbb.logout.button.label = OK
+bbb.logout.appshutdown = The server app has been shut down
+bbb.logout.asyncerror = An Async Error occured
+bbb.logout.connectionclosed = The connection to the server has been closed
+bbb.logout.connectionfailed = The connection to the server has ended
+bbb.logout.rejected = The connection to the server has been rejected
+bbb.logout.invalidapp = The red5 app does not exist
+bbb.logout.unknown = Your client has lost connection with the server
+bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
+bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
+bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
+bbb.logout.refresh.label = Reconnect
+bbb.logout.confirm.title = Confirm Logout
+bbb.logout.confirm.message = Are you sure you want to log out?
+bbb.logout.confirm.yes = Yes
+bbb.logout.confirm.no = No
+bbb.connection.failure=Detected Connectivity Problems
+bbb.connection.reconnecting=Reconnecting
+bbb.connection.reestablished=Connection reestablished
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Deskshare
+bbb.notes.title = Notes
+bbb.notes.cmpColorPicker.toolTip = Text Color
+bbb.notes.saveBtn = Save
+bbb.notes.saveBtn.toolTip = Save Note
+bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
+bbb.settings.deskshare.start = Check Desktop Sharing
+bbb.settings.voice.volume = Microphone Activity
+bbb.settings.flash.label = Flash version error
+bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
+bbb.settings.flash.command = Install newest Flash
+bbb.settings.isight.label = iSight webcam error
+bbb.settings.isight.text = If you have problems with your iSight webcam, it may be because you are running OS X 10.6.5, which is known to have a problem with Flash capturing video from the iSight webcam. \n To correct this, the link below will install a newer version of Flash player, or update your Mac to the newest version
+bbb.settings.isight.command = Install Flash 10.2 RC2
+bbb.settings.warning.label = Warning
+bbb.settings.warning.close = Close this Warning
+bbb.settings.noissues = No outstanding issues have been detected.
+bbb.settings.instructions = Accept the Flash prompt that asks you for webcam permissions. If the output matches what is expected, your browser has been set up correctly. Other potentials issues are below. Examine them to find a possible solution.
+ltbcustom.bbb.highlighter.toolbar.triangle = Triangle
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Switch whiteboard cursor to triangle
+ltbcustom.bbb.highlighter.toolbar.line = Line
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Switch whiteboard cursor to line
+ltbcustom.bbb.highlighter.toolbar.text = Text
+ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
+ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
+ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
+
+bbb.accessibility.clientReady = Ready
+
+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.chatwindow.audibleChatNotification = Audible Chat Notification
+
+bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+
+bbb.accessibility.notes.notesview.input = Notes input
+
+bbb.shortcuthelp.title = Shortcut Keys
+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.dropdown.general = Global shortcuts
+bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
+bbb.shortcuthelp.dropdown.chat = Chat shortcuts
+bbb.shortcuthelp.dropdown.users = Users shortcuts
+bbb.shortcuthelp.headers.shortcut = Shortcut
+bbb.shortcuthelp.headers.function = Function
+
+bbb.shortcutkey.general.minimize = 189
+bbb.shortcutkey.general.minimize.function = Minimize current window
+bbb.shortcutkey.general.maximize = 187
+bbb.shortcutkey.general.maximize.function = Maximize current window
+
+bbb.shortcutkey.flash.exit = 79
+bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
+bbb.shortcutkey.chat.chatinput = 73
+bbb.shortcutkey.chat.chatinput.function = Focus the chat input field
+bbb.shortcutkey.present.focusslide = 67
+bbb.shortcutkey.present.focusslide.function = Focus the presentation slide
+bbb.shortcutkey.whiteboard.undo = 90
+bbb.shortcutkey.whiteboard.undo.function = Undo last whiteboard mark
+
+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.presentation = 51
+bbb.shortcutkey.focus.presentation.function = Move focus to the Presentation window
+bbb.shortcutkey.focus.chat = 52
+bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
+
+bbb.shortcutkey.share.desktop = 68
+bbb.shortcutkey.share.desktop.function = Open desktop sharing window
+bbb.shortcutkey.share.webcam = 66
+bbb.shortcutkey.share.webcam.function = Open webcam sharing window
+
+bbb.shortcutkey.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Open/focus to shortcut help window
+bbb.shortcutkey.logout = 76
+bbb.shortcutkey.logout.function = Log out of this meeting
+bbb.shortcutkey.raiseHand = 82
+bbb.shortcutkey.raiseHand.function = Raise your hand
+
+bbb.shortcutkey.present.upload = 85
+bbb.shortcutkey.present.upload.function = Upload presentation
+bbb.shortcutkey.present.previous = 65
+bbb.shortcutkey.present.previous.function = Go to previous slide
+bbb.shortcutkey.present.select = 83
+bbb.shortcutkey.present.select.function = View all slides
+bbb.shortcutkey.present.next = 69
+bbb.shortcutkey.present.next.function = Go to next slide
+bbb.shortcutkey.present.fitWidth = 70
+bbb.shortcutkey.present.fitWidth.function = Fit slides to width
+bbb.shortcutkey.present.fitPage = 80
+bbb.shortcutkey.present.fitPage.function = Fit slides to page
+
+bbb.shortcutkey.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Mute or unmute selected person
+bbb.shortcutkey.users.muteall = 65
+bbb.shortcutkey.users.muteall.function = Mute or unmute all users
+bbb.shortcutkey.users.focusUsers = 85
+bbb.shortcutkey.users.focusUsers.function = Focus to users list
+bbb.shortcutkey.users.muteAllButPres = 65
+bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
+
+bbb.shortcutkey.chat.focusTabs = 89
+bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
+bbb.shortcutkey.chat.focusBox = 66
+bbb.shortcutkey.chat.focusBox.function = Focus to chat box
+bbb.shortcutkey.chat.changeColour = 67
+bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.
+bbb.shortcutkey.chat.sendMessage = 83
+bbb.shortcutkey.chat.sendMessage.function = Send chat message
+bbb.shortcutkey.chat.closePrivate = 69
+bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.explanation = ----
+bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+
+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.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.polling.startButton.tooltip = Start a poll
+bbb.polling.startButton.label = Start Poll
+bbb.polling.publishButton.label = Publish
+bbb.polling.closeButton.label = Close
+bbb.polling.pollModal.title = Live Poll Results
+bbb.polling.customChoices.title = Enter Polling Choices
+bbb.polling.respondersLabel.novotes = Waiting for responses
+bbb.polling.respondersLabel.text = {0} Users Responded
+bbb.polling.respondersLabel.finished = Done
+bbb.polling.answer.Yes = Yes
+bbb.polling.answer.No = No
+bbb.polling.answer.True = True
+bbb.polling.answer.False = False
+bbb.polling.answer.A = A
+bbb.polling.answer.B = B
+bbb.polling.answer.C = C
+bbb.polling.answer.D = D
+bbb.polling.answer.E = E
+bbb.polling.answer.F = F
+bbb.polling.answer.G = G
+bbb.polling.results.accessible.header = Poll Results.
+bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
+
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+
+bbb.accessibility.alerts.madePresenter = You are now the Presenter.
+bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+
+bbb.shortcutkey.specialKeys.space = Spacebar
+bbb.shortcutkey.specialKeys.left = Left Arrow
+bbb.shortcutkey.specialKeys.right = Right Arrow
+bbb.shortcutkey.specialKeys.up = Up Arrow
+bbb.shortcutkey.specialKeys.down = Down Arrow
+bbb.shortcutkey.specialKeys.plus = Plus
+bbb.shortcutkey.specialKeys.minus = Minus
+
+bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
+bbb.users.settings.lockAll=Lock All Users
+bbb.users.settings.lockAllExcept=Lock Users Except Presenter
+bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
+bbb.users.settings.unlockAll=Unlock All Viewers
+bbb.users.settings.roomIsLocked=Locked by default
+bbb.users.settings.roomIsMuted=Muted by default
+
+bbb.lockSettings.save = Apply
+bbb.lockSettings.save.tooltip = Apply lock settings
+bbb.lockSettings.cancel = Cancel
+bbb.lockSettings.cancel.toolTip = Close this window without saving
+
+bbb.lockSettings.moderatorLocking = Moderator locking
+bbb.lockSettings.privateChat = Private Chat
+bbb.lockSettings.publicChat = Public Chat
+bbb.lockSettings.webcam = Webcam
+bbb.lockSettings.microphone = Microphone
+bbb.lockSettings.layout = Layout
+bbb.lockSettings.title=Lock Viewers
+bbb.lockSettings.feature=Feature
+bbb.lockSettings.locked=Locked
+bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/nl_NL/bbbResources.properties b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
index caa3da87f8b28bf207b66d0200662f07bd70fe06..c24efadbf5e42ec595265d86e53c1aeeda4c5cea 100644
--- a/bigbluebutton-client/locale/nl_NL/bbbResources.properties
+++ b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
@@ -1,6 +1,6 @@
 bbb.mainshell.locale.version = 0.9.0
 bbb.mainshell.statusProgress.connecting = Verbinding aan het maken met de server
-bbb.mainshell.statusProgress.loading = Laden\:
+bbb.mainshell.statusProgress.loading = {0} modules aan het laden
 bbb.mainshell.statusProgress.cannotConnectServer = We kunnen geen verbinding maken met de server.
 bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
 bbb.mainshell.logBtn.toolTip = Open log scherm
@@ -10,7 +10,7 @@ bbb.mainshell.resetLayoutBtn.toolTip = Herstel de scherm-indeling
 bbb.mainshell.notification.tunnelling = Tunnel opzetten
 bbb.mainshell.notification.webrtc = WebRTC geluid
 bbb.oldlocalewindow.reminder1 = U hebt misschien een verouderde vertaling van BigBlueButton.
-bbb.oldlocalewindow.reminder2 = Gelieve de cache van uw browser te maken en opnieuw te proberen.
+bbb.oldlocalewindow.reminder2 = Gelieve de cache van uw browser te wissen en opnieuw te proberen.
 bbb.oldlocalewindow.windowTitle = Waarschuwing\: verouderde vertalingen
 bbb.audioSelection.title = Hoe wil je de audio meeting bijwonen?
 bbb.audioSelection.btnMicrophone.label = Microfoon
@@ -22,16 +22,16 @@ bbb.micSettings.title = Geluid test
 bbb.micSettings.speakers.header = Test speakers
 bbb.micSettings.microphone.header = Test microfoon
 bbb.micSettings.playSound = Test geluid afspelen
-bbb.micSettings.playSound.toolTip = Speel muziek om je speakers te testen
+bbb.micSettings.playSound.toolTip = Speel muziek af om je speakers te testen
 bbb.micSettings.hearFromHeadset = Je zou nu geluid moeten horen in je hoofdtelefoon, niet door de luidsprekers van je computer.
-bbb.micSettings.speakIntoMic = Als je een headset (of oordopjes) gebruikt dan zou je het geluid via het headset moeten horen, niet vanuit de speakers van je computer.
-bbb.micSettings.echoTestMicPrompt = Diot is een prive echo test. Spreek een paar woorden. Kun je het geluid horen?
+bbb.micSettings.speakIntoMic = Als je een headset (of oordopjes) gebruikt dan zou je het geluid via de headset moeten horen, niet vanuit de speakers van je computer.
+bbb.micSettings.echoTestMicPrompt = Dit is een prive echo test. Spreek een paar woorden. Kun je het geluid horen?
 bbb.micSettings.echoTestAudioYes = Ja
 bbb.micSettings.echoTestAudioNo = Nee
-bbb.micSettings.speakIntoMicTestLevel = Spreek in je microfoon, Je zou de balk moeten zien bewegen, Zo niet, kies dan een andere microfoon.
+bbb.micSettings.speakIntoMicTestLevel = Spreek in je microfoon. Je zou de balk moeten zien bewegen. Zo niet, kies dan een andere microfoon.
 bbb.micSettings.recommendHeadset = Gebruik een headset met microfoon voor het beste geluid.
-bbb.micSettings.changeMic = Wijzig microfoon
-bbb.micSettings.changeMic.toolTip = Open de instellingen van de Flah Player microfoon.
+bbb.micSettings.changeMic = Test of wijzig microfoon
+bbb.micSettings.changeMic.toolTip = Open de instellingen van de Flash Player microfoon.
 bbb.micSettings.comboMicList.toolTip = Selecteer een microfoon
 bbb.micSettings.micRecordVolume.label = Sterkte
 bbb.micSettings.micRecordVolume.toolTip = Stel de sterkte van je microfoon in
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Je Flash Player ({0}) is niet up to date. We adviseren om hiervan de laatste versie te gebruiken.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = We adviseren om Firefox of Chrome te gebruiken voor een betere geluids kwaliteit.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java versie kan niet worden gevonden.
-bbb.clientstatus.java.notinstalled = Je hebt geen Java geinstalleerd, Download alsjeblieft hier de laatste versie om je scherm te kunnen delen\: http\://www.java.com/nl/ 
-bbb.clientstatus.java.oldversion = Je hebt een oude versie van Java geinstalleerd, Download alsjebleift de laatste versie om je scherm te kunnen delen\: http\://www.java.com/nl/
 bbb.window.minimizeBtn.toolTip = Minimaliseer
 bbb.window.maximizeRestoreBtn.toolTip = Maximaliseer
 bbb.window.closeBtn.toolTip = Sluiten
@@ -135,7 +131,7 @@ bbb.users.settings.webcamSettings = Webcam instellingen
 bbb.users.settings.muteAll = Demp allen
 bbb.users.settings.muteAllExcept = Demp allen behalve presentator
 bbb.users.settings.unmuteAll = Iedereen dempen uit
-bbb.users.settings.clearAllStatus = Verwijder alle statud iconen.
+bbb.users.settings.clearAllStatus = Verwijder alle status iconen.
 bbb.users.emojiStatusBtn.toolTip = Update mijn status icon
 bbb.users.roomMuted.text = Kijkers gedempt
 bbb.users.roomLocked.text = Kijkers vergrendeld
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentatie
 bbb.presentation.titleWithPres = Presentatie {0}
 bbb.presentation.quickLink.label = Presentatie venster
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Sluit webcam instellingen venster
 bbb.video.publish.closeBtn.label = Annuleren
 bbb.video.publish.titleBar = Publiceer webcam venster
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop delen\: voorbeeld van scherm presentator
-bbb.desktopPublish.fullscreen.tooltip = Deel je hoofd scherm
-bbb.desktopPublish.fullscreen.label = Volledig scherm
-bbb.desktopPublish.region.tooltip = Deel een stuk van je scherm
-bbb.desktopPublish.region.label = Regio
-bbb.desktopPublish.stop.tooltip = Sluit het delen van het scherm
-bbb.desktopPublish.stop.label = Sluit
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = U kunt dit venster niet maximaliseren.
-bbb.desktopPublish.closeBtn.toolTip = Stop het delen en sluit dit scherm.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Bureaublad delen wordt momenteel niet ondersteund voor Chrome op Mac OS X. Je moet een andere internet browser gebruiken (Firefox wordt aangeraden) om je bureaublad te kunnen delen.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome ondersteunt geen Java programma;s meer. Je moet een andere internet browser (Firefox wordt aangeraden) gebruiken om je bureaublad te delen.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimaliseer
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimaliseer het desktop delen venster
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximaliseer het desktop delen venster
-bbb.desktopPublish.chromeHint.title = Chrome heeft wellicht je toestemming nodig
-bbb.desktopPublish.chromeHint.message = Selecteer de plug-in icoon (rechtsboven in Chrome) , deblokker plug-ins and probeer het dan nog eens.
-bbb.desktopPublish.chromeHint.button = Nogmaals proberen
-bbb.desktopView.title = Bureaublad delen
-bbb.desktopView.fitToWindow = Schaal naar venster
-bbb.desktopView.actualSize = Geef actuele grootte weer
-bbb.desktopView.minimizeBtn.accessibilityName = Minimaliseer het desktop delen venster
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximaliseer het desktop delen venster
-bbb.desktopView.closeBtn.accessibilityName = Sluit het desktop delen venster
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Deel je microfoon
 bbb.toolbar.phone.toolTip.stop = Stop met het delen van je microfoon
 bbb.toolbar.phone.toolTip.mute = Stop naar de meeting te luisteren
 bbb.toolbar.phone.toolTip.unmute = Begin met luisteren naar de meeting
 bbb.toolbar.phone.toolTip.nomic = Geen microfoon gevonden
-bbb.toolbar.deskshare.toolTip.start = Deel je scherm
-bbb.toolbar.deskshare.toolTip.stop = Stop met het delen van je scherm
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Deel je webcam
 bbb.toolbar.video.toolTip.stop = Stop met het delen van je webcam
 bbb.layout.addButton.toolTip = Voeg de aangepaste weergave toe aan de lijst
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Weergave is succesvol opgeslagen
 bbb.layout.load.complete = Weergave is succesvol geladen
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Standaard weergave
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video chat
 bbb.layout.name.webcamsfocus = Webcam meeting
 bbb.layout.name.presentfocus = Presentatie meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = De connectie naar de server is geweigerd
 bbb.logout.invalidapp = De red5 applicatie bestaat niet
 bbb.logout.unknown = Uw toepassing heeft de connectie met de server verbroken
 bbb.logout.usercommand = U bent uitgelogd uit de conferentie
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = Als het uitloggen onverwacht was klik dan op onderstaande knop om weer verbinding te maken.
 bbb.logout.refresh.label = Weer verbinding maken
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Sla notitie op
 bbb.settings.deskshare.instructions = Klik op toelaten in het pop-up venster dat controleert of scherm delen goed werkt
 bbb.settings.deskshare.start = Controleer scherm delen
 bbb.settings.voice.volume = Microfoon activiteit
-bbb.settings.java.label = Java versie fout
-bbb.settings.java.text = U heeft Java {0} geinstalleerd, maar u moet ten minste versie {1} hebben om desktop delen functionaliteit te kunnen gebruiken. Klik op de knop hieronder om de recentste versie van de Java JRE te installeren.
-bbb.settings.java.command = Installeer recentste Java versie
 bbb.settings.flash.label = Flash versie fout
 bbb.settings.flash.text = U heeft Flash {0} geinstalleerd, maar u moet ten minste versie {1} hebben om deze applicatie te kunnen gebruiken. Klik op de knop hieronder om de recentste versie van Adobe Flash te installeren.
 bbb.settings.flash.command = Installeer recentste Flash versie
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekst
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Verander de whiteboard cursor naar tekst
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Tekst kleur
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Tekst grootte
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Tekstgrootte\:
+bbb.caption.option.fontsize.tooltip = Tekstgrootte
+bbb.caption.option.backcolor = Achtergrondkleur\:
+bbb.caption.option.backcolor.tooltip = Achtergrondkleur
+bbb.caption.option.textcolor = Tekstkleur\:
+bbb.caption.option.textcolor.tooltip = Tekstkleur
+
 
 bbb.accessibility.clientReady = Klaar
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimaliseer het huidige venster
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximaliseer het huidige venster
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus op het Flash venster
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Dempen en niet dempen van je microfoon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Focus op het chat vernster
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open het scherm delen venster
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open het geluid instellingen venster
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Starten /stoppen van het luisteren naar de meeting
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open het webcam delen venster
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Sluit alle video's
 bbb.users.settings.lockAll=Vergrendel alle gebruikers
 bbb.users.settings.lockAllExcept=Vergrendel alle gebruikers behalve de presentator
 bbb.users.settings.lockSettings=Vergrendel kijkers
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Ontgrendel alle kijkers
 bbb.users.settings.roomIsLocked=Standaard vergrendeld
 bbb.users.settings.roomIsMuted=Standaard gedempt
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Vergrendel kijkers
 bbb.lockSettings.feature=Optie
 bbb.lockSettings.locked=Gesloten
 bbb.lockSettings.lockOnJoin=Op slot na meedoen
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Neem op
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/no_NO/bbbResources.properties b/bigbluebutton-client/locale/no_NO/bbbResources.properties
index 2a3c474eb486808dbbbaac3eb2a7348effbf08f5..e80bfcb6a0693323e1b92801bdc5a5102578e9f3 100644
--- a/bigbluebutton-client/locale/no_NO/bbbResources.properties
+++ b/bigbluebutton-client/locale/no_NO/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimer
 bbb.window.maximizeRestoreBtn.toolTip = Maksimer
 bbb.window.closeBtn.toolTip = Lukk
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentasjon
 bbb.presentation.titleWithPres = Presentasjon\: {0}
 bbb.presentation.quickLink.label = Presentasjonsvindu
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Lukk oppsettboksen for webkamera
 bbb.video.publish.closeBtn.label = Avbryt
 bbb.video.publish.titleBar = Webkamera deling Vindu
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Skrivebordsdeling\: Presenterers forhåndsvisning
-bbb.desktopPublish.fullscreen.tooltip = Del ut hele skjermen
-bbb.desktopPublish.fullscreen.label = Hele skjermen
-bbb.desktopPublish.region.tooltip = Del ut en del av skjermen
-bbb.desktopPublish.region.label = Område
-bbb.desktopPublish.stop.tooltip = Lukk skjermdeling
-bbb.desktopPublish.stop.label = Lukk
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Du kan ikke maksimere dette vinduet.
-bbb.desktopPublish.closeBtn.toolTip = Stopp deling og lukk vinduet.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimer
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimer vinduet for skrivebordsdeling
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maksimer vinduet for skrivebordsdeling
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Skrivebordsdeling
-bbb.desktopView.fitToWindow = Tilpass vindu
-bbb.desktopView.actualSize = Vis normal størrelse
-bbb.desktopView.minimizeBtn.accessibilityName = Minimer vinduet som viser skrivebordsdeling
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maksimer vinduet som viser skrivebordsdeling
-bbb.desktopView.closeBtn.accessibilityName = Lukk vinduet som viser skrivebordsdeling
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Del mikrofonen med andre
 bbb.toolbar.phone.toolTip.stop = Stopp delingen av mikrofon med andre
 bbb.toolbar.phone.toolTip.mute = Stopp å lytte til konferansen
 bbb.toolbar.phone.toolTip.unmute = Start å lytte til konferansen
 bbb.toolbar.phone.toolTip.nomic = Ingen mikrofon er detektert
-bbb.toolbar.deskshare.toolTip.start = Del ut skrivebordet
-bbb.toolbar.deskshare.toolTip.stop = Stopp å dele ut skrivebordet
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Del ut ditt webkamera
 bbb.toolbar.video.toolTip.stop = Stopp å dele ut ditt webkamera
 bbb.layout.addButton.toolTip = Legg til egendefinert layout i liste
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layout ble lagret
 bbb.layout.load.complete = Layout ble lastet inn
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Standard utforming
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam møte
 bbb.layout.name.presentfocus = Presentasjon møte
@@ -362,6 +395,7 @@ bbb.logout.rejected = Forbindelsen til serveren ble avvist
 bbb.logout.invalidapp = Appen red5 finnes ikke
 bbb.logout.unknown = Din klient har mistet forbindelsen til serveren
 bbb.logout.usercommand = Du har logget ut av konferansen
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = Hvis denne utloggingen var uventet kan du klilkke nedenfor for å logge inn igjen.
 bbb.logout.refresh.label = Kople opp igjen
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Lagre notat
 bbb.settings.deskshare.instructions = Klikk Tillat for å teste skrivebordsdeling
 bbb.settings.deskshare.start = Sjekk skrivebordsdeling
 bbb.settings.voice.volume = Mikrofonaktivitet
-bbb.settings.java.label = Feil versjon av Java
-bbb.settings.java.text = Du har installert versjon {0} av Java, men trenger minst versjon {1}. Klikk nedenfor for å installere siste Java JRE versjon.
-bbb.settings.java.command = Installer nyeste Java
 bbb.settings.flash.label = Feil versjon av Flash
 bbb.settings.flash.text = Du har installert versjon {0} av Flash, men trenger minst versjon {1}. Klikk nedenfor for å installere siste Adobe Flash versjon.
 bbb.settings.flash.command = Installer nyeste Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekst
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Endre tavlepeker til tekst
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Skriftfarge
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Skriftstørelse
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimer gjeldende vindu
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maksimer gjeldende vindu
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Fokuser ut fra Flash vindu
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Slå av eller på mikrofon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Endre fokus til chatvindu
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Ã…pne skrivebordsdeling vindu
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ã…pne mikrofoninnstillinger vindu
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stopp å lytte til konferansen
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Ã…pne webkamera deling vindu
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Lukk alle videoer
 bbb.users.settings.lockAll=LÃ¥s alle brukere
 bbb.users.settings.lockAllExcept=LÃ¥s brukere unntat presenterer
 bbb.users.settings.lockSettings=LÃ¥s seere...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Avslutt låsing av seere
 bbb.users.settings.roomIsLocked=LÃ¥st som standardsetting
 bbb.users.settings.roomIsMuted=Dempet som standardsetting
@@ -585,3 +637,34 @@ bbb.lockSettings.title=LÃ¥s seere
 bbb.lockSettings.feature=Mulighet
 bbb.lockSettings.locked=LÃ¥st
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/oc/bbbResources.properties b/bigbluebutton-client/locale/oc/bbbResources.properties
index f54cd212979b2e9a2329f488ae9247df7be6b270..24fecba2e0089b5c0b83b12201c0af6cff7625ff 100644
--- a/bigbluebutton-client/locale/oc/bbbResources.properties
+++ b/bigbluebutton-client/locale/oc/bbbResources.properties
@@ -9,16 +9,16 @@ bbb.mainshell.invalidAuthToken = Geton d'autentificacion invalid
 bbb.mainshell.resetLayoutBtn.toolTip = Disposicion per defaut
 bbb.mainshell.notification.tunnelling = Tunèl
 bbb.mainshell.notification.webrtc = Àudio WebRTC
-bbb.oldlocalewindow.reminder1 = Avètz probablament de vièlhas traduccions de BigBlueButton.
-bbb.oldlocalewindow.reminder2 = Escafatz la memòria escondedor de vòstre navigador web e ensajatz tornamai.
+bbb.oldlocalewindow.reminder1 = Avètz probablament d'ancianas traduccions de BigBlueButton.
+bbb.oldlocalewindow.reminder2 = Escafatz la memòria cache de vòstre navigador web e ensajatz tornamai.
 bbb.oldlocalewindow.windowTitle = Avertiment \: Las traduccions son pas a jorn
 bbb.audioSelection.title = Cossí volètz jónher la partida àudio ?
 bbb.audioSelection.btnMicrophone.label = Microfòn
 bbb.audioSelection.btnMicrophone.toolTip = Jónher l'àudio amb lo microfòn activat
 bbb.audioSelection.btnListenOnly.label = Escotar solament
 bbb.audioSelection.btnListenOnly.toolTip = Jónher l'àudio en escotant solament
-bbb.audioSelection.txtPhone.text = Per jónher aquesta conferéncia per telefòn, compausar\: {0} puèi, {1} coma còde d'accès.
-bbb.micSettings.title = Test àudio
+bbb.audioSelection.txtPhone.text = Per jónher aquesta conferéncia per telefòn, compausar\: {0} puèi, {1} coma còdi d'accès.
+bbb.micSettings.title = Tèst àudio
 bbb.micSettings.speakers.header = Testar los nautparlaires
 bbb.micSettings.microphone.header = Testar lo microfòn
 bbb.micSettings.playSound = Testar los nautparlaires
@@ -28,7 +28,7 @@ bbb.micSettings.speakIntoMic = Se utilizatz un casc (o d'escotadors), vos caldri
 bbb.micSettings.echoTestMicPrompt = Aquò es un tèst individual pel resson. Digatz qualques mots. Ausissètz quicòm ?
 bbb.micSettings.echoTestAudioYes = Ã’c
 bbb.micSettings.echoTestAudioNo = Non
-bbb.micSettings.speakIntoMicTestLevel = Parlez dins vòstre microfòn. Deuriatz veire la barra bolegar. Siquenon, causissètz un autre microfòn.
+bbb.micSettings.speakIntoMicTestLevel = Parlatz dins vòstre microfòn. Deuriatz veire la barra bolegar. Siquenon, causissètz un autre microfòn.
 bbb.micSettings.recommendHeadset = Utilizatz un casc d'escota amb microfòn per una melhora experiéncia àudio.
 bbb.micSettings.changeMic = Testar o cambiar vòstre microfòn
 bbb.micSettings.changeMic.toolTip = Dobrir la fenèstra de paramètres de microfòn per Flash Player
@@ -41,9 +41,9 @@ bbb.micSettings.join = Se jónher a l'àudio
 bbb.micSettings.join.toolTip = Rejónher la conferéncia àudio
 bbb.micSettings.cancel = Anullar
 bbb.micSettings.connectingtoecho = Connexion en cors
-bbb.micSettings.connectingtoecho.error = Error del tèst del resson\: Contactatz un administrator
+bbb.micSettings.connectingtoecho.error = Error del tèst del resson \: Contactatz un administrator
 bbb.micSettings.cancel.toolTip = Anullar rejónher la conferéncia àudio
-bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.helpButton = Ajuda (dobrir los tutorials vidèos dins una pagina novèla pagina)
 bbb.micSettings.access.title = Paramètres àudio. Lo fòcus serà gardat sus aquesta fenèstra fins al moment que serà tampada.
 bbb.micSettings.webrtc.title = Supòrt WebRTC
 bbb.micSettings.webrtc.capableBrowser = Vòstre navigador supòrta WebRTC
@@ -56,7 +56,7 @@ bbb.micSettings.webrtc.transferring = Transferiment en cors
 bbb.micSettings.webrtc.endingecho = Jónher l'àudio
 bbb.micSettings.webrtc.endedecho = Tèst de resson acabat.
 bbb.micPermissions.firefox.title = Permissions del microfòn de Firefox
-bbb.micPermissions.firefox.message1 = Causir vòstre microfòn e clicar Partage
+bbb.micPermissions.firefox.message1 = Causir vòstre microfòn e clicar Partiment
 bbb.micPermissions.firefox.message2 = Se vesètz pas una lista de microfòns, clicar sus l'icòna microfòn.
 bbb.micPermissions.chrome.title = Permissions del microfòn de Chrome
 bbb.micPermissions.chrome.message1 = Clicar per permetre a Chrome d'utilizar vòstre microfòn.
@@ -70,14 +70,14 @@ bbb.webrtcWarning.failedError.1001 = Error 1001 \\\: WebSocket desconnectada
 bbb.webrtcWarning.failedError.1002 = Error 1002 \\\: Impossible d'establir una connexion WebSocket
 bbb.webrtcWarning.failedError.1003 = Error 1003 \\\: Version del navigador non suportada
 bbb.webrtcWarning.failedError.1004 = Error 1004\\\: Fracàs sus apèl (rason\={0})
-bbb.webrtcWarning.failedError.1005 = Error 1005 \\\: L'apèl s'es arrestat d'un biais imprevist
-bbb.webrtcWarning.failedError.1006 = Error 1006 \\\: L'apèl a expirat
+bbb.webrtcWarning.failedError.1005 = Error 1005 \\\: La sonada s'es arrestada d'un biais imprevist
+bbb.webrtcWarning.failedError.1006 = Error 1006 \\\: La sonada a expirat
 bbb.webrtcWarning.failedError.1007 = Error 1007 \\\: Fracàs de la negociacion ICE
 bbb.webrtcWarning.failedError.1008 = Error 1008 \\\: Fracàs del transferiment
 bbb.webrtcWarning.failedError.1009 = Error 1009 \\\: Impossible de recuperar las informacions del servidor STUN/TURN
 bbb.webrtcWarning.failedError.1010 = Error 1010\\\: ICE temps de negociacion depassat
 bbb.webrtcWarning.failedError.1011 = Error 1011\\\: temps de reünion ICE acabat
-bbb.webrtcWarning.failedError.unknown = Error {0} \\\: Còde d'error desconegut
+bbb.webrtcWarning.failedError.unknown = Error {0} \\\: Còdi d'error desconegut
 bbb.webrtcWarning.failedError.mediamissing = Es pas estat possible d'utilizar vòstre microfòn per un apèl WebRTC
 bbb.webrtcWarning.failedError.endedunexpectedly = Lo tèst de resson WebRTC s'es acabat d'un biais imprevist
 bbb.webrtcWarning.connection.dropped = Connexion a WebRTC fracassada
@@ -95,7 +95,7 @@ bbb.mainToolbar.recordBtn.toolTip.start = Començar l'enregistrament
 bbb.mainToolbar.recordBtn.toolTip.stop = Arrestar l'enregistrament
 bbb.mainToolbar.recordBtn.toolTip.recording = Aquesta session es enregistrada
 bbb.mainToolbar.recordBtn.toolTip.notRecording = Aquesta session es pas enregistrada
-bbb.mainToolbar.recordBtn.confirm.title = Confirmer l'enregistrament
+bbb.mainToolbar.recordBtn.confirm.title = Confirmar l'enregistrament
 bbb.mainToolbar.recordBtn.confirm.message.start = Volètz començar l'enregistrament de la session ?
 bbb.mainToolbar.recordBtn.confirm.message.stop = Volètz arrestar l'enregistrament de la session ?
 bbb.mainToolbar.recordBtn..notification.title = Enregistrar la notificacion
@@ -114,11 +114,7 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Vòstra extension Flash Player ({0}) es pas a jorn. Es recomandat d'installar la darrièra version.
 bbb.clientstatus.webrtc.title = Àudio
 bbb.clientstatus.webrtc.message = Vos recomandam d'utilizar Firefox o Chrome per una melhora qualitat sonòra.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Version Java pas seleccionada.
-bbb.clientstatus.java.notinstalled = Avètz pas Java d'installat, clicats <font color\\\='\\\#0a4a7a'><a href\\\='http\\\://www.java.com/download/' target\\\='_blank'>AICÍ</a></font> per installar la darrièra version de Java e utilizar la foncionalitat de partiment d'ecran.
-bbb.clientstatus.java.oldversion = Avètz una anciana version de Java d'installada, clicatz <font color\\\='\\\#0a4a7a'><a href\\\='http\\\://www.java.com/download/' target\\\='_blank'>AICÍ</a></font> per installar la darrièra version de Java e utilizar la foncionalitat de partiment d'ecran.
-bbb.window.minimizeBtn.toolTip = Redusir
+bbb.window.minimizeBtn.toolTip = Reduire
 bbb.window.maximizeRestoreBtn.toolTip = Agrandir
 bbb.window.closeBtn.toolTip = Tampar
 bbb.videoDock.titleBar = Barra de títol de la fenèstra de la camèra web
@@ -127,13 +123,13 @@ bbb.chat.titleBar = Barra de títol de la fenèstra de discussion
 bbb.users.title = Utilizaires{0} {1}
 bbb.users.titleBar = Barra de títol de la fenèstra utilizaires
 bbb.users.quickLink.label = Fenèstra dels utilizaires
-bbb.users.minimizeBtn.accessibilityName = Redusir la fenèstra d'utilizaires
+bbb.users.minimizeBtn.accessibilityName = Reduire la fenèstra d'utilizaires
 bbb.users.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra d'utilizaires
 bbb.users.settings.buttonTooltip = Paramètres
 bbb.users.settings.audioSettings = Tèst àudio
 bbb.users.settings.webcamSettings = Paramètres de la camèra web
 bbb.users.settings.muteAll = Rendre silencioses totes los utilizaires
-bbb.users.settings.muteAllExcept = Rendre silencioses totes los utilizaires levat lo presentator
+bbb.users.settings.muteAllExcept = Rendre silencioses totes los utilizaires levat lo presentador
 bbb.users.settings.unmuteAll = Activar lo microfòn per totes los utilizaires
 bbb.users.settings.clearAllStatus = Suprimir totas las icònas d'estatut
 bbb.users.emojiStatusBtn.toolTip = Actualizar mon icòna d'estatut
@@ -146,17 +142,17 @@ bbb.users.muteMeBtnTxt.mute = Rendre silenciós
 bbb.users.muteMeBtnTxt.muted = Mut
 bbb.users.muteMeBtnTxt.unmuted = Sordina desactivada
 bbb.users.usersGrid.contextmenu.exportusers = Copiar los noms dels utilizaires
-bbb.users.usersGrid.accessibilityName = Listas d'utilizaires. Utilizatz las flèchas per navigar.
+bbb.users.usersGrid.accessibilityName = Listas d'utilizaires. Utilizatz las sagetas per navigar.
 bbb.users.usersGrid.nameItemRenderer = Nom
 bbb.users.usersGrid.nameItemRenderer.youIdentifier = vos
 bbb.users.usersGrid.statusItemRenderer = Estatut
-bbb.users.usersGrid.statusItemRenderer.changePresenter = Clicar per ne far lo presentator
-bbb.users.usersGrid.statusItemRenderer.presenter = Presentator
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Clicar per ne far lo presentador
+bbb.users.usersGrid.statusItemRenderer.presenter = Presentador
 bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
 bbb.users.usersGrid.statusItemRenderer.clearStatus = Voidar l'estat
 bbb.users.usersGrid.statusItemRenderer.viewer = Espectator
 bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Webcam en cors de partiment
-bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Es presentator
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Es presentador
 bbb.users.usersGrid.mediaItemRenderer = Mèdia
 bbb.users.usersGrid.mediaItemRenderer.talking = Parlar
 bbb.users.usersGrid.mediaItemRenderer.webcam = Partejar la webcam
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Estat triste
 bbb.users.emojiStatus.confused = Estat confús
 bbb.users.emojiStatus.neutral = Estat neutre
 bbb.users.emojiStatus.away = Estat inactiu
+bbb.users.emojiStatus.thumbsUp = Poce cap amont
+bbb.users.emojiStatus.thumbsDown = Poce cap aval
+bbb.users.emojiStatus.applause = Aplaudiments
 bbb.presentation.title = Presentacion
 bbb.presentation.titleWithPres = Presentacion \: {0}
 bbb.presentation.quickLink.label = Fenèstra de presentacion
@@ -204,7 +203,7 @@ bbb.presentation.error.convert.nbpage = Error \\\: impossible de determinar lo n
 bbb.presentation.error.convert.maxnbpagereach = Error \\\: lo fichièr mandat conten tròp de paginas.
 bbb.presentation.converted = {0} diapositiva(s) sus {1} convertida(s).
 bbb.presentation.ok = D'acòrdi
-bbb.presentation.slider = Niveau de zoom de la presentacion
+bbb.presentation.slider = Nivèl de zoom de la presentacion
 bbb.presentation.slideloader.starttext = Començament del tèxte de la pagina
 bbb.presentation.slideloader.endtext = Fin del tèxte de la pagina
 bbb.presentation.uploadwindow.presentationfile = FICHIÈR PRESENTACION
@@ -213,7 +212,7 @@ bbb.presentation.uploadwindow.word = WORD
 bbb.presentation.uploadwindow.excel = EXCEL
 bbb.presentation.uploadwindow.powerpoint = POWERPOINT
 bbb.presentation.uploadwindow.image = IMATGE
-bbb.presentation.minimizeBtn.accessibilityName = Redusir la fenèstra de presentacion
+bbb.presentation.minimizeBtn.accessibilityName = Reduire la fenèstra de presentacion
 bbb.presentation.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de presentacion
 bbb.presentation.closeBtn.accessibilityName = Tampar la fenèstra de presentacion
 bbb.fileupload.title = Mandar un fichièr de presentar
@@ -243,14 +242,14 @@ bbb.chat.optionsTabName = Opcions
 bbb.chat.privateChatSelect = Causissètz un utilizaire amb qual discutir en privat
 bbb.chat.private.userLeft = L'utilizaire es partit.
 bbb.chat.private.userJoined = L'utilizaire es entrat.
-bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
+bbb.chat.private.closeMessage = Podètz tampar aqueste onglet en utilizant la combinason de tòcas {0}.
 bbb.chat.usersList.toolTip = Seleccionatz un participant per dobrir una discussion privada
-bbb.chat.usersList.accessibilityName = Seleccionar un utilizaire per discutir en privat. Utilizar las sagetaas de direccion per navegar.
+bbb.chat.usersList.accessibilityName = Seleccionar un utilizaire per discutir en privat. Utilizar las sagetas de direccion per navegar.
 bbb.chat.chatOptions = Opcions de discussions
 bbb.chat.fontSize = Talha de la poliça
 bbb.chat.cmbFontSize.toolTip = Seleccionatz la talha de la poliça
 bbb.chat.messageList = Camp de picada
-bbb.chat.minimizeBtn.accessibilityName = Redusir la fenèstra de discussion
+bbb.chat.minimizeBtn.accessibilityName = Reduire la fenèstra de discussion
 bbb.chat.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de discussion
 bbb.chat.closeBtn.accessibilityName = Tampar la fenèstra de discussion
 bbb.chat.chatTabs.accessibleNotice = Messatges novèls dins aqueste onglet.
@@ -266,10 +265,10 @@ bbb.webcamPermissions.chrome.title = Permissions de la webcam de Chrome
 bbb.webcamPermissions.chrome.message1 = Clicar per permetre a Chrome d'utilizar vòstra webcam.
 bbb.videodock.title = Webcams
 bbb.videodock.quickLink.label = Fenèstra de las webcams
-bbb.video.minimizeBtn.accessibilityName = Redusir la fenèstra de las webcams
+bbb.video.minimizeBtn.accessibilityName = Reduire la fenèstra de las webcams
 bbb.video.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de las webcams
 bbb.video.controls.muteButton.toolTip = Activar o desactivar la sordina per {0}
-bbb.video.controls.switchPresenter.toolTip = Far de {0} lo presentator
+bbb.video.controls.switchPresenter.toolTip = Far de {0} lo presentador
 bbb.video.controls.ejectUserBtn.toolTip = Ejectar {0} de la conferéncia
 bbb.video.controls.privateChatBtn.toolTip = Discutir amb {0}
 bbb.video.publish.hint.noCamera = Pas de webcam disponibla
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Tampar la fenèstra de paramètres per l
 bbb.video.publish.closeBtn.label = Anullar
 bbb.video.publish.titleBar = Publicar la webcam
 bbb.video.streamClose.toolTip = Tampar l'emission de \: {0}
-bbb.desktopPublish.title = Partiment de burèu \\\: Apercebut del presentator
-bbb.desktopPublish.fullscreen.tooltip = Partejar l'integralitat de vòstre ecran
-bbb.desktopPublish.fullscreen.label = Ecran complet
-bbb.desktopPublish.region.tooltip = Partejar una partida de vòstre ecran
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Tampar lo partiment d'ecran
-bbb.desktopPublish.stop.label = Tampar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Podètz pas agrandir aquesta fenèstra.
-bbb.desktopPublish.closeBtn.toolTip = Arrestar de partejar e tampar
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Lo partiment d'ecran es pas suportat actualament per Chrome jos Mac OS X. Vos cal utilizar un autre navigador (recomandam FireFox) pel partiment d'ecran.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome supòrta pas mai las Applets Java. Vos cal utilizar un autre navigador (Firefox recomandat) per partejar vòstre ecran.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge supòrta pas Applets Java. Vos cal causir un autre navigador (recomandam Firefox) per partejar lo burèu.
-bbb.desktopPublish.minimizeBtn.toolTip = Redusir
-bbb.desktopPublish.minimizeBtn.accessibilityName = Redusir la fenèstra de partiment d'ecran
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de partiment d'ecran
-bbb.desktopPublish.chromeHint.title = Chrome pòt aver besoin de vòstra permission.
-bbb.desktopPublish.chromeHint.message = Seleccionatz l'icòna d'extension (amont a drecha de Chrome), desblocatz las extensions, e seleccionatz 'Tornar ensajar'.
-bbb.desktopPublish.chromeHint.button = Tornar ensajar
-bbb.desktopView.title = Partiment d'ecran
-bbb.desktopView.fitToWindow = Adaptar la talha a la fenèstra
-bbb.desktopView.actualSize = Afichar a la talha normala
-bbb.desktopView.minimizeBtn.accessibilityName = Redusir la fenèstra de partiment d'ecran
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de partiment d'ecran
-bbb.desktopView.closeBtn.accessibilityName = Tampar la fenèstra de partiment d'ecran
+bbb.screensharePublish.title = Partiment de burèu \\\: Apercebut del presentador
+bbb.screensharePublish.pause.tooltip = Metre lo partiment d'ecran en pause
+bbb.screensharePublish.pause.label = Pausa
+bbb.screensharePublish.restart.tooltip = Reaviar lo partiment d'ecran
+bbb.screensharePublish.restart.label = Reaviar
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Podètz pas agrandir aquesta fenèstra.
+bbb.screensharePublish.closeBtn.toolTip = Arrestar de partejar e tampar
+bbb.screensharePublish.minimizeBtn.toolTip = Reduire
+bbb.screensharePublish.minimizeBtn.accessibilityName = Reduire la fenèstra de partiment d'ecran
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de partiment d'ecran
+bbb.screensharePublish.commonHelpText.text = Las etapas çaijós vos guidaràn per aviar lo partiment d’ecran (necessita Java).
+bbb.screensharePublish.helpButton.toolTip = Ajuda
+bbb.screensharePublish.helpButton.accessibilityName = Ajuda (Dobrís lo tutorial dins una novèla fenèstra)
+bbb.screensharePublish.helpText.PCIE1 = 1. Seleccionatz 'Dobrir'
+bbb.screensharePublish.helpText.PCIE2 = 2. Acceptar lo certificat
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Clicar 'D'acòrdi' per aviar
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Acceptar lo certificat
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Localizar 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Clicar per dobrir
+bbb.screensharePublish.helpText.PCChrome3 = 3. Acceptar lo certificat
+bbb.screensharePublish.helpText.MacSafari1 = 1. Localizar 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Seleccionatz 'Afichar dins lo Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Far un clic dreit e seleccionar 'Dobrir'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Seleccionatz 'Dobrir' (se i sètz convidat)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Causissètz 'Enregistrar lo fichièr' (se demandat)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Seleccionatz 'Afichar dins lo Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Far un clic dreit e seleccionar 'Dobrir'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Seleccionatz 'Dobrir' (se i sètz convidat)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Localizar 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Seleccionatz 'Afichar dins lo Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Far un clic dreit e seleccionar 'Dobrir'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Seleccionatz 'Dobrir' (se i sètz convidat)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Clicar 'D'acòrdi' per aviar
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Acceptar lo certificat
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Localizar 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Clicar per dobrir
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Acceptar lo certificat
+bbb.screensharePublish.shareTypeLabel.text = Partiment \:
+bbb.screensharePublish.shareType.fullScreen = Ecran complet
+bbb.screensharePublish.shareType.region = Partida
+bbb.screensharePublish.pauseMessage.label = Lo partiment d'ecran es actualament en pausa.
+bbb.screensharePublish.startFailed.label = Aviada del partiment d'ecran pas detectada.
+bbb.screensharePublish.restartFailed.label = Reaviada del partiment d'ecran pas detectada.
+bbb.screensharePublish.jwsCrashed.label = L'aplicacion de partiment d'ecran s'es tampada de faiçon inesperada.
+bbb.screensharePublish.commonErrorMessage.label = Causir 'Anullar' e ensajar tornamai.
+bbb.screensharePublish.cancelButton.label = Anullar
+bbb.screensharePublish.startButton.label = Aviar
+bbb.screensharePublish.stopButton.label = Arrestar
+bbb.screenshareView.title = Partiment d'ecran
+bbb.screenshareView.fitToWindow = Adaptar la talha a la fenèstra
+bbb.screenshareView.actualSize = Afichar a la talha normala
+bbb.screenshareView.minimizeBtn.accessibilityName = Reduire la fenèstra de partiment d'ecran
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Agrandir la fenèstra de partiment d'ecran
+bbb.screenshareView.closeBtn.accessibilityName = Tampar la fenèstra de partiment d'ecran
 bbb.toolbar.phone.toolTip.start = Partejar vòstre microfòn
 bbb.toolbar.phone.toolTip.stop = Daissar de partejar vòstre microfòn
 bbb.toolbar.phone.toolTip.mute = Daissar d'escotar la conferéncia
 bbb.toolbar.phone.toolTip.unmute = Aviar l'escota la conferéncia
 bbb.toolbar.phone.toolTip.nomic = Cap de microfòn pas detectat
-bbb.toolbar.deskshare.toolTip.start = Partejar vòstre ecran
-bbb.toolbar.deskshare.toolTip.stop = Arrestar lo partiment de vòstre ecran
+bbb.toolbar.deskshare.toolTip.start = Partejar vòstre burèu
+bbb.toolbar.deskshare.toolTip.stop = Arrestar de partejar vòstre burèu
 bbb.toolbar.video.toolTip.start = Partejar vòstra webcam
 bbb.toolbar.video.toolTip.stop = Arrestar lo partiment de vòstra webcam
 bbb.layout.addButton.toolTip = Apondre la mesa en pagina personalizada a la lista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Las mesas en pagina son estadas salvadas amb succès
 bbb.layout.load.complete = Las mesas en pagina son estadas telecargadas amb succès
 bbb.layout.load.failed = Impossible de cargar las mesas en pagina
 bbb.layout.name.defaultlayout = Configuracion per defaut
+bbb.layout.name.closedcaption = Sostitolatge per sords e malentendents
 bbb.layout.name.videochat = Discussion vidèo
 bbb.layout.name.webcamsfocus = Webconferéncia
 bbb.layout.name.presentfocus = Visioconferéncia
@@ -351,17 +384,18 @@ bbb.highlighter.toolbar.undo.accessibilityName = Escafar la darrièra marca sul
 bbb.highlighter.toolbar.color = Seleccionar una color
 bbb.highlighter.toolbar.color.accessibilityName = Color de la marca
 bbb.highlighter.toolbar.thickness = Cambiar l'espessor
-bbb.highlighter.toolbar.thickness.accessibilityName = Espessor del trach
+bbb.highlighter.toolbar.thickness.accessibilityName = Espessor del trait
 bbb.logout.title = Desconnectat
 bbb.logout.button.label = D'acòrdi
 bbb.logout.appshutdown = L'aplicacion servidor es estada arrestada
-bbb.logout.asyncerror = Un error de sincronizacion s'es produsida
+bbb.logout.asyncerror = Una error de sincronizacion s'es produita
 bbb.logout.connectionclosed = La connexion al servidor es estada tampada
 bbb.logout.connectionfailed = La connexion al servidor es estada tampada
 bbb.logout.rejected = La connexion al servidor es estada refusada
 bbb.logout.invalidapp = L'aplicacion red5 existís pas
 bbb.logout.unknown = Vòstre client a perdut la connexion al servidor
 bbb.logout.usercommand = Ara, sètz desconnectat de la conferéncia
+bbb.logour.breakoutRoomClose = La fenèstra de vòstre navigador se va tampar
 bbb.logout.ejectedFromMeeting = Un moderator vos a bandit de la reünion.
 bbb.logout.refresh.message = Se aquesta fin de session était involontaire, clicar lo boton çaijós per vos reconnectar.
 bbb.logout.refresh.label = Reconnectar
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Salvar la nòta
 bbb.settings.deskshare.instructions = Clicatz sus Autorizar sul convit que s'aficha per verificar que lo partiment d'ecran fonciona corrèctament per vos
 bbb.settings.deskshare.start = Verificar lo partiment d'ecran
 bbb.settings.voice.volume = Activitat del microfòn
-bbb.settings.java.label = Error de la version de Java
-bbb.settings.java.text = Avètz Java {0} d'installat, mas vos cal aver al mens la version {1} per utilizar lo partiment d'ecran de BigBlueButton. Per installar la version la mai recenta de Java JRE, clicatz sul boton çaijós.
-bbb.settings.java.command = Installar la novèla version de Java
 bbb.settings.flash.label = Error de la version de Flash
 bbb.settings.flash.text = Avètz Flash {0} d'installat, mas vos cal aver al mens la version {1} per utilizar BigBlueButton convenablement. Per installar la version la mai recenta de Adobe Flash, clicatz sul boton çaijós.
 bbb.settings.flash.command = Installar la novèla version de Flash
@@ -404,23 +435,46 @@ ltbcustom.bbb.highlighter.toolbar.text = Tèxte
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Cambiar lo cursor del tablèu per de tèxte
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Color del tèxte
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Talha de la poliça
+bbb.caption.window.title = Sostitolatge per sords e malentendents
+bbb.caption.window.titleBar = Barra de Títol Sostitolatge per sords e malentendents
+bbb.caption.window.minimizeBtn.accessibilityName = Reduire
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Agrandir
+bbb.caption.transcript.noowner = Pas cap
+bbb.caption.transcript.youowner = Vos
+bbb.caption.transcript.pastewarning.title = Avertiment de pegatge de sostítol
+bbb.caption.transcript.pastewarning.text = Impossible de pegar mai de {0} caractèrs. Avètz pegat {1} caractèrs.
+bbb.caption.option.label = Opcions
+bbb.caption.option.language = Lenga \:
+bbb.caption.option.language.tooltip = Lenga\\\:
+bbb.caption.option.language.accessibilityName = Seleccionatz una lenga de sostitolatge. Utilizatz las tòcas sagetas per navigar.
+bbb.caption.option.takeowner = Prene lo contraròtle
+bbb.caption.option.takeowner.tooltip = Prene lo contraròtle de la lenga seleccionada
+bbb.caption.option.fontfamily = Familha de poliça \:
+bbb.caption.option.fontfamily.tooltip = Familha de poliça
+bbb.caption.option.fontsize = Talha de caractèr \:
+bbb.caption.option.fontsize.tooltip = Talha de caractèr
+bbb.caption.option.backcolor = Color de rèireplan \:
+bbb.caption.option.backcolor.tooltip = Color de rèireplan
+bbb.caption.option.textcolor = Color del tèxte \:
+bbb.caption.option.textcolor.tooltip = Color del tèxte
+
 
 bbb.accessibility.clientReady = Prèst
 
-bbb.accessibility.chat.chatBox.reachedFirst = Avètz atench lo primièr messatge.
-bbb.accessibility.chat.chatBox.reachedLatest = Avètz atench lo darrier messatge.
+bbb.accessibility.chat.chatBox.reachedFirst = Avètz atent lo primièr messatge.
+bbb.accessibility.chat.chatBox.reachedLatest = Avètz atent lo darrier messatge.
 bbb.accessibility.chat.chatBox.navigatedFirst =  Avètz navigat fins al primièr messatge.
 bbb.accessibility.chat.chatBox.navigatedLatest = Avètz navigat fins al darrièr messatge.
 bbb.accessibility.chat.chatBox.navigatedLatestRead = Avètz navigat fins al messatge lo mai recent qu'avètz legit.
 bbb.accessibility.chat.chatwindow.input = Picada de tèxte
 bbb.accessibility.chat.chatwindow.audibleChatNotification = Son de notificacion de chat
 
-bbb.accessibility.chat.initialDescription = Utilizar las flèchas per navigar entre los messatges.
+bbb.accessibility.chat.initialDescription = Utilizar las sagetas per navigar entre los messatges.
 
 bbb.accessibility.notes.notesview.input = Picada de nòtas
 
 bbb.shortcuthelp.title = Acorchis de clavièr
-bbb.shortcuthelp.minimizeBtn.accessibilityName = Redusir l'ajuda suls acorchis
+bbb.shortcuthelp.minimizeBtn.accessibilityName = Reduire l'ajuda suls acorchis
 bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Agrandir l'ajuda suls acorchis
 bbb.shortcuthelp.closeBtn.accessibilityName = Tampar l'ajuda suls acorchis
 bbb.shortcuthelp.dropdown.general = Acorchis globals
@@ -431,11 +485,11 @@ bbb.shortcuthelp.headers.shortcut = Acorchi
 bbb.shortcuthelp.headers.function = Foncion
 
 bbb.shortcutkey.general.minimize = 189
-bbb.shortcutkey.general.minimize.function = Redusir la fenèstra correnta
+bbb.shortcutkey.general.minimize.function = Reduire la fenèstra correnta
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Agrandir la fenèstra correnta
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Levar lo fòcus de la fenèstra de Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Activar e desactivar vòstre microfòn
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Metre lo fòcus sus la fenèstra de discus
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Dobrir la fenèstra de partiment d'ecran
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Dobrir la fenèstra de paramètres àudio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Aviar / arrestar l'escota de la conferéncia
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Dobrir la fenèstra de partiment de la webcam
 
@@ -485,7 +535,7 @@ bbb.shortcutkey.present.fitPage = 80
 bbb.shortcutkey.present.fitPage.function = Ajustar las paginas a la pagina
 
 bbb.shortcutkey.users.makePresenter = 80
-bbb.shortcutkey.users.makePresenter.function = Far de la persona seleccionada lo presentator
+bbb.shortcutkey.users.makePresenter.function = Far de la persona seleccionada lo presentador
 bbb.shortcutkey.users.kick = 75
 bbb.shortcutkey.users.kick.function = Ejectar la persona seleccionada de la conferéncia
 bbb.shortcutkey.users.mute = 83
@@ -495,7 +545,7 @@ bbb.shortcutkey.users.muteall.function = Activar o desactivar la sordina per tot
 bbb.shortcutkey.users.focusUsers = 85
 bbb.shortcutkey.users.focusUsers.function = Metre lo fòcus sus la lista d'utilizaires
 bbb.shortcutkey.users.muteAllButPres = 65
-bbb.shortcutkey.users.muteAllButPres.function = Metre tot lo monde en sordina levat lo presentator
+bbb.shortcutkey.users.muteAllButPres.function = Metre tot lo monde en sordina levat lo presentador
 
 bbb.shortcutkey.chat.focusTabs = 89
 bbb.shortcutkey.chat.focusTabs.function = Metre lo fòcus suls onglets de la fenèstra de discussion
@@ -533,7 +583,7 @@ bbb.polling.pollModal.title = Los resultats del vòte en dirècte
 bbb.polling.customChoices.title = Entrar las causidas del vòte
 bbb.polling.respondersLabel.novotes = En espèra de las responsas
 bbb.polling.respondersLabel.text = {0} Utilizaires an respondut
-bbb.polling.respondersLabel.finished = Fach
+bbb.polling.respondersLabel.finished = Fait
 bbb.polling.answer.Yes = Ã’c
 bbb.polling.answer.No = Non
 bbb.polling.answer.True = Verai
@@ -551,21 +601,23 @@ bbb.polling.results.accessible.answer = La responsa {0} aviá {1} vòtes.
 bbb.publishVideo.startPublishBtn.labelText = Aviar lo partiment
 bbb.publishVideo.changeCameraBtn.labelText = Cambiar la webcam
 
-bbb.accessibility.alerts.madePresenter = Ara, sètz lo presentator.
+bbb.accessibility.alerts.madePresenter = Ara, sètz lo presentador.
 bbb.accessibility.alerts.madeViewer = Ara, sètz un espectator.
 
 bbb.shortcutkey.specialKeys.space = Barra d'espaçament
-bbb.shortcutkey.specialKeys.left = Flècha esquèrra
-bbb.shortcutkey.specialKeys.right = Flècha drecha
-bbb.shortcutkey.specialKeys.up = Flècha naut
-bbb.shortcutkey.specialKeys.down = Flècha bas
+bbb.shortcutkey.specialKeys.left = Sageta esquèrra
+bbb.shortcutkey.specialKeys.right = Sageta dreita
+bbb.shortcutkey.specialKeys.up = Sageta naut
+bbb.shortcutkey.specialKeys.down = Sageta bas
 bbb.shortcutkey.specialKeys.plus = Mai
 bbb.shortcutkey.specialKeys.minus = Mens
 
 bbb.toolbar.videodock.toolTip.closeAllVideos = Tampar totas las vidèos
 bbb.users.settings.lockAll=Verrolhar totes los utilizaires
-bbb.users.settings.lockAllExcept=Verrolhar totes los utilizaires levat lo presentator
+bbb.users.settings.lockAllExcept=Verrolhar totes los utilizaires levat lo presentador
 bbb.users.settings.lockSettings=Verrolhar los participants
+bbb.users.settings.breakoutRooms=Metre las salas en pausa...
+bbb.users.settings.sendBreakoutRoomsInvitations=Mandar los convits per las Salas de Grop...
 bbb.users.settings.unlockAll=Desverrolhar totes los participants
 bbb.users.settings.roomIsLocked=Verrolhat per defaut
 bbb.users.settings.roomIsMuted=Sens son per defaut
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Verrolhar los participants
 bbb.lockSettings.feature=Foncionalitat
 bbb.lockSettings.locked=Verrolhat
 bbb.lockSettings.lockOnJoin=Verrolhar a la connexion
+
+bbb.users.breakout.breakoutRooms = Metre las salas en pausa
+bbb.users.breakout.updateBreakoutRooms = Metre a jorn las Salas de Grop
+bbb.users.breakout.remainingTimeBreakout = {0}\\\: <b>{1} restant</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} restant</b>
+bbb.users.breakout.calculatingRemainingTime = Calcul del temps restant...
+bbb.users.breakout.remainingTimeEnded = Temps depassat, la sala de grop se va tampar.
+bbb.users.breakout.rooms = Salas
+bbb.users.breakout.roomsCombo.accessibilityName = Nombre de salas de crear
+bbb.users.breakout.room = Sala
+bbb.users.breakout.randomAssign = Afectar los utilizaires aleatòriament
+bbb.users.breakout.timeLimit = Limit de temps
+bbb.users.breakout.durationStepper.accessibilityName = Limit de temps en minutas
+bbb.users.breakout.minutes = Minutas
+bbb.users.breakout.record = Enregistrar
+bbb.users.breakout.recordCheckbox.accessibilityName = Enregistrar las salas de grop
+bbb.users.breakout.notAssigned = Pas assignat
+bbb.users.breakout.dragAndDropToolTip = Astúce\\\: Podètz lisar-depausar los utilizaires entre las salas
+bbb.users.breakout.start = Començar
+bbb.users.breakout.invite = Convidar
+bbb.users.breakout.close = Tampar
+bbb.users.breakout.closeAllRooms = Tampar Totas las Salas de Grop
+bbb.users.breakout.insufficientUsers = Nombre d'utilizaires insufisent. Deuriatz apondre al mens un utilizaire per sala
+bbb.users.breakout.openJoinURL = Sètz convidat a rejónher la Sala de Grop {0}\\n(En acceptant, quitaretz automaticament l’audioconferéncia)
+bbb.users.breakout.confirm = Confirmar Jónher Sala de Grop
+bbb.users.roomsGrid.room = Sala
+bbb.users.roomsGrid.users = Utilizaires
+bbb.users.roomsGrid.action = Accion
+bbb.users.roomsGrid.transfer = Transferiment àudio
+bbb.users.roomsGrid.join = Rejónher
+bbb.users.roomsGrid.noUsers = Pas cap d'utilizaire dins aquesta sala
diff --git a/bigbluebutton-client/locale/or_IN/bbbResources.properties b/bigbluebutton-client/locale/or_IN/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/or_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/or_IN/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/pl_PL/bbbResources.properties b/bigbluebutton-client/locale/pl_PL/bbbResources.properties
index 313825fda1d9b5c91a579e4e8b3ed28cf857c37a..a3b993c3fe1e4bba87f57520262eaf6ef34a5012 100644
--- a/bigbluebutton-client/locale/pl_PL/bbbResources.properties
+++ b/bigbluebutton-client/locale/pl_PL/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Wtyczka Flash ({0}) jest nieaktualna. Zalecana jest aktualizacja do najnowszej wersji.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Zalecane jest użycie przeglądarki Firefox lub Chrome dla lepszej jakości dźwięku.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Nie wykryto wersji Java
-bbb.clientstatus.java.notinstalled = Nie masz zainstalowanej Javy, kliknij <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>TUTAJ</a></font>, aby pobrać najnowszą wersję Javy, aby korzystać z udostępniania pulpitu.
-bbb.clientstatus.java.oldversion = Posiadasz starą wersję Javy, kliknij <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>TUTAJ</a></font>, aby pobrać najnowszą wersję Javy, aby korzystać z udostępniania pulpitu.
 bbb.window.minimizeBtn.toolTip = Zwiń
 bbb.window.maximizeRestoreBtn.toolTip = Powiększ
 bbb.window.closeBtn.toolTip = Zamknij
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Status\: smutek
 bbb.users.emojiStatus.confused = Status\: zakłopotany
 bbb.users.emojiStatus.neutral = Status\: neutralny
 bbb.users.emojiStatus.away = Status\: nieobecny
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentacja
 bbb.presentation.titleWithPres = Prezentacja\: {0}
 bbb.presentation.quickLink.label = Okno Prezentacji
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Zamknij okno dialogowe ustawień kamery
 bbb.video.publish.closeBtn.label = Anuluj
 bbb.video.publish.titleBar = Okno publikacji kamery
 bbb.video.streamClose.toolTip = Zamknij strumień dla\: {0}
-bbb.desktopPublish.title = Udostępnianie pulpitu\: podgląd prezentera
-bbb.desktopPublish.fullscreen.tooltip = Udostępnij Swój Główny Ekran
-bbb.desktopPublish.fullscreen.label = Pełny ekran
-bbb.desktopPublish.region.tooltip = Udostępnij Część Swojego Ekranu
-bbb.desktopPublish.region.label = Strefa
-bbb.desktopPublish.stop.tooltip = Zamknij udostępnianie ekranu
-bbb.desktopPublish.stop.label = Zamknij
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Nie możesz powiększyć tego okna
-bbb.desktopPublish.closeBtn.toolTip = Zakończ udostępnianie i zamknij
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Udostępnianie pulpitu nie jest dostępne w przeglądarce Chrome na Mac OS X. Musisz użyć innej przeglądarki (zalecany Firefox), aby udostępnić Twój pulpit. 
-bbb.desktopPublish.chrome42UnsupportedHint = Przeglądarka Chrome nie wspiera już appletów Javy. Musisz użyc innej przeglądarki (zalecany Firefox), aby udostępnić swój ekran.
-bbb.desktopPublish.edgePluginUnsupportedHint = Przeglądarka Edge nie wspiera appletów Javy. Musisz użyc innej przeglądarki (zalecany Firefox), aby udostępnić swój ekran.
-bbb.desktopPublish.minimizeBtn.toolTip = Zwiń
-bbb.desktopPublish.minimizeBtn.accessibilityName = Zwiń okno udostępniania pulpitu
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Powiększ okno udostępniania pulpitu
-bbb.desktopPublish.chromeHint.title = Przeglądarka Chrome może potrzebować Twojej zgody.
-bbb.desktopPublish.chromeHint.message = Wybierz ikonę pluginu (prawy, górny róg w przeglądarce Chrone), odblokuj pluginy i wybierz przycisk "Ponów".
-bbb.desktopPublish.chromeHint.button = Ponów
-bbb.desktopView.title = Udostępnianie pulpitu
-bbb.desktopView.fitToWindow = Dopasuj do okna
-bbb.desktopView.actualSize = Wyświetl aktualną wielkość
-bbb.desktopView.minimizeBtn.accessibilityName = Zwiń okno widoku udostępniania pulpitu
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Powiększ okno widoku udostępniania pulpitu
-bbb.desktopView.closeBtn.accessibilityName = Zamknij okno widoku udostępniania pulpitu
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Wybierz Swój Mikrofon
 bbb.toolbar.phone.toolTip.stop = Wyłącz Udostępnianie Swojego Mikrofonu
 bbb.toolbar.phone.toolTip.mute = Przestań słuchać konferencji
 bbb.toolbar.phone.toolTip.unmute = Zacznij słuchać konferencji
 bbb.toolbar.phone.toolTip.nomic = Nie wykryto mikrofonu
-bbb.toolbar.deskshare.toolTip.start = Udostępnij Swój Ekran
-bbb.toolbar.deskshare.toolTip.stop = Wyłącz Udostępnianie Swojego Ekranu
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Udostępnij Obraz Swojej Kamery Internetowej
 bbb.toolbar.video.toolTip.stop = Wyłącz Udostępnianie Obrazu Swojej Kamery Internetowej
 bbb.layout.addButton.toolTip = Dodaj niestandardowy układ do listy
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Układ został zapisany
 bbb.layout.load.complete = Układ został wczytany
 bbb.layout.load.failed = Nie można załadować układów 
 bbb.layout.name.defaultlayout = Standardowy układ
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Chat video
 bbb.layout.name.webcamsfocus = Kamerki internetowe
 bbb.layout.name.presentfocus = Prezentacja
@@ -362,6 +395,7 @@ bbb.logout.rejected = Połączenie z serwerem zostało utracone
 bbb.logout.invalidapp = Aplikacja red5 nie istnieje
 bbb.logout.unknown = Twój klient stracił połączenie z serwerem
 bbb.logout.usercommand = Wylogowałeś się z konferencji
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Moderator wyrzucił Cię ze spotkania.
 bbb.logout.refresh.message = Jeśli to wylogowanie było niezamierzone, naciśnij na przycisk poniżej by ponownie połączyć.
 bbb.logout.refresh.label = Połącz ponownie
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Zapisz notatkÄ™
 bbb.settings.deskshare.instructions = Kliknij zezwalaj aby sprawdzić czy udostępnianie pulpitu działa u Ciebie poprawnie
 bbb.settings.deskshare.start = Sprawdź udostępnianie pulpitu
 bbb.settings.voice.volume = Aktywność mikrofonu
-bbb.settings.java.label = BÅ‚Ä…d wersji komponentu Java
-bbb.settings.java.text = Posiadasz zainstalowaną wersję Java {0}, ale nie posiadasz najnowszej wersji {1} wymaganej do używania BigBlueButton opcji udostępniania pulpitu. Kliknij aby zainstalować najnowszą wersję Java JRE.
-bbb.settings.java.command = Instaluj najnowszÄ… JavÄ™
 bbb.settings.flash.label = BÅ‚Ä…d wersji Flash
 bbb.settings.flash.text = Posiadasz zainstalowany Flash w wersji {0}, ale nie masz najnowszej wersji {1} wymaganej do używania BigBlueButton. Kliknij aby zainstalować najnowszy Adobe Flash.
 bbb.settings.flash.command = Instaluj najnowszy Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Tekst
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Zamień kursor na tekst
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Kolor tekstu
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Wielkość czcionki
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Gotowe
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Zwiń aktualne okno
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Powiększ aktualne okno
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = A1
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Wycisz i włącz Twój mikrofon
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Aktywuj okno czatu
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Otwórz okno udostępniania pulpitu
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Otwórz okno ustawień mikrofonu
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Zacznij/Zakończ słuchać konferencji
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Otwórz okno udostępniania kamery
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Zamknij Wszystkie Wideo
 bbb.users.settings.lockAll=Zablokuj Wszystkich Użytkowników
 bbb.users.settings.lockAllExcept=Zablokuj Użytkowników Oprócz Prezentera
 bbb.users.settings.lockSettings=Zablokuj Widzów
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Odblokuj Wszystkich Widzów
 bbb.users.settings.roomIsLocked=Zablokowany domyślnie
 bbb.users.settings.roomIsMuted=Wyciszony domyślnie
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Zablokuj Widzów
 bbb.lockSettings.feature=Cecha
 bbb.lockSettings.locked=Zablokowany
 bbb.lockSettings.lockOnJoin=Zablokuj podczas dołączania
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/pt_BR/bbbResources.properties b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
index 3757a95051341e4dc8f56f580b18e3571843207a..ef5e3e3be6cded78fe4341fcbf7297b55ece4f60 100755
--- a/bigbluebutton-client/locale/pt_BR/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Seu plugin Flash Player ({0}) está desatualizado. Recomenda-se a atualização para a versão mais recente.
 bbb.clientstatus.webrtc.title = Áudio
 bbb.clientstatus.webrtc.message = Recomenda-se a utilização dos navegadores Mozilla Firefox ou Google Chrome para uma melhor qualidade de áudio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Versão do Java não detectada.
-bbb.clientstatus.java.notinstalled = Você não possui o Java instalado, por favor clique <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>AQUI</a></font> para instalar a última versão do Java e com isso utilizar a função de compartilhar a tela.
-bbb.clientstatus.java.oldversion = Você possui uma versão antiga do Java, por favor clique <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>AQUI</a></font> para instalar a última versão do Java e com isso utilizar a função de compartilhar a tela.
 bbb.window.minimizeBtn.toolTip = Minimizar
 bbb.window.maximizeRestoreBtn.toolTip = Maximizar
 bbb.window.closeBtn.toolTip = Fechar
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Triste
 bbb.users.emojiStatus.confused = Confuso
 bbb.users.emojiStatus.neutral = Neutro
 bbb.users.emojiStatus.away = Ausente
+bbb.users.emojiStatus.thumbsUp = Afirmativo
+bbb.users.emojiStatus.thumbsDown = Negativo
+bbb.users.emojiStatus.applause = Aplauso
 bbb.presentation.title = Apresentação
 bbb.presentation.titleWithPres = Apresentação\: {0}
 bbb.presentation.quickLink.label = Janela de apresentação
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Fechar caixa de diálogo de configuraç
 bbb.video.publish.closeBtn.label = Cancelar
 bbb.video.publish.titleBar = Janela de transmissão de vídeo
 bbb.video.streamClose.toolTip = Fechar transmissão para\: {0}
-bbb.desktopPublish.title = Compartilhamento de tela\: preview do apresentador
-bbb.desktopPublish.fullscreen.tooltip = Compartilhar sua tela principal
-bbb.desktopPublish.fullscreen.label = Tela cheia
-bbb.desktopPublish.region.tooltip = Compartilhar parte da sua tela
-bbb.desktopPublish.region.label = Região
-bbb.desktopPublish.stop.tooltip = Fechar compartilhamento de tela
-bbb.desktopPublish.stop.label = Cancelar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Você não pode maximizar esta janela.
-bbb.desktopPublish.closeBtn.toolTip = Interromper compartilhamento de tela
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Compartilhamento de tela não é suportado atualmente no Chrome no Mac OS X. Você deve usar outro navegador web (Firefox é recomendado) para compartilhar sua tela.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome não suporta mais Applets Java. Você deve usar um navegador web diferente (Firefox é recomendado) para compartilhar seu desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge não suporta Applets Java. Você deve usar outro navegador web (Firefox é recomendado) para compartilhar sua tela.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimizar
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela
-bbb.desktopPublish.chromeHint.title = Chrome pode precisar de sua permissão.
-bbb.desktopPublish.chromeHint.message = Selecione o ícone de plugins (canto superior direito do Chrome), desbloqueie os plugins, e então selecione "Tentar novamente".
-bbb.desktopPublish.chromeHint.button = Tentar novamente
-bbb.desktopView.title = Compartilhamento de tela
-bbb.desktopView.fitToWindow = Ajustar à janela
-bbb.desktopView.actualSize = Exibir tamanho original
-bbb.desktopView.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela
-bbb.desktopView.closeBtn.accessibilityName = Fechar janela do compartilhamento de tela
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pausar compartilhamento de tela
+bbb.screensharePublish.pause.label = Pausar
+bbb.screensharePublish.restart.tooltip = Reiniciar compartilhamento de tela
+bbb.screensharePublish.restart.label = Reiniciar
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Você não pode maximizar esta janela.
+bbb.screensharePublish.closeBtn.toolTip = Parar compartilhamento de tela e fechar janela
+bbb.screensharePublish.minimizeBtn.toolTip = Minimizar
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = Os passos abaixo o ajudarão iniciar o compartilhamento de tela (requer Java).
+bbb.screensharePublish.helpButton.toolTip = Ajuda
+bbb.screensharePublish.helpButton.accessibilityName = Ajuda (Abre o tutorial em uma nova janela)
+bbb.screensharePublish.helpText.PCIE1 = 1. Selecione 'Abrir'
+bbb.screensharePublish.helpText.PCIE2 = 2. Aceite o certificado
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Clique 'OK' para executar
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Aceite o certificado
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Localize 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Clique para abrir
+bbb.screensharePublish.helpText.PCChrome3 = 3. Aceite o certificado
+bbb.screensharePublish.helpText.MacSafari1 = 1. Localize 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Clique com o botão direito e selecione 'Abrir'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Selecione 'Abrir' (se for solicitado)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Selecione 'Salvar Arquivo' (se solicitado)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Clique com o botão direito e selecione 'Abrir'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Selecione 'Abrir' (se for solicitado)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Localize 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Clique com o botão direito e selecione 'Abrir'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Selecione 'Abrir' (se for solicitado)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Clique 'OK' para executar
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Aceite o certificado
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Localize 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Clique para abrir
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Aceite o certificado
+bbb.screensharePublish.shareTypeLabel.text = Compartilhar\:
+bbb.screensharePublish.shareType.fullScreen = Tela cheia
+bbb.screensharePublish.shareType.region = Região
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Não foi detectado o início do compartilhamento de tela.
+bbb.screensharePublish.restartFailed.label = Não foi detectado o reinício do compartilhamento de tela.
+bbb.screensharePublish.jwsCrashed.label = O compartilhamento de tela fechou inesperadamente
+bbb.screensharePublish.commonErrorMessage.label = Selecione 'Cancelar' e tente novamente.
+bbb.screensharePublish.cancelButton.label = Cancelar
+bbb.screensharePublish.startButton.label = Iniciar
+bbb.screensharePublish.stopButton.label = Parar
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Ajustar à janela
+bbb.screenshareView.actualSize = Exibir tamanho original
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Transmitir seu microfone
 bbb.toolbar.phone.toolTip.stop = Interromper transmissão do seu microfone
 bbb.toolbar.phone.toolTip.mute = Parar de escutar a conferência
 bbb.toolbar.phone.toolTip.unmute = Começar a escutar a conferência
 bbb.toolbar.phone.toolTip.nomic = Nenhum microfone detectado
-bbb.toolbar.deskshare.toolTip.start = Compartilhar sua tela
-bbb.toolbar.deskshare.toolTip.stop = Interromper compartilhamento da sua tela
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Transmitir sua câmera
 bbb.toolbar.video.toolTip.stop = Interromper compartilhamento da sua câmera
 bbb.layout.addButton.toolTip = Adicionar layout atual à lista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts salvos com sucesso
 bbb.layout.load.complete = Layouts carregados com sucesso
 bbb.layout.load.failed = Não foi possível carregar os layouts
 bbb.layout.name.defaultlayout = Layout padrão
+bbb.layout.name.closedcaption = Closed Caption
 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
@@ -362,6 +395,7 @@ bbb.logout.rejected = A conexão com o servidor foi rejeitada
 bbb.logout.invalidapp = O aplicativo red5 não existe
 bbb.logout.unknown = Seu cliente perdeu conexão com o servidor
 bbb.logout.usercommand = Você saiu da conferência
+bbb.logour.breakoutRoomClose = A janela do navegador será fechada
 bbb.logout.ejectedFromMeeting = Um moderador expulsou você da sala.
 bbb.logout.refresh.message = Se você foi desconectado de maneira inesperada, clique no botão baixo para reconectar.
 bbb.logout.refresh.label = Reconectar
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Salvar nota
 bbb.settings.deskshare.instructions = Clique em Permitir na janela que será aberta para verificar se o compartilhamento de tela está funcionando corretamente
 bbb.settings.deskshare.start = Verificar compartilhamento de tela
 bbb.settings.voice.volume = Atividade do microfone
-bbb.settings.java.label = Erro na versão do Java
-bbb.settings.java.text = Você possui a versão {0} do Java instalada, mas é necessário pelo menos a versão {1} para executar o compartilhamento de tela corretamente. Clique no botão abaixo para instalar a versão mais nova do Java JRE.
-bbb.settings.java.command = Instalar a versão mais nova do Java
 bbb.settings.flash.label = Erro na versão do Flash
 bbb.settings.flash.text = Você possui a versão {0} do Flash instalada, mas é necessário pelo menos a versão {1} para executar o BigBlueButton corretamente. Clique no botão abaixo para instalar a versão mais nova do Adobe Flash Player.
 bbb.settings.flash.command = Instalar a versão mais nova do Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Texto
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Mudar o cursor do quadro branco para texto
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Cor do texto
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Tamanho da fonte
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = Nenhum
+bbb.caption.transcript.youowner = Você
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Não é possível colar text mais longo que {0} caracteres. Você colou {1} caracteres.
+bbb.caption.option.label = Opções
+bbb.caption.option.language = Linguagem\:
+bbb.caption.option.language.tooltip = Selecione a Linguagem das Legendas
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Tornar-se Dono
+bbb.caption.option.takeowner.tooltip = Tornar-se Dono da Linguagem Selecionada
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Tamanho da Fonte\:
+bbb.caption.option.fontsize.tooltip = Tamanho da Fonte
+bbb.caption.option.backcolor = Cor de Fundo\:
+bbb.caption.option.backcolor.tooltip = Cor de Fundo
+bbb.caption.option.textcolor = Cor do Texto\:
+bbb.caption.option.textcolor.tooltip = Cor do Texto
+
 
 bbb.accessibility.clientReady = Pronto
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimizar janela atual
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximizar janela atual
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Mudar foco para fora da janela do Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Silenciar e acionar seu microfone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Mudar foco para a janela de bate-papo
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Abrir janela de compartilhamento de tela
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Abrir janela de configuração de microfone
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Começar/Parar de escutar a conferência
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Abrir janela de transmissão da câmera
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Fechar todas câmeras
 bbb.users.settings.lockAll=Bloquear todos
 bbb.users.settings.lockAllExcept=Bloquear todos exceto o apresentador
 bbb.users.settings.lockSettings=Restringir participantes ...
+bbb.users.settings.breakoutRooms=Salas de Apoio ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Enviar Convites para Sala de Apoio ...
 bbb.users.settings.unlockAll=Liberar todos os participantes
 bbb.users.settings.roomIsLocked=Bloqueados por padrão
 bbb.users.settings.roomIsMuted=Silenciados por padrão
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Restringir participantes
 bbb.lockSettings.feature=Recurso
 bbb.lockSettings.locked=Bloqueado
 bbb.lockSettings.lockOnJoin=Restringir ao entrar
+
+bbb.users.breakout.breakoutRooms = Salas de Apoio
+bbb.users.breakout.updateBreakoutRooms = Atualizar Salas de Apoio
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} restante</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} restante</b>
+bbb.users.breakout.calculatingRemainingTime = Calculando tempo restante...
+bbb.users.breakout.remainingTimeEnded = Tempo esgotado, a sala de apoio será fechada.
+bbb.users.breakout.rooms = Salas
+bbb.users.breakout.roomsCombo.accessibilityName = Números de Sala para criar
+bbb.users.breakout.room = Sala
+bbb.users.breakout.randomAssign = Atribuir Usuários Aleatóriamente
+bbb.users.breakout.timeLimit = Tempo Limite
+bbb.users.breakout.durationStepper.accessibilityName = Tempo limite em minutos
+bbb.users.breakout.minutes = Minutos
+bbb.users.breakout.record = Gravar
+bbb.users.breakout.recordCheckbox.accessibilityName = Gravar salas de apoio
+bbb.users.breakout.notAssigned = Não Atribuído
+bbb.users.breakout.dragAndDropToolTip = Dica\: Você pode arrastar os usuários entre as salas
+bbb.users.breakout.start = Iniciar
+bbb.users.breakout.invite = Convidar
+bbb.users.breakout.close = Fechar
+bbb.users.breakout.closeAllRooms = Fechar Todas Salas de Apoio
+bbb.users.breakout.insufficientUsers = Usuários insuficientes. Você deve colocar pelo menos um usuário em uma sala de apoio. 
+bbb.users.breakout.openJoinURL = Você foi convidado a entrar na Sala de Apoio {0}\n(Aceitando, você irá automaticamente deixar a conferência de áudio)
+bbb.users.breakout.confirm = Confirme para Entrar na Sala de Apoio
+bbb.users.roomsGrid.room = Sala
+bbb.users.roomsGrid.users = Usuários
+bbb.users.roomsGrid.action = Ação
+bbb.users.roomsGrid.transfer = Trasferir Áudio
+bbb.users.roomsGrid.join = Entrar
+bbb.users.roomsGrid.noUsers = Nenhum usuário nesta sala
diff --git a/bigbluebutton-client/locale/pt_PT/bbbResources.properties b/bigbluebutton-client/locale/pt_PT/bbbResources.properties
index f05032cefd46196880e71ce23c48e57cf9237612..223b34898d6dbeb9943fd9ef7c127c690a426b6f 100644
--- a/bigbluebutton-client/locale/pt_PT/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_PT/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimizar
 bbb.window.maximizeRestoreBtn.toolTip = Máximizar
 bbb.window.closeBtn.toolTip = Fechar
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Apresentação
 bbb.presentation.titleWithPres = Apresentação\\\: {0}
 bbb.presentation.quickLink.label = Janela de apresentação
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Fechar janela de definições da webcam
 bbb.video.publish.closeBtn.label = Cancelar
 bbb.video.publish.titleBar = Publicar a janela da webcam
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Partilha de desktop
-bbb.desktopPublish.fullscreen.tooltip = Partilhar o ecrã principal
-bbb.desktopPublish.fullscreen.label = Ecrã inteiro
-bbb.desktopPublish.region.tooltip = Partilhar apenas uma parte do ecrã
-bbb.desktopPublish.region.label = Região
-bbb.desktopPublish.stop.tooltip = Fechar partilha de ecrã
-bbb.desktopPublish.stop.label = Fechar
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Não pode maximizar esta janela
-bbb.desktopPublish.closeBtn.toolTip = Parar a partilha e fechar esta janela
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimizar janela
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar a janela de partilha do ambiente de trabalho
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar a janela de partilha do ambiente de trabalho
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Patilha de Ambiente de Trabalho
-bbb.desktopView.fitToWindow = Ajustar à janela
-bbb.desktopView.actualSize = Mostar tamanho actual
-bbb.desktopView.minimizeBtn.accessibilityName = Minimizar a janela de partilha da vista de ambiente de trabalho
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximizar a janela de partilha da vista de ambiente de trabalho
-bbb.desktopView.closeBtn.accessibilityName = Fechar a janela de partilha da vista de ambiente de trabalho
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Partilhar o microfone
 bbb.toolbar.phone.toolTip.stop = Parar a partilha do microfone
 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 = Partilha de ambiente de trabalho
-bbb.toolbar.deskshare.toolTip.stop = Parar a partilha do ambiente de trabalho
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Partilhar webcam
 bbb.toolbar.video.toolTip.stop = Parar partilha da webcam
 bbb.layout.addButton.toolTip = Adicionar o layout personalizado à lista
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Os layouts foram gravados com sucesso
 bbb.layout.load.complete = Os layouts foram carregados com sucesso
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = A ligação ao servidor for rejeitada
 bbb.logout.invalidapp = aplicação red5 não existe
 bbb.logout.unknown = Foi perdida a ligação ao servidor
 bbb.logout.usercommand = Saiu da conferencia
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Gravar nota
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Verificar Partilha de Ambiente de Trabalho
 bbb.settings.voice.volume = Actividade de Microfone
-bbb.settings.java.label = Erro na versão do Java
-bbb.settings.java.text = Este PC tem instalada a versão {0} do Java. No entanto, a funcionalidade de partilha de ambiente de trabalho requer pelo menos a versão {1}. O botão abaixo irá instalar a versão mais recente do Java JRE.
-bbb.settings.java.command = Instale uma versão do Java mais recente
 bbb.settings.flash.label = Erro na Versão do flash
 bbb.settings.flash.text = Este PC tem instalada a versão {0} do Flash. No entanto, esta aplicação requer pelo menos a versão {1}. O botão abaixo irá instalar a versão mais recente do Adobe Flash.
 bbb.settings.flash.command = Instale uma versão mais recente do flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Texto
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Alterar o cursor do whiteboard para texto
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Cor de texto
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Tamanho do texto
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimizar a janela atual
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximizar a janela atual
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Abrir janela de partilha do ambiente de trabalho
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Abrir a janela de definições de audio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Abrir a janela de partilha da webcam
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ro_RO/bbbResources.properties b/bigbluebutton-client/locale/ro_RO/bbbResources.properties
index 8b5aae1a396e6b3ac533daae028cd151428336af..a90a5a2cb4aa2cd1218b7f3a885cca02242c32a1 100644
--- a/bigbluebutton-client/locale/ro_RO/bbbResources.properties
+++ b/bigbluebutton-client/locale/ro_RO/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Inchidere
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentare
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Anulare
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Partajare spaţiu de lucru
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Ecran Plin
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Regiune
-bbb.desktopPublish.stop.tooltip = ÃŽnchide partajarea ecranului
-bbb.desktopPublish.stop.label = ÃŽnchide
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Nu puteţi maximiza această fereastră
-bbb.desktopPublish.closeBtn.toolTip = Opreşte partajarea şi închide aceasta fereastră
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimizează aceasta fereastră
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Partajare spațiu de lucru
-bbb.desktopView.fitToWindow = Potriviți în cadrul ferestrei
-bbb.desktopView.actualSize = Afişează dimensiunea actuală
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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 = Nu s-a detectat niciun microfon
-bbb.toolbar.deskshare.toolTip.start = Share Your Desktop
-bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Desktop
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = Conexiunea la server a fost respinsă
 bbb.logout.invalidapp = Aplicatia red5 nu există
 bbb.logout.unknown = Clientul dumneavoastră a pierdut conexiunea cu serverul
 bbb.logout.usercommand = Aţi ieşit din conferinţă
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Apăsați "Allow" în fereastra de dialog ce va apărea pentru a verifica faptul că partajarea spațiului de lucru funcționează corect pentru dvs.
 bbb.settings.deskshare.start = Verifică partajarea spaţiului de lucru
 bbb.settings.voice.volume = Activitate Microfon
-bbb.settings.java.label = Eroare la versiunea Java
-bbb.settings.java.text = Aveți instalată Java versiunea {0} dar vă trebuie cel puțin versiunea {1} pentru a folosi funcționalitatea de partajare a spatiului de lucru oferită de BigBlueButton. Apăsați butonul de mai jos pentru a instala ultima versiune de Java Runtime Environment
-bbb.settings.java.command = Instalați ultima versiune de Java
 bbb.settings.flash.label = Eroare la versiunea Flash
 bbb.settings.flash.text = Aveți instalat Flash, versiunea {0}, dar vă trebuie cel puțin versiunea {1} pentru a rula BigBlueButton in mod adecvat. Apăsați pe butonul de mai jos pentru a instala ultima versiune a Adobe Flash.
 bbb.settings.flash.command = Instalați ultima versiune de Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/ru_RU/bbbResources.properties b/bigbluebutton-client/locale/ru_RU/bbbResources.properties
index 1be4eeaacb4a5d608b1b2f705d6ecce5bc0b8cdc..f9ea5cff1f177a51a65d42b548aa3cab8967c464 100755
--- a/bigbluebutton-client/locale/ru_RU/bbbResources.properties
+++ b/bigbluebutton-client/locale/ru_RU/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Установленный плагин Flash Player ({0}) устарел. Рекомендуем обновить его до наиболее свежей версии.
 bbb.clientstatus.webrtc.title = Аудио
 bbb.clientstatus.webrtc.message = Рекомендуется использовать Firefox или Chrome для улучшения качества аудио.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Версия Java не определена.
-bbb.clientstatus.java.notinstalled = У Вас не установлена Java. Чтобы установить последнюю версию Java и пользоваться функцией трансляции рабочего стола, пожалуйста, перейдите по этой <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ССЫЛКЕ</a></font>.
-bbb.clientstatus.java.oldversion = У Вас установлена устаревшая версия Java. Чтобы установить последнюю версию Java и пользоваться функцией трансляции рабочего стола, пожалуйста, перейдите по этой <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>ССЫЛКЕ</a></font>.
 bbb.window.minimizeBtn.toolTip = Свернуть
 bbb.window.maximizeRestoreBtn.toolTip = Развернуть
 bbb.window.closeBtn.toolTip = Закрыть
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Грустный
 bbb.users.emojiStatus.confused = Смущенный
 bbb.users.emojiStatus.neutral = Нейтральный
 bbb.users.emojiStatus.away = Нет на месте
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Презентация
 bbb.presentation.titleWithPres = Презентация\: {0}
 bbb.presentation.quickLink.label = Окно презентаций
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Закрыть окно настроек
 bbb.video.publish.closeBtn.label = Отмена
 bbb.video.publish.titleBar = Окно включения веб-камеры
 bbb.video.streamClose.toolTip = Закрыть трансляцию для\: {0}
-bbb.desktopPublish.title = Трансляция рабочего стола\: предварительный просмотр
-bbb.desktopPublish.fullscreen.tooltip = Транслировать весь экран
-bbb.desktopPublish.fullscreen.label = Полноэкранный режим
-bbb.desktopPublish.region.tooltip = Транслировать область экрана
-bbb.desktopPublish.region.label = Область
-bbb.desktopPublish.stop.tooltip = Закрыть трансляцию экрана
-bbb.desktopPublish.stop.label = Закрыть
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Вы не можете развернуть это окно.
-bbb.desktopPublish.closeBtn.toolTip = Остановить трансляцию и закрыть окно
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Трансляция рабочего стола невозможна в браузере Chrome в системе Mac OS X. Используйте другой браузер (рекомендуется Firefox).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome больше не поддерживает Java апплеты. Используйте другой браузер (рекомендуется Firefox) для трансляции рабочего стола
-bbb.desktopPublish.edgePluginUnsupportedHint = Браузер Edge не поддерживает Java апплеты. Используйте другой веб-браузер (рекомендуется Firefox), чтобы показать свой экран.
-bbb.desktopPublish.minimizeBtn.toolTip = Свернуть
-bbb.desktopPublish.minimizeBtn.accessibilityName = Свернуть окно трансляции рабочего стола
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Развернуть окно трансляции рабочего стола
-bbb.desktopPublish.chromeHint.title = Возможно, Chrome требуется ваше разрешение.
-bbb.desktopPublish.chromeHint.message = Выделите иконку расширений (в верхнем правом углу окна Chrome), разблокируйте расширения, а затем выберите "Повторить".
-bbb.desktopPublish.chromeHint.button = Повторить
-bbb.desktopView.title = Трансляция рабочего стола
-bbb.desktopView.fitToWindow = Подогнать под размеры окна
-bbb.desktopView.actualSize = Фактический размер экрана
-bbb.desktopView.minimizeBtn.accessibilityName = Свернуть окно просмотра трансляции рабочего стола
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Развернуть окно просмотра трансляции рабочего стола
-bbb.desktopView.closeBtn.accessibilityName = Закрыть окно просмотра трансляции рабочего стола
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Пауза
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Перезапустить
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Свернуть
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Справка
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Полноэкранный режим
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Выберите "Отмена" и попробуйте снова.
+bbb.screensharePublish.cancelButton.label = Отмена
+bbb.screensharePublish.startButton.label = Начать
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Включить ваш микрофон
 bbb.toolbar.phone.toolTip.stop = Выключить ваш микрофон
 bbb.toolbar.phone.toolTip.mute = Прекратить слушать конференцию
 bbb.toolbar.phone.toolTip.unmute = Начать слушать конференцию
 bbb.toolbar.phone.toolTip.nomic = Микрофон не обнаружен
-bbb.toolbar.deskshare.toolTip.start = Транслировать рабочий стол
-bbb.toolbar.deskshare.toolTip.stop = Остановить трансляцию рабочего стола
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Включить трансляцию вашей веб-камеры
 bbb.toolbar.video.toolTip.stop = Остановить трансляцию вашей веб-камеры
 bbb.layout.addButton.toolTip = Добавить в список схему пользователя
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Схемы успешно сохранены
 bbb.layout.load.complete = Схемы успешно загруженны
 bbb.layout.load.failed = Не удается загрузить макеты
 bbb.layout.name.defaultlayout = Расположение окон по умолчанию
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Видеочат
 bbb.layout.name.webcamsfocus = Видеоконференция
 bbb.layout.name.presentfocus = Презентация
@@ -362,6 +395,7 @@ bbb.logout.rejected = Соединение с сервером отклонен
 bbb.logout.invalidapp = Приложение red5 отсутствует
 bbb.logout.unknown = Ваш клиент потерял соединение с сервером
 bbb.logout.usercommand = Вы вышли из конференции
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Модератор исключил вас из встречи.
 bbb.logout.refresh.message = Если этот выход был неожиданным нажмите на кнопку ниже, чтобы восстановить подключение.
 bbb.logout.refresh.label = Повторное подключение
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Сохранить заметку
 bbb.settings.deskshare.instructions = Нажмите кнопку Разрешить на всплывающем окне, чтобы удостовериться, что трансляция рабочего стола работает корректно
 bbb.settings.deskshare.start = Проверить трансляцию рабочего стола
 bbb.settings.voice.volume = Активность микрофона
-bbb.settings.java.label = Ошибка версии Java
-bbb.settings.java.text = У вас установлена Java версии {0}, но необходима по крайней мере версия {1} для использования функции BigBlueButton трансляции рабочего стола. Нажмите на кнопку ниже чтобы установить последнюю версию Java JRE.
-bbb.settings.java.command = Установите новейшую версию Java
 bbb.settings.flash.label = Ошибка версии Flash
 bbb.settings.flash.text = У вас установленный Flash версии {0}, но для корректной работы BigBlueButton необходим Flash, по крайней мере, версии {1}. Нажмите на кнопку нижу для установки последней версии Adobe Flash.
 bbb.settings.flash.command = Установить новейшую версию Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Текст
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Переключить курсор на текст
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Цвет текста
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Размер шрифта
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Язык\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Размер шрифта\:
+bbb.caption.option.fontsize.tooltip = Размер шрифта
+bbb.caption.option.backcolor = Цвет фона\:
+bbb.caption.option.backcolor.tooltip = Цвет фона
+bbb.caption.option.textcolor = Цвет текста\:
+bbb.caption.option.textcolor.tooltip = Цвет текста
+
 
 bbb.accessibility.clientReady = Готово
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Свернуть текущее ок
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Развернуть текущее окно
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Покинуть окно Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Выкл./Вкл. ваш микрофон
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Перейти к окну чата
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Открыть окно трансляции рабочего стола
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Открыть окно настройки аудио трансляции
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Начать/Прекратить слушать конференцию
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Открыть окно трансляции веб-камеры
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Закрыть все окна с
 bbb.users.settings.lockAll=Заблокировать  всех пользователей
 bbb.users.settings.lockAllExcept=Заблокировать всех пользователей кроме ведущего
 bbb.users.settings.lockSettings=Заблокировать наблюдателей
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Разблокировать для всех наблюдателей
 bbb.users.settings.roomIsLocked=Заблокированные по умолчанию
 bbb.users.settings.roomIsMuted=Микрофон выключен по умолчанию
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Блокировать зрителей
 bbb.lockSettings.feature=Функция
 bbb.lockSettings.locked=Заблокировано
 bbb.lockSettings.lockOnJoin=Блокировать при входе
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>осталось {1}</b> 
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Аудитория
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Минут(ы)
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Подсказка\: вы можете перемещать участника между аудиториями простым перетаскиванием мышки 
+bbb.users.breakout.start = Начать
+bbb.users.breakout.invite = Пригласить
+bbb.users.breakout.close = Закрыть
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Аудитория
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Присоединиться
+bbb.users.roomsGrid.noUsers = В этой аудитории нет собеседников
diff --git a/bigbluebutton-client/locale/ru_lv/bbbResources.properties b/bigbluebutton-client/locale/ru_lv/bbbResources.properties
index fdb4f5289841f31a7b77c25dccba7f6b3770d9af..58663b57531fcf74290462d4c3fe4ab11db39227 100644
--- a/bigbluebutton-client/locale/ru_lv/bbbResources.properties
+++ b/bigbluebutton-client/locale/ru_lv/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/si_LK/bbbResources.properties b/bigbluebutton-client/locale/si_LK/bbbResources.properties
index 90fd9d34b9f329d8a4bf2f3e1a23dca3c6dd1f76..c5caef39fa49f226800a10e77aa5518b8f639360 100644
--- a/bigbluebutton-client/locale/si_LK/bbbResources.properties
+++ b/bigbluebutton-client/locale/si_LK/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = ඉදිරිපත් කිරීම
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Full Screen
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Close screen share
-bbb.desktopPublish.stop.label = Close
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
-bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimize
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Desktop Sharing
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Display actual size
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/sk_SK/bbbResources.properties b/bigbluebutton-client/locale/sk_SK/bbbResources.properties
index 8f375d08977f749f5a3c341ae09358ce2c069ed5..abb7a8662654f0e936dea493d3d9ac51461176bc 100644
--- a/bigbluebutton-client/locale/sk_SK/bbbResources.properties
+++ b/bigbluebutton-client/locale/sk_SK/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimalizovať
 bbb.window.maximizeRestoreBtn.toolTip = Maximalizovať
 bbb.window.closeBtn.toolTip = Zavrieť
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentácia
 bbb.presentation.titleWithPres = Prezentácia\: {0}
 bbb.presentation.quickLink.label = Okno prezentácie
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Zatvoriť dialógové okno nastavení we
 bbb.video.publish.closeBtn.label = Zrušiť
 bbb.video.publish.titleBar = Publikovať okno webkamery
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-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
-bbb.desktopPublish.region.label = Región
-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. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimalizovať toto okno.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimalizovať okno zdieľania plochy
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximalizovať okno zdieľania plochy
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-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 = 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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Zdieľať mikrofón
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ 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 = Unable to load the layouts
 bbb.layout.name.defaultlayout = Prednastavené rozloženie
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video chat
 bbb.layout.name.webcamsfocus = Lekcia s webkamerou
 bbb.layout.name.presentfocus = Lekcia s prezentáciou
@@ -362,6 +395,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.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 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ť
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Uložiť poznámku
 bbb.settings.deskshare.instructions = Kliknite na tlačidlo Povoliť v riadku, ktorý sa objaví pre uistenie, že zdieľanie pracovnej plochy funguje správne pre Vás
 bbb.settings.deskshare.start = Skontrolovať Zdieľanie plochy
 bbb.settings.voice.volume = Aktivita mikrofónu
-bbb.settings.java.label = Chybná verzia Javy
-bbb.settings.java.text = Máte nainštalovanú Java {0}, ale potrebujete minimálne verziu {1} aby ste mohli používať funkciu Zdieľanie Plochy v BigBlueButton. Kliknite na tlačítko nižšie pre inštaláciu najnovšej Java JRE verzie.
-bbb.settings.java.command = Nainštalovať najnovšiu verziu Javy
 bbb.settings.flash.label = Chybná verzia Flashového prehrávača
 bbb.settings.flash.text = Máte nainštalovaný Flash prehrávač {0}, ale potrebujete minimálne verziu {1} aby ste prehrať BigBlueButton. Kliknite na tlačítko nižšie pre inštaláciu najnovšieho Adobe Flash prehrávača.
 bbb.settings.flash.command = Nainštalovať najnovší Flash player
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = 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.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimalizovať aktuálne okno
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximalizovať aktuálne okno
 
-bbb.shortcutkey.flash.exit = 8
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Zaostriť mimo Flash okna
 bbb.shortcutkey.users.muteme = 7
 bbb.shortcutkey.users.muteme.function = Stlmte a vypnite stlmenie vášho mikrofónu
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Presunúť zaostrenie na okno chatu
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Otvoriť okno zdieľania obrazovky
-bbb.shortcutkey.share.microphone = 79
-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 = Otvoriť okno zdieľania webkamery
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Zatvoriť všetky videá
 bbb.users.settings.lockAll=Zamknúť všetkých užívateľov
 bbb.users.settings.lockAllExcept=Zamknúť všetkých užívateľov okrem prezentéra
 bbb.users.settings.lockSettings=Zamknúť divákov ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Odomknúť všetkých divákov
 bbb.users.settings.roomIsLocked=Prednastavene zamknuté
 bbb.users.settings.roomIsMuted=Prednastavene stlmené
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Zamknúť užívateľov
 bbb.lockSettings.feature=Prvok
 bbb.lockSettings.locked=Zamknutý
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/sl_SI/bbbResources.properties b/bigbluebutton-client/locale/sl_SI/bbbResources.properties
index 170a7fd4906506feda9f981bd6462283eacd672a..5ad1d1e31790d88ccc4f7d9933f6b15e975485d5 100644
--- a/bigbluebutton-client/locale/sl_SI/bbbResources.properties
+++ b/bigbluebutton-client/locale/sl_SI/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Predstavitev
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Desktop Sharing\: Presenter's Preview
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Celoten zaslon
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Regija
-bbb.desktopPublish.stop.tooltip = Zapri deljenje ekrana
-bbb.desktopPublish.stop.label = Zapri
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Tega okna ne morete povečati.
-bbb.desktopPublish.closeBtn.toolTip = Prenehaj z deljenjem in zapri to okno.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Pomanjšajte to okno.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Deljenje namizja
-bbb.desktopView.fitToWindow = Fit to Window
-bbb.desktopView.actualSize = Prikaži realno velikost
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = Povezava s strežnikom je bila zavrnjena
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Vaša stranka je izgubila povezavo s strežnikom
 bbb.logout.usercommand = Izpisali ste se iz konference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Click Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Preverite deljenje namizja
 bbb.settings.voice.volume = Dejavnost mikrofona
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. Click on the button bellow to install the newest Java JRE version.
-bbb.settings.java.command = Namestite najnovejšo Javo
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. Click on the button bellow to install the newest Adobe Flash version.
 bbb.settings.flash.command = Namestite najnovejši Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/sr_RS/bbbResources.properties b/bigbluebutton-client/locale/sr_RS/bbbResources.properties
index 8929174a8534aaf65edfeccbae2f35ab8455aef8..af78d0ea5daa3e91a151ca2cc60f8d2dd6ea7fad 100644
--- a/bigbluebutton-client/locale/sr_RS/bbbResources.properties
+++ b/bigbluebutton-client/locale/sr_RS/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Prezentacija
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Podeli radnu ploču\: Prezentatorov pregled
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Ceo prozor
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Oblast
-bbb.desktopPublish.stop.tooltip = Zatvori podelu radne ploče
-bbb.desktopPublish.stop.label = Zatvori
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Ne možešda uvećaš ovaj prozor.
-bbb.desktopPublish.closeBtn.toolTip = Prekini podelu radne ploče i zatvori prozor.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimiraj ovaj prozor.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Podela radne ploče
-bbb.desktopView.fitToWindow = Podesi prozor
-bbb.desktopView.actualSize = Prikaži trenutnu veličinu
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = Konekcija sa serverom odbačena
 bbb.logout.invalidapp = red5 aplikacija ne postoji
 bbb.logout.unknown = Izgubljena veza sa serverom
 bbb.logout.usercommand = Uspešno ste izašli iz konferencije
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Označi podelu radne ploče
 bbb.settings.voice.volume = Aktivitet mikrofona
-bbb.settings.java.label = Greška u Java verziji
-bbb.settings.java.text = Imate instaliranu Java verziju {0}, ali vam je potrebna verzija {1} kako bi mogli da koristite opciju deljenje radne ploče. Kliknite na dugme dole, kako bi instalirali najnoviju verziju Jave.
-bbb.settings.java.command = Instaliraj najnoviju Javu
 bbb.settings.flash.label = Greška u Flash verziji
 bbb.settings.flash.text = Imate instaliran Flash {0}, a vama je potrebna najmanje verzija {1}, da bi BigBlueButtor radio kako treba. Kliknite na dugme ispod, kako bi instalirali najnoviju verziju Adobe Flash-a.
 bbb.settings.flash.command = Instaliraj najnoviji Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/sv_SE/bbbResources.properties b/bigbluebutton-client/locale/sv_SE/bbbResources.properties
index 212d0a6b43fedfe8c3a5534e8e042b633b1911b6..d25dbbd8149492c293096fc43202e238fad98f2a 100644
--- a/bigbluebutton-client/locale/sv_SE/bbbResources.properties
+++ b/bigbluebutton-client/locale/sv_SE/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimera
 bbb.window.maximizeRestoreBtn.toolTip = Maximera
 bbb.window.closeBtn.toolTip = Stäng
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Presentation
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Stäng dialogrutan för webbkamerainstä
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publicera webbkamerafönster
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = Skärmdelning\: Presentatörens förhandsvisning
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = Fullskärm
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = Region
-bbb.desktopPublish.stop.tooltip = Stäng skärmdelning
-bbb.desktopPublish.stop.label = Stäng
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Du kan inte maximera detta fönster
-bbb.desktopPublish.closeBtn.toolTip = Avsluta delning och stäng
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = Minimera
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimera fönstret för skärmdelning
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximera fönstret för skärmdelning
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = Skärmdelning
-bbb.desktopView.fitToWindow = Anpassa till fönster
-bbb.desktopView.actualSize = Visa verklig storlek
-bbb.desktopView.minimizeBtn.accessibilityName = Minimera fönstret för skärmdelning
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maximera fönstret för skärmdelning
-bbb.desktopView.closeBtn.accessibilityName = Stäng fönstret för skärmdelning
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Share Your Webcam
 bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam
 bbb.layout.addButton.toolTip = Lägg till anpassad layout till listan
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouter sparades
 bbb.layout.load.complete = Layouter laddades
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = Flash version error
 bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
 bbb.settings.flash.command = Install newest Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/th_TH/bbbResources.properties b/bigbluebutton-client/locale/th_TH/bbbResources.properties
index 161d91b6bbb2fcc4e54c66d84c3a31520d7f307a..e37adc86df6e7f17b4b297efe6fca863a24496d2 100644
--- a/bigbluebutton-client/locale/th_TH/bbbResources.properties
+++ b/bigbluebutton-client/locale/th_TH/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
 bbb.clientstatus.webrtc.title = Audio
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = Minimize
 bbb.window.maximizeRestoreBtn.toolTip = Maximize
 bbb.window.closeBtn.toolTip = Close
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Sad status
 bbb.users.emojiStatus.confused = Confused status
 bbb.users.emojiStatus.neutral = Neutral status
 bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = การนำเสนอ
 bbb.presentation.titleWithPres = Presentation\: {0}
 bbb.presentation.quickLink.label = Presentation Window
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
 bbb.video.publish.closeBtn.label = Cancel
 bbb.video.publish.titleBar = Publish Webcam Window
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = แพร่ภาพจากเดสก์ทอป\: แสดงตัวอย่างของผู้นำเสนอ
-bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
-bbb.desktopPublish.fullscreen.label = ขยายเต็มจอ
-bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
-bbb.desktopPublish.region.label = พื้นที่หน้าจอ
-bbb.desktopPublish.stop.tooltip = ปิดหน้าจอการแชร์
-bbb.desktopPublish.stop.label = ปิด
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = คุณไม่สามารถขยายหน้าต่างนี้ได้สุงสูด
-bbb.desktopPublish.closeBtn.toolTip = หยุดการแผยแพร่และปิดหน้าต่าง
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = ลดหน้าต่างนี้ลง
-bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = แชร์ปเดสก์ทอปร่วมกัน
-bbb.desktopView.fitToWindow = พอดีกับหน้าต่าง
-bbb.desktopView.actualSize = แสดงผลจอขนาดจริง
-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.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Share Your Microphone
 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.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 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
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Layouts were successfully saved
 bbb.layout.load.complete = Layouts were successfully loaded
 bbb.layout.load.failed = Unable to load the layouts
 bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Video Chat
 bbb.layout.name.webcamsfocus = Webcam Meeting
 bbb.layout.name.presentfocus = Presentation Meeting
@@ -362,6 +395,7 @@ bbb.logout.rejected = The connection to the server has been rejected
 bbb.logout.invalidapp = The red5 app does not exist
 bbb.logout.unknown = Your client has lost connection with the server
 bbb.logout.usercommand = คุณได้ออกจากห้องประชุมแล้ว
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
 bbb.logout.refresh.label = Reconnect
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
 bbb.settings.deskshare.start = Check Desktop Sharing
 bbb.settings.voice.volume = Microphone Activity
-bbb.settings.java.label = Java version error
-bbb.settings.java.text = You have Java {0} installed, but you need at least version {1} to use the BigBlueButton desktop sharing feature. The button below will install the newest Java JRE version.
-bbb.settings.java.command = Install newest Java
 bbb.settings.flash.label = เกิดความผิดพลาดกับรุ่นของ Flash
 bbb.settings.flash.text = คุณติดตั้ง Flash รุ่น {0} แต่ระบบ BigBlueButton ต้องการอย่างน้อยรุ่น {1} เพื่อทำงานได้อย่างถูกต้อง คลิกปุ่มด้านล่างนี้เพื่อติดตั้ง Adobe Flash รุ่นล่าสุด
 bbb.settings.flash.command = ติดตั้ง Flash รุ่นใหม่ล่าสุด
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Text
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Ready
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Minimize current window
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Maximize current window
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Open desktop sharing window
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Open audio settings window
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Start/Stop listening the conference
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Open webcam sharing window
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
 bbb.users.settings.lockAll=Lock All Users
 bbb.users.settings.lockAllExcept=Lock Users Except Presenter
 bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Unlock All Viewers
 bbb.users.settings.roomIsLocked=Locked by default
 bbb.users.settings.roomIsMuted=Muted by default
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Lock Viewers
 bbb.lockSettings.feature=Feature
 bbb.lockSettings.locked=Locked
 bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/tr/bbbResources.properties b/bigbluebutton-client/locale/tr/bbbResources.properties
new file mode 100644
index 0000000000000000000000000000000000000000..58663b57531fcf74290462d4c3fe4ab11db39227
--- /dev/null
+++ b/bigbluebutton-client/locale/tr/bbbResources.properties
@@ -0,0 +1,670 @@
+bbb.mainshell.locale.version = 0.9.0
+bbb.mainshell.statusProgress.connecting = Connecting to the server
+bbb.mainshell.statusProgress.loading = Loading {0} modules
+bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
+bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
+bbb.mainshell.logBtn.toolTip = Open Log Window
+bbb.mainshell.meetingNotFound = Meeting Not Found
+bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
+bbb.mainshell.notification.tunnelling = Tunnelling
+bbb.mainshell.notification.webrtc = WebRTC Audio
+bbb.oldlocalewindow.reminder1 = You may have an old language translations of BigBlueButton.
+bbb.oldlocalewindow.reminder2 = Please clear your browser's cache and try again.
+bbb.oldlocalewindow.windowTitle = Warning\: Old Language Translations
+bbb.audioSelection.title = How do you want to join the audio?
+bbb.audioSelection.btnMicrophone.label = Microphone
+bbb.audioSelection.btnMicrophone.toolTip = Join the audio with your microphone
+bbb.audioSelection.btnListenOnly.label = Listen Only
+bbb.audioSelection.btnListenOnly.toolTip = Join the audio as listen only
+bbb.audioSelection.txtPhone.text = To join this meeting by phone, dial\: {0} then enter {1} as the conference pin number.
+bbb.micSettings.title = Audio Test
+bbb.micSettings.speakers.header = Test Speakers
+bbb.micSettings.microphone.header = Test Microphone
+bbb.micSettings.playSound = Test Speakers
+bbb.micSettings.playSound.toolTip = Play music to test your speakers
+bbb.micSettings.hearFromHeadset = You should hear audio in your headset, not your computer speakers.
+bbb.micSettings.speakIntoMic = If you are using a headset (or earbuds), you should hear the audio from your headset -- not from your computer speakers.
+bbb.micSettings.echoTestMicPrompt = This is a private echo test.  Speak a few words.  Did you hear audio?
+bbb.micSettings.echoTestAudioYes = Yes
+bbb.micSettings.echoTestAudioNo = No
+bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic.
+bbb.micSettings.recommendHeadset = Use a headset with a microphone for best audio experience.
+bbb.micSettings.changeMic = Test or Change Microphone
+bbb.micSettings.changeMic.toolTip = Open the Flash Player microphone settings dialog box
+bbb.micSettings.comboMicList.toolTip = Select a microphone
+bbb.micSettings.micRecordVolume.label = Gain
+bbb.micSettings.micRecordVolume.toolTip = Set your microphone gain
+bbb.micSettings.nextButton = Next
+bbb.micSettings.nextButton.toolTip = Start the echo test
+bbb.micSettings.join = Join Audio
+bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.cancel = Cancel
+bbb.micSettings.connectingtoecho = Connecting
+bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
+bbb.micSettings.cancel.toolTip = Cancel joining the audio conference
+bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.title = Audio Settings. Focus will remain in this audio settings window until the window is closed.
+bbb.micSettings.webrtc.title = WebRTC Support
+bbb.micSettings.webrtc.capableBrowser = Your browser supports WebRTC.
+bbb.micSettings.webrtc.capableBrowser.dontuseit = Click not to use WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Click here if you don't want to use the WebRTC technology (recommended if you have problems using it).
+bbb.micSettings.webrtc.notCapableBrowser = WebRTC is not supported in your browser. Please use Google Chrome (version 32 or greater); or Mozilla Firefox (version 26 or greater). You will still be able to join the voice conference using the Adobe Flash Platform.
+bbb.micSettings.webrtc.connecting = Calling
+bbb.micSettings.webrtc.waitingforice = Connecting
+bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.endingecho = Joining audio
+bbb.micSettings.webrtc.endedecho = Echo test ended.
+bbb.micPermissions.firefox.title = Firefox Microphone Permissions
+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.chrome.title = Chrome Microphone Permissions
+bbb.micPermissions.chrome.message1 = Click Allow to give Chrome permission to use your microphone.
+bbb.micWarning.title = Audio Warning
+bbb.micWarning.joinBtn.label = Join anyway
+bbb.micWarning.testAgain.label = Test again
+bbb.micWarning.message = Your microphone did not show any activity, others probably won't be able to hear you during the session.
+bbb.webrtcWarning.message = Detected the following WebRTC issue\: {0}. Do you want to try Flash instead?
+bbb.webrtcWarning.title = WebRTC Audio Failure
+bbb.webrtcWarning.failedError.1001 = Error 1001\: WebSocket disconnected
+bbb.webrtcWarning.failedError.1002 = Error 1002\: Could not make a WebSocket connection
+bbb.webrtcWarning.failedError.1003 = Error 1003\: Browser version not supported
+bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1005 = Error 1005\: Call ended unexpectedly
+bbb.webrtcWarning.failedError.1006 = Error 1006\: Call timed out
+bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE negotiation failed
+bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
+bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
+bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.unknown = Error {0}\: Unknown error code
+bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
+bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
+bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
+bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
+bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
+bbb.mainToolbar.helpBtn = Help
+bbb.mainToolbar.logoutBtn = Logout
+bbb.mainToolbar.logoutBtn.toolTip = Log Out
+bbb.mainToolbar.langSelector = Select language
+bbb.mainToolbar.settingsBtn = Settings
+bbb.mainToolbar.settingsBtn.toolTip = Open Settings
+bbb.mainToolbar.shortcutBtn = Shortcut Keys
+bbb.mainToolbar.shortcutBtn.toolTip = Open Shortcut Keys Window
+bbb.mainToolbar.recordBtn.toolTip.start = Start recording
+bbb.mainToolbar.recordBtn.toolTip.stop = Stop recording
+bbb.mainToolbar.recordBtn.toolTip.recording = The session is being recorded
+bbb.mainToolbar.recordBtn.toolTip.notRecording = The session isn't being recorded
+bbb.mainToolbar.recordBtn.confirm.title = Confirm recording
+bbb.mainToolbar.recordBtn.confirm.message.start = Are you sure you want to start recording the session?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Are you sure you want to stop recording the session?
+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.clientstatus.title = Configuration Notifications
+bbb.clientstatus.notification = Unread notifications
+bbb.clientstatus.close = Close
+bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
+bbb.clientstatus.browser.title = Browser Version
+bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
+bbb.clientstatus.flash.title = Flash Player
+bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
+bbb.clientstatus.webrtc.title = Audio
+bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
+bbb.window.minimizeBtn.toolTip = Minimize
+bbb.window.maximizeRestoreBtn.toolTip = Maximize
+bbb.window.closeBtn.toolTip = Close
+bbb.videoDock.titleBar = Webcam Window Title Bar
+bbb.presentation.titleBar = Presentation Window Title Bar
+bbb.chat.titleBar = Chat Window Title Bar
+bbb.users.title = Users{0} {1}
+bbb.users.titleBar = Users Window title bar
+bbb.users.quickLink.label = Users Window
+bbb.users.minimizeBtn.accessibilityName = Minimize the Users Window
+bbb.users.maximizeRestoreBtn.accessibilityName = Maximize the Users Window
+bbb.users.settings.buttonTooltip = Settings
+bbb.users.settings.audioSettings = Audio Test
+bbb.users.settings.webcamSettings = Webcam Settings
+bbb.users.settings.muteAll = Mute All Users
+bbb.users.settings.muteAllExcept = Mute All Users Except Presenter
+bbb.users.settings.unmuteAll = Unmute All Users
+bbb.users.settings.clearAllStatus = Clear all status icons
+bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.roomMuted.text = Viewers Muted
+bbb.users.roomLocked.text = Viewers Locked
+bbb.users.pushToTalk.toolTip = Talk
+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.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.accessibilityName = Users List. Use the arrow keys to navigate.
+bbb.users.usersGrid.nameItemRenderer = Name
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = you
+bbb.users.usersGrid.statusItemRenderer = Status
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
+bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
+bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.mediaItemRenderer.talking = Talking
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+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.pushToLock = Lock {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Unlock {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off
+bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
+bbb.users.emojiStatus.clear = Clear
+bbb.users.emojiStatus.clear.toolTip = Clear status
+bbb.users.emojiStatus.close = Close
+bbb.users.emojiStatus.close.toolTip = Close status popup
+bbb.users.emojiStatus.raiseHand = Raise hand status
+bbb.users.emojiStatus.happy = Happy status
+bbb.users.emojiStatus.smile = Smile status
+bbb.users.emojiStatus.sad = Sad status
+bbb.users.emojiStatus.confused = Confused status
+bbb.users.emojiStatus.neutral = Neutral status
+bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
+bbb.presentation.title = Presentation
+bbb.presentation.titleWithPres = Presentation\: {0}
+bbb.presentation.quickLink.label = Presentation Window
+bbb.presentation.fitToWidth.toolTip = Fit Presentation To Width
+bbb.presentation.fitToPage.toolTip = Fit Presentation To Page
+bbb.presentation.uploadPresBtn.toolTip = Upload Presentation
+bbb.presentation.backBtn.toolTip = Previous slide
+bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
+bbb.presentation.btnSlideNum.toolTip = Select a slide
+bbb.presentation.forwardBtn.toolTip = Next slide
+bbb.presentation.maxUploadFileExceededAlert = Error\: The file is bigger than what's allowed.
+bbb.presentation.uploadcomplete = Upload completed. Please wait while we convert the document.
+bbb.presentation.uploaded = uploaded.
+bbb.presentation.document.supported = The uploaded document is supported. Starting to convert...
+bbb.presentation.document.converted = Successfully converted the office document.
+bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.io = IO Error\: Please contact administrator.
+bbb.presentation.error.security = Security Error\: Please contact administrator.
+bbb.presentation.error.convert.notsupported = Error\: The uploaded document is unsupported. Please upload a compatible file.
+bbb.presentation.error.convert.nbpage = Error\: Failed to determine the number of pages in the uploaded document.
+bbb.presentation.error.convert.maxnbpagereach = Error\: The uploaded document has too many pages.
+bbb.presentation.converted = Converted {0} of {1} slides.
+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.uploadwindow.presentationfile = Presentation file
+bbb.presentation.uploadwindow.pdf = PDF
+bbb.presentation.uploadwindow.word = WORD
+bbb.presentation.uploadwindow.excel = EXCEL
+bbb.presentation.uploadwindow.powerpoint = POWERPOINT
+bbb.presentation.uploadwindow.image = IMAGE
+bbb.presentation.minimizeBtn.accessibilityName = Minimize the Presentation Window
+bbb.presentation.maximizeRestoreBtn.accessibilityName = Maximize the Presentation Window
+bbb.presentation.closeBtn.accessibilityName = Close the Presentation Window
+bbb.fileupload.title = Add Files to Your Presentation
+bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.selectBtn.label = Select File
+bbb.fileupload.selectBtn.toolTip = Open dialog box to select a file
+bbb.fileupload.uploadBtn = Upload
+bbb.fileupload.uploadBtn.toolTip = Upload the selected file
+bbb.fileupload.deleteBtn.toolTip = Delete Presentation
+bbb.fileupload.showBtn = Show
+bbb.fileupload.showBtn.toolTip = Show Presentation
+bbb.fileupload.okCancelBtn = Close
+bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
+bbb.fileupload.genThumbText = Generating thumbnails..
+bbb.fileupload.progBarLbl = Progress\:
+bbb.fileupload.fileFormatHint = Upload any office document or Portable Document Format (PDF) file.  For best results upload PDF.
+bbb.chat.title = Chat
+bbb.chat.quickLink.label = Chat Window
+bbb.chat.cmpColorPicker.toolTip = Text Color
+bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.sendBtn = Send
+bbb.chat.sendBtn.toolTip = Send Message
+bbb.chat.sendBtn.accessibilityName = Send chat message
+bbb.chat.contextmenu.copyalltext = Copy All Text
+bbb.chat.publicChatUsername = Public
+bbb.chat.optionsTabName = Options
+bbb.chat.privateChatSelect = Select a person to chat with privately
+bbb.chat.private.userLeft = The user has left.
+bbb.chat.private.userJoined = The user has joined.
+bbb.chat.private.closeMessage = You can close this tab by using the key combination {0}.
+bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.usersList.accessibilityName = Select user to open private chat. Use the arrow keys to navigate.
+bbb.chat.chatOptions = Chat Options
+bbb.chat.fontSize = Chat Message Font Size
+bbb.chat.cmbFontSize.toolTip = Select Chat Message Font Size
+bbb.chat.messageList = Message Box
+bbb.chat.minimizeBtn.accessibilityName = Minimize the Chat Window
+bbb.chat.maximizeRestoreBtn.accessibilityName = Maximize the Chat Window
+bbb.chat.closeBtn.accessibilityName = Close the Chat Window
+bbb.chat.chatTabs.accessibleNotice = New messages in this tab.
+bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
+bbb.publishVideo.cmbResolution.tooltip = Select a webcam resolution
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.startPublishBtn.toolTip = Start sharing your webcam
+bbb.publishVideo.startPublishBtn.errorName = Can't share webcam. Reason\: {0}
+bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
+bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.videodock.title = Webcams
+bbb.videodock.quickLink.label = Webcams Window
+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.controls.privateChatBtn.toolTip = Chat with {0}
+bbb.video.publish.hint.noCamera = No webcam available
+bbb.video.publish.hint.cantOpenCamera = Can't open your webcam
+bbb.video.publish.hint.waitingApproval = Waiting for approval
+bbb.video.publish.hint.videoPreview = Webcam preview
+bbb.video.publish.hint.openingCamera = Opening webcam...
+bbb.video.publish.hint.cameraDenied = Webcam access denied
+bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.publishing = Publishing...
+bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
+bbb.video.publish.closeBtn.label = Cancel
+bbb.video.publish.titleBar = Publish Webcam Window
+bbb.video.streamClose.toolTip = Close stream for\: {0}
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
+bbb.toolbar.phone.toolTip.start = Share Your Microphone
+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 Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
+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 = Unable to load the layouts
+bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.closedcaption = Closed Caption
+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.highlighter.toolbar.pencil = Pencil
+bbb.highlighter.toolbar.pencil.accessibilityName = Switch whiteboard cursor to pencil
+bbb.highlighter.toolbar.ellipse = Circle
+bbb.highlighter.toolbar.ellipse.accessibilityName = Switch whiteboard cursor to circle
+bbb.highlighter.toolbar.rectangle = Rectangle
+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 = Select Color
+bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
+bbb.highlighter.toolbar.thickness = Change Thickness
+bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
+bbb.logout.title = Logged Out
+bbb.logout.button.label = OK
+bbb.logout.appshutdown = The server app has been shut down
+bbb.logout.asyncerror = An Async Error occured
+bbb.logout.connectionclosed = The connection to the server has been closed
+bbb.logout.connectionfailed = The connection to the server has ended
+bbb.logout.rejected = The connection to the server has been rejected
+bbb.logout.invalidapp = The red5 app does not exist
+bbb.logout.unknown = Your client has lost connection with the server
+bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
+bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
+bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
+bbb.logout.refresh.label = Reconnect
+bbb.logout.confirm.title = Confirm Logout
+bbb.logout.confirm.message = Are you sure you want to log out?
+bbb.logout.confirm.yes = Yes
+bbb.logout.confirm.no = No
+bbb.connection.failure=Detected Connectivity Problems
+bbb.connection.reconnecting=Reconnecting
+bbb.connection.reestablished=Connection reestablished
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Deskshare
+bbb.notes.title = Notes
+bbb.notes.cmpColorPicker.toolTip = Text Color
+bbb.notes.saveBtn = Save
+bbb.notes.saveBtn.toolTip = Save Note
+bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you
+bbb.settings.deskshare.start = Check Desktop Sharing
+bbb.settings.voice.volume = Microphone Activity
+bbb.settings.flash.label = Flash version error
+bbb.settings.flash.text = You have Flash {0} installed, but you need at least version {1} to run BigBlueButton properly. The button below will install the newest Adobe Flash version.
+bbb.settings.flash.command = Install newest Flash
+bbb.settings.isight.label = iSight webcam error
+bbb.settings.isight.text = If you have problems with your iSight webcam, it may be because you are running OS X 10.6.5, which is known to have a problem with Flash capturing video from the iSight webcam. \n To correct this, the link below will install a newer version of Flash player, or update your Mac to the newest version
+bbb.settings.isight.command = Install Flash 10.2 RC2
+bbb.settings.warning.label = Warning
+bbb.settings.warning.close = Close this Warning
+bbb.settings.noissues = No outstanding issues have been detected.
+bbb.settings.instructions = Accept the Flash prompt that asks you for webcam permissions. If the output matches what is expected, your browser has been set up correctly. Other potentials issues are below. Examine them to find a possible solution.
+ltbcustom.bbb.highlighter.toolbar.triangle = Triangle
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Switch whiteboard cursor to triangle
+ltbcustom.bbb.highlighter.toolbar.line = Line
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Switch whiteboard cursor to line
+ltbcustom.bbb.highlighter.toolbar.text = Text
+ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Switch whiteboard cursor to text
+ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Text color
+ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Font size
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
+
+bbb.accessibility.clientReady = Ready
+
+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.chatwindow.audibleChatNotification = Audible Chat Notification
+
+bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+
+bbb.accessibility.notes.notesview.input = Notes input
+
+bbb.shortcuthelp.title = Shortcut Keys
+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.dropdown.general = Global shortcuts
+bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
+bbb.shortcuthelp.dropdown.chat = Chat shortcuts
+bbb.shortcuthelp.dropdown.users = Users shortcuts
+bbb.shortcuthelp.headers.shortcut = Shortcut
+bbb.shortcuthelp.headers.function = Function
+
+bbb.shortcutkey.general.minimize = 189
+bbb.shortcutkey.general.minimize.function = Minimize current window
+bbb.shortcutkey.general.maximize = 187
+bbb.shortcutkey.general.maximize.function = Maximize current window
+
+bbb.shortcutkey.flash.exit = 79
+bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
+bbb.shortcutkey.chat.chatinput = 73
+bbb.shortcutkey.chat.chatinput.function = Focus the chat input field
+bbb.shortcutkey.present.focusslide = 67
+bbb.shortcutkey.present.focusslide.function = Focus the presentation slide
+bbb.shortcutkey.whiteboard.undo = 90
+bbb.shortcutkey.whiteboard.undo.function = Undo last whiteboard mark
+
+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.presentation = 51
+bbb.shortcutkey.focus.presentation.function = Move focus to the Presentation window
+bbb.shortcutkey.focus.chat = 52
+bbb.shortcutkey.focus.chat.function = Move focus to the Chat window
+
+bbb.shortcutkey.share.desktop = 68
+bbb.shortcutkey.share.desktop.function = Open desktop sharing window
+bbb.shortcutkey.share.webcam = 66
+bbb.shortcutkey.share.webcam.function = Open webcam sharing window
+
+bbb.shortcutkey.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Open/focus to shortcut help window
+bbb.shortcutkey.logout = 76
+bbb.shortcutkey.logout.function = Log out of this meeting
+bbb.shortcutkey.raiseHand = 82
+bbb.shortcutkey.raiseHand.function = Raise your hand
+
+bbb.shortcutkey.present.upload = 85
+bbb.shortcutkey.present.upload.function = Upload presentation
+bbb.shortcutkey.present.previous = 65
+bbb.shortcutkey.present.previous.function = Go to previous slide
+bbb.shortcutkey.present.select = 83
+bbb.shortcutkey.present.select.function = View all slides
+bbb.shortcutkey.present.next = 69
+bbb.shortcutkey.present.next.function = Go to next slide
+bbb.shortcutkey.present.fitWidth = 70
+bbb.shortcutkey.present.fitWidth.function = Fit slides to width
+bbb.shortcutkey.present.fitPage = 80
+bbb.shortcutkey.present.fitPage.function = Fit slides to page
+
+bbb.shortcutkey.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Mute or unmute selected person
+bbb.shortcutkey.users.muteall = 65
+bbb.shortcutkey.users.muteall.function = Mute or unmute all users
+bbb.shortcutkey.users.focusUsers = 85
+bbb.shortcutkey.users.focusUsers.function = Focus to users list
+bbb.shortcutkey.users.muteAllButPres = 65
+bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
+
+bbb.shortcutkey.chat.focusTabs = 89
+bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
+bbb.shortcutkey.chat.focusBox = 66
+bbb.shortcutkey.chat.focusBox.function = Focus to chat box
+bbb.shortcutkey.chat.changeColour = 67
+bbb.shortcutkey.chat.changeColour.function = Focus to font color picker.
+bbb.shortcutkey.chat.sendMessage = 83
+bbb.shortcutkey.chat.sendMessage.function = Send chat message
+bbb.shortcutkey.chat.closePrivate = 69
+bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.explanation = ----
+bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+
+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.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.polling.startButton.tooltip = Start a poll
+bbb.polling.startButton.label = Start Poll
+bbb.polling.publishButton.label = Publish
+bbb.polling.closeButton.label = Close
+bbb.polling.pollModal.title = Live Poll Results
+bbb.polling.customChoices.title = Enter Polling Choices
+bbb.polling.respondersLabel.novotes = Waiting for responses
+bbb.polling.respondersLabel.text = {0} Users Responded
+bbb.polling.respondersLabel.finished = Done
+bbb.polling.answer.Yes = Yes
+bbb.polling.answer.No = No
+bbb.polling.answer.True = True
+bbb.polling.answer.False = False
+bbb.polling.answer.A = A
+bbb.polling.answer.B = B
+bbb.polling.answer.C = C
+bbb.polling.answer.D = D
+bbb.polling.answer.E = E
+bbb.polling.answer.F = F
+bbb.polling.answer.G = G
+bbb.polling.results.accessible.header = Poll Results.
+bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
+
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+
+bbb.accessibility.alerts.madePresenter = You are now the Presenter.
+bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+
+bbb.shortcutkey.specialKeys.space = Spacebar
+bbb.shortcutkey.specialKeys.left = Left Arrow
+bbb.shortcutkey.specialKeys.right = Right Arrow
+bbb.shortcutkey.specialKeys.up = Up Arrow
+bbb.shortcutkey.specialKeys.down = Down Arrow
+bbb.shortcutkey.specialKeys.plus = Plus
+bbb.shortcutkey.specialKeys.minus = Minus
+
+bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
+bbb.users.settings.lockAll=Lock All Users
+bbb.users.settings.lockAllExcept=Lock Users Except Presenter
+bbb.users.settings.lockSettings=Lock Viewers ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
+bbb.users.settings.unlockAll=Unlock All Viewers
+bbb.users.settings.roomIsLocked=Locked by default
+bbb.users.settings.roomIsMuted=Muted by default
+
+bbb.lockSettings.save = Apply
+bbb.lockSettings.save.tooltip = Apply lock settings
+bbb.lockSettings.cancel = Cancel
+bbb.lockSettings.cancel.toolTip = Close this window without saving
+
+bbb.lockSettings.moderatorLocking = Moderator locking
+bbb.lockSettings.privateChat = Private Chat
+bbb.lockSettings.publicChat = Public Chat
+bbb.lockSettings.webcam = Webcam
+bbb.lockSettings.microphone = Microphone
+bbb.lockSettings.layout = Layout
+bbb.lockSettings.title=Lock Viewers
+bbb.lockSettings.feature=Feature
+bbb.lockSettings.locked=Locked
+bbb.lockSettings.lockOnJoin=Lock On Join
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/tr_TR/bbbResources.properties b/bigbluebutton-client/locale/tr_TR/bbbResources.properties
index b7563889357e1a97963ae30ad606b40e77ee5f0f..0608cdcf420fb8ad2b18b68827d8a745b711283f 100644
--- a/bigbluebutton-client/locale/tr_TR/bbbResources.properties
+++ b/bigbluebutton-client/locale/tr_TR/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Oynatıcı
 bbb.clientstatus.flash.message = Flash Player bileşeni ({0}) güncel değil. Son sürüme güncellemeniz önerilmektedir.
 bbb.clientstatus.webrtc.title = Ses
 bbb.clientstatus.webrtc.message = Daha iyi  ses için Firefox ya da Chrome kullanmanız önerilir.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java sürümü tespit edilemedi
-bbb.clientstatus.java.notinstalled = Java yüklü değil, masaüstü paylaşım özelliğini kullanmak için  lütfen <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>buraya</a></font> tıklayarak Java'nın son sürümünü yükleyiniz.
-bbb.clientstatus.java.oldversion = Bilgisayarınızda Java'nın eski sürümü yüklü. Masaüstü paylaşımını kullanmak için lütfen <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>BURAYA </a></font> tıklayarak Java nın son sürümünü kurunuz.
 bbb.window.minimizeBtn.toolTip = Küçült
 bbb.window.maximizeRestoreBtn.toolTip = Büyült
 bbb.window.closeBtn.toolTip = Kapat
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Mutsuz durumu
 bbb.users.emojiStatus.confused = Karmaşık durumu
 bbb.users.emojiStatus.neutral = Normal durum
 bbb.users.emojiStatus.away = Dışarda durumu
+bbb.users.emojiStatus.thumbsUp = Parmak kaldırma durumu
+bbb.users.emojiStatus.thumbsDown = Parmak indirme durumu
+bbb.users.emojiStatus.applause = Alkış durumu
 bbb.presentation.title = Sunum
 bbb.presentation.titleWithPres = Sunum\: {0}
 bbb.presentation.quickLink.label = Sunum Penceresi
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Kamera ayarları iletişim kutusunu kapa
 bbb.video.publish.closeBtn.label = Vazgeç
 bbb.video.publish.titleBar = Kamera Penceresini Yayımla 
 bbb.video.streamClose.toolTip = Kapatılacak yayın akışı\: {0}
-bbb.desktopPublish.title = Masaüstü Paylaşımı\: Sunucu Önizlemesi
-bbb.desktopPublish.fullscreen.tooltip = Ana Ekranımı Paylaş
-bbb.desktopPublish.fullscreen.label = Tam Ekran
-bbb.desktopPublish.region.tooltip = Ekranımın Bir Kısmını Paylaş
-bbb.desktopPublish.region.label = Bölge
-bbb.desktopPublish.stop.tooltip = Ekran paylaşımını kapat
-bbb.desktopPublish.stop.label = Kapat
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Bu pencereyi tam ekran yapamazsınız.
-bbb.desktopPublish.closeBtn.toolTip = Paylaşımı durdur ve Kapat.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Masaüstü paylaşımı şu anda Mac OS X altında çalışan Chrome tarayıcısında desteklenmiyor. Masaüstünü paylaşmak için farklı bir tarayıcı (Firefox önerilir) kullanmanız gerekiyor.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome tarafından Java Applets artık desteklenmiyor. Masaüstü paylaşımı için farklı bir tarayıcı (Firefox önerilir)  kullanmalısınız.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge tarafından Java Applets desteklenmiyor. Masaüstü paylaşımı için farklı bir tarayıcı (Firefox önerilir) kullanmalısınız.
-bbb.desktopPublish.minimizeBtn.toolTip = Küçült
-bbb.desktopPublish.minimizeBtn.accessibilityName = Masaüstü Paylaşımı Yayımlama Penceresini Küçült
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Masaüstü Paylaşımı Yayımlama Penceresini Büyült
-bbb.desktopPublish.chromeHint.title = Chrome izninize ihtiyaç duyuyor.
-bbb.desktopPublish.chromeHint.message = Chrome eklenti simgesini seçin (sağ üst köşesindeki) engellemeyi kaldırın ve tekrar deneyin.
-bbb.desktopPublish.chromeHint.button = Tekrar Dene
-bbb.desktopView.title = Masaüstü Paylaşımı
-bbb.desktopView.fitToWindow = Pencereye Sığdır
-bbb.desktopView.actualSize = Gerçek boyutu görüntüle
-bbb.desktopView.minimizeBtn.accessibilityName = Masaüstü Paylaşım İzleme Penceresini Küçült
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Masaüstü Paylaşım İzleme Penceresini Büyült
-bbb.desktopView.closeBtn.accessibilityName = Masaüstü Paylaşım İzleme Penceresini Kapat
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Bu pencereyi tam ekran yapamazsınız.
+bbb.screensharePublish.closeBtn.toolTip = Paylaşımı durdur ve Kapat.
+bbb.screensharePublish.minimizeBtn.toolTip = Küçült
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Pencereye Sığdır
+bbb.screenshareView.actualSize = Gerçek boyutta görüntüle
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Sesli Katıl
 bbb.toolbar.phone.toolTip.stop = Sesli Katılmayı Durdur
 bbb.toolbar.phone.toolTip.mute = Konferansı dinlemeyi durdur
 bbb.toolbar.phone.toolTip.unmute = Konferansı dinlemeye başla.
 bbb.toolbar.phone.toolTip.nomic = Mikrofon bulunamadı
-bbb.toolbar.deskshare.toolTip.start = Masaüstümü Paylaş
-bbb.toolbar.deskshare.toolTip.stop = Masaüstümü Paylaşmayı Durdur
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Kameramı Paylaş
 bbb.toolbar.video.toolTip.stop = Kameramı Paylaşmayı Durdur
 bbb.layout.addButton.toolTip = Oluşturulan sayfa düzenini listeye ekle
@@ -331,6 +363,7 @@ 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 = Varsayılan Görünüm
+bbb.layout.name.closedcaption = Altyazı
 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ü
@@ -362,6 +395,7 @@ bbb.logout.rejected = Sunucu olan bağlantı reddedildi.
 bbb.logout.invalidapp = Red5 uygulaması mevcut değil
 bbb.logout.unknown = Kullanıcı sunucuyla olan bağlantısını kaybetti.
 bbb.logout.usercommand = Konferanstan ayrıldınız
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Moderatör sizi toplantıdan çıkardı.
 bbb.logout.refresh.message = Eğer bağlantınız beklenmedik bir şekilde koptuysa Tekrar Bağlan butonuna basarak yeniden bağlanabilirsiniz.
 bbb.logout.refresh.label = Tekrar BaÄŸlan
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Notları Kaydet
 bbb.settings.deskshare.instructions = Masaüstü paylaşımınızın düzgün çalışıp çalışmadığını denetleyen iletilerde Kabul seçeneğini tıklayın
 bbb.settings.deskshare.start = Masaüstü Paylaşımını Kontrol Et
 bbb.settings.voice.volume = Mikrofon Hareketleri
-bbb.settings.java.label = Java sürümü hatası
-bbb.settings.java.text = Bilgisayarınızda Java {0} sürümü yüklü fakat BigBlueButton masaüstü paylaşımını kullanabilmek için {1} sürümüne ihtiyacınız var. En son Java JRE sürümünü yüklemek için aşağıdaki düğmeye tıklayın.
-bbb.settings.java.command = Java'nın yeni sürümünü Yükle
 bbb.settings.flash.label = Flash sürüm hatası
 bbb.settings.flash.text = Bilgisayarınızda Flash {0} sürümü yüklü, fakat BigBlueButton’ı düzgün çalıştırmak için Flash {1} ve üzeri sürümüne ihtiyacınız var. Güncel Adobe Flash sürümünü yüklemek için düğmeye tıklayın.
 bbb.settings.flash.command = Flash'ın yenisürümünü Yükle
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Metin
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Beyaz tahta imlecini metin olarak deÄŸiÅŸtir
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Metin rengi
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Yazı büyüklüğü
+bbb.caption.window.title = Altyazı
+bbb.caption.window.titleBar = Altyazı Penceresi Başlık Çubuğunu Kapat
+bbb.caption.window.minimizeBtn.accessibilityName = Altyazı Penceresini Küçült
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Altyazı Penceresini Büyüt
+bbb.caption.transcript.noowner = Hiçbiri
+bbb.caption.transcript.youowner = Siz
+bbb.caption.transcript.pastewarning.title = Altyazı Yapıştırma Uyarısı
+bbb.caption.transcript.pastewarning.text = {0} karakterden uzun metin yapıştıramazsınız.  {1} karakter yapıştırdınız.
+bbb.caption.option.label = Seçenekler
+bbb.caption.option.language = Dil\:
+bbb.caption.option.language.tooltip = Altyazı Dili Seç
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = SahipliÄŸini Al
+bbb.caption.option.takeowner.tooltip = Seçilen Dilin Sahipliğini Al
+bbb.caption.option.fontfamily = Yazı Tipi\:
+bbb.caption.option.fontfamily.tooltip = Yazı Tipi
+bbb.caption.option.fontsize = Yazı büyüklüğü\:
+bbb.caption.option.fontsize.tooltip = Yazı büyüklüğü
+bbb.caption.option.backcolor = Arkalan Rengi\:
+bbb.caption.option.backcolor.tooltip = Arkalan Rengi
+bbb.caption.option.textcolor = Metin Rengi\:
+bbb.caption.option.textcolor.tooltip = Metin Rengi
+
 
 bbb.accessibility.clientReady = Hazır
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Mevcut pencereyi küçült
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Mevcut pencereyi büyült
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Flash Penceresinden Uzaklaştır
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Mikrofonunuzu sesli ya da sessiz yapın
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Odaklamayı Sohbet penceresine kaydır
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Masaüstü paylaşım penceresini aç
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Ses ayarları penceresini aç
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Konferansı dinlemeyi Başlat/Bitir
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Kamera paylaşım penceresini aç
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Tüm videoları kapat
 bbb.users.settings.lockAll=Tüm Kullanıcıları Kilitle
 bbb.users.settings.lockAllExcept=Sunuş Yapan Kişi Hariç Kilitle
 bbb.users.settings.lockSettings=Ä°zleyicileri Kilitle ...
+bbb.users.settings.breakoutRooms=Özel Odalar ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Tüm izleyicilerin kilidini aç
 bbb.users.settings.roomIsLocked=Varsayılan kilitle
 bbb.users.settings.roomIsMuted=Varsayılan Sessiz
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Izleyicileri Kilitle
 bbb.lockSettings.feature=Özellik
 bbb.lockSettings.locked=Kilitlendi
 bbb.lockSettings.lockOnJoin=Katılım Kilitli
+
+bbb.users.breakout.breakoutRooms = Özel Odalar
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Kalan zaman hesaplanıyor...
+bbb.users.breakout.remainingTimeEnded = Zaman sona erdi, özel oda kapanacak.
+bbb.users.breakout.rooms = Odalar
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Raslantısal Atanan Kullanıcılar 
+bbb.users.breakout.timeLimit = Zaman Kısıtı
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Dakika
+bbb.users.breakout.record = Kayıt
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Atanmadı
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = BaÅŸlat
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Kapat
+bbb.users.breakout.closeAllRooms = Tüm Özel Odaları Kapat
+bbb.users.breakout.insufficientUsers = Yetersiz kullanıcı. Bir özel odaya en az bir kullanıcı yerleştirmelisiniz.
+bbb.users.breakout.openJoinURL = Katılım için davet edildiğiniz Özel Oda {0}\n(Kabul ettiğinizde, otomatik olarak sesli konferanstan ayrılacaksınız)
+bbb.users.breakout.confirm = Özel Odalara Katılımı Onayla
+bbb.users.roomsGrid.room = Oda
+bbb.users.roomsGrid.users = Kullanıcılar
+bbb.users.roomsGrid.action = Eylem
+bbb.users.roomsGrid.transfer = Sesi Aktar
+bbb.users.roomsGrid.join = Katıl
+bbb.users.roomsGrid.noUsers = Bu odada kullanıcı yok
diff --git a/bigbluebutton-client/locale/uk_UA/bbbResources.properties b/bigbluebutton-client/locale/uk_UA/bbbResources.properties
index 550a985fcde98545497fd78f1ef4bdcbc2c3abf1..3f4ad7f9c9f8d416691f7769ae507e562acdae9d 100644
--- a/bigbluebutton-client/locale/uk_UA/bbbResources.properties
+++ b/bigbluebutton-client/locale/uk_UA/bbbResources.properties
@@ -87,8 +87,8 @@ bbb.mainToolbar.helpBtn = Допомога
 bbb.mainToolbar.logoutBtn = Вихід
 bbb.mainToolbar.logoutBtn.toolTip = Вийти
 bbb.mainToolbar.langSelector = Вибрати мову
-bbb.mainToolbar.settingsBtn = Налаштування
-bbb.mainToolbar.settingsBtn.toolTip = Відкрити Налаштування
+bbb.mainToolbar.settingsBtn = Настройки
+bbb.mainToolbar.settingsBtn.toolTip = Відкрити Настройки
 bbb.mainToolbar.shortcutBtn = Клавіші швидкого доступу
 bbb.mainToolbar.shortcutBtn.toolTip = Відкрити вікно зі списком комбінацій клавіш
 bbb.mainToolbar.recordBtn.toolTip.start = Почати запис
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Flash Player
 bbb.clientstatus.flash.message = Встановлений плагін Flash Player ({0}) застарів. Рекомендуємо оновити його до найбільш свіжої версії.
 bbb.clientstatus.webrtc.title = Аудіо
 bbb.clientstatus.webrtc.message = Рекомендуємо використовувати Firefox або Chrome для поліпшення якості аудіо.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Версію Java не визначено.
-bbb.clientstatus.java.notinstalled = У Вас не встановлена Java. Щоб встановити останню версію  Java і користуватись функцією  "показати робочий стіл ", будь ласка перейдіть за цим <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>посиланням</a></font>.
-bbb.clientstatus.java.oldversion = У Вас встановлена застаріла версія  Java. Щоб встановити останню версію  Java і користуватись функцією  "показати робочий стіл ", будь ласка перейдіть за цим <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>посиланням</a></font>.
 bbb.window.minimizeBtn.toolTip = Згорнути
 bbb.window.maximizeRestoreBtn.toolTip = Розгорнути
 bbb.window.closeBtn.toolTip = Закрити
@@ -129,7 +125,7 @@ bbb.users.titleBar = Користувачі
 bbb.users.quickLink.label = Вікно користувачів
 bbb.users.minimizeBtn.accessibilityName = Згорнути вікно користувачів
 bbb.users.maximizeRestoreBtn.accessibilityName = Розгорнути вікно користувачів
-bbb.users.settings.buttonTooltip = Налаштування
+bbb.users.settings.buttonTooltip = Настройки
 bbb.users.settings.audioSettings = Тестування звуку
 bbb.users.settings.webcamSettings = Налаштування веб-камери
 bbb.users.settings.muteAll = Вимкн. всіх
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Сум
 bbb.users.emojiStatus.confused = Ніяковий
 bbb.users.emojiStatus.neutral = Нейтральний
 bbb.users.emojiStatus.away = Не на місці
+bbb.users.emojiStatus.thumbsUp = Палець вгору статус
+bbb.users.emojiStatus.thumbsDown = Палець вниз статус
+bbb.users.emojiStatus.applause = Аплодисменти статус
 bbb.presentation.title = Презентація
 bbb.presentation.titleWithPres = Презентація\: {0}
 bbb.presentation.quickLink.label = Вікно презентації
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Закрити вікно налашту
 bbb.video.publish.closeBtn.label = Скасувати
 bbb.video.publish.titleBar = Вікно увімкнення веб-камери
 bbb.video.streamClose.toolTip = Закрити трансляцію для\: {0}
-bbb.desktopPublish.title = Трансляція робочого столу\: попередній перегляд
-bbb.desktopPublish.fullscreen.tooltip = Транслювати весь екран
-bbb.desktopPublish.fullscreen.label = Повноекранний режим
-bbb.desktopPublish.region.tooltip = Транслювати область екрана
-bbb.desktopPublish.region.label = Область
-bbb.desktopPublish.stop.tooltip = Закрити трансляцію екрана
-bbb.desktopPublish.stop.label = Закрити
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Ви не можете розгорнути це вікно.
-bbb.desktopPublish.closeBtn.toolTip = Зупинити трансляцію і закрити вікно
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Демонстрація робочого столу неможлива в браузері  Chrome в системі Mac OS X.\nВикористовуйте інший браузер (Firefox).
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome більше не піддтримує Java аплети  Використовуйте інший браузер (Firefox) для демонстрації робочого столу. 
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge не піддтримує Java аплети. Використовуйте інший браузер (Firefox) для демонстрації робочого столу.
-bbb.desktopPublish.minimizeBtn.toolTip = Згорнути
-bbb.desktopPublish.minimizeBtn.accessibilityName = Згорнути вікно трансляції робочого столу
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Розгорнути вікно трансляції робочого столу
-bbb.desktopPublish.chromeHint.title = Можливо Chrome потребує вашого дозволу. 
-bbb.desktopPublish.chromeHint.message = Виділіть іконку розширень (в верхньому правому куті вікна Chrome), розблокуйте розширення, а потім виберіть пункт "Повторити"
-bbb.desktopPublish.chromeHint.button = Повторити
-bbb.desktopView.title = Трансляція робочого столу
-bbb.desktopView.fitToWindow = Підігнати під розміри вікна
-bbb.desktopView.actualSize = Фактичний розмір екрана
-bbb.desktopView.minimizeBtn.accessibilityName = Згорнути вікно перегляду трансляції робочого столу
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Розгорнути вікно перегляду трансляції робочого столу
-bbb.desktopView.closeBtn.accessibilityName = Закрити вікно перегляду трансляції робочого столу
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Перезапустити
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = Ви не можете розгорнути це вікно.
+bbb.screensharePublish.closeBtn.toolTip = Припинити трансляцію и закрити
+bbb.screensharePublish.minimizeBtn.toolTip = Мінімізувати
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Допомога
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Регіон
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Скасувати
+bbb.screensharePublish.startButton.label = Старт
+bbb.screensharePublish.stopButton.label = Зупинити
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Підлаштувати під розміри вікна
+bbb.screenshareView.actualSize = Показати фактичний розмір
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Увімкнути ваш мікрофон
 bbb.toolbar.phone.toolTip.stop = Вимкнути ваш мікрофон
 bbb.toolbar.phone.toolTip.mute = Припинити слухати конференцію
 bbb.toolbar.phone.toolTip.unmute = Почати слухати конференцію
 bbb.toolbar.phone.toolTip.nomic = Мікрофон не виявлено
-bbb.toolbar.deskshare.toolTip.start = Транслювати робочий стіл
-bbb.toolbar.deskshare.toolTip.stop = Зупинити трансляцію робочого столу
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Увімкнути трансляцію вашої веб-камери
 bbb.toolbar.video.toolTip.stop = Зупинити трансляцію вашої веб-камери
 bbb.layout.addButton.toolTip = Додати в список схему користувача
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Схеми успішно збережені
 bbb.layout.load.complete = Схеми успішно завантажені
 bbb.layout.load.failed = Не вдалось завантажити макети
 bbb.layout.name.defaultlayout = Розташування вікон за замовчуванням
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Відеочат
 bbb.layout.name.webcamsfocus = Відеоконференція
 bbb.layout.name.presentfocus = Презентація
@@ -362,6 +395,7 @@ bbb.logout.rejected = З'єднання з сервером відхилено
 bbb.logout.invalidapp = Додаток red5 відсутній
 bbb.logout.unknown = Ваш клієнт втратив зв'язок з сервером
 bbb.logout.usercommand = Ви вийшли із конференції
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Модератор виключив вас із зустрічі. 
 bbb.logout.refresh.message = Якщо цей вихід був несподіваним натисніть на кнопку нижче, щоб відновити підключення.
 bbb.logout.refresh.label = Повторне підключення
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Зберегти примітки
 bbb.settings.deskshare.instructions = Натисніть на кнопку Дозволити на спливаючому запиті, аби перевірити, що у вас коректно працює трансляція робочого столу
 bbb.settings.deskshare.start = Перевірити трансляцію робочого столу
 bbb.settings.voice.volume = Активність мікрофону
-bbb.settings.java.label = Помилка версії Java
-bbb.settings.java.text = У вас встановлена Java версії {0}, але необхідна принаймні версія {1} для використання функції BigBlueButton трансляції робочого столу. Натисніть на кнопку нижче щоб встановити останню версію Java JRE.
-bbb.settings.java.command = Встановіть новітню Java
 bbb.settings.flash.label = Помилка версії Flash
 bbb.settings.flash.text = У вас встановлений флеш {0}, але для коректної роботи BigBlueButton потрібна, принаймні, версія {1}. Натисніть на кнопку знизу, щоб встановити останню версію Adobe Flash.
 bbb.settings.flash.command = Встановіть новітню Flash
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Текст
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Перемкнути курсор на текст
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Колір тексту
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Розмір шрифту
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = Жоден
+bbb.caption.transcript.youowner = Ви
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Мова\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Готово
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Згорнути поточне ві
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Розгорнути поточне вікно
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Покинути вікно Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Вимк./Увімк. ваш мікрофон
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Перейти до вікна чату
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Відкрити вікно трансляції робочого столу
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Відкрити вікно налаштувань аудіо трансляцій
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Почати/Припинити слухати конференцію
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Відкрити вікно трансляції веб-камери
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Закрити всі відео
 bbb.users.settings.lockAll=Заблокувати вісх користувачів
 bbb.users.settings.lockAllExcept=Заблокувати всіх окрім ведучого
 bbb.users.settings.lockSettings=Заблокувати глядачів
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Розблокувати всіх глядачів
 bbb.users.settings.roomIsLocked=Заблоковані за замовчуванням
 bbb.users.settings.roomIsMuted=Вимкнутий мікрофон за замовчуванням
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Блокувати глядачів
 bbb.lockSettings.feature=Можливості
 bbb.lockSettings.locked=Заблоковано
 bbb.lockSettings.lockOnJoin=Блокувати при вході
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Кімнати
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Кімната
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Хвилин
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Старт
+bbb.users.breakout.invite = Запросити
+bbb.users.breakout.close = Закрити
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Кімната
+bbb.users.roomsGrid.users = Користувачі
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Приєднатися
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/vi_VN/bbbResources.properties b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
index 66f5d28dc6491cc1641eb80ad0a9cd71ad2606ab..5c922d4bbce94f947a2eb8f614653896440550f4 100644
--- a/bigbluebutton-client/locale/vi_VN/bbbResources.properties
+++ b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
@@ -114,10 +114,6 @@ bbb.clientstatus.flash.title = Máy trình chiếu Flash
 bbb.clientstatus.flash.message = Máy trình chiếu Flash ({0}) của bạn không phải là mới nhất. Khuyến nghị nên cập nhật phiên bản mới nhất.
 bbb.clientstatus.webrtc.title = Âm thanh
 bbb.clientstatus.webrtc.message = Khuyến nghị sử dụng Firefox hay Chrome để có âm thanh tốt hơn
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Không kiểm tra được phiên bản Java.
-bbb.clientstatus.java.notinstalled = Bạn chưa cài đặt Java, vui lòng click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>tại đây</a></font> để cài đặt Java phiên bản mới nhất cho chức năng chia sẻ desktop.
-bbb.clientstatus.java.oldversion = Phiên bản cài đặt Java đã cũ, vui lòng click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>tại đây</a></font> để cài đặt Java phiên bản mới nhất cho chức năng chia sẻ desktop.
 bbb.window.minimizeBtn.toolTip = Thu nhỏ
 bbb.window.maximizeRestoreBtn.toolTip = Phóng to
 bbb.window.closeBtn.toolTip = Đóng lại
@@ -181,6 +177,9 @@ bbb.users.emojiStatus.sad = Trạng thái buồn bã
 bbb.users.emojiStatus.confused = Trạng thái lẫn lộn
 bbb.users.emojiStatus.neutral = Trạng thái trung lập
 bbb.users.emojiStatus.away = Trạng thái bất kỳ
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = Trình bày
 bbb.presentation.titleWithPres = Trình bày\: {0}
 bbb.presentation.quickLink.label = Cửa sổ trình bày
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = Đóng lại hộp thoại điều chỉ
 bbb.video.publish.closeBtn.label = Hủy bỏ
 bbb.video.publish.titleBar = \ Xuất bản cửa sổ webcam
 bbb.video.streamClose.toolTip = Đóng kết nối truyền dữ liệu của\: {0}
-bbb.desktopPublish.title = Chia sẻ Màn hình
-bbb.desktopPublish.fullscreen.tooltip = Chia sẻ màn hình chính của bạn
-bbb.desktopPublish.fullscreen.label = Toàn màn hình
-bbb.desktopPublish.region.tooltip = Chia sẻ một phần màn hình của bạn
-bbb.desktopPublish.region.label = Một vùng
-bbb.desktopPublish.stop.tooltip = Đóng chia sẻ màn hình
-bbb.desktopPublish.stop.label = Đóng
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = Bạn không thể phóng lớn cửa sổ này.
-bbb.desktopPublish.closeBtn.toolTip = Ngừng chia sẻ và đóng cửa sổ này lại.
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Chia sẻ Desktop chưa được hỗ trợ cho trình duyệt Chrome chạy trên HĐH Mac OS X. Bạn phải dùng trình duyệt khác (khuyến nghị Firefox) để chia sẻ Desktop của bạn.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome không còn hỗ trợ Java Appets. Bạn phải sử dụng trình duyệt khác (nên dùng Firefox) để chia sẻ desktop của bạn 
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge không hỗ trợ Java Applets. Bạn phải dùng một trình duyệt khác (đề cử dùng Firefox) để chia sẻ màn hình desktop của bạn.
-bbb.desktopPublish.minimizeBtn.toolTip = Thu nhỏ cửa sổ này.
-bbb.desktopPublish.minimizeBtn.accessibilityName = Thu nhở cửa sổ xuất bản cho chia sẻ dạng desktop
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Phóng to cửa sổ xuất bản cho chia sẻ dạng desktop
-bbb.desktopPublish.chromeHint.title = Chrome cần sự cho phép của bạn.
-bbb.desktopPublish.chromeHint.message = Chọn biểu tượng plug-in (góc trên trái của Chrome), un-block plug-in và chọn 'Thử lại'
-bbb.desktopPublish.chromeHint.button = Thử lại
-bbb.desktopView.title = Chia sẻ Màn hình
-bbb.desktopView.fitToWindow = Phóng toàn Cửa sổ
-bbb.desktopView.actualSize = Hiện kích thước thật
-bbb.desktopView.minimizeBtn.accessibilityName = Thu nhở cửa sổ xuất bản cho chia sẻ dạng desktop
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = Phóng to cửa sổ xuất bản cho chia sẻ dạng desktop
-bbb.desktopView.closeBtn.accessibilityName = Đóng lại cửa sổ xuất bản cho chia sẻ dạng desktop
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = Chia sẻ microphone của bạn
 bbb.toolbar.phone.toolTip.stop = Ngừng chia sẻ microphone của bạn
 bbb.toolbar.phone.toolTip.mute = Dừng nghe hội thảo 
 bbb.toolbar.phone.toolTip.unmute = Bắt đầu nghe hội thảo
 bbb.toolbar.phone.toolTip.nomic = Không tìm thấy microphone
-bbb.toolbar.deskshare.toolTip.start = Chia sẻ desktop của bạn
-bbb.toolbar.deskshare.toolTip.stop = Ngừng chia sẻ desktop của bạn
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = Chia sẻ webcam của bạn
 bbb.toolbar.video.toolTip.stop = Ngừng chia sẻ webcam của bạn
 bbb.layout.addButton.toolTip = Thêm vào phần bố trí tùy chọn cho danh sách
@@ -331,6 +363,7 @@ bbb.layout.save.complete = Các bố cục đã được lưu thành công
 bbb.layout.load.complete = Các bố cục đã được tải thành công
 bbb.layout.load.failed = Không thể khởi tạo mẫu trình bày
 bbb.layout.name.defaultlayout = Kiểu trình bày mặc định 
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = Tán gẫu qua Video 
 bbb.layout.name.webcamsfocus = Hội thoại qua Webcam
 bbb.layout.name.presentfocus = Hội thoại trình chiếu
@@ -362,6 +395,7 @@ bbb.logout.rejected = Kết nối tới máy chủ đã bị từ chối
 bbb.logout.invalidapp = Ứng dụng Red5 không tồn tại
 bbb.logout.unknown = Trình duyệt của bạn đã mất kết nối tới máy chủ
 bbb.logout.usercommand = Bạn vừa thoát ra khỏi cuộc hội thoại
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = Một người quản lý đã loại bạn ra khỏi cuộc thảo luận.
 bbb.logout.refresh.message = Nếu không mong muốn thoát khỏi hệ thống, click Kết nối lại để kết nối trở lại 
 bbb.logout.refresh.label = Kết nối lại
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = Lưu ghi chú
 bbb.settings.deskshare.instructions = Nhấn vào Cho phép (Allow) tại hộp thoại bật lên để kiểm tra dịch vụ chia sẻ màn hình hoạt động tốt
 bbb.settings.deskshare.start = Kiểm tra Chia sẻ Màn hình
 bbb.settings.voice.volume = Tình trạng của Micro
-bbb.settings.java.label = Lỗi phiên bản Java
-bbb.settings.java.text = Bạn có Java {0} đã cài đặt, nhưng bạn cần ít nhất phiên bản {1} để dùng chức năng chia sẻ màn hình của BigBlueButton. Nhấn vào nút bên dưới để cài đặt phiên bản Java JRE mới nhất.
-bbb.settings.java.command = Cài bản Java mới nhất
 bbb.settings.flash.label = Lỗi phiên bản Flash
 bbb.settings.flash.text = Bạn đã cài Flash {0}, nhưng bạn cần ít nhất phiên bản {1} để chạy tốt BigBlueButton. Nhấn vào nút dưới đây để cài phiên bản Adobe Flash mới nhất.
 bbb.settings.flash.command = Cài bản Flash mới nhất
@@ -404,6 +435,29 @@ ltbcustom.bbb.highlighter.toolbar.text = Văn bản
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Chuyển đổi trỏ chuột trắng sang dạng chữ viết
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Màu chữ
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Kích thước kiểu chữ
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
+
 
 bbb.accessibility.clientReady = Sẵn sàng
 
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = Thu nhỏ cửa sổ hiện tại
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = Phóng to cửa sổ hiện tại
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = Tập trung vào cửa sổ Flash
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = Tắt và mở âm thanh phần microphone
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = Chuyển phần tập trung vào cửa s
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = Mở cửa sổ chia sẻ dạng desktop
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = Mở cửa sổ thiết lập audio
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = Bắt đầu/Dừng nghe hội thảo
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = Mở cửa sổ chia sẻ webcam
 
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = Đóng tất cả video
 bbb.users.settings.lockAll=Khóa tất cả người dùng
 bbb.users.settings.lockAllExcept=Khóa tất cả người dùng trừ người trình bày
 bbb.users.settings.lockSettings=Khóa những người đang xem ...
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=Mở khóa tất cả người đang xem
 bbb.users.settings.roomIsLocked=Mặc định là khóa
 bbb.users.settings.roomIsMuted=Mặc định là im lặng 
@@ -585,3 +637,34 @@ bbb.lockSettings.title=Khóa người dùng
 bbb.lockSettings.feature=Tính năng
 bbb.lockSettings.locked=Đã khóa
 bbb.lockSettings.lockOnJoin=Khóa ngay khi gia nhập
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = Close
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/locale/zh_CN/bbbResources.properties b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
index f2aaf2f08df8c0adc298812eb667910b03db6ef4..4e9b7fa6f1c63d6eb0026a9ff21abd5f49bcb8c8 100644
--- a/bigbluebutton-client/locale/zh_CN/bbbResources.properties
+++ b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
 bbb.mainshell.statusProgress.connecting = 正在连接到服务器
 bbb.mainshell.statusProgress.loading = 载入 {0} 模块
 bbb.mainshell.statusProgress.cannotConnectServer = 抱歉，无法连接到服务器。
-bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (build {0})
+bbb.mainshell.copyrightLabel2 = (c) 2016 <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>BigBlueButton Inc.</u></a> (编译 {0})
 bbb.mainshell.logBtn.toolTip = 打开日志
 bbb.mainshell.meetingNotFound = 没有找到会话
 bbb.mainshell.invalidAuthToken = 无效的认证码
@@ -43,7 +43,7 @@ bbb.micSettings.cancel = 取消
 bbb.micSettings.connectingtoecho = 连接
 bbb.micSettings.connectingtoecho.error = 回音测试错误：请联系管理员
 bbb.micSettings.cancel.toolTip = 撤销加入音频会议
-bbb.micSettings.access.helpButton = Help (open tutorial videos in new page)
+bbb.micSettings.access.helpButton = 帮助 (在新的页面打开教学视频)
 bbb.micSettings.access.title = 音频设置。焦点将会保持在音频设置窗口直到该窗口关闭。
 bbb.micSettings.webrtc.title = WebRTC 支持
 bbb.micSettings.webrtc.capableBrowser = 您的浏览器支持WebRTC 
@@ -52,7 +52,7 @@ bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = 如果您不想使用W
 bbb.micSettings.webrtc.notCapableBrowser = 您的浏览器不支持WebRTC。请使用Google Chrome ( 32 版本或更新) 或Mozilla Firefox (26版本或更新)。您始终可以通过Adobe Flash Platform加入语音会话。
 bbb.micSettings.webrtc.connecting = 正在呼叫
 bbb.micSettings.webrtc.waitingforice = 连接
-bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.transferring = 传输中
 bbb.micSettings.webrtc.endingecho = \ 加入语音
 bbb.micSettings.webrtc.endedecho = 回音测试已结束
 bbb.micPermissions.firefox.title = Firefox麦克风允许
@@ -69,20 +69,20 @@ bbb.webrtcWarning.title = WebRTC音频启动失败
 bbb.webrtcWarning.failedError.1001 = 错误1001\: WebSocket未连接
 bbb.webrtcWarning.failedError.1002 = 错误1002：WebSocket无法连接
 bbb.webrtcWarning.failedError.1003 = 错误1003：浏览器版本不支持
-bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1004 = 错误1004\: 呼叫失败  (原因\={0})
 bbb.webrtcWarning.failedError.1005 = 错误1005：呼叫中断
 bbb.webrtcWarning.failedError.1006 = 错误1006：呼叫超时
 bbb.webrtcWarning.failedError.1007 = 错误1007：ICE协议失败
-bbb.webrtcWarning.failedError.1008 = Error 1008\: Transfer failed
-bbb.webrtcWarning.failedError.1009 = Error 1009\: Could not fetch STUN/TURN server information
-bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
-bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.1008 = 错误1008\: 传输失败
+bbb.webrtcWarning.failedError.1009 = 错误1009\:无法获取STUN/TURN服务器信息
+bbb.webrtcWarning.failedError.1010 = 错误1010：ICE协议超时
+bbb.webrtcWarning.failedError.1011 = 错误1011：ICE收集超时了
 bbb.webrtcWarning.failedError.unknown = 错误 {0}\: 未知的错误代码
 bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
 bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
-bbb.webrtcWarning.connection.dropped = WebRTC connection dropped
-bbb.webrtcWarning.connection.reconnecting = Attempting to reconnect
-bbb.webrtcWarning.connection.reestablished = WebRTC connection re-established
+bbb.webrtcWarning.connection.dropped = 放弃WebRTC连接
+bbb.webrtcWarning.connection.reconnecting = 重新连接尝试中
+bbb.webrtcWarning.connection.reestablished = WebRTC连接重新建立
 bbb.mainToolbar.helpBtn = 帮助
 bbb.mainToolbar.logoutBtn = 退出
 bbb.mainToolbar.logoutBtn.toolTip = 登出
@@ -105,19 +105,15 @@ bbb.mainToolbar.recordingLabel.recording = (录制中)
 bbb.mainToolbar.recordingLabel.notRecording = 没有录制
 bbb.clientstatus.title = Configuration Notifications
 bbb.clientstatus.notification = Unread notifications
-bbb.clientstatus.close = Close
-bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.close = 关闭
+bbb.clientstatus.tunneling.title = 防火墙
 bbb.clientstatus.tunneling.message = A firewall is preventing your client from connecting directly on port 1935 to the remote server. Recommend joining a less restrictive network for a more stable connection
-bbb.clientstatus.browser.title = Browser Version
+bbb.clientstatus.browser.title = 浏览器版本
 bbb.clientstatus.browser.message = Your browser ({0}) is not up-to-date. Recommend updating to the latest version.
-bbb.clientstatus.flash.title = Flash Player
-bbb.clientstatus.flash.message = Your Flash Player plugin ({0}) is out-of-date. Recommend updating to the latest version.
-bbb.clientstatus.webrtc.title = Audio
+bbb.clientstatus.flash.title = Flash播放器
+bbb.clientstatus.flash.message = 您的Flash播放器插件({0}) 已经过时。请更新到最新版本。
+bbb.clientstatus.webrtc.title = 音频
 bbb.clientstatus.webrtc.message = Recommend using either Firefox or Chrome for better audio.
-bbb.clientstatus.java.title = Java
-bbb.clientstatus.java.notdetected = Java version not detected.
-bbb.clientstatus.java.notinstalled = You have no Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
-bbb.clientstatus.java.oldversion = You have an old Java installed, please click <font color\='\#0a4a7a'><a href\='http\://www.java.com/download/' target\='_blank'>HERE</a></font> to install the latest Java to use the desktop sharing feature.
 bbb.window.minimizeBtn.toolTip = 最小化
 bbb.window.maximizeRestoreBtn.toolTip = 最大化
 bbb.window.closeBtn.toolTip = 关闭
@@ -135,8 +131,8 @@ bbb.users.settings.webcamSettings = 摄像头设置
 bbb.users.settings.muteAll = 全部话筒静音
 bbb.users.settings.muteAllExcept = 演讲者外全部话筒静音
 bbb.users.settings.unmuteAll = 解除全部话筒静音
-bbb.users.settings.clearAllStatus = Clear all status icons
-bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.settings.clearAllStatus = 清除所有状态图标
+bbb.users.emojiStatusBtn.toolTip = 更新我的状态图标
 bbb.users.roomMuted.text = 浏览用户被静音
 bbb.users.roomLocked.text = 浏览用户被锁定
 bbb.users.pushToTalk.toolTip = 单击此处开始发言
@@ -145,7 +141,7 @@ bbb.users.muteMeBtnTxt.talk = 解除静音
 bbb.users.muteMeBtnTxt.mute = 静音
 bbb.users.muteMeBtnTxt.muted = 已被设为静音
 bbb.users.muteMeBtnTxt.unmuted = 已被解除静音
-bbb.users.usersGrid.contextmenu.exportusers = Copy User Names
+bbb.users.usersGrid.contextmenu.exportusers = 复制用户名字
 bbb.users.usersGrid.accessibilityName = 用户名单。使用箭头键浏览。
 bbb.users.usersGrid.nameItemRenderer = 名字
 bbb.users.usersGrid.nameItemRenderer.youIdentifier = ä½ 
@@ -153,10 +149,10 @@ bbb.users.usersGrid.statusItemRenderer = 状态
 bbb.users.usersGrid.statusItemRenderer.changePresenter = 点击来设置演讲者
 bbb.users.usersGrid.statusItemRenderer.presenter = 演讲者
 bbb.users.usersGrid.statusItemRenderer.moderator = 管理者
-bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
+bbb.users.usersGrid.statusItemRenderer.clearStatus = 清除状态
 bbb.users.usersGrid.statusItemRenderer.viewer = 观众
-bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
-bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = 摄像头共享中。
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = 是演讲者。
 bbb.users.usersGrid.mediaItemRenderer = 媒体
 bbb.users.usersGrid.mediaItemRenderer.talking = 发言
 bbb.users.usersGrid.mediaItemRenderer.webcam = 摄像头共享
@@ -170,17 +166,20 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = 摄像头共享
 bbb.users.usersGrid.mediaItemRenderer.micOff = 关闭麦克风
 bbb.users.usersGrid.mediaItemRenderer.micOn = 打开麦克风
 bbb.users.usersGrid.mediaItemRenderer.noAudio = 不在音频会议中
-bbb.users.emojiStatus.clear = Clear
-bbb.users.emojiStatus.clear.toolTip = Clear status
-bbb.users.emojiStatus.close = Close
-bbb.users.emojiStatus.close.toolTip = Close status popup
-bbb.users.emojiStatus.raiseHand = Raise hand status
-bbb.users.emojiStatus.happy = Happy status
-bbb.users.emojiStatus.smile = Smile status
-bbb.users.emojiStatus.sad = Sad status
-bbb.users.emojiStatus.confused = Confused status
-bbb.users.emojiStatus.neutral = Neutral status
-bbb.users.emojiStatus.away = Away status
+bbb.users.emojiStatus.clear = 清除
+bbb.users.emojiStatus.clear.toolTip = 清除状态
+bbb.users.emojiStatus.close = 关闭
+bbb.users.emojiStatus.close.toolTip = 关闭状态提示
+bbb.users.emojiStatus.raiseHand = 举手状态
+bbb.users.emojiStatus.happy = 高兴状态
+bbb.users.emojiStatus.smile = 微笑状态
+bbb.users.emojiStatus.sad = 难过状态
+bbb.users.emojiStatus.confused = 困惑状态
+bbb.users.emojiStatus.neutral = 中立状态
+bbb.users.emojiStatus.away = 离开状态
+bbb.users.emojiStatus.thumbsUp = Thumbs Up status
+bbb.users.emojiStatus.thumbsDown = Thumbs Down status
+bbb.users.emojiStatus.applause = Applause status
 bbb.presentation.title = 演示
 bbb.presentation.titleWithPres = 演示文档：{0}
 bbb.presentation.quickLink.label = 演示窗口
@@ -196,7 +195,7 @@ bbb.presentation.uploadcomplete = 上传完毕。请耐心等待文件转换。
 bbb.presentation.uploaded = 已上传。
 bbb.presentation.document.supported = 支持上传文件类型，开始转换...
 bbb.presentation.document.converted = 办公文件转换成功。
-bbb.presentation.error.document.convert.failed = Error\: Unable to convert the office document.
+bbb.presentation.error.document.convert.failed = 错误：无法转换该文档。
 bbb.presentation.error.io = IO 错误\: 请与管理员联系。
 bbb.presentation.error.security = 安全错误\: 请与管理员联系。
 bbb.presentation.error.convert.notsupported = 错误：上传的文件不支持。请上传可被支持的文件。
@@ -254,14 +253,14 @@ bbb.chat.minimizeBtn.accessibilityName = 最小化聊天窗口
 bbb.chat.maximizeRestoreBtn.accessibilityName = 最大化聊天窗口
 bbb.chat.closeBtn.accessibilityName = 关闭聊天窗口
 bbb.chat.chatTabs.accessibleNotice = 此选项卡里的新信息。
-bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.systemMessage = 系统
 bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
 bbb.publishVideo.changeCameraBtn.labelText = 更换摄像头
 bbb.publishVideo.changeCameraBtn.toolTip = 打开改变摄像头对话框
 bbb.publishVideo.cmbResolution.tooltip = 选择网络摄像头分辨率
 bbb.publishVideo.startPublishBtn.labelText = 开始共享
 bbb.publishVideo.startPublishBtn.toolTip = 开始共享
-bbb.publishVideo.startPublishBtn.errorName = Can't share webcam. Reason\: {0}
+bbb.publishVideo.startPublishBtn.errorName = 无法共享摄像头。原因： {0}
 bbb.webcamPermissions.chrome.title = Chrome摄像头允许
 bbb.webcamPermissions.chrome.message1 = 点击“允许”来使用摄像头
 bbb.videodock.title = 视频区
@@ -284,37 +283,70 @@ bbb.video.publish.closeBtn.accessName = 关闭摄像头窗口
 bbb.video.publish.closeBtn.label = 取消
 bbb.video.publish.titleBar = 发布网络摄像窗口
 bbb.video.streamClose.toolTip = Close stream for\: {0}
-bbb.desktopPublish.title = 桌面共享：演讲人预览
-bbb.desktopPublish.fullscreen.tooltip = 分享您的主页面
-bbb.desktopPublish.fullscreen.label = 全屏
-bbb.desktopPublish.region.tooltip = 分享您的部分页面
-bbb.desktopPublish.region.label = 区域
-bbb.desktopPublish.stop.tooltip = 关闭桌面共享
-bbb.desktopPublish.stop.label = 关闭
-bbb.desktopPublish.maximizeRestoreBtn.toolTip = 此窗口不能最大化
-bbb.desktopPublish.closeBtn.toolTip = 停止共享并关闭
-bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop.
-bbb.desktopPublish.minimizeBtn.toolTip = 最小化
-bbb.desktopPublish.minimizeBtn.accessibilityName = 最小化桌面共享发布窗口
-bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = 最大化桌面共享发布窗口
-bbb.desktopPublish.chromeHint.title = Chrome may need your permission.
-bbb.desktopPublish.chromeHint.message = Select the plug-in icon (upper right-hand corner of Chrome), un-block plug-ins, and then select 'Retry'.
-bbb.desktopPublish.chromeHint.button = Retry
-bbb.desktopView.title = 桌面共享
-bbb.desktopView.fitToWindow = 适应窗口大小
-bbb.desktopView.actualSize = 显示实际大小
-bbb.desktopView.minimizeBtn.accessibilityName = 最小化桌面共享窗口
-bbb.desktopView.maximizeRestoreBtn.accessibilityName = 最大化桌面共享窗口
-bbb.desktopView.closeBtn.accessibilityName = 关闭桌面共享窗口
+bbb.screensharePublish.title = Screen Sharing\: Presenter's Preview
+bbb.screensharePublish.pause.tooltip = Pause screen share
+bbb.screensharePublish.pause.label = Pause
+bbb.screensharePublish.restart.tooltip = Restart screen share
+bbb.screensharePublish.restart.label = Restart
+bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
+bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close
+bbb.screensharePublish.minimizeBtn.toolTip = Minimize
+bbb.screensharePublish.minimizeBtn.accessibilityName = Minimize the Screen Sharing Publish Window
+bbb.screensharePublish.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing Publish Window
+bbb.screensharePublish.commonHelpText.text = The steps below will guide you through starting screen sharing (requires Java).
+bbb.screensharePublish.helpButton.toolTip = Help
+bbb.screensharePublish.helpButton.accessibilityName = Help (Opens tutorial in a new window)
+bbb.screensharePublish.helpText.PCIE1 = 1. Select 'Open'
+bbb.screensharePublish.helpText.PCIE2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCIE3 =
+bbb.screensharePublish.helpText.PCFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.PCFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.PCFirefox3 =
+bbb.screensharePublish.helpText.PCChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.PCChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.PCChrome3 = 3. Accept the certificate
+bbb.screensharePublish.helpText.MacSafari1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacSafari2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacSafari3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacSafari4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacFirefox1 = 1. Choose 'Save File' (if asked)
+bbb.screensharePublish.helpText.MacFirefox2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacFirefox3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacFirefox4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.MacChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.MacChrome2 = 2. Select 'Show In Finder'
+bbb.screensharePublish.helpText.MacChrome3 = 3. Right-click and select 'Open'
+bbb.screensharePublish.helpText.MacChrome4 = 4. Select 'Open' (if prompted)
+bbb.screensharePublish.helpText.LinuxFirefox1 = 1. Click 'OK' to run
+bbb.screensharePublish.helpText.LinuxFirefox2 = 2. Accept the certificate
+bbb.screensharePublish.helpText.LinuxFirefox3 =
+bbb.screensharePublish.helpText.LinuxChrome1 = 1. Locate 'screenshare.jnlp'
+bbb.screensharePublish.helpText.LinuxChrome2 = 2. Click to open
+bbb.screensharePublish.helpText.LinuxChrome3 = 3. Accept the certificate
+bbb.screensharePublish.shareTypeLabel.text = Share\:
+bbb.screensharePublish.shareType.fullScreen = Full screen
+bbb.screensharePublish.shareType.region = Region
+bbb.screensharePublish.pauseMessage.label = Screen sharing is currently paused.
+bbb.screensharePublish.startFailed.label = Did not detect start of screen sharing.
+bbb.screensharePublish.restartFailed.label = Did not detect restart of screen sharing.
+bbb.screensharePublish.jwsCrashed.label = The screen sharing application closed unexpectedly.
+bbb.screensharePublish.commonErrorMessage.label = Select 'Cancel' and try again.
+bbb.screensharePublish.cancelButton.label = Cancel
+bbb.screensharePublish.startButton.label = Start
+bbb.screensharePublish.stopButton.label = Stop
+bbb.screenshareView.title = Screen Sharing
+bbb.screenshareView.fitToWindow = Fit to Window
+bbb.screenshareView.actualSize = Display actual size
+bbb.screenshareView.minimizeBtn.accessibilityName = Minimize the Screen Sharing View Window
+bbb.screenshareView.maximizeRestoreBtn.accessibilityName = Maximize the Screen Sharing View Window
+bbb.screenshareView.closeBtn.accessibilityName = Close the Screen Sharing View Window
 bbb.toolbar.phone.toolTip.start = 分享麦克风
 bbb.toolbar.phone.toolTip.stop = 停止分享麦克风
 bbb.toolbar.phone.toolTip.mute = 停止听取该会话
 bbb.toolbar.phone.toolTip.unmute = 开始听取该会话
 bbb.toolbar.phone.toolTip.nomic = 没有检测到麦克风
-bbb.toolbar.deskshare.toolTip.start = 分享桌面
-bbb.toolbar.deskshare.toolTip.stop = 停止分享桌面
+bbb.toolbar.deskshare.toolTip.start = Share Your Screen
+bbb.toolbar.deskshare.toolTip.stop = Stop Sharing Your Screen
 bbb.toolbar.video.toolTip.start = 分享摄像头
 bbb.toolbar.video.toolTip.stop = 停止分享摄像头
 bbb.layout.addButton.toolTip = 将自定义布局加入到列表
@@ -329,8 +361,9 @@ bbb.layout.combo.customName = 自定义布局
 bbb.layout.combo.remote = 远程
 bbb.layout.save.complete = 布局保存成功
 bbb.layout.load.complete = 布局成功载入
-bbb.layout.load.failed = Unable to load the layouts
+bbb.layout.load.failed = 无法加载该布局
 bbb.layout.name.defaultlayout = 默认布局
+bbb.layout.name.closedcaption = Closed Caption
 bbb.layout.name.videochat = 视频会话
 bbb.layout.name.webcamsfocus = 视频会议
 bbb.layout.name.presentfocus = 演示稿会话
@@ -357,11 +390,12 @@ bbb.logout.button.label = OK
 bbb.logout.appshutdown = 服务器应用已被关闭
 bbb.logout.asyncerror = 同步错误
 bbb.logout.connectionclosed = 连接被关闭
-bbb.logout.connectionfailed = The connection to the server has ended
+bbb.logout.connectionfailed = 连接服务器已经结束
 bbb.logout.rejected = 服务器连接被拒绝
 bbb.logout.invalidapp = Red5 应用不存在
 bbb.logout.unknown = 您已掉线
 bbb.logout.usercommand = 您已从会议中登出
+bbb.logour.breakoutRoomClose = Your browser window will be closed
 bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
 bbb.logout.refresh.message = \ 如果意外登出，请点击下面按钮重新连接
 bbb.logout.refresh.label = 重新连接
@@ -370,12 +404,12 @@ bbb.logout.confirm.message = 你确定要退出吗？
 bbb.logout.confirm.yes = 是的
 bbb.logout.confirm.no = 不是
 bbb.connection.failure=Detected Connectivity Problems
-bbb.connection.reconnecting=Reconnecting
-bbb.connection.reestablished=Connection reestablished
+bbb.connection.reconnecting=重新连接中
+bbb.connection.reestablished=重新连接
 bbb.connection.bigbluebutton=BigBlueButton
 bbb.connection.sip=SIP
-bbb.connection.video=Video
-bbb.connection.deskshare=Deskshare
+bbb.connection.video=视频
+bbb.connection.deskshare=桌面共享
 bbb.notes.title = 笔记
 bbb.notes.cmpColorPicker.toolTip = 文字颜色
 bbb.notes.saveBtn = 保存
@@ -383,9 +417,6 @@ bbb.notes.saveBtn.toolTip = 保存笔记
 bbb.settings.deskshare.instructions = 在弹出窗口中点击同意检查桌面共享程序工作是否正常
 bbb.settings.deskshare.start = 检查桌面共享
 bbb.settings.voice.volume = 麦克风状态
-bbb.settings.java.label = Java 版本错误
-bbb.settings.java.text = 您安装的是Java {0}，但 BigBlueButton 中的桌面共享功能要求的最低版本是 {1} 。点击下面的按钮安装最新的 JRE 。
-bbb.settings.java.command = 安装最新版 Java
 bbb.settings.flash.label = Flash 版本错误
 bbb.settings.flash.text = 您安装的 Flash 为 {0} ，BigBlueButton 需要 {1} 以上版本才能正常运行。点击下面的链接安装最新的 Flash Player
 bbb.settings.flash.command = 安装最新 Flash
@@ -404,8 +435,31 @@ ltbcustom.bbb.highlighter.toolbar.text = 文字
 ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = 切换白板光标为文字
 ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = 文字颜色
 ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = 字体大小
+bbb.caption.window.title = Closed Caption
+bbb.caption.window.titleBar = Close Caption Window Title Bar
+bbb.caption.window.minimizeBtn.accessibilityName = Minimize the Closed Caption Window
+bbb.caption.window.maximizeRestoreBtn.accessibilityName = Maximize the Closed Caption Window
+bbb.caption.transcript.noowner = None
+bbb.caption.transcript.youowner = You
+bbb.caption.transcript.pastewarning.title = Caption Paste Warning
+bbb.caption.transcript.pastewarning.text = Cannot paste text longer than {0} characters. You pasted {1} characters.
+bbb.caption.option.label = Options
+bbb.caption.option.language = Language\:
+bbb.caption.option.language.tooltip = Select Caption Language
+bbb.caption.option.language.accessibilityName = Select caption language. Use the arrow keys to navigate.
+bbb.caption.option.takeowner = Take Ownership
+bbb.caption.option.takeowner.tooltip = Take Ownership of Selected Language
+bbb.caption.option.fontfamily = Font Family\:
+bbb.caption.option.fontfamily.tooltip = Font Family
+bbb.caption.option.fontsize = Font Size\:
+bbb.caption.option.fontsize.tooltip = Font Size
+bbb.caption.option.backcolor = Background Color\:
+bbb.caption.option.backcolor.tooltip = Background Color
+bbb.caption.option.textcolor = Text Color\:
+bbb.caption.option.textcolor.tooltip = Text Color
 
-bbb.accessibility.clientReady = Ready
+
+bbb.accessibility.clientReady = 准备
 
 bbb.accessibility.chat.chatBox.reachedFirst = 已经是第一条信息
 bbb.accessibility.chat.chatBox.reachedLatest = 已经是最后一条信息
@@ -435,7 +489,7 @@ bbb.shortcutkey.general.minimize.function = 最小化当前窗口
 bbb.shortcutkey.general.maximize = 187
 bbb.shortcutkey.general.maximize.function = 最大化当前窗口
 
-bbb.shortcutkey.flash.exit = 81
+bbb.shortcutkey.flash.exit = 79
 bbb.shortcutkey.flash.exit.function = 焦点离开 Flash 窗口
 bbb.shortcutkey.users.muteme = 77
 bbb.shortcutkey.users.muteme.function = 话筒静音或解除话筒静音
@@ -457,10 +511,6 @@ bbb.shortcutkey.focus.chat.function = 将焦点移到聊天窗口
 
 bbb.shortcutkey.share.desktop = 68
 bbb.shortcutkey.share.desktop.function = 打开桌面共享窗口
-bbb.shortcutkey.share.microphone = 79
-bbb.shortcutkey.share.microphone.function = 打开麦克风设置窗口
-bbb.shortcutkey.share.pauseRemoteStream = 80
-bbb.shortcutkey.share.pauseRemoteStream.function = 开始/停止听取该会话
 bbb.shortcutkey.share.webcam = 66
 bbb.shortcutkey.share.webcam.function = 打开摄像头共享窗口
 
@@ -506,7 +556,7 @@ bbb.shortcutkey.chat.changeColour.function = 焦点集中到文字颜色选择
 bbb.shortcutkey.chat.sendMessage = 83
 bbb.shortcutkey.chat.sendMessage.function = 发送聊天信息
 bbb.shortcutkey.chat.closePrivate = 69
-bbb.shortcutkey.chat.closePrivate.function = Close private chat tab
+bbb.shortcutkey.chat.closePrivate.function = 关闭私聊标签
 bbb.shortcutkey.chat.explanation = ----
 bbb.shortcutkey.chat.explanation.function = 如果要浏览信息，您必须把焦点集中到聊天框
 
@@ -525,19 +575,19 @@ bbb.shortcutkey.chat.chatbox.goread.function = 浏览到您最近读过的信息
 bbb.shortcutkey.chat.chatbox.debug = 71
 bbb.shortcutkey.chat.chatbox.debug.function = 临时调试快捷键
 
-bbb.polling.startButton.tooltip = Start a poll
-bbb.polling.startButton.label = Start Poll
+bbb.polling.startButton.tooltip = 发起一个投票
+bbb.polling.startButton.label = 发起投票
 bbb.polling.publishButton.label = 发布
 bbb.polling.closeButton.label = 关闭
-bbb.polling.pollModal.title = Live Poll Results
-bbb.polling.customChoices.title = Enter Polling Choices
-bbb.polling.respondersLabel.novotes = Waiting for responses
-bbb.polling.respondersLabel.text = {0} Users Responded
-bbb.polling.respondersLabel.finished = Done
+bbb.polling.pollModal.title = 投票实时结果
+bbb.polling.customChoices.title = 输入投票选项
+bbb.polling.respondersLabel.novotes = 等待反馈
+bbb.polling.respondersLabel.text = 用户{0} 已经提交
+bbb.polling.respondersLabel.finished = 完成
 bbb.polling.answer.Yes = 是的
 bbb.polling.answer.No = 不是
-bbb.polling.answer.True = True
-bbb.polling.answer.False = False
+bbb.polling.answer.True = 对
+bbb.polling.answer.False = é”™
 bbb.polling.answer.A = A
 bbb.polling.answer.B = B
 bbb.polling.answer.C = C
@@ -545,7 +595,7 @@ bbb.polling.answer.D = D
 bbb.polling.answer.E = E
 bbb.polling.answer.F = F
 bbb.polling.answer.G = G
-bbb.polling.results.accessible.header = Poll Results.
+bbb.polling.results.accessible.header = 投票结果。
 bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
 
 bbb.publishVideo.startPublishBtn.labelText = 开始共享
@@ -566,6 +616,8 @@ bbb.toolbar.videodock.toolTip.closeAllVideos = 关闭所有视频
 bbb.users.settings.lockAll=锁定所有用户
 bbb.users.settings.lockAllExcept=锁定除演示者外的所有用户
 bbb.users.settings.lockSettings=锁定浏览用户
+bbb.users.settings.breakoutRooms=Breakout Rooms ...
+bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
 bbb.users.settings.unlockAll=解锁所有浏览用户
 bbb.users.settings.roomIsLocked=默认锁定
 bbb.users.settings.roomIsMuted=默认静音
@@ -584,4 +636,35 @@ bbb.lockSettings.layout = 页面布局
 bbb.lockSettings.title=锁定浏览用户
 bbb.lockSettings.feature=特点
 bbb.lockSettings.locked=已锁定
-bbb.lockSettings.lockOnJoin=Lock On Join
+bbb.lockSettings.lockOnJoin=锁定加入
+
+bbb.users.breakout.breakoutRooms = Breakout Rooms
+bbb.users.breakout.updateBreakoutRooms = Update Breakout Rooms
+bbb.users.breakout.remainingTimeBreakout = {0}\: <b>{1} remaining</b>
+bbb.users.breakout.remainingTimeParent = <b>{1} remaining</b>
+bbb.users.breakout.calculatingRemainingTime = Calculating remaining time...
+bbb.users.breakout.remainingTimeEnded = Time ended, breakout room will close.
+bbb.users.breakout.rooms = Rooms
+bbb.users.breakout.roomsCombo.accessibilityName = Number of rooms to create
+bbb.users.breakout.room = Room
+bbb.users.breakout.randomAssign = Randomly Assign Users
+bbb.users.breakout.timeLimit = Time Limit
+bbb.users.breakout.durationStepper.accessibilityName = Time limit in minutes
+bbb.users.breakout.minutes = Minutes
+bbb.users.breakout.record = Record
+bbb.users.breakout.recordCheckbox.accessibilityName = Record breakout rooms
+bbb.users.breakout.notAssigned = Not Assigned
+bbb.users.breakout.dragAndDropToolTip = Tip\: You can drag and drop users between rooms
+bbb.users.breakout.start = Start
+bbb.users.breakout.invite = Invite
+bbb.users.breakout.close = 关闭
+bbb.users.breakout.closeAllRooms = Close All Breakout Rooms
+bbb.users.breakout.insufficientUsers = Insufficient users. You should place at least one user in one breakout room.
+bbb.users.breakout.openJoinURL = You have been invited to join Breakout Room {0}\n(By accepting, you will automatically leave the audio conference)
+bbb.users.breakout.confirm = Confirm Join Breakout Room
+bbb.users.roomsGrid.room = Room
+bbb.users.roomsGrid.users = Users
+bbb.users.roomsGrid.action = Action
+bbb.users.roomsGrid.transfer = Transfer Audio
+bbb.users.roomsGrid.join = Join
+bbb.users.roomsGrid.noUsers = No users is this room
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index 8b505b3922168a088a33a354c22f0104f712ab9b..5689846d6035e96fc58d56eca37de4f6ea8f4ae8 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -16,6 +16,7 @@
             showLogoutWindow="true" showLayoutTools="true" confirmLogout="true"
             showRecordingNotification="true"/>
     <meeting muteOnStart="false" />
+    <breakoutRooms enabled="true" record="false" />
     <logging enabled="true" target="trace" level="info" format="{dateUTC} {time} :: {name} :: [{logLevel}] {message}" uri="http://HOST" logPattern=".*"/>
     <lock disableCamForLockedUsers="false" disableMicForLockedUsers="false" disablePrivateChatForLockedUsers="false" 
           disablePublicChatForLockedUsers="false" lockLayoutForLockedUsers="false" lockOnJoin="true" lockOnJoinConfigurable="false"/>
@@ -38,7 +39,6 @@
 			allowKickUser="true"
 			enableEmojiStatus="true"
 			enableSettingsButton="true"
-			enableBreakoutRooms="true"
 			baseTabIndex="301"
 		/>
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as b/bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
index 0b46c6b3f5ffccea55307f9f5dd5eb8673d31a36..635d72726174bd22f25046000be7af2ce92a00f0 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
@@ -25,7 +25,8 @@ package org.bigbluebutton.core
   import org.bigbluebutton.core.managers.UserManager;
   import org.bigbluebutton.core.vo.CameraSettingsVO;
   import org.bigbluebutton.main.model.users.BBBUser;
-
+  import org.bigbluebutton.util.SessionTokenUtil;
+  
   public class UsersUtil
   {
     
@@ -194,7 +195,7 @@ package org.bigbluebutton.core
       return null;
     }
     
-    public static function getUserData():Object {
+    private static function getUserData():Object {
       var userData:Object = new Object();
       userData.meetingId = getInternalMeetingID();
       userData.externalMeetingId = getExternalMeetingID();
@@ -215,5 +216,20 @@ package org.bigbluebutton.core
 		return false;
 	}
     
+    
+    public static function initLogData():Object {
+        var logData:Object = new Object();
+        if (getInternalMeetingID() != null) {
+            logData.user = UsersUtil.getUserData();
+        }
+        logData.sessionToken = getUserSession();
+        return logData;
+    }
+    
+    public static function getUserSession():String {
+        var sessionUtil:SessionTokenUtil = new SessionTokenUtil()
+        return sessionUtil.getSessionToken();
+    }
+    
   }
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
index 7c684a195e12f1625542a2c70f9ce57baf086dcb..e96b3e54f8826b34111adff8d16bdfdd96294b06 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
@@ -85,12 +85,9 @@ package org.bigbluebutton.core.managers
 
     public function onDisconnected(type:String, callback:Function, parameters:Array):void {
       if (!_canceled) {
-		var logData:Object = new Object();
-		logData.user = UsersUtil.getUserData();
+		var logData:Object = UsersUtil.initLogData();
 		logData.user.connection = type;
-		
-		JSLog.warn("Connection disconnected", logData);
-		
+        logData.tags = ["connection"];
 		logData.message = "Connection disconnected";
 		LOGGER.info(JSON.stringify(logData));
 		
@@ -110,14 +107,9 @@ package org.bigbluebutton.core.managers
     }
 
     public function onConnectionAttemptFailed(type:String):void {
-      LOGGER.warn("onConnectionAttemptFailed, type={0}", [type]);
-	  
-	  var logData:Object = new Object();
-	  logData.user = UsersUtil.getUserData();
-	  logData.user.connection = type;
-	  
-	  JSLog.warn("Reconnect attempt on connection failed.", logData);
-	  
+	  var logData:Object = UsersUtil.initLogData();
+	  logData.user.connection = type; 
+      logData.tags = ["connection"];
 	  logData.message = "Reconnect attempt on connection failed.";
 	  LOGGER.info(JSON.stringify(logData));
 	  
@@ -150,18 +142,13 @@ package org.bigbluebutton.core.managers
     }
 
     public function onConnectionAttemptSucceeded(type:String):void {
-	  LOGGER.debug("onConnectionAttemptSucceeded, type={0}", [type]);
-	  var logData:Object = new Object();
-	  logData.user = UsersUtil.getUserData();
+	  var logData:Object = UsersUtil.initLogData();
 	  logData.user.connection = type;
-	  
-	  JSLog.warn("Reconnect succeeded.", logData);
-	  
+      logData.tags = ["connection"];
 	  logData.message = "Reconnect succeeded.";
 	  LOGGER.info(JSON.stringify(logData));
 	  
       dispatchReconnectionSucceededEvent(type);
-
       delete _connections[type];
       if (type == BIGBLUEBUTTON_CONNECTION) {
         reconnect();
@@ -173,7 +160,7 @@ package org.bigbluebutton.core.managers
 
         _dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.SUCCESS_MESSAGE_EVENT, 
           ResourceUtil.getInstance().getString('bbb.connection.reestablished'), 
-          msg));
+          msg, 'bbb.connection.reestablished'));
 
         _reconnectTimeout.reset();
         removePopUp();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as b/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
index 0712c100e106f53e2ad784c7ccff534a5b6237b6..0df4af0d4f4896f156f106d844261934b4108b82 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
@@ -107,6 +107,10 @@ package org.bigbluebutton.core.model
 			return new XML(config.logging.toXMLString());
 		}
 		
+		public function get breakoutRooms():XML {
+			return new XML(config.breakoutRooms.toXMLString());
+		}
+		
 		public function get lock():XML {
 			if(config.lock == null) return null;
 			return new XML(config.lock.toXMLString());
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/model/VideoProfile.as b/bigbluebutton-client/src/org/bigbluebutton/core/model/VideoProfile.as
old mode 100644
new mode 100755
index 72aa9c878f1661531b8ad1ec365ac7fda78f25bc..6d59301bed663c546b4b93a8020ca9defbb657f8
--- a/bigbluebutton-client/src/org/bigbluebutton/core/model/VideoProfile.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/model/VideoProfile.as
@@ -19,10 +19,10 @@
 package org.bigbluebutton.core.model
 {
     import flash.utils.Dictionary;
-    
+    import org.bigbluebutton.core.UsersUtil;
     import org.as3commons.logging.api.ILogger;
     import org.as3commons.logging.api.getClassLogger;
-    import org.bigbluebutton.util.i18n.ResourceUtil;
+    import org.bigbluebutton.util.i18n.ResourceUtil;
 
     public class VideoProfile
     {
@@ -89,8 +89,11 @@ package org.bigbluebutton.core.model
                 _h264Profile = vxml.h264Profile.toString();
             }
 
-			LOGGER.debug("This is a new video profile");
-			LOGGER.debug(this.toString());
+            var logData:Object = UsersUtil.initLogData();
+            logData.videoProfile = this.toString();
+            logData.tags = ["video"];
+            logData.message = "Loaded new video profile.";
+            LOGGER.info(JSON.stringify(logData));
         }
 
         public function toString():String {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as
index c8a890e8cc05779962bd236414711ee3f989a871..2fe1797d611a365012c7ee4f07f91e0b933c58f8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/ClientStatusEvent.as
@@ -29,12 +29,14 @@ package org.bigbluebutton.main.events
 		
 		public var title:String;
 		public var message:String;
-		
-		public function ClientStatusEvent(type:String, title:String, message:String)
+		public var logCode:String;
+
+		public function ClientStatusEvent(type:String, title:String, message:String, logCode:String)
 		{
 			super(type);
 			this.title = title;
 			this.message = message;
+			this.logCode = logCode;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/PortTest.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/PortTest.as
index faf05a8cfea82b42515b682d1e12b401cc772ec4..0ab10e7dd69c7bb9a315d0c64506df1de94039fd 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/PortTest.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/PortTest.as
@@ -1,3 +1,265 @@
-/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
* 
* Copyright (c) 2012 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.main.model
{
	 
	import flash.events.NetStatusEvent;
	import flash.events.TimerEvent;
	import flash.net.NetConnection;
	import flash.net.ObjectEncoding;
	import flash.utils.Timer;
  import flash.utils.Dictionary;
	import org.as3commons.logging.api.ILogger;
	import org.as3commons.logging.api.getClassLogger;
	
	[Bindable]
	/**
	 * Test RTMP port.
	 * 
	 * @author Thijs Triemstra ( info@collab.nl )
	 */	
	public class PortTest 
	{
		private static const LOGGER:ILogger = getClassLogger(PortTest);      

		/**
		* Connect using rtmp or rtmpt.
		*/		
		private var tunnel: Boolean;
			
		/**
		* RTMP hostname.
		*/		
		private var hostname 		: String;
		
		/**
		* RTMP port.
		*/		
		public var port 			: String;
		
		/**
		* RTMP port.
		*/		
		public var portName 		: String = "Default";
		
		/**
		* RTMP application.
		*/		
		private var application 	: String;

		/**
		* Base RTMP URI.
		*/		
		private var baseURI 		: String;
		
		/**
		* RTMP connection.
		*/		
		public var nc 				: NetConnection;
		
		/**
		* Connection status.
		*/		
		public var status 			: String;
		
		private var _connectionListener:Function;
		
		/**
		* Timer to control timeout of connection test
		*/
		private var testTimeout:Number = 0;
		
		/**
		* Timer to control timeout of connection test
		*/
		private var connectionTimer:Timer;
    
    private var closeConnectionTimer:Timer;
		
		/**
		* Set default encoding to AMF0 so FMS also understands.
		*/		
		NetConnection.defaultObjectEncoding = ObjectEncoding.AMF0;
		
		/**
		 * Create new port test and connect to the RTMP server.
		 * 
		 * @param protocol
		 * @param hostname
		 * @param port
		 * @param application
		 * @testTimeout timeout of test in milliseconds
		 */			
		public function PortTest( tunnel : Boolean,
								  hostname : String = "",
								  port : String = "",
								  application : String = "",
								  testTimeout : Number = 10000) {
			this.tunnel = tunnel;
			this.hostname = hostname;
			this.application = application;
			this.testTimeout = testTimeout;
			
			if ( port.length > 0 ) {
				this.portName = port;
				this.port = ":" + port;
			} else {
				this.port = port;
			}
			// Construct URI.
      if (tunnel) {
        this.baseURI = "rtmpt://" + this.hostname + "/" + this.application;
      } else {
        this.baseURI = "rtmp://" + this.hostname + this.port + "/" + this.application;
      }
		}
		
		/**
		 * Start connection.
		 */		
		public function connect():void {
			nc = new NetConnection();
			nc.client = this;
-      nc.proxyType = "best";
-
			nc.addEventListener( NetStatusEvent.NET_STATUS, netStatus );
			// connect to server
			try {
        LOGGER.debug("Testing connection to " + this.baseURI);
        
        connectionTimer = new Timer(testTimeout, 1);
        connectionTimer.addEventListener(TimerEvent.TIMER, connectionTimeout);
        connectionTimer.start();
        
        var curTime:Number = new Date().getTime();
				// Create connection with the server.
				nc.connect( this.baseURI, "portTestMeetingId-" + curTime, "portTestDummyUserId-" + curTime);
				status = "Connecting...";
			} catch( e : ArgumentError ) {
				// Invalid parameters.
				status = "ERROR: " + e.message;
			}	
		}
		
		/**
		* Method called when connection timed out
		*/
		public function connectionTimeout (e:TimerEvent) : void {
      LOGGER.debug("Timedout trying to connect to " + this.baseURI); 
			status = "FAILED";
			_connectionListener(status, tunnel, hostname, port, application);
      closeConnection();
		}
		
		/**
		 * Close connection.
		 */		
		private function close():void {	
      LOGGER.debug("Closing port test connection.");
      var dc:Dictionary = new Dictionary(true);
      nc.client = dc;
      // Remove listener.
      nc.removeEventListener( NetStatusEvent.NET_STATUS, netStatus );
			// Close the NetConnection.
			nc.close();

		}
			
    
    private function closeConnection():void {
      closeConnectionTimer = new Timer(100, 1);
      closeConnectionTimer.addEventListener(TimerEvent.TIMER, closeConnectionTimerHandler);
      closeConnectionTimer.start();
    }
    
    private function closeConnectionTimerHandler (e:TimerEvent) : void {
      LOGGER.debug("Closing connection to " + this.baseURI); 
      close();
    }
    
		/**
		 * Catch NetStatusEvents.
		 * 
		 * @param event
		 */		
		protected function netStatus(event : NetStatusEvent):void {
      
      //Stop timeout timer when connected/rejected
      connectionTimer.stop();
      
			var info : Object = event.info;
			var statusCode : String = info.code;
            
			if ( statusCode == "NetConnection.Connect.Success" ) {
				status = "SUCCESS";
        LOGGER.debug("Successfully connected to " + this.baseURI); 
				_connectionListener(status, tunnel, hostname, port, application);
			} else if ( statusCode == "NetConnection.Connect.Rejected" ||
				 	  statusCode == "NetConnection.Connect.Failed" || 
				 	  statusCode == "NetConnection.Connect.Closed" ) {
        LOGGER.debug("Failed to connect to " + this.baseURI); 
				status = "FAILED";
				_connectionListener(status, tunnel, hostname, port, application);
			}
      
      closeConnection();
		}
		
		public function onBWCheck(... rest):Number { 
			return 0; 
		} 
    
		public function onBWDone(... rest):void { 
			var p_bw:Number; 
			if (rest.length > 0) p_bw = rest[0]; 
			// your application should do something here 
			// when the bandwidth check is complete 
			LOGGER.debug("bandwidth = {0} Kbps.", [p_bw]); 
		}
		
		public function addConnectionSuccessListener(listener:Function):void {
			_connectionListener = listener;
		}
	}
}
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+* 
+* Copyright (c) 2012 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.main.model
+{
+	 
+	import flash.events.NetStatusEvent;
+	import flash.events.TimerEvent;
+	import flash.net.NetConnection;
+	import flash.net.ObjectEncoding;
+	import flash.utils.Timer;
+    import flash.utils.Dictionary;
+    import org.bigbluebutton.core.UsersUtil;
+	import org.as3commons.logging.api.ILogger;
+	import org.as3commons.logging.api.getClassLogger;
+	
+	[Bindable]
+	/**
+	 * Test RTMP port.
+	 * 
+	 * @author Thijs Triemstra ( info@collab.nl )
+	 */	
+	public class PortTest 
+	{
+		private static const LOGGER:ILogger = getClassLogger(PortTest);      
+
+		/**
+		* Connect using rtmp or rtmpt.
+		*/		
+		private var tunnel: Boolean;
+			
+		/**
+		* RTMP hostname.
+		*/		
+		private var hostname 		: String;
+		
+		/**
+		* RTMP port.
+		*/		
+		public var port 			: String;
+		
+		/**
+		* RTMP port.
+		*/		
+		public var portName 		: String = "Default";
+		
+		/**
+		* RTMP application.
+		*/		
+		private var application 	: String;
+
+		/**
+		* Base RTMP URI.
+		*/		
+		private var baseURI 		: String;
+		
+		/**
+		* RTMP connection.
+		*/		
+		public var nc 				: NetConnection;
+		
+		/**
+		* Connection status.
+		*/		
+		public var status 			: String;
+		
+		private var _connectionListener:Function;
+		
+		/**
+		* Timer to control timeout of connection test
+		*/
+		private var testTimeout:Number = 0;
+		
+		/**
+		* Timer to control timeout of connection test
+		*/
+		private var connectionTimer:Timer;
+    
+    private var closeConnectionTimer:Timer;
+		
+		/**
+		* Set default encoding to AMF0 so FMS also understands.
+		*/		
+		NetConnection.defaultObjectEncoding = ObjectEncoding.AMF0;
+		
+		/**
+		 * Create new port test and connect to the RTMP server.
+		 * 
+		 * @param protocol
+		 * @param hostname
+		 * @param port
+		 * @param application
+		 * @testTimeout timeout of test in milliseconds
+		 */			
+		public function PortTest( tunnel : Boolean,
+								  hostname : String = "",
+								  port : String = "",
+								  application : String = "",
+								  testTimeout : Number = 10000) {
+			this.tunnel = tunnel;
+			this.hostname = hostname;
+			this.application = application;
+			this.testTimeout = testTimeout;
+			
+			if ( port.length > 0 ) {
+				this.portName = port;
+				this.port = ":" + port;
+			} else {
+				this.port = port;
+			}
+			// Construct URI.
+      if (tunnel) {
+        this.baseURI = "rtmpt://" + this.hostname + "/" + this.application;
+      } else {
+        this.baseURI = "rtmp://" + this.hostname + this.port + "/" + this.application;
+      }
+		}
+		
+		/**
+		 * Start connection.
+		 */		
+		public function connect():void {
+			nc = new NetConnection();
+			nc.client = this;
+      nc.proxyType = "best";
+
+			nc.addEventListener( NetStatusEvent.NET_STATUS, netStatus );
+			// connect to server
+			try {
+                var logData:Object = UsersUtil.initLogData();
+                logData.connection = this.baseURI;
+                logData.tags = ["initialization", "port-test", "connection"];
+                logData.message = "Port testing connection.";
+                LOGGER.info(JSON.stringify(logData));
+        
+        connectionTimer = new Timer(testTimeout, 1);
+        connectionTimer.addEventListener(TimerEvent.TIMER, connectionTimeout);
+        connectionTimer.start();
+        
+        var curTime:Number = new Date().getTime();
+				// Create connection with the server.
+				nc.connect( this.baseURI, "portTestMeetingId-" + curTime, "portTestDummyUserId-" + curTime);
+				status = "Connecting...";
+			} catch( e : ArgumentError ) {
+				// Invalid parameters.
+				status = "ERROR: " + e.message;
+			}	
+		}
+		
+		/**
+		* Method called when connection timed out
+		*/
+		public function connectionTimeout (e:TimerEvent) : void {
+            var logData:Object = UsersUtil.initLogData();
+            logData.connection = this.baseURI;
+            logData.tags = ["initialization", "port-test", "connection"];
+            logData.message = "Port testing connection timedout.";
+            LOGGER.info(JSON.stringify(logData));
+
+			status = "FAILED";
+			_connectionListener(status, tunnel, hostname, port, application);
+      closeConnection();
+		}
+		
+		/**
+		 * Close connection.
+		 */		
+		private function close():void {	
+      var dc:Dictionary = new Dictionary(true);
+      nc.client = dc;
+      // Remove listener.
+      nc.removeEventListener( NetStatusEvent.NET_STATUS, netStatus );
+			// Close the NetConnection.
+			nc.close();
+
+		}
+			
+    
+    private function closeConnection():void {
+      closeConnectionTimer = new Timer(100, 1);
+      closeConnectionTimer.addEventListener(TimerEvent.TIMER, closeConnectionTimerHandler);
+      closeConnectionTimer.start();
+    }
+    
+    private function closeConnectionTimerHandler (e:TimerEvent) : void {
+        var logData:Object = UsersUtil.initLogData();
+        logData.connection = this.baseURI;
+        logData.tags = ["initialization", "port-test", "connection"];
+        logData.message = "Closing port testing connection.";
+        LOGGER.info(JSON.stringify(logData));
+
+        close();
+    }
+    
+    /**
+    * Catch NetStatusEvents.
+    * 
+    * @param event
+    * */
+    protected function netStatus(event : NetStatusEvent):void {
+      
+        //Stop timeout timer when connected/rejected
+        connectionTimer.stop();
+      
+        var info : Object = event.info;
+        var statusCode : String = info.code;
+            
+        var logData:Object = UsersUtil.initLogData();
+        logData.connection = this.baseURI;
+        logData.tags = ["initialization", "port-test", "connection"];
+
+        
+        if ( statusCode == "NetConnection.Connect.Success" ) {
+            status = "SUCCESS";
+            logData.message = "Port test successfully connected.";
+            LOGGER.info(JSON.stringify(logData));
+
+            _connectionListener(status, tunnel, hostname, port, application);
+        } else if ( statusCode == "NetConnection.Connect.Rejected" ||
+                    statusCode == "NetConnection.Connect.Failed" || 
+                    statusCode == "NetConnection.Connect.Closed" ) {
+                        
+            logData.message = "Port test failed to connect.";
+            LOGGER.info(JSON.stringify(logData));
+            
+            status = "FAILED";
+            _connectionListener(status, tunnel, hostname, port, application);
+            
+        }
+      
+      //closeConnection();
+    }
+		
+		public function onBWCheck(... rest):Number { 
+			return 0; 
+		} 
+    
+		public function onBWDone(... rest):void { 
+			var p_bw:Number; 
+			if (rest.length > 0) p_bw = rest[0]; 
+			// your application should do something here 
+			// when the bandwidth check is complete 
+			LOGGER.debug("bandwidth = {0} Kbps.", [p_bw]); 
+		}
+		
+		public function addConnectionSuccessListener(listener:Function):void {
+			_connectionListener = listener;
+		}
+	}
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/EnterApiService.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/EnterApiService.as
index c499fbddbf224228a4d757d3ce5d41e8e8d0252e..ce92a8f875ecc6cbc3694b8dc4088c27cf00356c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/EnterApiService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/EnterApiService.as
@@ -9,7 +9,7 @@ package org.bigbluebutton.main.model.modules
   import flash.net.URLRequest;
   import flash.net.URLRequestMethod;
   import flash.net.URLVariables;
-  
+  import org.bigbluebutton.core.UsersUtil;
   import org.as3commons.logging.api.ILogger;
   import org.as3commons.logging.api.getClassLogger;
   import org.as3commons.logging.util.jsonXify;
@@ -59,18 +59,29 @@ package org.bigbluebutton.main.model.modules
       var result:Object = JSON.parse(e.target.data);
       LOGGER.debug("Enter response = {0}", [jsonXify(result)]);
       
+        var logData:Object = UsersUtil.initLogData
+        
       var returncode:String = result.response.returncode;
       if (returncode == 'FAILED') {
-        LOGGER.error("Enter API call FAILED = {0}", [jsonXify(result)]);						
+        logData.tags = ["initialization"];
+        logData.message = "Enter API call failed.";
+        LOGGER.info(JSON.stringify(logData));
+
         var dispatcher:Dispatcher = new Dispatcher();
         dispatcher.dispatchEvent(new MeetingNotFoundEvent(result.response.logoutURL));			
       } else if (returncode == 'SUCCESS') {
-        LOGGER.debug("Enter API call SUCESS = {0}", [jsonXify(result)]);
+
+          
         var response:Object = new Object();
         response.username = result.response.fullname;
         response.userId = result.response.internalUserID;
         response.meetingName = result.response.confname;
         response.meetingId = result.response.meetingID;
+        
+        logData.response = response;
+        logData.tags = ["initialization"];
+        logData.message = "Enter API call succeeded.";
+        LOGGER.info(JSON.stringify(logData));
          
         if (_resultListener != null) _resultListener(true, response);
       }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
index b7aa4724373451d46053f08d09e5fe462bd27184..4eeeb8a8fd0900bd66da3b4476b5f07137000104 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
@@ -32,7 +32,7 @@ package org.bigbluebutton.main.model.modules
   import org.bigbluebutton.main.events.ModuleLoadEvent;
   import org.bigbluebutton.main.events.PortTestEvent;
   import org.bigbluebutton.main.events.UserServicesEvent;
-  import org.bigbluebutton.main.model.ConfigParameters;
+  import org.bigbluebutton.main.model.ConfigParameters;
   
   public class ModulesDispatcher
   {
@@ -111,31 +111,11 @@ package org.bigbluebutton.main.model.modules
       dispatcher.dispatchEvent(evt);
     }
     
-    public function sendTunnelingFailedEvent(server: String, app: String):void{
-      var logData:Object = new Object();
-      logData.server = server;
-      logData.app = app;
-      logData.userId = meetingInfo.userId;
-      logData.username = meetingInfo.username;
-      logData.meetingName = meetingInfo.meetingName;
-      logData.meetingId = meetingInfo.meetingId;
-	  LOGGER.fatal("Cannot connect to Red5 using RTMP and RTMPT {0}", [jsonXify(logData)]);
-      JSLog.critical("Cannot connect to Red5 using RTMP and RTMPT", logData);
-      
+    public function sendTunnelingFailedEvent(server: String, app: String):void{     
       dispatcher.dispatchEvent(new PortTestEvent(PortTestEvent.TUNNELING_FAILED));
     }
     
     public function sendPortTestSuccessEvent(port:String, host:String, tunnel:Boolean, app:String):void{
-      var logData:Object = new Object();
-      logData.port = port;
-      logData.server = host;
-      logData.tunnel = tunnel;
-      logData.app = app;      
-      logData.userId = meetingInfo.userId;
-      logData.username = meetingInfo.username;
-      logData.meetingName = meetingInfo.meetingName;
-      logData.meetingId = meetingInfo.meetingId;
-      JSLog.debug("Successfully connected on test connection.", logData);
       
       var portEvent:PortTestEvent = new PortTestEvent(PortTestEvent.PORT_TEST_SUCCESS);
       portEvent.port = port;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as
index fea887fa47aba690ae15cea8d86bf71af4295cc5..58fcc15ea5ae70f6c01232f76191f04e858f9218 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as
@@ -21,7 +21,8 @@ package org.bigbluebutton.main.model.modules
 	import org.as3commons.logging.api.ILogger;
 	import org.as3commons.logging.api.getClassLogger;
 	import org.bigbluebutton.main.model.ConferenceParameters;
-	import org.bigbluebutton.main.model.PortTestProxy;
+	import org.bigbluebutton.main.model.PortTestProxy;
+    import org.bigbluebutton.core.UsersUtil;
 	
 	public class ModulesProxy {
 		private static const LOGGER:ILogger = getClassLogger(ModulesProxy);      
@@ -43,7 +44,12 @@ package org.bigbluebutton.main.model.modules
 		}
 
 		public function portTestSuccess(tunnel:Boolean):void {
-      LOGGER.debug("Successfully tested connection to server. isTunnelling=" + tunnel);
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["initialization"];
+            logData.tunnel = tunnel;
+            logData.message = "Successfully tested connection to server.";
+            LOGGER.info(JSON.stringify(logData));
+                
 			modulesManager.useProtocol(tunnel);
 			modulesManager.startUserServices();
 		}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
old mode 100644
new mode 100755
index 61022aa41a66fe7c82fe9f8a4cc8a44d0b5f4744..8cbf366250d46ee6034e9d0a19990ce438dfc6be
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
@@ -1,4 +1,4 @@
-/**
+ /**
  * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
  *
  * Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
index 9b2d9f1ff35113193e9fd59c031978588733997e..2e4b15c1983b12d150fb547090f3b4da5e4ed1d3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
@@ -27,7 +27,7 @@ package org.bigbluebutton.main.model.users
 	import flash.net.URLRequest;
 	import flash.net.URLRequestMethod;
 	import flash.net.URLVariables;
-	
+	import org.bigbluebutton.core.UsersUtil;
 	import org.as3commons.logging.api.ILogger;
 	import org.as3commons.logging.api.getClassLogger;
 	import org.as3commons.logging.util.jsonXify;
@@ -80,62 +80,74 @@ package org.bigbluebutton.main.model.users
 		}
 
 		private function ioErrorHandler(event:IOErrorEvent):void {
-			LOGGER.error("ioErrorHandler: {0}", [event]);
+			var logData:Object = UsersUtil.initLogData();
+			logData.tags = ["initialization"];
+			logData.message = "IOError calling ENTER api."; 
+			LOGGER.error(JSON.stringify(logData));
+            
 			var e:ConnectionFailedEvent = new ConnectionFailedEvent(ConnectionFailedEvent.USER_LOGGED_OUT);
 			var dispatcher:Dispatcher = new Dispatcher();
 			dispatcher.dispatchEvent(e);
 		}
 		
 		private function handleComplete(e:Event):void {			
-      var result:Object = JSON.parse(e.target.data);
-      LOGGER.debug("Enter response = {0}" + [jsonXify(result)]);
+            var result:Object = JSON.parse(e.target.data);
+            
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["initialization"];
+
             
-			var returncode:String = result.response.returncode;
-			if (returncode == 'FAILED') {
-				LOGGER.error("Join FAILED = {0}", [jsonXify(result)]);						
-        var dispatcher:Dispatcher = new Dispatcher();
-        dispatcher.dispatchEvent(new MeetingNotFoundEvent(result.response.logoutURL));			
-			} else if (returncode == 'SUCCESS') {
-				LOGGER.debug("Join SUCESS = {0}", [jsonXify(result)]);
-        var response:Object = new Object();
-        response.username = result.response.fullname;
-        response.conference = result.response.conference; 
-        response.conferenceName = result.response.confname;
-        response.externMeetingID = result.response.externMeetingID;
-        response.meetingID = result.response.meetingID;
-        response.isBreakout = result.response.isBreakout;
-        response.externUserID = result.response.externUserID;
-        response.internalUserId = result.response.internalUserID;
-        response.role = result.response.role;
-        response.room = result.response.room;
-        response.authToken = result.response.authToken;
-        response.record = result.response.record;
-        response.allowStartStopRecording = result.response.allowStartStopRecording;
-        response.webvoiceconf = result.response.webvoiceconf;
-        response.dialnumber = result.response.dialnumber;
-        response.voicebridge = result.response.voicebridge;
-        response.mode = result.response.mode;
-        response.welcome = result.response.welcome;
-        response.logoutUrl = result.response.logoutUrl;
-        response.defaultLayout = result.response.defaultLayout;
-        response.avatarURL = result.response.avatarURL
+            var returncode:String = result.response.returncode;
+            if (returncode == 'FAILED') {
+                logData.message = "Calling ENTER api failed."; 
+                LOGGER.info(JSON.stringify(logData));
+
+                var dispatcher:Dispatcher = new Dispatcher();
+                dispatcher.dispatchEvent(new MeetingNotFoundEvent(result.response.logoutURL));			
+            } else if (returncode == 'SUCCESS') {
+                logData.message = "Calling ENTER api succeeded."; 
+                LOGGER.info(JSON.stringify(logData));
+                
+                var response:Object = new Object();
+                response.username = result.response.fullname;
+                response.conference = result.response.conference; 
+                response.conferenceName = result.response.confname;
+                response.externMeetingID = result.response.externMeetingID;
+                response.meetingID = result.response.meetingID;
+                response.isBreakout = result.response.isBreakout;
+                response.externUserID = result.response.externUserID;
+                response.internalUserId = result.response.internalUserID;
+                response.role = result.response.role;
+                response.room = result.response.room;
+                response.authToken = result.response.authToken;
+                response.record = result.response.record;
+                response.allowStartStopRecording = result.response.allowStartStopRecording;
+                response.webvoiceconf = result.response.webvoiceconf;
+                response.dialnumber = result.response.dialnumber;
+                response.voicebridge = result.response.voicebridge;
+                response.mode = result.response.mode;
+                response.welcome = result.response.welcome;
+                response.logoutUrl = result.response.logoutUrl;
+                response.defaultLayout = result.response.defaultLayout;
+                response.avatarURL = result.response.avatarURL
         
-        if (result.response.hasOwnProperty("modOnlyMessage")) {
-          response.modOnlyMessage = result.response.modOnlyMessage;
-          MeetingModel.getInstance().modOnlyMessage = response.modOnlyMessage;
-        }
+                if (result.response.hasOwnProperty("modOnlyMessage")) {
+                  response.modOnlyMessage = result.response.modOnlyMessage;
+                  MeetingModel.getInstance().modOnlyMessage = response.modOnlyMessage;
+                }
           
-        response.customdata = new Object();
+                response.customdata = new Object();
        
-				if (result.response.customdata) {
-          var cdata:Array = result.response.customdata as Array;
-          for each (var item:Object in cdata) {
-            for (var id:String in item) {
-              var value:String = item[id] as String;
-              response.customdata[id] = value;
-            }                        
-          }
-				}
+                if (result.response.customdata) {
+                    var cdata:Array = result.response.customdata as Array;
+                    for each (var item:Object in cdata) {
+                        for (var id:String in item) {
+                        var value:String = item[id] as String;
+                        response.customdata[id] = value;
+                    }                        
+                }
+                
+            }
 				        
         UsersModel.getInstance().me = new MeBuilder(response.internalUserId, response.username).withAvatar(response.avatarURL)
                                              .withExternalId(response.externUserID).withToken(response.authToken)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
index 729a824bc8a2d44d22d8bf1e11e89ff203dd36ab..ba6043e0d05df3c7c619d928bed8829031f91b86 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
@@ -26,7 +26,7 @@ package org.bigbluebutton.main.model.users
 	import flash.events.TimerEvent;
 	import flash.net.NetConnection;
 	import flash.net.Responder;
-	import flash.utils.Timer;	
+	import flash.utils.Timer;
 	import org.as3commons.logging.api.ILogger;
 	import org.as3commons.logging.api.getClassLogger;
 	import org.bigbluebutton.core.BBB;
@@ -40,402 +40,450 @@ package org.bigbluebutton.main.model.users
 	import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent;
 	import org.bigbluebutton.main.model.users.events.UsersConnectionEvent;
   
-	public class NetConnectionDelegate
-	{
-		private static const LOGGER:ILogger = getClassLogger(NetConnectionDelegate);
-		
-		private var _netConnection:NetConnection;	
-		private var connectionId:Number;
-		private var connected:Boolean = false;
-		
-		private var _userid:Number = -1;
-		private var _role:String = "unknown";
-		
-		private var logoutOnUserCommand:Boolean = false;
-		private var dispatcher:Dispatcher;    
-    private var _messageListeners:Array = new Array();
-    
-    private var authenticated: Boolean = false;
-    private var reconnecting:Boolean = false;
-	private var numNetworkChangeCount:int = 0;
-	
-		private var _validateTokenTimer:Timer = null;	
-	
-		public function NetConnectionDelegate():void {
-			dispatcher = new Dispatcher();
-		}
-		  
-		public function get connection():NetConnection {
-			return _netConnection;
-		}
+    public class NetConnectionDelegate {
+        private static const LOGGER:ILogger = getClassLogger(NetConnectionDelegate);
+
+        private var _netConnection:NetConnection;	
+        private var connectionId:Number;
+        private var connected:Boolean = false;
+        private var _userid:Number = -1;
+        private var _role:String = "unknown";
+        private var logoutOnUserCommand:Boolean = false;
+        private var dispatcher:Dispatcher;    
+        private var _messageListeners:Array = new Array();
+        private var authenticated: Boolean = false;
+        private var reconnecting:Boolean = false;
         
-    public function addMessageListener(listener:IMessageListener):void {
-      _messageListeners.push(listener);
-    }
+        private var maxConnectAttempt:int = 2;
+        private var connectAttemptCount:int = 0;
+        private var connectAttemptTimeout:Number = 5000;
+        private var connectionTimer:Timer;
+    
+        private var numNetworkChangeCount:int = 0;
+        private var _validateTokenTimer:Timer = null;
+
+        private var bbbAppsUrl: String = null;
         
-    public function removeMessageListener(listener:IMessageListener):void {
-      for (var ob:int=0; ob<_messageListeners.length; ob++) {
-        if (_messageListeners[ob] == listener) {
-          _messageListeners.splice (ob,1);
-          break;
+        public function NetConnectionDelegate():void {
+            dispatcher = new Dispatcher();
+            _netConnection = new NetConnection();
+            _netConnection.proxyType = "best";
+            _netConnection.client = this;
+            _netConnection.addEventListener( NetStatusEvent.NET_STATUS, netStatus );
+            _netConnection.addEventListener( AsyncErrorEvent.ASYNC_ERROR, netASyncError );
+            _netConnection.addEventListener( SecurityErrorEvent.SECURITY_ERROR, netSecurityError );
+            _netConnection.addEventListener( IOErrorEvent.IO_ERROR, netIOError );
         }
-      }
-    }
-        
-    private function notifyListeners(messageName:String, message:Object):void {
-      if (messageName != null && messageName != "") {
-        for (var notify:String in _messageListeners) {
-          _messageListeners[notify].onMessage(messageName, message);
-        }                
-      } else {
-		  LOGGER.debug("Message name is undefined");
-      }
-    }   
+
         
-    public function onMessageFromServer(messageName:String, msg:Object):void {
-      if (!authenticated && (messageName == "validateAuthTokenReply")) {
-        handleValidateAuthTokenReply(msg)
-      } else if (messageName == "validateAuthTokenTimedOut") {
-        handleValidateAuthTokenTimedOut(msg)
-      } else if (authenticated) {
-        notifyListeners(messageName, msg);
-      } else {
-        LOGGER.debug("Ignoring message=[{0}] as our token hasn't been validated yet.", [messageName]);
-      }     
-    }
-	
-	private function validataTokenTimerHandler(event:TimerEvent):void {
-		var logData:Object = new Object();
-		logData.user = UsersUtil.getUserData();
-		JSLog.critical("No response for validate token request.", logData);
-		logData.message = "No response for validate token request.";
-		LOGGER.info(JSON.stringify(logData));
-	}
-	
-    private function validateToken():void {
-      var confParams:ConferenceParameters = BBB.initUserConfigManager().getConfParams();
-      
-      var message:Object = new Object();
-      message["userId"] = confParams.internalUserID;
-      message["authToken"] = confParams.authToken;
-      
-	  _validateTokenTimer = new Timer(7000, 1);
-	  _validateTokenTimer.addEventListener(TimerEvent.TIMER, validataTokenTimerHandler);
-	  _validateTokenTimer.start();
-	  
-      sendMessage(
-        "validateToken",// Remote function name
-        // result - On successful result
-        function(result:Object):void { 
+        public function get connection():NetConnection {
+            return _netConnection;
+        }
+            
+        public function addMessageListener(listener:IMessageListener):void {
+          _messageListeners.push(listener);
+        }
+            
+        public function removeMessageListener(listener:IMessageListener):void {
+          for (var ob:int=0; ob<_messageListeners.length; ob++) {
+            if (_messageListeners[ob] == listener) {
+              _messageListeners.splice (ob,1);
+              break;
+            }
+          }
+        }
+            
+        private function notifyListeners(messageName:String, message:Object):void {
+          if (messageName != null && messageName != "") {
+            for (var notify:String in _messageListeners) {
+              _messageListeners[notify].onMessage(messageName, message);
+            }                
+          } else {
+            LOGGER.debug("Message name is undefined");
+          }
+        }   
+            
+        public function onMessageFromServer(messageName:String, msg:Object):void {
+          if (!authenticated && (messageName == "validateAuthTokenReply")) {
+            handleValidateAuthTokenReply(msg)
+          } else if (messageName == "validateAuthTokenTimedOut") {
+            handleValidateAuthTokenTimedOut(msg)
+          } else if (authenticated) {
+            notifyListeners(messageName, msg);
+          } else {
+            LOGGER.debug("Ignoring message=[{0}] as our token hasn't been validated yet.", [messageName]);
+          }     
+        }
+
+        private function validataTokenTimerHandler(event:TimerEvent):void {
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps"];
+            logData.key = "validate_token_request_timedout";
+            logData.message = "No response for validate token request.";
+            LOGGER.info(JSON.stringify(logData));
+        }
+
+        private function validateToken():void {
+            var confParams:ConferenceParameters = BBB.initUserConfigManager().getConfParams();
           
-        },	
-        // status - On error occurred
-        function(status:Object):void {
-	      LOGGER.error("Error occurred:");
-          for (var x:Object in status) {
-			LOGGER.error(x + " : " + status[x]);
-          } 
-        },
-        message
-      ); //_netConnection.call      
-    }
-    
-	private function stopValidateTokenTimer():void {
-		if (_validateTokenTimer != null && _validateTokenTimer.running) {
-			_validateTokenTimer.stop();
-			_validateTokenTimer = null;
-		}		
-	}
-	
-    private function handleValidateAuthTokenTimedOut(msg: Object):void {  
-      stopValidateTokenTimer();
-	  
-      var map:Object = JSON.parse(msg.msg);  
-      var tokenValid: Boolean = map.valid as Boolean;
-      var userId: String = map.userId as String;
-
-      var logData:Object = new Object();
-      logData.user = UsersUtil.getUserData();
-      JSLog.critical("Validate auth token timed out.", logData);
+            var message:Object = new Object();
+            message["userId"] = confParams.internalUserID;
+            message["authToken"] = confParams.authToken;
+                    
+            sendMessage(
+                "validateToken",// Remote function name
+                // result - On successful result
+                function(result:Object):void { 
+              
+                },
+                // status - On error occurred
+                function(status:Object):void {
+                    LOGGER.error("Error occurred:");
+                    for (var x:Object in status) {
+                        LOGGER.error(x + " : " + status[x]);
+                    } 
+                },
+                message
+            ); //_netConnection.call      
+            
+            _validateTokenTimer = new Timer(10000, 1);
+            _validateTokenTimer.addEventListener(TimerEvent.TIMER, validataTokenTimerHandler);
+            _validateTokenTimer.start();
+        }
+        
+        private function stopValidateTokenTimer():void {
+            if (_validateTokenTimer != null && _validateTokenTimer.running) {
+                _validateTokenTimer.stop();
+                _validateTokenTimer = null;
+            }
+        }
+
+        private function handleValidateAuthTokenTimedOut(msg: Object):void {  
+            stopValidateTokenTimer();
       
-	  logData.message = "Validate auth token timed out.";
-	  LOGGER.info(JSON.stringify(logData));
-	  
-      if (tokenValid) {
-        authenticated = true;
-      } else {
-        dispatcher.dispatchEvent(new InvalidAuthTokenEvent());
-      }
-	  if (reconnecting) {
-		  onReconnect();
-		  reconnecting = false;
-	  }
-    }
-    
-    private function handleValidateAuthTokenReply(msg: Object):void {  
-      stopValidateTokenTimer();
-		
-      var map:Object = JSON.parse(msg.msg);  
-      var tokenValid: Boolean = map.valid as Boolean;
-      var userId: String = map.userId as String;
+            var map:Object = JSON.parse(msg.msg);  
+            var tokenValid: Boolean = map.valid as Boolean;
+            var userId: String = map.userId as String;
+
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps", "connected"];
+            logData.tokenValid = tokenValid;
+            logData.key = "validate_token_response_received";
+            logData.message = "Validate auth token timed out.";
+            LOGGER.info(JSON.stringify(logData));
       
-      if (tokenValid) {
-        authenticated = true;
-      } else {
-        dispatcher.dispatchEvent(new InvalidAuthTokenEvent());
-      }
-	  if (reconnecting) {
-		  onReconnect();
-		  reconnecting = false;
-	  }
-    }
+            if (tokenValid) {
+                authenticated = true;
+            } else {
+                dispatcher.dispatchEvent(new InvalidAuthTokenEvent());
+            }
 
-	private function onReconnect():void {
-		if (authenticated) {
-			onReconnectSuccess();
-		} else {
-			onReconnectFailed();
-		}
-	}
-	
-    private function onReconnectSuccess():void {
-      var attemptSucceeded:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_CONNECTION_ATTEMPT_SUCCEEDED_EVENT);
-      attemptSucceeded.payload.type = ReconnectionManager.BIGBLUEBUTTON_CONNECTION;
-      dispatcher.dispatchEvent(attemptSucceeded);
-    }
+            if (reconnecting) {
+              onReconnect();
+              reconnecting = false;
+            }
+        }
+        
+        private function handleValidateAuthTokenReply(msg: Object):void {  
+            stopValidateTokenTimer();
 
-    private function onReconnectFailed():void {
-      sendUserLoggedOutEvent();
-    }
-    
-    private function sendConnectionSuccessEvent(userid:String):void{      
-      var e:UsersConnectionEvent = new UsersConnectionEvent(UsersConnectionEvent.CONNECTION_SUCCESS);
-      e.userid = userid;
-      dispatcher.dispatchEvent(e);
+            var map:Object = JSON.parse(msg.msg);  
+            var tokenValid: Boolean = map.valid as Boolean;
+            var userId: String = map.userId as String;
+ 
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps", "connected"];
+            logData.tokenValid = tokenValid;
+            logData.status = "validate_token_response_received";
+            logData.message = "Received validate token response from server.";
+            LOGGER.info(JSON.stringify(logData));
+            
+            if (tokenValid) {
+                authenticated = true;
+            } else {
+                dispatcher.dispatchEvent(new InvalidAuthTokenEvent());
+            }
       
-    }
-    
-		public function sendMessage(service:String, onSuccess:Function, onFailure:Function, message:Object=null):void {
-			var responder:Responder =	new Responder(                    
-					function(result:Object):void { // On successful result
-						onSuccess("Successfully sent [" + service + "]."); 
-					},	                   
-					function(status:Object):void { // status - On error occurred
-						var errorReason:String = "Failed to send [" + service + "]:\n"; 
-						for (var x:Object in status) { 
-							errorReason += "\t" + x + " : " + status[x]; 
-						} 
-					}
-				);
-			
-			if (message == null) {
-				_netConnection.call(service, responder);			
-			} else {
-				_netConnection.call(service, responder, message);
-			}
-		}
-		
-		/**
-		 * Connect to the server.
-		 * uri: The uri to the conference application.
-		 * username: Fullname of the participant.
-		 * role: MODERATOR/VIEWER
-		 * conference: The conference room
-		 * mode: LIVE/PLAYBACK - Live:when used to collaborate, Playback:when being used to playback a recorded conference.
-		 * room: Need the room number when playing back a recorded conference. When LIVE, the room is taken from the URI.
-		 */
-		public function connect():void {	
-      var confParams:ConferenceParameters = BBB.initUserConfigManager().getConfParams();
-			
-      _netConnection = new NetConnection();				
-      _netConnection.proxyType = "best";
-      _netConnection.client = this;
-      _netConnection.addEventListener( NetStatusEvent.NET_STATUS, netStatus );
-      _netConnection.addEventListener( AsyncErrorEvent.ASYNC_ERROR, netASyncError );
-      _netConnection.addEventListener( SecurityErrorEvent.SECURITY_ERROR, netSecurityError );
-      _netConnection.addEventListener( IOErrorEvent.IO_ERROR, netIOError );
+            if (reconnecting) {
+              onReconnect();
+              reconnecting = false;
+            }
+        }
+
+        private function onReconnect():void {
+            if (authenticated) {
+                onReconnectSuccess();
+            } else {
+                onReconnectFailed();
+            }
+        }
+
+        private function onReconnectSuccess():void {
+            var attemptSucceeded:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_CONNECTION_ATTEMPT_SUCCEEDED_EVENT);
+            attemptSucceeded.payload.type = ReconnectionManager.BIGBLUEBUTTON_CONNECTION;
+            dispatcher.dispatchEvent(attemptSucceeded);
+        }
+
+        private function onReconnectFailed():void {
+            sendUserLoggedOutEvent();
+        }
+        
+        private function sendConnectionSuccessEvent(userid:String):void{      
+            var e:UsersConnectionEvent = new UsersConnectionEvent(UsersConnectionEvent.CONNECTION_SUCCESS);
+            e.userid = userid;
+            dispatcher.dispatchEvent(e);
+        }
+        
+        public function sendMessage(service:String, onSuccess:Function, onFailure:Function, message:Object=null):void {
+            var responder:Responder =	new Responder(
+                function(result:Object):void { // On successful result
+                    onSuccess("Successfully sent [" + service + "]."); 
+                },
+                function(status:Object):void { // status - On error occurred
+                    var errorReason:String = "Failed to send [" + service + "]:\n"; 
+                    for (var x:Object in status) { 
+                        errorReason += "\t" + x + " : " + status[x]; 
+                    } 
+                }
+            );
+
+            if (message == null) {
+                _netConnection.call(service, responder);
+            } else {
+                _netConnection.call(service, responder, message);
+            }
+        }
+
+        public function connect():void {
+            var confParams:ConferenceParameters = BBB.initUserConfigManager().getConfParams();
+
+                
+            try {
+                var appURL:String = BBB.getConfigManager().config.application.uri;
+                var pattern:RegExp = /(?P<protocol>.+):\/\/(?P<server>.+)\/(?P<app>.+)/;
+                var result:Array = pattern.exec(appURL);
+            
+                var protocol:String = "rtmp";
+                var uri:String = appURL + "/" + confParams.room;
             
-			try {	
-        var appURL:String = BBB.getConfigManager().config.application.uri;
-        var pattern:RegExp = /(?P<protocol>.+):\/\/(?P<server>.+)\/(?P<app>.+)/;
-        var result:Array = pattern.exec(appURL);
+                if (BBB.initConnectionManager().isTunnelling) {
+                    bbbAppsUrl = "rtmpt://" + result.server + "/" + result.app + "/" + confParams.room;
+                } else {
+                    bbbAppsUrl = "rtmp://" + result.server + ":1935/" + result.app + "/" + confParams.room;
+                }
+
+                var logData:Object = UsersUtil.initLogData();
+                logData.connection = bbbAppsUrl;
+                logData.tags = ["apps", "connection"];
+                logData.message = "Connecting to bbb-apps.";
+                LOGGER.info(JSON.stringify(logData));
+            
+                connectAttemptCount++;
+                
+                connectionTimer = new Timer(connectAttemptTimeout, 1);
+                connectionTimer.addEventListener(TimerEvent.TIMER, connectionTimeout);
+                connectionTimer.start();
+
+                _netConnection.connect(bbbAppsUrl, confParams.username, confParams.role,
+                                        confParams.room, confParams.voicebridge, 
+                                        confParams.record, confParams.externUserID,
+                                        confParams.internalUserID, confParams.muteOnStart, confParams.lockSettings);
+                   
+            } catch(e:ArgumentError) {
+                // Invalid parameters.
+                switch (e.errorID) {
+                    case 2004 :
+                        LOGGER.debug("Error! Invalid server location: {0}", [uri]);
+                        break;
+                    default :
+                        LOGGER.debug("UNKNOWN Error! Invalid server location: {0}", [uri]);
+                       break;
+                }
+            }
+        }
+            
+        public function connectionTimeout (e:TimerEvent) : void {
+            var logData:Object = UsersUtil.initLogData();
+            logData.connection = bbbAppsUrl;
+            logData.tags = ["apps", "connection"];
+            logData.connectAttemptCount = connectAttemptCount;
+            logData.message = "Connecting attempt to bbb-apps timedout. Retrying.";
+            LOGGER.info(JSON.stringify(logData));
+            
+            if (connectAttemptCount <= maxConnectAttempt) {
+                connect();
+            } else {
+                sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_ATTEMPT_TIMEDOUT);
+            }
+            
+        }
+            
+
+        public function disconnect(logoutOnUserCommand:Boolean):void {
+            this.logoutOnUserCommand = logoutOnUserCommand;
+            _netConnection.close();
+        }
         
-        var protocol:String = "rtmp";
-        var uri:String = appURL + "/" + confParams.room;
+        public function forceClose():void {
+          _netConnection.close();
+        }
         
-        if (BBB.initConnectionManager().isTunnelling) {
-          uri = "rtmpt://" + result.server + "/" + result.app + "/" + confParams.room;
-        } else {
-          uri = "rtmp://" + result.server + ":1935/" + result.app + "/" + confParams.room;
+        protected function netStatus(event:NetStatusEvent):void {
+            handleResult( event );
         }
-				
-				
-				LOGGER.debug("BBB Apps URI=" + uri);
-				
-				_netConnection.connect(uri, confParams.username, confParams.role,
-          confParams.room, confParams.voicebridge, 
-          confParams.record, confParams.externUserID,
-          confParams.internalUserID, confParams.muteOnStart, confParams.lockSettings);
-               
-			} catch(e:ArgumentError) {
-				// Invalid parameters.
-				switch (e.errorID) {
-					case 2004 :
-						LOGGER.debug("Error! Invalid server location: {0}", [uri]);
-						break;						
-					default :
-						LOGGER.debug("UNKNOWN Error! Invalid server location: {0}", [uri]);
-					   break;
-				}
-			}	
-		}
-			
-		public function disconnect(logoutOnUserCommand:Boolean):void {
-			this.logoutOnUserCommand = logoutOnUserCommand;
-			_netConnection.close();
-		}
-		
-    
-    public function forceClose():void {
-      _netConnection.close();
-    }
-    
-		protected function netStatus(event:NetStatusEvent):void {
-			handleResult( event );
-		}
-		
-		public function handleResult(event:Object):void {
-			var info : Object = event.info;
-			var statusCode : String = info.code;
-
-      var logData:Object = new Object();
-      logData.user = UsersUtil.getUserData();
-      
-			switch (statusCode) {
-				case "NetConnection.Connect.Success":
-					numNetworkChangeCount = 0;
-          JSLog.debug("Successfully connected to BBB App.", logData);
-          validateToken();
-					break;
-			
-				case "NetConnection.Connect.Failed":					
-            LOGGER.error(":Connection to viewers application failed...even when tunneling");
-						sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_FAILED);								
-					break;
-					
-				case "NetConnection.Connect.Closed":	
-					logData.message = "NetConnection.Connect.Closed on bbb-apps";
-					LOGGER.info(JSON.stringify(logData));
-          sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_CLOSED);		
-					break;
-					
-				case "NetConnection.Connect.InvalidApp":	
-          LOGGER.debug(":viewers application not found on server");			
-					sendConnectionFailedEvent(ConnectionFailedEvent.INVALID_APP);				
-					break;
-					
-				case "NetConnection.Connect.AppShutDown":
-          LOGGER.debug(":viewers application has been shutdown");
-					sendConnectionFailedEvent(ConnectionFailedEvent.APP_SHUTDOWN);	
-					break;
-					
-				case "NetConnection.Connect.Rejected":
-          var appURL:String = BBB.getConfigManager().config.application.uri
-          LOGGER.debug(":Connection to the server rejected. Uri: {0}. Check if the red5 specified in the uri exists and is running", [appURL]);
-					sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_REJECTED);		
-					break;
-				
-				case "NetConnection.Connect.NetworkChange":
-					numNetworkChangeCount++;
-					if (numNetworkChangeCount % 20 == 0) {
-						logData.message = "Detected network change on bbb-apps";
-						logData.numNetworkChangeCount = numNetworkChangeCount;
-						LOGGER.info(JSON.stringify(logData));
-					}
-					break;
-					
-				default :
-          LOGGER.debug(":Default status to the viewers application" );
-				   sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
-				   break;
-			}
-		}
-			
-		protected function netSecurityError(event: SecurityErrorEvent):void {
-      LOGGER.error("Security error - {0}", [event.text]);
-			sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
-		}
-		
-		protected function netIOError(event: IOErrorEvent):void {
-      LOGGER.error("Input/output error - {0}", [event.text]);
-			sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
-		}
-			
-		protected function netASyncError(event: AsyncErrorEvent):void  {
-	  		LOGGER.debug("Asynchronous code error - {0}", [event.toString()]);
-			sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
-		}	
-			
+
+        public function handleResult(event:Object):void {
+            var info : Object = event.info;
+            var statusCode : String = info.code;
+            
+            //Stop timeout timer when connected/rejected
+            if (connectionTimer != null && connectionTimer.running) {
+                connectionTimer.stop();
+                connectionTimer = null;
+            }
+            
+
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps", "connection"];
+          
+            switch (statusCode) {
+                case "NetConnection.Connect.Success":
+                    numNetworkChangeCount = 0;
+                    connectAttemptCount = 0;
+                    logData.message = "Successfully connected to bbb-apps.";
+                    LOGGER.info(JSON.stringify(logData));
+                    validateToken();
+                    break;
+
+                case "NetConnection.Connect.Failed":
+                    logData.message = "Connection to bbb-apps failed.";
+                    LOGGER.info(JSON.stringify(logData));
+                    sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_FAILED);	
+                    break;
+
+                case "NetConnection.Connect.Closed":
+                    logData.message = "NetConnection.Connect.Closed on bbb-apps";
+                    LOGGER.info(JSON.stringify(logData));
+                    sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_CLOSED);
+                    break;
+
+                case "NetConnection.Connect.InvalidApp":
+                    logData.message = "bbb-app not found.";
+                    LOGGER.info(JSON.stringify(logData));
+                    sendConnectionFailedEvent(ConnectionFailedEvent.INVALID_APP);
+                    break;
+
+                case "NetConnection.Connect.AppShutDown":
+                    LOGGER.debug(":viewers application has been shutdown");
+                    sendConnectionFailedEvent(ConnectionFailedEvent.APP_SHUTDOWN);
+                    break;
+
+                case "NetConnection.Connect.Rejected":
+                    var appURL:String = BBB.getConfigManager().config.application.uri
+                    LOGGER.debug(":Connection to the server rejected. Uri: {0}. Check if the red5 specified in the uri exists and is running", [appURL]);
+                    sendConnectionFailedEvent(ConnectionFailedEvent.CONNECTION_REJECTED);
+                    break;
+                
+                case "NetConnection.Connect.NetworkChange":
+                    numNetworkChangeCount++;
+                    if (numNetworkChangeCount % 20 == 0) {
+                        logData.message = "Detected network change on bbb-apps";
+                        logData.numNetworkChangeCount = numNetworkChangeCount;
+                        LOGGER.info(JSON.stringify(logData));
+                    }
+                    break;
+
+                default :
+                    LOGGER.debug(":Default status to the viewers application" );
+                    sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
+                    break;   
+             }
+        }
+
+        protected function netSecurityError(event: SecurityErrorEvent):void {
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps", "connection"];
+            logData.message = "Security error - " + event.text;
+            LOGGER.info(JSON.stringify(logData));
+            sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
+        }
+
+        protected function netIOError(event: IOErrorEvent):void {
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps", "connection"];
+            logData.message = "Input/output error - " + event.text;
+            LOGGER.info(JSON.stringify(logData));
+
+            sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
+        }
+
+        protected function netASyncError(event: AsyncErrorEvent):void  {
+            LOGGER.debug("Asynchronous code error - {0}", [event.toString()]);
+            sendConnectionFailedEvent(ConnectionFailedEvent.UNKNOWN_REASON);
+        }
+
         private function sendConnectionFailedEvent(reason:String):void{
-            var logData:Object = new Object();
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps", "connection"];
 
             if (this.logoutOnUserCommand) {
                 logData.reason = "User requested.";
-                logData.user = UsersUtil.getUserData();
                 logData.message = "User logged out from BBB App.";
                 LOGGER.info(JSON.stringify(logData));
-                
+                   
                 sendUserLoggedOutEvent();
             } else if (reason == ConnectionFailedEvent.CONNECTION_CLOSED && !UsersUtil.isUserEjected()) {
                 // do not try to reconnect if the connection failed is different than CONNECTION_CLOSED  
                 logData.reason = reason;
-                logData.user = UsersUtil.getUserData();
                 logData.message = "User disconnected from BBB App.";
                 LOGGER.info(JSON.stringify(logData));
 
                 if (reconnecting) {
-                  var attemptFailedEvent:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_CONNECTION_ATTEMPT_FAILED_EVENT);
-                  attemptFailedEvent.payload.type = ReconnectionManager.BIGBLUEBUTTON_CONNECTION;
-                  dispatcher.dispatchEvent(attemptFailedEvent);
+                    var attemptFailedEvent:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_CONNECTION_ATTEMPT_FAILED_EVENT);
+                    attemptFailedEvent.payload.type = ReconnectionManager.BIGBLUEBUTTON_CONNECTION;
+                    dispatcher.dispatchEvent(attemptFailedEvent);
                 } else {
-                  reconnecting = true;
-                  authenticated = false;
-
-                  var disconnectedEvent:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_DISCONNECTED_EVENT);
-                  disconnectedEvent.payload.type = ReconnectionManager.BIGBLUEBUTTON_CONNECTION;
-                  disconnectedEvent.payload.callback = connect;
-                  disconnectedEvent.payload.callbackParameters = new Array();
-                  dispatcher.dispatchEvent(disconnectedEvent);
-                }
+                    reconnecting = true;
+                    authenticated = false;
 
+                    var disconnectedEvent:BBBEvent = new BBBEvent(BBBEvent.RECONNECT_DISCONNECTED_EVENT);
+                    disconnectedEvent.payload.type = ReconnectionManager.BIGBLUEBUTTON_CONNECTION;
+                    disconnectedEvent.payload.callback = connect;
+                    disconnectedEvent.payload.callbackParameters = new Array();
+                    dispatcher.dispatchEvent(disconnectedEvent);
+                }
             } else {
                 if (UsersUtil.isUserEjected()) {
-                    logData.user = UsersUtil.getUserData();
                     logData.message = "User has been ejected from meeting.";
                     LOGGER.info(JSON.stringify(logData));
                     reason = ConnectionFailedEvent.USER_EJECTED_FROM_MEETING;
+                    var cfe:ConnectionFailedEvent = new ConnectionFailedEvent(reason);
+                    dispatcher.dispatchEvent(cfe);
+                } else {
+                    logData.message = "Connection failed event - " + reason;
+                    LOGGER.info(JSON.stringify(logData));
+                    var e:ConnectionFailedEvent = new ConnectionFailedEvent(reason);
+                    dispatcher.dispatchEvent(e);
                 }
-                LOGGER.debug("Connection failed event - " + reason);
-                var e:ConnectionFailedEvent = new ConnectionFailedEvent(reason);
-                dispatcher.dispatchEvent(e);
+
             }
         }
-		
-		private function sendUserLoggedOutEvent():void{
-			var e:ConnectionFailedEvent = new ConnectionFailedEvent(ConnectionFailedEvent.USER_LOGGED_OUT);
-			dispatcher.dispatchEvent(e);
-		}
-		
-		public function onBWCheck(... rest):Number { 
-			return 0; 
-		} 
-    
-		public function onBWDone(... rest):void { 
-			var p_bw:Number; 
-			if (rest.length > 0) p_bw = rest[0]; 
-			// your application should do something here 
-			// when the bandwidth check is complete 
-			LOGGER.debug("bandwidth = {0} Kbps.", [p_bw]); 
-		}
-	}
+
+        private function sendUserLoggedOutEvent():void{
+            var e:ConnectionFailedEvent = new ConnectionFailedEvent(ConnectionFailedEvent.USER_LOGGED_OUT);
+            dispatcher.dispatchEvent(e);
+        }
+
+        public function onBWCheck(... rest):Number { 
+            return 0; 
+        } 
+        
+        public function onBWDone(... rest):void { 
+            var p_bw:Number; 
+            if (rest.length > 0) p_bw = rest[0]; 
+            // your application should do something here 
+            // when the bandwidth check is complete 
+            LOGGER.debug("bandwidth = {0} Kbps.", [p_bw]); 
+        }
+    }
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
index 6ceb8b8efd29258a32fa63ddcc7f523a8df3af4e..f6b8530e5a99d5138daeff5fc225127aadf836be 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
@@ -18,23 +18,22 @@
 */
 package org.bigbluebutton.main.model.users.events
 {
-	import flash.events.Event;
+    import flash.events.Event;
 
-	public class ConnectionFailedEvent extends Event
-	{
-		public static const UNKNOWN_REASON:String = "unknownReason";
-		public static const CONNECTION_FAILED:String = "connectionFailed";
-		public static const CONNECTION_CLOSED:String = "connectionClosed";
-		public static const INVALID_APP:String = "invalidApp";
-		public static const APP_SHUTDOWN:String = "appShutdown";
-		public static const CONNECTION_REJECTED:String = "connectionRejected";
-		public static const ASYNC_ERROR:String = "asyncError";
-		public static const USER_LOGGED_OUT:String = "userHasLoggedOut";
-		public static const USER_EJECTED_FROM_MEETING:String = "userHasBeenEjectFromMeeting";
-		
-		public function ConnectionFailedEvent(type:String)
-		{
-			super(type, true, false);
-		}
-	}
+    public class ConnectionFailedEvent extends Event {
+        public static const UNKNOWN_REASON:String = "unknownReason";
+        public static const CONNECTION_FAILED:String = "connectionFailed";
+        public static const CONNECTION_CLOSED:String = "connectionClosed";
+        public static const CONNECTION_ATTEMPT_TIMEDOUT:String = "connectionAttemptTimedout";
+        public static const INVALID_APP:String = "invalidApp";
+        public static const APP_SHUTDOWN:String = "appShutdown";
+        public static const CONNECTION_REJECTED:String = "connectionRejected";
+        public static const ASYNC_ERROR:String = "asyncError";
+        public static const USER_LOGGED_OUT:String = "userHasLoggedOut";
+        public static const USER_EJECTED_FROM_MEETING:String = "userHasBeenEjectFromMeeting";
+
+        public function ConnectionFailedEvent(type:String) {
+            super(type, true, false);
+        }
+    }
 }
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
index b8ceb6b8de1664adc5457c327baae04a8aa0d1b4..ac461d35064fc6202b3ab69a15578619e2057eab 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
@@ -39,7 +39,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import com.asfusion.mate.events.Dispatcher;
 			
 			import flash.ui.Keyboard;
-			
+			import org.bigbluebutton.core.UsersUtil;
 			import mx.controls.sliderClasses.Slider;
 			import mx.events.CloseEvent;
 			import mx.events.SliderEvent;
@@ -100,7 +100,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
       private function reInitialize():void {
         my_nc = new NetConnection();
-	      my_nc.proxyType = "best";
+	      my_nc.proxyType = "best";
         my_nc.connect(null);
         nsStream = new NetStream(my_nc);
         if (mic != null) {
@@ -127,14 +127,21 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         audioMicLevelDetected = 0;     
 			}
       
-      private function micStatusEventHandler(event:StatusEvent):void {					
+      private function micStatusEventHandler(event:StatusEvent):void {
+        var logData:Object = UsersUtil.initLogData();
+            
         switch(event.code) {
-          case "Microphone.Muted":						
-			LOGGER.debug("Access to microphone has been denied.");
+          case "Microphone.Muted":
+            logData.tags = ["voice", "flash"];
+            logData.message = "Access to microphone has been denied.";
+            LOGGER.info(JSON.stringify(logData));
             statusText.text = "You did not allow Flash to access your mic.";
             break;
           case "Microphone.Unmuted":         
-			LOGGER.debug("Access to the microphone has been allowed.");
+            logData.tags = ["voice", "flash"];
+            logData.message = "Access to the microphone has been allowed.";
+            LOGGER.info(JSON.stringify(logData));
+            
             // Comment these next 2-lines. We don't want the user hearing audio
             // while testing mic levels. (richard mar 26, 2014)
             // mic.setLoopBack(true);
@@ -155,7 +162,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         micActivityTimer.start();          
       }
       
-			private function onCreationComplete():void {
+      private function onCreationComplete():void {
         LOGGER.debug("onCreationComplete. Seeting state to [flashMicSettingsTest]");
         microphoneList = Media.getMicrophoneNames();
         setupForMicLoopbackTest();
@@ -252,7 +259,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       }
       
       private function onCancelClicked():void {
-		LOGGER.debug("onCancelClicked closing popup");
         cleanUp();
         stopEchoTest();
         var dispatcher:Dispatcher = new Dispatcher();
@@ -292,7 +298,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
      
       private function yesButtonClicked():void {
-        LOGGER.debug("Echo test passed.");    
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["voice"];
+        logData.message = "Echo test passed.";
+        LOGGER.info(JSON.stringify(logData));
+
         cleanUp();
         dispatchEvent(new FlashEchoTestHasAudioEvent());
         var dispatcher:Dispatcher = new Dispatcher();
@@ -301,7 +311,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       }
       
       private function noButtonClicked():void {
-		LOGGER.debug("Echo test failed.");
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["voice"];
+        logData.message = "Echo test failed.";
+        LOGGER.info(JSON.stringify(logData));
+        
         dispatchEvent(new FlashEchoTestNoAudioEvent());
         testMicrophoneLoopback();
         setupForMicLoopbackTest();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 4ec206e18a5a031852ff2abd95fb967c5c9bb211..f0a90158456fa05ffe1b75d8eb8d111d0dfe9598 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -11,6 +11,7 @@ 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.
@@ -109,7 +110,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import org.bigbluebutton.main.events.ModuleLoadEvent;
 			import org.bigbluebutton.main.events.ShortcutEvent;
 			import org.bigbluebutton.main.model.LayoutOptions;
-			import org.bigbluebutton.main.model.ShortcutOptions;
 			import org.bigbluebutton.main.model.users.Conference;
 			import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent;
 			import org.bigbluebutton.modules.phone.events.AudioSelectionWindowEvent;
@@ -120,6 +120,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import org.bigbluebutton.modules.users.views.BreakoutRoomSettings;
 			import org.bigbluebutton.modules.videoconf.events.ShareCameraRequestEvent;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
+            import org.bigbluebutton.core.UsersUtil;
 	
 			private static const LOGGER:ILogger = getClassLogger(MainApplicationShell);      
       
@@ -223,14 +224,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function handleApplicationVersionEvent(event:AppVersionEvent):void {
+                var logData:Object = UsersUtil.initLogData();
+                
 				if (event.configLocaleVersion == true) {
 					receivedConfigLocaleVer = true;
 					appVersion = event.appVersion;
 					localeVersion = event.localeVersion;
+                                        
+                    logData.localeVersion = localeVersion;
+                    logData.tags = ["locale"];
+                    logData.message = "Received locale version from config.xml";
+                    LOGGER.info(JSON.stringify(logData));
+      
 					LOGGER.debug("Received locale version fron config.xml");
 				} else {
 					receivedResourceLocaleVer = true;
-					LOGGER.debug("Received locale version fron locale file.");
+
+                    logData.tags = ["locale"];
+                    logData.message = "Received locale version from locale file";
+                    LOGGER.info(JSON.stringify(logData));
 				}
 				
 				if (receivedConfigLocaleVer && receivedResourceLocaleVer) {
@@ -253,11 +265,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private function fullScreenHandler(evt:FullScreenEvent):void {
 				dispState = stage.displayState + " (fullScreen=" + evt.fullScreen.toString() + ")";
 				if (evt.fullScreen) {
-					LOGGER.debug("Switching to full screen");
 					/* Do something specific here if we switched to full screen mode. */
 				
 				} else {
-					LOGGER.debug("Switching to normal screen");
 					/* Do something specific here if we switched to normal mode. */
 				}
 			}			
@@ -287,16 +297,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function toggleFullScreen():void{
-				LOGGER.debug("Toggling fullscreen");
 	   			try {
 					switch (stage.displayState) {
 						case StageDisplayState.FULL_SCREEN:
-							LOGGER.debug("full screen mode");
 							// If already in full screen mode, switch to normal mode.
 							stage.displayState = StageDisplayState.NORMAL;
 							break;
 						default:
-							LOGGER.debug("Normal screen mode");
 							// If not in full screen mode, switch to full screen mode.
 							stage.displayState = StageDisplayState.FULL_SCREEN;
 							break;
@@ -310,7 +317,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				// this is a terrible place for these checks because this function runs 4 times on startup
 				if (BBB.initConnectionManager().isTunnelling) {
 					isTunneling = true;
-					globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.message")));
+					globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
+						ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.title"),
+						ResourceUtil.getInstance().getString("bbb.clientstatus.tunneling.message"),
+						'bbb.clientstatus.tunneling'));
 				}
 				versionCheck();
 				
@@ -332,7 +342,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					if ((browserVersion[0].toString().toLowerCase() == "chrome" && browserVersion[1] < xml.@chrome) || browserVersion[0].toString().toLowerCase() == "firefox" && browserVersion[1] < xml.@firefox) {
 						globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT, 
 							ResourceUtil.getInstance().getString("bbb.clientstatus.browser.title"), 
-							ResourceUtil.getInstance().getString("bbb.clientstatus.browser.message", [browserVersion[0]+" "+browserVersion[1]])));
+							ResourceUtil.getInstance().getString("bbb.clientstatus.browser.message", [browserVersion[0]+" "+browserVersion[1]]),
+							'bbb.clientstatus.browser.message'));
 					}
 					
 					//find flash version
@@ -342,7 +353,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 						((flashVersion.os != 'LNX' || browserVersion[0].toString().toLowerCase() == "chrome") && flashVersion.major < xml.@flash)) {
 						globalDispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT, 
 							ResourceUtil.getInstance().getString("bbb.clientstatus.flash.title"), 
-							ResourceUtil.getInstance().getString("bbb.clientstatus.flash.message", [flashVersion.major+"."+flashVersion.minor+"."+flashVersion.build])));
+							ResourceUtil.getInstance().getString("bbb.clientstatus.flash.message", [flashVersion.major+"."+flashVersion.minor+"."+flashVersion.build]),
+							'bbb.clientstatus.flash.message'));
 					}
 				}
 
@@ -378,8 +390,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	   			Alert.okLabel ="OK";
 				var version:String = "old-locales";
 				version = ResourceUtil.getInstance().getString('bbb.mainshell.locale.version');
-				LOGGER.debug("Locale from config={0}, from locale file={1}", [localeVersion, version]);
-
+                
+                var logData:Object = UsersUtil.initLogData();
+                logData.configVersion = localeVersion;
+                logData.localeVersion = version;
+                logData.locale = ResourceUtil.getInstance().getCurrentLanguageCode();
+                logData.tags = ["locale"];
+                logData.message = "Loaded locale.";
+                LOGGER.info(JSON.stringify(logData));
+                    
 				if ((version == "old-locales") || (version == "") || (version == null)) {
 					wrongLocaleVersion();
 				} else {
@@ -627,11 +646,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private function openBreakoutRoomsWindow(e:BreakoutRoomEvent):void  {
 				var popUp:IFlexDisplayObject = PopUpManager.createPopUp(mdiCanvas, BreakoutRoomSettings, true);
 				PopUpManager.centerPopUp(popUp);
-				BreakoutRoomSettings(popUp).initCreateBreakoutRooms(e.joinMode);
+				BreakoutRoomSettings(popUp).initCreateBreakoutRooms(e.joinMode, e.record);
 			}
 			
 			private function onFooterLinkClicked(e:TextEvent):void{
-				LOGGER.debug("Clicked on link[{0}] from footer", [e.text]);
 				if (ExternalInterface.available) {
 					ExternalInterface.call("chatLinkClicked", e.text);
 				}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index 5d1841b93abf8a28cf15308e05efc5cc59c6bedd..f73c205eb38f9be439a7efa1612abfbb035c3bc6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -187,8 +187,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
      }
 
      private function logFlashPlayerCapabilities():void {
-         var logData:Object = new Object();
-         logData.user = UsersUtil.getUserData();
+         var logData:Object = UsersUtil.initLogData();
+         logData.tags = ["initialization"];
          logData.capabilities = getFlashPlayerCapabilities();
          logData.message = "Flash Player Capabilities.";
          LOGGER.info(JSON.stringify(logData));
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
index 7f26f8fed5ce801c28189543d1a470b5e7a93587..50013250951b357b8ba4157c9f3c70e624e1c9c8 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/WarningButton.mxml
@@ -94,7 +94,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 				messages.push(obj);
 				showNotification();
-				LOGGER.warn("ClientNotification:" + e.title + " " + e.message);
+
+				var logData:Object = {};
+				logData.type = "ClientNotification";
+				logData.logCode = e.logCode;
+				logData.message = e.message;
+				logData.title = e.title;
+				LOGGER.warn(JSON.stringify(logData));
 			}
 			
 			private function showNotification():void {
@@ -102,7 +108,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					visible = includeInLayout = true;
 					
 					if (hideTimer.running) hideTimer.reset();
-					hideTimer.start()
+					hideTimer.start();
 					
 					if (!notification) {
 						notification = ToolTipManager.createToolTip(ResourceUtil.getInstance().getString("bbb.clientstatus.notification"), 100, 100, "errorTipAbove", this) as ToolTip;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
index d8001da96670d90f55d621dd22229761aef5d613..4435fe9a5c53eebddd1b23951e7b7edfcc416c0c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
@@ -101,13 +101,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				userClosed = true;
 				
         
-        var logData:Object = new Object();       
+        var logData:Object = UsersUtil.initLogData();       
         logData.reason = "User requested.";
-        logData.user = UsersUtil.getUserData();
+        logData.tags = ["voice", "webrtc"];
         logData.message = "WebRtc Echo test passed.";
-        
-        JSLog.info("WebRtc Echo test passed.", logData);
-        
         LOGGER.info(JSON.stringify(logData));
         
 				setCurrentState("connecting");
@@ -120,11 +117,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private function noButtonClicked():void {
 				userClosed = true;
                 
-                var logData:Object = new Object();       
+                var logData:Object = UsersUtil.initLogData();       
                 logData.reason = "User requested.";
-                logData.user = UsersUtil.getUserData();
-                logData.message = "WebRtc Echo test failed.";
-                
+                logData.tags = ["voice", "webrtc"];
+                logData.message = "WebRtc Echo test failed.";                
                 LOGGER.info(JSON.stringify(logData));
                 
 				var dispatcher:Dispatcher = new Dispatcher();
@@ -190,9 +186,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
       
       private function webRTCCallStarted():void {
-        var logData:Object = new Object();       
+        var logData:Object = UsersUtil.initLogData();       
         logData.reason = "User requested.";
-        logData.user = UsersUtil.getUserData();
+        logData.tags = ["voice", "webrtc"];
         logData.message = "WebRtc call started.";
                 
         LOGGER.info(JSON.stringify(logData));
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
old mode 100644
new mode 100755
index 18526f150aae6e1aa7ee1339e8a111c11ce7cff2..57eb6a74c19973bde61a624af421b981f6f85bb9
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
@@ -16,16 +16,16 @@
 * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 *
 */
-package org.bigbluebutton.modules.layout.model {
-	import flash.utils.Dictionary;
-	
-	import flexlib.mdi.containers.MDICanvas;
-	import flexlib.mdi.containers.MDIWindow;
-	
-	import org.as3commons.logging.api.ILogger;
-	import org.as3commons.logging.api.getClassLogger;
-	import org.bigbluebutton.common.Role;
-	import org.bigbluebutton.core.managers.UserManager;
+package org.bigbluebutton.modules.layout.model {
+	import flash.utils.Dictionary;
+	
+	import flexlib.mdi.containers.MDICanvas;
+	import flexlib.mdi.containers.MDIWindow;
+	import org.bigbluebutton.core.UsersUtil;
+	import org.as3commons.logging.api.ILogger;
+	import org.as3commons.logging.api.getClassLogger;
+	import org.bigbluebutton.common.Role;
+	import org.bigbluebutton.core.managers.UserManager;
 
 	public class LayoutDefinition {
 		
@@ -92,8 +92,11 @@ package org.bigbluebutton.modules.layout.model {
 			} else if (hasPresenterLayout) {
 				return _layoutsPerRole[Role.PRESENTER];
 			} else {
-				LOGGER.error("There's no layout that fits the participants profile");
-        //trace(LOG + "getMyLayout There's no layout that fits the participants profile");
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["layout"];
+                logData.message = "There's no layout that fits the participants profile."; 
+                LOGGER.error(JSON.stringify(logData));
+
 				return null;
 			}
 		}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
index a3eaa9085b6eddd71cc3df962148915cdb52ce00..7d4e2357b50d02194697d72ef2a80d83be8d3114 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
@@ -148,18 +148,18 @@ package org.bigbluebutton.modules.phone.managers {
       var info : Object = event.info;
       var statusCode : String = info.code;
       
-      var logData:Object = new Object();       
-      logData.user = UsersUtil.getUserData();
+      var logData:Object = UsersUtil.initLogData();
       
       switch (statusCode) {
         case "NetConnection.Connect.Success":
           numNetworkChangeCount = 0;
-          LOGGER.debug("Connection success");
-          JSLog.debug("Successfully connected to BBB Voice", logData);
+          logData.tags = ["voice", "flash"];
+          logData.message = "Connection success.";
+          LOGGER.info(JSON.stringify(logData));
           handleConnectionSuccess();
           break;
         case "NetConnection.Connect.Failed":
-          JSLog.error("Failed to connect to BBB Voice", logData);
+          logData.tags = ["voice", "flash"];
 		  logData.message = "NetConnection.Connect.Failed from bbb-voice";
 		  LOGGER.info(JSON.stringify(logData));
           handleConnectionFailed();
@@ -167,13 +167,14 @@ package org.bigbluebutton.modules.phone.managers {
         case "NetConnection.Connect.NetworkChange":
           numNetworkChangeCount++;
           if (numNetworkChangeCount % 20 == 0) {
+              logData.tags = ["voice", "flash"];
              logData.message = "Detected network change on bbb-voice";
              logData.numNetworkChangeCount = numNetworkChangeCount;
              LOGGER.info(JSON.stringify(logData));
           }
           break;
         case "NetConnection.Connect.Closed":
-          JSLog.debug("Disconnected from BBB Voice", logData);
+          logData.tags = ["voice", "flash"];
 		  logData.message = "Disconnected from BBB Voice";
 		  LOGGER.info(JSON.stringify(logData));
           handleConnectionClosed();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
index 3d5ba4ee6319b9bab1501cf71456622989f144ca..bab48ef7345453058369ad83338c26fe72c2a40c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
@@ -277,12 +277,11 @@
     
     public function handleFlashCallConnectedEvent(event:FlashCallConnectedEvent):void {      
       LOGGER.debug("handling FlashCallConnectedEvent, current state: {0}", [state]);
-      var logData:Object = new Object();       
-      logData.user = UsersUtil.getUserData();
+      var logData:Object = UsersUtil.initLogData();
+      logData.tags = ["voice", "flash"];
       
       switch (state) {
         case CALLING_INTO_CONFERENCE:
-          JSLog.info("Successfully joined the voice conference.", logData);
 		  logData.message = "Successfully joined the voice conference";
           LOGGER.info(jsonXify(logData));
           state = IN_CONFERENCE;
@@ -290,7 +289,6 @@
           streamManager.callConnected(event.playStreamName, event.publishStreamName, event.codec, event.listenOnlyCall);
           break;
         case CONNECTING_TO_LISTEN_ONLY_STREAM:
-          JSLog.info("Successfully connected to the listen only stream.", logData);
 		  logData.message = "Successfully connected to the listen only stream.";
           LOGGER.info(jsonXify(logData));
           state = ON_LISTEN_ONLY_STREAM;
@@ -299,7 +297,6 @@
           break;
         case CALLING_INTO_ECHO_TEST:
           state = IN_ECHO_TEST;
-          JSLog.info("Successfully called into the echo test application.", logData);
 		  logData.message = "Successfully called into the echo test application.";
 		  logData.publishStreamName = event.publishStreamName;
 		  logData.playStreamName = event.playStreamName;
@@ -317,8 +314,8 @@
     }
 
     public function handleFlashCallDisconnectedEvent(event:FlashCallDisconnectedEvent):void {
-      var logData:Object = new Object();       
-      logData.user = UsersUtil.getUserData();
+      var logData:Object = UsersUtil.initLogData();
+      logData.tags = ["voice", "flash"];
       
       LOGGER.debug("Flash call disconnected, current state: {0}", [state]);
       switch (state) {
@@ -328,14 +325,12 @@
           break;
         case ON_LISTEN_ONLY_STREAM:
           state = INITED;
-          JSLog.info("Flash user left the listen only stream.", logData);
 		  logData.message = "Flash user left the listen only stream.";
           LOGGER.info(jsonXify(logData));
 		  dispatcher.dispatchEvent(new FlashLeftVoiceConferenceEvent());
           break;
         case IN_ECHO_TEST:
           state = INITED;
-          JSLog.info("Flash echo test stopped.", logData);
 		  logData.message = "Flash echo test stopped.";
 		  LOGGER.info(jsonXify(logData));
 
@@ -347,8 +342,6 @@
           break;
         case CALLING_INTO_ECHO_TEST:
           state = INITED;
-          JSLog.error("Unsuccessfully called into the echo test application.", logData);
-
 		  logData.message = "Unsuccessfully called into the echo test application.";
 		  LOGGER.info(jsonXify(logData));
           dispatcher.dispatchEvent(new FlashEchoTestFailedEvent());
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
index 7c0ea79396a6e7c288333e94debd60dbdebbac5e..3c09198bbdcfb67951e6ca4c4a8be89421367623 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
@@ -14,7 +14,6 @@ package org.bigbluebutton.modules.phone.managers
   import org.as3commons.logging.util.jsonXify;
   import org.bigbluebutton.core.UsersUtil;
   import org.bigbluebutton.main.api.JSAPI;
-  import org.bigbluebutton.main.api.JSLog;
   import org.bigbluebutton.main.events.ClientStatusEvent;
   import org.bigbluebutton.main.model.users.AutoReconnect;
   import org.bigbluebutton.modules.phone.PhoneModel;
@@ -32,7 +31,7 @@ package org.bigbluebutton.modules.phone.managers
 
   public class WebRTCCallManager
   {
-	private static const LOGGER:ILogger = getClassLogger(WebRTCCallManager);      
+    private static const LOGGER:ILogger = getClassLogger(WebRTCCallManager);
     private const MAX_RETRIES:Number = 3;
     
     private var browserType:String = "unknown";
@@ -60,7 +59,8 @@ package org.bigbluebutton.modules.phone.managers
       if (options.useWebRTCIfAvailable && !isWebRTCSupported()) {
         dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT, 
           ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.title"), 
-          ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message")));
+          ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message"),
+          'bbb.clientstatus.webrtc.title'));
       }
       
       usingWebRTC = checkIfToUseWebRTC();
@@ -135,7 +135,8 @@ package org.bigbluebutton.modules.phone.managers
       if(reconnecting) {
         dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.SUCCESS_MESSAGE_EVENT,
           ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reestablished"),
-          ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reestablished")));
+          ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reestablished"),
+          'bbb.webrtcWarning.connection.reestablished'));
         reconnecting = false;
       }
     }
@@ -150,8 +151,12 @@ package org.bigbluebutton.modules.phone.managers
     }
     
     public function handleJoinVoiceConferenceCommand(event:JoinVoiceConferenceCommand):void {
-	  LOGGER.debug("handleJoinVoiceConferenceCommand - usingWebRTC: " + usingWebRTC + ", event.mic: " + event.mic);
-      
+      var logData:Object = UsersUtil.initLogData();
+      logData.usingWebRTC = usingWebRTC;
+      logData.eventMic = event.mic;
+      logData.message = "handleJoinVoiceConferenceCommand - usingWebRTC:";
+      LOGGER.info(JSON.stringify(logData));
+
       if (!usingWebRTC || !event.mic) return;
       
       if (options.skipCheck || echoTestDone) {
@@ -200,28 +205,34 @@ package org.bigbluebutton.modules.phone.managers
         errorString = ResourceUtil.getInstance().getString("bbb.webrtcWarning.failedError.unknown", [event.errorCode]);
       }
       
-	  var logData:Object = new Object();       
-	  logData.user = UsersUtil.getUserData();
-	  logData.user.reason = errorString;
+        var logData:Object = UsersUtil.initLogData();
+      logData.user.reason = errorString;
+      logData.tags = ["voice", "webrtc"];
       logData.message = "WebRtc Echo test failed.";
-	  JSLog.warn("WebRtc Echo test failed.", logData);
-	  
-	  LOGGER.info(jsonXify(logData));
-	  
-      sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"), ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]), errorString);
+      logData.errorEvent = event;
+      LOGGER.info(jsonXify(logData));
+
+      sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"),
+              ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]),
+              errorString,
+              'bbb.webrtcWarning webRTCEchoTestFailedEvent');
     }
     
     public function handleWebRTCEchoTestEndedUnexpectedly():void {
       model.state = Constants.INITED;
-      var errorString:String = ResourceUtil.getInstance().getString("bbb.webrtcWarning.failedError.endedunexpectedly");
-	  
-	  var logData:Object = new Object();       
-	  logData.user = UsersUtil.getUserData();
-	  logData.user.reason = errorString;
+      var logCode:String = "bbb.webrtcWarning.failedError.endedunexpectedly";
+      var errorString:String = ResourceUtil.getInstance().getString(logCode);
+
+      var logData:Object = UsersUtil.initLogData();
+      logData.user.reason = errorString;
+      logData.tags = ["voice", "webrtc"];
       logData.message = "WebRtc Echo test ended unexpectedly.";
-	  LOGGER.info(jsonXify(logData));
-	  
-      sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"), ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]), errorString);
+      LOGGER.info(jsonXify(logData));
+
+      sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"),
+              ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]),
+              errorString,
+              logCode);
     }
     
     public function handleWebRTCCallFailedEvent(event:WebRTCCallEvent):void {
@@ -233,7 +244,8 @@ package org.bigbluebutton.modules.phone.managers
         reconnecting = true;
         dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.WARNING_MESSAGE_EVENT,
           ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.dropped"),
-          ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reconnecting")));
+          ResourceUtil.getInstance().getString("bbb.webrtcWarning.connection.reconnecting"),
+          'bbb.webrtcWarning.connection.dropped,reconnecting'));
         reconnect.onDisconnect(joinVoiceConference, []);
       }
       else {
@@ -256,26 +268,32 @@ package org.bigbluebutton.modules.phone.managers
             errorString = ResourceUtil.getInstance().getString("bbb.webrtcWarning.failedError.unknown", [event.errorCode]);
           }
           
-          var logData:Object = new Object();       
-          logData.user = UsersUtil.getUserData();
-          logData.user.reason = errorString;
+          var logData:Object = UsersUtil.initLogData();
+          logData.tags = ["voice", "webrtc"];
+          logData.errorEvent = event;
           LOGGER.info(jsonXify(logData));
           
-          sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"), ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]), errorString);
+          sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"),
+                  ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]),
+                  errorString,
+                  'bbb.webrtcWarning.failedError');
         }
       }
     }
     
     public function handleWebRTCMediaFailedEvent():void {
       model.state = Constants.INITED;
-      var errorString:String = ResourceUtil.getInstance().getString("bbb.webrtcWarning.failedError.mediamissing");
-	  
-	  var logData:Object = new Object();       
-	  logData.user = UsersUtil.getUserData();
-	  logData.user.reason = errorString;
-	  LOGGER.info(jsonXify(logData));
-	  
-      sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"), ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]), errorString);
+      var logCode:String = "bbb.webrtcWarning.failedError.mediamissing";
+      var errorString:String = ResourceUtil.getInstance().getString(logCode);
+
+      var logData:Object = UsersUtil.initLogData();
+      logData.user.reason = errorString;
+      LOGGER.info(jsonXify(logData));
+
+      sendWebRTCAlert(ResourceUtil.getInstance().getString("bbb.webrtcWarning.title"),
+              ResourceUtil.getInstance().getString("bbb.webrtcWarning.message", [errorString]),
+              errorString,
+              logCode);
     }
     
     private var popUpDelayTimer:Timer = new Timer(100, 1);
@@ -297,7 +315,7 @@ package org.bigbluebutton.modules.phone.managers
       }
     }
     
-    private function sendWebRTCAlert(title:String, message:String, error:String):void {
+    private function sendWebRTCAlert(title:String, message:String, error:String, logCode:String):void {
       /**
        * There is a bug in Flex SDK 4.14 where the screen stays blurry if a 
        * pop-up is opened from another pop-up. I delayed the second open to 
@@ -308,9 +326,15 @@ package org.bigbluebutton.modules.phone.managers
         Alert.show(message, title, Alert.YES | Alert.NO, null, handleCallFailedUserResponse, null, Alert.YES);
       });
       popUpDelayTimer.start();
-      dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, title, error));
+      dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, title, error, logCode));
 
-      LOGGER.warn("WebRTCAlert:" + title + " " + error + " " + message);
+      var logData:Object = UsersUtil.initLogData();
+      logData.type = "WebRTCAlert";
+      logData.title = title;
+      logData.error = error;
+      logData.message = message;
+      logData.logCode = logCode;
+      LOGGER.warn(JSON.stringify(logData));
     }
   }
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/FileUploadService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/FileUploadService.as
old mode 100644
new mode 100755
index d9e57878dfe7930568e1d77a42a3819080f1ec47..11839bce8688bb8c5e0d6691436def93d205cfb1
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/FileUploadService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/FileUploadService.as
@@ -29,13 +29,13 @@ package org.bigbluebutton.modules.present.business
 	import flash.net.URLRequest;
 	import flash.net.URLRequestMethod;
 	import flash.net.URLVariables;
-	
+	import org.bigbluebutton.core.UsersUtil;
 	import org.as3commons.logging.api.ILogger;
 	import org.as3commons.logging.api.getClassLogger;
 	import org.bigbluebutton.modules.present.events.UploadCompletedEvent;
 	import org.bigbluebutton.modules.present.events.UploadIoErrorEvent;
 	import org.bigbluebutton.modules.present.events.UploadProgressEvent;
-	import org.bigbluebutton.modules.present.events.UploadSecurityErrorEvent;
+	import org.bigbluebutton.modules.present.events.UploadSecurityErrorEvent;
 	
 	public class FileUploadService {
 		public static const ID:String = "FileUploadService";
@@ -125,8 +125,12 @@ package org.bigbluebutton.modules.present.business
 		 * 
 		 */
 		private function onUploadIoError(event:IOErrorEvent):void {
-			if(event.errorID != 2038){ //upload works despite of this error.
-				LOGGER.error("onUploadIoError text: {0}, errorID: {1}", [event.text, event.errorID]);
+			if (event.errorID != 2038){ //upload works despite of this error.
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["presentation"];
+                logData.message = "IOError while uploading presentation."; 
+                LOGGER.error(JSON.stringify(logData));
+            
 				dispatcher.dispatchEvent(new UploadIoErrorEvent());
 			}
 			
@@ -138,8 +142,11 @@ package org.bigbluebutton.modules.present.business
 		 * 
 		 */		
 		private function onUploadSecurityError(event:SecurityErrorEvent) : void {
-			dispatcher.dispatchEvent(new UploadSecurityErrorEvent());
-			LOGGER.error("A security error occured while trying to upload the presentation. {0}", [event.toString()]);
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["presentation"];
+            logData.message = "Security error while uploading presentation."; 
+            LOGGER.error(JSON.stringify(logData));
+            dispatcher.dispatchEvent(new UploadSecurityErrorEvent());
 		}		
 	}
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
old mode 100644
new mode 100755
index 6a78844833a91a91f73014f26f53c57122242f97..410e40c51e043ae9827744d4fdb5644b72204f91
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
@@ -44,7 +44,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <![CDATA[
 		import mx.collections.ArrayCollection;
 		import mx.utils.StringUtil;
-		
+		import org.bigbluebutton.core.UsersUtil;
 		import org.as3commons.logging.api.ILogger;
 		import org.as3commons.logging.api.getClassLogger;
 		import org.bigbluebutton.common.Images;
@@ -158,12 +158,17 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         if (fileSize > maxFileSizeBytes) {     
           // Hardcode for now to 30M limit. 
           // This should be configurable to match what's allowed in nginx. (ralam feb 23, 2010) 
-          LOGGER.debug("File exceeds max limit:({0}>{1})", [fileSize, maxFileSizeBytes]);  			
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["presentation"];
+            logData.message = "File exceeds max limit."; 
+            logData.fileSizeBytes = fileSize;
+            logData.maxFileSizeBytes = maxFileSizeBytes;
+            LOGGER.error(JSON.stringify(logData));
+                
           enableControls();
           displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.maxUploadFileExceededAlert'));
         } else {
           var presentationName:String = StringUtil.trim(fileToUpload.name);
-          LOGGER.debug("Uploading file : {0}", [presentationName]);
 
           progBarLbl.visible = true;          
           lblFileName.enabled = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as
index a6965b457b45195a7a497535f7b29aa5052eaab8..a362e16fef74968067106e731f76f40dacf04104 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/WebRTCConnection.as
@@ -38,9 +38,9 @@ package org.bigbluebutton.modules.screenshare.services.red5
 	import org.bigbluebutton.core.UsersUtil;
 	import org.bigbluebutton.core.managers.ReconnectionManager;
 	import org.bigbluebutton.main.events.BBBEvent;
-	import org.bigbluebutton.modules.screenshare.events.WebRTCViewStreamEvent;
-	import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnectionEvent;
-
+	import org.bigbluebutton.modules.screenshare.events.WebRTCViewStreamEvent;
+	import org.bigbluebutton.modules.screenshare.services.red5.WebRTCConnectionEvent;
+
 	public class WebRTCConnection {
 	private static const LOGGER:ILogger = getClassLogger(Connection);
 
@@ -168,6 +168,12 @@ package org.bigbluebutton.modules.screenshare.services.red5
 		private function netStatusHandler(event:NetStatusEvent):void {
 			LOGGER.debug("Connected to [" + getURI() + "]. [" + event.info.code + "]");
 
+			var logData:Object = {};
+			logData.type = "ConnectionStatusChanged";
+			logData.newStatus = event.info.code;
+			logData.connection = getURI();
+			LOGGER.info(JSON.stringify(logData));
+
 			if (retryTimer) {
 				retryCount = 0;
 				LOGGER.debug("Cancelling retry timer.");
@@ -211,7 +217,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
 							LOGGER.debug(result);
 						},
 						function(status:String):void { // status - On error occurred
-					LOGGER.error(status);
+							LOGGER.error(status);
 						}
 					);
 
@@ -257,7 +263,8 @@ package org.bigbluebutton.modules.screenshare.services.red5
 				break;
 
 				case "NetConnection.Connect.NetworkChange":
-					LOGGER.info("Detected network change. User might be on a wireless and temporarily dropped connection. Doing nothing. Just making a note.");
+					// LOGGER.info("Detected network change. User might be on a wireless and
+					// temporarily dropped connection. Doing nothing. Just making a note.");
 					break;
 
 				default :
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
index 68ba332a19dbaaa436c1322652f77e5ca27f579d..fbf95f7a868d9ef21f09eae4d2e28d68efc026c3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
@@ -58,6 +58,7 @@
       import org.bigbluebutton.core.managers.ReconnectionManager;
       import org.bigbluebutton.main.events.BBBEvent;
       import org.bigbluebutton.modules.screenshare.services.red5.Connection;
+      import org.bigbluebutton.core.UsersUtil;
       
       private static const LOG:String = "SC::ScreenshareViewWIndow - ";
       private static const LOGGER:ILogger = getClassLogger(ScreenshareViewWindow);
@@ -116,12 +117,13 @@
 				maximizeRestoreBtn.tabIndex = baseIndex+2;
 				closeBtn.tabIndex = baseIndex+3;
                
-        var logData:Object = new Object();
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["screenshare"];
         logData.width = videoWidth;
         logData.height = videoHeight;
         logData.streamId = streamId;
         
-        JSLog.debug(LOG + "onCreationComplete", logData);
+        LOGGER.info(JSON.stringify(logData));
 			}
 			
 			private function onResizeEndEvent(event:MDIWindowEvent):void {
@@ -146,12 +148,13 @@
         videoHeight = ScreenshareModel.getInstance().height;
         streamId = ScreenshareModel.getInstance().streamId;
         
-        var logData:Object = new Object();
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["screenshare"];
         logData.width = videoWidth;
         logData.height = videoHeight;
         logData.streamId = streamId;
         
-        JSLog.debug(LOG + "viewScreenshareStream Chrome", logData);
+        LOGGER.info(JSON.stringify(logData));
         
         ns = new NetStream(connection.getConnection());
         ns.addEventListener( NetStatusEvent.NET_STATUS, onNetStatus );
@@ -176,11 +179,12 @@
       public function onMetaData(info:Object):void{
         trace("metadata: width=" + info.width + " height=" + info.height);
         
-        var logData:Object = new Object();
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["screenshare"];
         logData.width = info.width;
         logData.height = info.height;
         
-        JSLog.debug(LOG + "onMetaData", logData);
+        LOGGER.info(JSON.stringify(logData));
       }
       
       protected function updateButtonsPosition():void {
@@ -207,23 +211,25 @@
 						
 			private function onAsyncError(e:AsyncErrorEvent):void{
         LOGGER.debug("asyncerror " + e.toString());
-        var logData:Object = new Object();
-        logData.error = e.toString();
-        JSLog.debug(LOG + "asyncerror ", logData);
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["screenshare"];
+        logData.message = "asyncerror";
+        LOGGER.info(JSON.stringify(logData));
 			}
 			
 			private function onNetStatus(e:NetStatusEvent):void{
-        var logData:Object = new Object();
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["screenshare"];
         logData.stream = streamId;
         
 				switch(e.info.code){
   				case "NetStream.Play.Start":
-            LOGGER.debug("NetStream.Publish.Start for broadcast stream " + streamId);
-            JSLog.debug(LOG + "NetStream.Publish.Start for broadcast stream ", logData);
+            logData.message = "NetStream.Publish.Start for broadcast stream " + streamId;
+            LOGGER.info(JSON.stringify(logData));
   					break;
   				case "NetStream.Play.UnpublishNotify":
-            LOGGER.debug("NetStream.Play.UnpublishNotify for broadcast stream " + streamId);
-            JSLog.debug(LOG + "NetStream.Play.UnpublishNotify for broadcast stream ", logData);
+            logData.message = "NetStream.Play.UnpublishNotify for broadcast stream " + streamId;
+            LOGGER.info(JSON.stringify(logData));
   					stopViewing();
   					break;
 				}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as
index 11be9f8bb54fb68ec1e8899e56e42873d9d69f77..6068c20a87d25fca31a3323354e08f83261ad337 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as
@@ -22,8 +22,8 @@ package org.bigbluebutton.modules.users.managers
 	
 	import org.bigbluebutton.common.events.CloseWindowEvent;
 	import org.bigbluebutton.common.events.OpenWindowEvent;
-	import org.bigbluebutton.core.BBB;
 	import org.bigbluebutton.modules.users.events.StartUsersModuleEvent;
+	import org.bigbluebutton.modules.users.model.BreakoutRoomsOptions;
 	import org.bigbluebutton.modules.users.model.UsersOptions;
 	import org.bigbluebutton.modules.users.views.UsersWindow;
 
@@ -40,6 +40,7 @@ package org.bigbluebutton.modules.users.managers
 			if (usersWindow == null){
 				usersWindow = new UsersWindow();
 				usersWindow.partOptions = new UsersOptions();
+				usersWindow.breakoutOptions = new BreakoutRoomsOptions();
 				
 				var e:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
 				e.window = usersWindow;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/BreakoutRoomsOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/BreakoutRoomsOptions.as
new file mode 100644
index 0000000000000000000000000000000000000000..0c0feada57bf66f5e76b2f6e4903cd8d37ef13e0
--- /dev/null
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/BreakoutRoomsOptions.as
@@ -0,0 +1,40 @@
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2015 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.modules.users.model {
+	import org.bigbluebutton.core.BBB;
+	
+	public class BreakoutRoomsOptions {
+		
+		[Bindable]
+		public var enabled:Boolean = true;
+		
+		[Bindable]
+		public var record:Boolean = true;
+		
+		public function BreakoutRoomsOptions() {
+			var lxml:XML = BBB.getConfigManager().config.breakoutRooms;
+			if (lxml.@enabled != undefined) {
+				enabled = (lxml.@enabled.toString().toUpperCase() == "TRUE") ? true : false;
+			}
+			if (lxml.@record != undefined) {
+				record = (lxml.@record.toString().toUpperCase() == "TRUE") ? true : false;
+			}
+		}
+	}
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
index 84e11724e9242fc16ff70636fa865c581e149c4c..1ec8ef3ce960c4bdd10a9b7ec96b593453268c04 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
@@ -1,13 +1,13 @@
 /**
  * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
+ *
  * Copyright (c) 2012 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.
@@ -16,12 +16,12 @@
  * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.bigbluebutton.modules.users.model
-{
+package org.bigbluebutton.modules.users.model {
+
 	import org.bigbluebutton.core.BBB;
 
-	public class UsersOptions
-	{
+	public class UsersOptions {
+		
 		[Bindable]
 		public var windowVisible:Boolean = true;
 		
@@ -37,9 +37,6 @@ package org.bigbluebutton.modules.users.model
 		[Bindable]
 		public var enableEmojiStatus:Boolean = true;
 
-		[Bindable]
-		public var enableBreakoutRooms:Boolean = true;
-
 		[Bindable]
 		public var enableSettingsButton:Boolean = true;
 
@@ -60,9 +57,6 @@ package org.bigbluebutton.modules.users.model
 			if (vxml.@enableEmojiStatus != undefined) {
 				enableEmojiStatus = (vxml.@enableEmojiStatus.toString().toUpperCase() == "TRUE") ? true : false;
 			}
-			if (vxml.@enableBreakoutRooms != undefined) {
-				enableBreakoutRooms = (vxml.@enableBreakoutRooms.toString().toUpperCase() == "TRUE") ? true : false;
-			}
 			if (vxml.@enableSettingsButton != undefined) {
 				enableSettingsButton = (vxml.@enableSettingsButton.toString().toUpperCase() == "TRUE") ? true : false;
 			}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
index a7d3379ed7e6890ba6fb44370d6ac2ab1cc94f92..282b3920d35020c194a2e4700152e57dd9c5b4e6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
@@ -180,7 +180,14 @@ package org.bigbluebutton.modules.users.services
     }
 
     private function handleUserEjectedFromMeeting(msg: Object):void {
-      UsersUtil.setUserEjected();
+        UsersUtil.setUserEjected();
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["users"];
+        logData.status = "user_ejected";
+        logData.message = "User ejected from meeting.";
+
+        LOGGER.info(JSON.stringify(logData));
+      
     }
 
 	private function handleUserLocked(msg:Object):void {
@@ -430,8 +437,6 @@ package org.bigbluebutton.modules.users.services
     }
     
     public function handleParticipantJoined(msg:Object):void {
-	  LOGGER.info("handleParticipantJoined = " + msg.msg);
-		
       var map:Object = JSON.parse(msg.msg);
       
       var user:Object = map.user as Object;
@@ -542,13 +547,12 @@ package org.bigbluebutton.modules.users.services
     private function handleUserUnsharedWebcam(msg: Object):void {  
 	  var map:Object = JSON.parse(msg.msg);
 	  
-	  var logData:Object = new Object();
-	  logData.user = UsersUtil.getUserData();
-	  logData.user.webcamStream = map.webcamStream;
-	  logData.user.serverTimestamp = map.serverTimestamp;
-	  JSLog.warn("UserUnsharedWebcam server message", logData);
-      
-	  logData.message = "UserUnsharedWebcam server message";
+       var logData:Object = UsersUtil.initLogData();
+       logData.tags = ["webcam"];
+       logData.message = "UserUnsharedWebcam server message";
+       logData.user.webcamStream = map.webcamStream;
+       logData.user.serverTimestamp = map.serverTimestamp;
+
 	  LOGGER.info(JSON.stringify(logData));
 	  
       UserManager.getInstance().getConference().unsharedWebcam(map.userId, map.webcamStream);
@@ -572,8 +576,6 @@ package org.bigbluebutton.modules.users.services
     }
     
     public function participantJoined(joinedUser:Object):void {    
-      LOGGER.info(JSON.stringify(joinedUser));
-	  
       var user:BBBUser = new BBBUser();
       user.userID = joinedUser.userId;
       user.name = joinedUser.name;
@@ -583,12 +585,7 @@ package org.bigbluebutton.modules.users.services
       user.listenOnly = joinedUser.listenOnly;
       user.userLocked = joinedUser.locked;
       user.avatarURL = joinedUser.avatarURL;
-	  
-      var logData:Object = new Object();
-	  logData.user = user;
-      logData.message = "User joined.";
-	  LOGGER.info(JSON.stringify(logData));
-	  
+	   
       UserManager.getInstance().getConference().addUser(user);
       
       if (joinedUser.hasStream) {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
index 9881a0fe0f5a13b9fe736c68e6ef0d8c80bddd2e..ba3404ea525ddab5f21ed6f0adc3cc7d5dc75a04 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
@@ -23,7 +23,7 @@ package org.bigbluebutton.modules.users.services
   import org.bigbluebutton.core.BBB;
   import org.bigbluebutton.core.UsersUtil;
   import org.bigbluebutton.core.managers.ConnectionManager;
-  import org.bigbluebutton.main.api.JSLog;
+  import org.bigbluebutton.main.api.JSLog;
   
   public class MessageSender {
 	private static const LOGGER:ILogger = getClassLogger(MessageSender);      
@@ -38,7 +38,11 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps"];
+            logData.userId = userID;
+            logData.message = "Error occured ejecting user.";
+            LOGGER.info(JSON.stringify(logData));
         },
         message
       );
@@ -50,7 +54,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps"];
+            logData.message = "Error occured querying users.";
+            LOGGER.info(JSON.stringify(logData));
         }
       );
     }
@@ -66,26 +73,34 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+            var logData:Object = UsersUtil.initLogData();
+            logData.tags = ["apps"];
+            logData.message = "Error occured assigning presenter.";
+            LOGGER.info(JSON.stringify(logData));
         },
         message
       );
-		}
-		
-		public function emojiStatus(userID:String, emoji:String):void {
-			var message:Object = new Object();
-			message["emojiStatus"] = emoji;
-			message["userId"] = userID;
-			var _nc:ConnectionManager = BBB.initConnectionManager();
-			_nc.sendMessage("participants.userEmojiStatus", function(result:String):void
-			{ // On successful result
-			}, function(status:String):void
-			{ // status - On error occurred
-				LOGGER.error(status);
-			},
-			message
-			);
-		}
+      
+    }
+
+    public function emojiStatus(userID:String, emoji:String):void {
+        var message:Object = new Object();
+        message["emojiStatus"] = emoji;
+        message["userId"] = userID;
+        
+        var _nc:ConnectionManager = BBB.initConnectionManager();
+        _nc.sendMessage("participants.userEmojiStatus", 
+            function(result:String):void { // On successful result   
+                
+            }, function(status:String):void { // status - On error occurred
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured setting emoji status.";
+                LOGGER.info(JSON.stringify(logData));
+            },
+            message
+        );
+    }
 		
 		public function createBreakoutRooms(meetingId:String, rooms:Array, durationInMinutes:int, record:Boolean, redirectOnJoin:Boolean):void {
 			var message:Object = new Object();
@@ -102,7 +117,10 @@ package org.bigbluebutton.modules.users.services
 				// On successful result
 			}, function(status:String):void
 			{ // status - On error occurred
-				LOGGER.error(status);
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured creating breakout rooms.";
+                LOGGER.info(JSON.stringify(logData));
 			},
 			jsonMsg
 			);
@@ -121,7 +139,10 @@ package org.bigbluebutton.modules.users.services
 			_nc.sendMessage("breakoutroom.requestBreakoutJoinUrl", function(result:String):void {
 				// On successful result
 			}, function(status:String):void { // status - On error occurred
-				LOGGER.error(status);
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured requesting breakout room join url.";
+                LOGGER.info(JSON.stringify(logData));
 			}, jsonMsg);
 		}
 		
@@ -132,7 +153,10 @@ package org.bigbluebutton.modules.users.services
 				// On successful result
 			}, function(status:String):void
 			{ // status - On error occurred
-				LOGGER.error(status);
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured listen on breakout room.";
+                LOGGER.info(JSON.stringify(logData));
 			},
 			JSON.stringify({meetingId: meetingId, targetMeetingId: targetMeetingId, userId: userId})
 			);
@@ -145,7 +169,10 @@ package org.bigbluebutton.modules.users.services
 				// On successful result
 			}, function(status:String):void
 			{ // status - On error occurred
-				LOGGER.error(status);
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured ending breakout rooms.";
+                LOGGER.info(JSON.stringify(logData));
 			},
 			JSON.stringify({meetingId: meetingId})
 			);
@@ -157,29 +184,33 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured sharing webcam.";
+                LOGGER.info(JSON.stringify(logData));
         },
         streamName
       );
     }
     
     public function removeStream(userID:String, streamName:String):void {
-	  
-	  var logData:Object = new Object();
-	  logData.user = UsersUtil.getUserData();
-	  
-	  JSLog.warn("User stopped sharing webcam event.", logData);
-	  
-	  logData.streamId = streamName;
-	  logData.message = "User stopped sharing webcam";
-	  LOGGER.info(JSON.stringify(logData));
-	  
+  
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["webcam"];
+        logData.streamId = streamName;
+        logData.message = "User stopped sharing webcam";
+        LOGGER.info(JSON.stringify(logData));
+
+  
       var _nc:ConnectionManager = BBB.initConnectionManager();
       _nc.sendMessage("participants.unshareWebcam", 
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status);  
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured unsharing webcam.";
+                LOGGER.info(JSON.stringify(logData));
         },
         streamName
       );
@@ -192,7 +223,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured getting recording status.";
+                LOGGER.info(JSON.stringify(logData));
         }
       ); //_netConnection.call
     }
@@ -208,7 +242,10 @@ package org.bigbluebutton.modules.users.services
 			// On successful result
 		}, function(status:String):void
 		{ // status - On error occurred
-			LOGGER.error(status);
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured querying breakout rooms.";
+                LOGGER.info(JSON.stringify(logData));
 		},
 			jsonMsg
 		);
@@ -225,7 +262,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured change recording status.";
+                LOGGER.info(JSON.stringify(logData));
         },
         message
       ); //_netConnection.call
@@ -241,7 +281,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured muting all users.";
+                LOGGER.info(JSON.stringify(logData));
         },
         message
       ); 
@@ -257,7 +300,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured muting all users except presenter.";
+                LOGGER.info(JSON.stringify(logData));
         },
         message
       ); 
@@ -274,7 +320,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured muting user.";
+                LOGGER.info(JSON.stringify(logData));
         },
         message
       );          
@@ -290,7 +339,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured ejecting user.";
+                LOGGER.info(JSON.stringify(logData));
         },
         message
       );    
@@ -305,7 +357,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occuredget room mute state.";
+                LOGGER.info(JSON.stringify(logData));
         }
       ); 
     }
@@ -319,7 +374,10 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured getting lock state.";
+                LOGGER.info(JSON.stringify(logData));
         }
       );    
     }    
@@ -367,7 +425,10 @@ package org.bigbluebutton.modules.users.services
 			function(result:String):void { // On successful result
 			},	                   
 			function(status:String):void { // status - On error occurred
-			  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured setting user lock status.";
+                LOGGER.info(JSON.stringify(logData));
 			},
 			message
 		);
@@ -421,10 +482,13 @@ package org.bigbluebutton.modules.users.services
         function(result:String):void { // On successful result
         },	                   
         function(status:String):void { // status - On error occurred
-		  LOGGER.error(status); 
+                var logData:Object = UsersUtil.initLogData();
+                logData.tags = ["apps"];
+                logData.message = "Error occured saving lock settings.";
+                LOGGER.info(JSON.stringify(logData));
         },
         newLockSettings
       );      
     }
   }
-}
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
index 8a3b007d526f0f183968b6485aba83c9241d3f0a..742bdbca18329cfc37b57bd11ea481ace99fbf5a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml
@@ -49,6 +49,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 			[Bindable]
 			private var mode:String;
+			
+			[Bindable]
+			private var recordingEnabled:Boolean;
 
 			private static var assignement : Dictionary;
 
@@ -238,10 +241,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				}
 			}
 
-			public function initCreateBreakoutRooms(mode:String):void {
+			public function initCreateBreakoutRooms(mode:String, record:Boolean):void {
 				dispatcher = new Dispatcher();
 				roomsProvider = new Array();
 				this.mode = mode;
+				this.recordingEnabled = record;
 				for (var i:int = 2; i <= 5; i++) {
 					roomsProvider.push(i.toString() + " " + ResourceUtil.getInstance().getString('bbb.users.breakout.rooms'));
 				}
@@ -293,7 +297,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			<mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.minutes')}"/>
 		</mx:HBox>
 		
-		<mx:HBox id="recordBox" width="100%" paddingTop="12">
+		<mx:HBox id="recordBox" width="100%" paddingTop="12" visible="{recordingEnabled}">
 		    <mx:Label text="{ResourceUtil.getInstance().getString('bbb.users.breakout.record')}"/>
 			<mx:CheckBox id="recordCheckbox"
 						 accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.breakout.recordCheckbox.accessibilityName')}"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index 81162c71cb5885ebfd4bf8e29c4422d2e20f6860..ad652990da7f395add122120aba899e054af4f06 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -78,6 +78,7 @@
 			import org.bigbluebutton.modules.phone.events.LeaveVoiceConferenceCommand;
 			import org.bigbluebutton.modules.users.events.MeetingMutedEvent;
 			import org.bigbluebutton.modules.users.events.UsersRollEvent;
+			import org.bigbluebutton.modules.users.model.BreakoutRoomsOptions;
 			import org.bigbluebutton.modules.users.model.UsersOptions;
 			import org.bigbluebutton.modules.videoconf.events.StopBroadcastEvent;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
@@ -101,6 +102,9 @@
 			[Bindable]
 			public var partOptions:UsersOptions;
 			
+			[Bindable]
+			public var breakoutOptions:BreakoutRoomsOptions;
+			
 			[Bindable]
 			private var images:Images = new Images();
 			
@@ -268,7 +272,7 @@
 					paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.unmuteAll'), icon: images.audio, handler: muteAll});
 								
 				paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.lockSettings'), icon: images.lock_open, handler: lockSettings});
-				if (partOptions.enableBreakoutRooms && amIModerator && !UserManager.getInstance().getConference().isBreakout) {
+				if (breakoutOptions.enabled && amIModerator && !UserManager.getInstance().getConference().isBreakout) {
 					if (breakoutRoomsList.length == 0) {
 						paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.breakoutRooms'), handler: breakoutRooms});
 					} else {
@@ -316,12 +320,14 @@
 			private function breakoutRooms():void {
 				var event:BreakoutRoomEvent = new BreakoutRoomEvent(BreakoutRoomEvent.OPEN_BREAKOUT_ROOMS_PANEL);
 				event.joinMode = "create";
+				event.record = breakoutOptions.record;
 				dispatcher.dispatchEvent(event);
 			}
 
 			private function sendBreakoutRoomsInvitations():void {
 				var event:BreakoutRoomEvent = new BreakoutRoomEvent(BreakoutRoomEvent.OPEN_BREAKOUT_ROOMS_PANEL);
 				event.joinMode = "invite";
+				event.record = breakoutOptions.record;
 				dispatcher.dispatchEvent(event);
 			}
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
index 6dfe4584e17c078b4c89e3da5e6be2b6c1649436..0a1590bc2c0d760821d44b9f87b541fde3cde56f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
@@ -85,15 +85,15 @@ package org.bigbluebutton.modules.videoconf.business
 	    }
 	    
 		private function onAsyncError(event:AsyncErrorEvent):void{
-			var logData:Object = new Object();
-			logData.user = UsersUtil.getUserData();
+			var logData:Object = UsersUtil.initLogData();
+			logData.tags = ["webcam"];
 			logData.message = "VIDEO WEBCAM onAsyncError"; 
 			LOGGER.error(JSON.stringify(logData));
 		}
 		
 		private function onIOError(event:NetStatusEvent):void{
-			var logData:Object = new Object();
-			logData.user = UsersUtil.getUserData();
+			var logData:Object = UsersUtil.initLogData();
+			logData.tags = ["webcam"];
 			logData.message = "VIDEO WEBCAM onIOError"; 
 			LOGGER.error(JSON.stringify(logData));
 		}
@@ -112,8 +112,8 @@ package org.bigbluebutton.modules.videoconf.business
 		private function onNetStatus(event:NetStatusEvent):void{
 
 			LOGGER.debug("[{0}] for [{1}]", [event.info.code, _url]);
-			var logData:Object = new Object();
-			logData.user = UsersUtil.getUserData();
+			var logData:Object = UsersUtil.initLogData();
+			logData.tags = ["webcam"];
 			logData.user.eventCode = event.info.code + "[reconnecting=" + reconnecting + ",reconnect=" + reconnect + "]";
 						
 			switch(event.info.code){
@@ -123,7 +123,6 @@ package org.bigbluebutton.modules.videoconf.business
 					break;
 				case "NetStream.Play.Failed":
 					if (reconnect) {
-						JSLog.warn("NetStream.Play.Failed from bbb-video", logData);
 						logData.message = "NetStream.Play.Failed from bbb-video";
 						LOGGER.info(JSON.stringify(logData));
 					}
@@ -131,7 +130,6 @@ package org.bigbluebutton.modules.videoconf.business
 					break;
 				case "NetStream.Play.Stop":
 					if (reconnect) {
-						JSLog.warn("NetStream.Play.Stop from bbb-video", logData);
 						logData.message = "NetStream.Play.Stop from bbb-video";
 						LOGGER.info(JSON.stringify(logData));
 					}
@@ -162,7 +160,6 @@ package org.bigbluebutton.modules.videoconf.business
 					}
 					
 					if (reconnect) {
-						JSLog.warn("NetConnection.Connect.Failed from bbb-video", logData);
 						logData.message = "NetConnection.Connect.Failed from bbb-video";
 						LOGGER.info(JSON.stringify(logData));
 					}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as
old mode 100644
new mode 100755
index fd1c4b09996ff3be9d427477b502594fe747f46a..792d6246b1a267cac1eadb31bf8966935ed023fc
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as
@@ -21,7 +21,7 @@ package org.bigbluebutton.modules.whiteboard.models
 	import flash.events.IEventDispatcher;
 	
 	import mx.collections.ArrayCollection;
-	
+	import org.bigbluebutton.core.UsersUtil;
 	import org.as3commons.logging.api.ILogger;
 	import org.as3commons.logging.api.getClassLogger;
 	import org.bigbluebutton.modules.present.model.Page;
@@ -51,7 +51,7 @@ package org.bigbluebutton.modules.whiteboard.models
     }
     
 		public function addAnnotation(annotation:Annotation):void {
-      LOGGER.debug("*** Adding annotation [{0},{1},{2}] ****", [annotation.id, annotation.type, annotation.status]);
+     // LOGGER.debug("*** Adding annotation [{0},{1},{2}] ****", [annotation.id, annotation.type, annotation.status]);
       var wb:Whiteboard;
       if (annotation.status == DrawObject.DRAW_START || annotation.type == DrawObject.POLL
 		  || annotation.status == TextObject.TEXT_CREATED) {
@@ -70,7 +70,7 @@ package org.bigbluebutton.modules.whiteboard.models
          }
        }
 			 
-       LOGGER.debug("*** Dispatching WhiteboardUpdate.BOARD_UPDATED Event ****");
+      // LOGGER.debug("*** Dispatching WhiteboardUpdate.BOARD_UPDATED Event ****");
        var event:WhiteboardUpdate = new WhiteboardUpdate(WhiteboardUpdate.BOARD_UPDATED);
        event.annotation = annotation;
        _dispatcher.dispatchEvent(event);
@@ -86,13 +86,13 @@ package org.bigbluebutton.modules.whiteboard.models
     
     
     public function addAnnotationFromHistory(whiteboardId:String, annotation:Array):void {                
-      LOGGER.debug("addAnnotationFromHistory: wb id=[{0}]", [whiteboardId]);
+      //LOGGER.debug("addAnnotationFromHistory: wb id=[{0}]", [whiteboardId]);
       var wb:Whiteboard = getWhiteboard(whiteboardId);
       if (wb != null) {
-        LOGGER.debug("Whiteboard is already present. Adding shapes.");
+       // LOGGER.debug("Whiteboard is already present. Adding shapes.");
         addShapes(wb, annotation);
       } else {
-        LOGGER.debug("Whiteboard is NOT present. Creating WB and adding shapes.");
+       // LOGGER.debug("Whiteboard is NOT present. Creating WB and adding shapes.");
         wb = new Whiteboard(whiteboardId);
         addShapes(wb, annotation);
         _whiteboards.addItem(wb);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as b/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
index 917451c0f61724e15321e1cd1c46127bdbc381ea..a29d34af03943a0de3fd11b46bf680c657b83892 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
@@ -32,7 +32,7 @@ package org.bigbluebutton.util.i18n
 	import mx.resources.IResourceManager;
 	import mx.resources.ResourceManager;
 	import mx.utils.URLUtil;
-	
+    import org.bigbluebutton.core.UsersUtil;
 	import org.as3commons.logging.api.ILogger;
 	import org.as3commons.logging.api.getClassLogger;
 	import org.bigbluebutton.common.events.LocaleChangeEvent;
@@ -180,7 +180,10 @@ package org.bigbluebutton.util.i18n
 				localeIndex = getIndexForLocale(preferredLocale);
 			} else {
 				if (preferredLocale != MASTER_LOCALE) {
-					LOGGER.debug("Failed to load locale [{0}].", [preferredLocale]);
+                    var logData:Object = UsersUtil.initLogData();
+                    logData.tags = ["locale"];
+                    logData.message = "Failed to load locale = " + preferredLocale;
+                    LOGGER.info(JSON.stringify(logData));
 				}
 	
 				resourceManager.localeChain = [MASTER_LOCALE];
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 627cdb309edd9f36b97077fa24da3f97302b8233..c023f7af50eca406f1119d0a35bac2f1f48f3de1 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -888,9 +888,9 @@ check_configuration() {
                 echo "# is not owned by red5"
         fi
 		
-        if [ "$(ls -ld /usr/share/red5/webapps/video/stream | cut -d' ' -f3)" != "red5" ]; then
+        if [ "$(ls -ld /usr/share/red5/webapps/video/streams | cut -d' ' -f3)" != "red5" ]; then
                 echo "# Warning: Detected the directory"
-                echo "#    /usr/share/red5/webapps/video/stream"
+                echo "#    /usr/share/red5/webapps/video/streams"
                 echo "# is not owned by red5"
         fi
 		
diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record
index 608707dbfeadfb9172c1dc9b84e471b0a79e2c9d..f108dd09d98c98e74e67d68321685f6e21eb0de4 100755
--- a/bigbluebutton-config/bin/bbb-record
+++ b/bigbluebutton-config/bin/bbb-record
@@ -602,6 +602,9 @@ for meeting in $(cat $tmp_file | sort -t - -k 2 -r| uniq); do
 fi
 	echo
 done
+	if [ -f $tmp_file ]; then
+		rm $tmp_file
+	fi
 	echo
 	echo "--"
 	systemctl --all --no-pager list-timers bbb-record-core.timer
diff --git a/bigbluebutton-config/cron.daily/bigbluebutton b/bigbluebutton-config/cron.daily/bigbluebutton
index 68e0ac48918fb4a3f8685312b40bf990410c193d..3e7b5df6cd7f34e98a5ef805ea5ede70351eee4d 100755
--- a/bigbluebutton-config/cron.daily/bigbluebutton
+++ b/bigbluebutton-config/cron.daily/bigbluebutton
@@ -120,5 +120,5 @@ find /tmp -name "*.pfb" -mtime +$history -delete
 # If there are no users currently logged in, restart libreoffice to clear its memory usage
 #
 if [[ $(netstat -ant | egrep ":1935\ " | egrep -v ":::|0.0.0.0"  | wc | awk '{print $1}') == 0 ]]; then
-  service libreoffice restart
+  systemctl restart libreoffice.service
 fi
diff --git a/bigbluebutton-html5/imports/api/chat/server/modifiers/addChat.js b/bigbluebutton-html5/imports/api/chat/server/modifiers/addChat.js
index 07a7b7818a68f594021424685461e5889236e36b..f561d8b5e3d8b0a14a366a6d3ee1a39501f71f56 100755
--- a/bigbluebutton-html5/imports/api/chat/server/modifiers/addChat.js
+++ b/bigbluebutton-html5/imports/api/chat/server/modifiers/addChat.js
@@ -54,7 +54,7 @@ export default function addChat(meetingId, message) {
   };
 
   const cb = (err, numChanged) => {
-    if (err != null) {
+    if (err) {
       Logger.error(`Adding chat to collection: ${err}`);
     }
 
diff --git a/bigbluebutton-html5/imports/api/common/server/helpers.js b/bigbluebutton-html5/imports/api/common/server/helpers.js
index 8678b9415bdb187590e94d33c1e3b5112f10de1e..f4947545796bd75c1367a676fc1f9d2fa08e0718 100755
--- a/bigbluebutton-html5/imports/api/common/server/helpers.js
+++ b/bigbluebutton-html5/imports/api/common/server/helpers.js
@@ -1,15 +1,3 @@
-import { clearUsersCollection } from '/imports/api/users/server/modifiers/clearUsersCollection';
-import clearChats from '/imports/api/chat/server/modifiers/clearChats';
-import { clearShapesCollection } from '/imports/api/shapes/server/modifiers/clearShapesCollection';
-import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection';
-import { clearPresentationsCollection }
-  from '/imports/api/presentations/server/modifiers/clearPresentationsCollection';
-import { clearMeetingsCollection }
-  from '/imports/api/meetings/server/modifiers/clearMeetingsCollection';
-import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection';
-import { clearCursorCollection } from '/imports/api/cursor/server/modifiers/clearCursorCollection';
-import { clearCaptionsCollection }
-  from '/imports/api/captions/server/modifiers/clearCaptionsCollection';
 import { logger } from '/imports/startup/server/logger';
 import { redisPubSub } from '/imports/startup/server';
 import { BREAK_LINE, CARRIAGE_RETURN, NEW_LINE } from '/imports/utils/lineEndings.js';
@@ -24,42 +12,6 @@ export function appendMessageHeader(eventName, messageObj) {
   return messageObj;
 };
 
-export function clearCollections() {
-  console.log('in function clearCollections');
-
-  /*
-    This is to prevent collection clearing in development environment when the server
-    refreshes. Related to: https://github.com/meteor/meteor/issues/6576
-  */
-
-  if (process.env.NODE_ENV === 'development') {
-    return;
-  }
-
-  const meetingId = arguments[0];
-  if (meetingId != null) {
-    clearUsersCollection(meetingId);
-    clearChats(meetingId);
-    clearMeetingsCollection(meetingId);
-    clearShapesCollection(meetingId);
-    clearSlidesCollection(meetingId);
-    clearPresentationsCollection(meetingId);
-    clearPollCollection(meetingId);
-    clearCursorCollection(meetingId);
-    clearCaptionsCollection(meetingId);
-  } else {
-    clearUsersCollection();
-    clearChats();
-    clearMeetingsCollection();
-    clearShapesCollection();
-    clearSlidesCollection();
-    clearPresentationsCollection();
-    clearPollCollection();
-    clearCursorCollection();
-    clearCaptionsCollection();
-  }
-}
-
 export const indexOf = [].indexOf || function (item) {
     for (let i = 0, l = this.length; i < l; i++) {
       if (i in this && this[i] === item) {
diff --git a/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js b/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b5a931ad8018016f28cd1e33cb6351c5c0e0235
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/eventHandlers.js
@@ -0,0 +1,17 @@
+import RedisPubSub from '/imports/startup/server/redis';
+import handleMeetingDestruction from './handlers/meetingDestruction';
+import handleRecordingStatusChange from './handlers/recordingStatusChange';
+import handlePermissionSettingsChange from './handlers/permissionSettingsChange';
+import handleMeetingCreation from './handlers/meetingCreation';
+import handleGetAllMettings from './handlers/getAllMeetings';
+import handleStunTurnReply from './handlers/stunTurnReply';
+
+RedisPubSub.on('meeting_destroyed_event', handleMeetingDestruction);
+RedisPubSub.on('meeting_ended_message', handleMeetingDestruction);
+RedisPubSub.on('end_and_kick_all_message', handleMeetingDestruction);
+RedisPubSub.on('disconnect_all_users_message', handleMeetingDestruction);
+RedisPubSub.on('recording_status_changed_message', handleRecordingStatusChange);
+RedisPubSub.on('new_permission_settings', handlePermissionSettingsChange);
+RedisPubSub.on('meeting_created_message', handleMeetingCreation);
+RedisPubSub.on('get_all_meetings_reply_message', handleGetAllMettings);
+RedisPubSub.on('send_stun_turn_info_reply_message', handleStunTurnReply);
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/getAllMeetings.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/getAllMeetings.js
new file mode 100644
index 0000000000000000000000000000000000000000..16b27d8f1bed64e823d474db5e8d9675ce07776a
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/getAllMeetings.js
@@ -0,0 +1,36 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import Meetings from '/imports/api/meetings';
+import addMeeting from '../modifiers/addMeeting';
+import removeMeeting from '../modifiers/removeMeeting';
+
+export default function handleGetAllMettings({ payload }) {
+  let meetings = payload.meetings;
+
+  check(meetings, Array);
+
+  // We need to map the meetings payload because for some reason this payload
+  // is different than the `meeting_created_message` one
+  meetings = meetings.map(m => ({
+    meeting_id: m.meetingID,
+    name: m.meetingName,
+    recorded: m.recorded,
+    voice_conf: m.voiceBridge,
+    duration: m.duration,
+  }));
+
+  const meetingsIds = meetings.map(m => m.meeting_id);
+
+  const meetingsToRemove = Meetings.find({
+    meetingId: { $nin: meetingsIds },
+  }).fetch();
+
+  meetingsToRemove.forEach(meeting => removeMeeting(meeting.meetingId));
+
+  let meetingsAdded = [];
+  meetings.forEach(meeting => {
+    meetingsAdded.push(addMeeting(meeting));
+  });
+
+  return meetingsAdded;
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/meetingCreation.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/meetingCreation.js
new file mode 100644
index 0000000000000000000000000000000000000000..aa29050be74b07e7c02dd53c090a37fa458a3ecd
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/meetingCreation.js
@@ -0,0 +1,11 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import addMeeting from '../modifiers/addMeeting';
+
+export default function handleMeetingCreation({ payload }) {
+  const meetingId = payload.meeting_id;
+
+  check(meetingId, String);
+
+  return addMeeting(payload);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e5ca2a23eca48bf9d8964af8348646bab968f91
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
@@ -0,0 +1,11 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import removeMeeting from '../modifiers/removeMeeting';
+
+export default function handleMeetingDestruction({ payload }) {
+  const meetingId = payload.meeting_id;
+
+  check(meetingId, String);
+
+  return removeMeeting(meetingId);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/permissionSettingsChange.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/permissionSettingsChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..44f67bd8fb5ca64528f60ce5e9de39de058e5b04
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/permissionSettingsChange.js
@@ -0,0 +1,52 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import Meetings from '/imports/api/meetings';
+import handleLockingMic from '/imports/api/users/server/modifiers/handleLockingMic';
+
+export default function handlePermissionSettingsChange({ payload }) {
+  const meetingId = payload.meeting_id;
+  const permissions = payload.permissions;
+
+  check(meetingId, String);
+  check(permissions, Object);
+
+  const selector = {
+    meetingId,
+  };
+
+  const Meeting = Meetings.findOne(selector);
+
+  if (!Meeting) {
+    throw new Meteor.error('meeting-not-found', `Meeting id=${meetingId} was not found`);
+  }
+
+  const modifier = {
+    $set: {
+      roomLockSettings: {
+        disablePrivateChat: permissions.disablePrivateChat,
+        disableCam: permissions.disableCam,
+        disableMic: permissions.disableMic,
+        lockOnJoin: permissions.lockOnJoin,
+        lockedLayout: permissions.lockedLayout,
+        disablePublicChat: permissions.disablePublicChat,
+        lockOnJoinConfigurable: permissions.lockOnJoinConfigurable,
+      },
+    },
+  };
+
+  const cb = (err, numChanged) => {
+    if (err) {
+      return Logger.error(`Updating meeting permissions: ${err}`);
+    }
+
+    if (permissions.disableMic) {
+      handleLockingMic(meetingId, permissions);
+    }
+
+    if (numChanged) {
+      return Logger.info(`Updated meeting permissions id=${meetingId}`);
+    }
+  };
+
+  return Meetings.update(selector, modifier, cb);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingStatusChange.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingStatusChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b97c56f3a97b0fe37ed8971c9e48d19f011abbf
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/recordingStatusChange.js
@@ -0,0 +1,36 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import Meetings from '/imports/api/meetings';
+
+export default function handleRecordingStatusChange({ payload }) {
+  const meetingId = arg.payload.meeting_id;
+  const intendedForRecording = arg.payload.recorded;
+  const currentlyBeingRecorded = arg.payload.recording;
+
+  check(meetingId, String);
+  check(intendedForRecording, Boolean);
+  check(currentlyBeingRecorded, Boolean);
+
+  const selector = {
+    meetingId,
+    intendedForRecording,
+  };
+
+  const modifier = {
+    $set: {
+      currentlyBeingRecorded,
+    },
+  };
+
+  const cb = (err, numChanged) => {
+    if (err) {
+      return Logger.error(`Updating meeting recording status: ${err}`);
+    }
+
+    if (numChanged) {
+      return Logger.info(`Updated meeting recording status id=${meetingId}`);
+    }
+  };
+
+  return Meetings.update(selector, modifier, cb);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/handlers/stunTurnReply.js b/bigbluebutton-html5/imports/api/meetings/server/handlers/stunTurnReply.js
new file mode 100644
index 0000000000000000000000000000000000000000..0816355f79158cc8c2c1baf5eb682751694442b9
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/handlers/stunTurnReply.js
@@ -0,0 +1,33 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import Meetings from '/imports/api/meetings';
+
+export default function handleStunTurnReply({ payload }) {
+  const meetingId = payload.meeting_id;
+  const { stuns, turns } = payload;
+
+  check(meetingId, String);
+
+  const selector = {
+    meetingId,
+  };
+
+  const modifier = {
+    $set: {
+      stuns,
+      turns,
+    },
+  };
+
+  const cb = (err, numChanged) => {
+    if (err) {
+      return Logger.error(`Updating meeting stuns/turns: ${err}`);
+    }
+
+    if (numChanged) {
+      return Logger.info(`Updated meeting stuns/turns id=${meetingId}`);
+    }
+  };
+
+  return Meetings.update(selector, modifier, cb);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/index.js b/bigbluebutton-html5/imports/api/meetings/server/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..92451ac76bf27410726e8f3cd2eebac46cd7b83e
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/index.js
@@ -0,0 +1,3 @@
+import './eventHandlers';
+import './methods';
+import './publishers';
diff --git a/bigbluebutton-html5/imports/api/meetings/server/methods.js b/bigbluebutton-html5/imports/api/meetings/server/methods.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ce65c369863cac02b7c5224a46ab766a38cf8b3
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/methods.js
@@ -0,0 +1,4 @@
+import { Meteor } from 'meteor/meteor';
+
+Meteor.methods({
+});
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
new file mode 100755
index 0000000000000000000000000000000000000000..7c9943b3b771a0e1acad6a27687eac471d67c96e
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
@@ -0,0 +1,55 @@
+import { check } from 'meteor/check';
+import Meetings from '/imports/api/meetings';
+import Logger from '/imports/startup/server/logger';
+import { initializeCursor } from '/imports/api/cursor/server/modifiers/initializeCursor';
+
+export default function addMeeting(meeting) {
+  const APP_CONFIG = Meteor.settings.public.app;
+  const meetingId = meeting.meeting_id;
+
+  check(meeting, Object);
+  check(meetingId, String);
+
+  const selector = {
+    meetingId,
+  };
+
+  const modifier = {
+    $set: {
+      meetingId,
+      meetingName: meeting.name,
+      intendedForRecording: meeting.recorded,
+      currentlyBeingRecorded: false,
+      voiceConf: meeting.voice_conf,
+      duration: meeting.duration,
+      roomLockSettings: {
+        disablePrivateChat: false,
+        disableCam: false,
+        disableMic: false,
+        lockOnJoin: APP_CONFIG.lockOnJoin,
+        lockedLayout: false,
+        disablePublicChat: false,
+        lockOnJoinConfigurable: false,
+      },
+    },
+  };
+
+  const cb = (err, numChanged) => {
+    if (err) {
+      return Logger.error(`Adding meeting to collection: ${err}`);
+    }
+
+    initializeCursor(meetingId);
+
+    const { insertedId } = numChanged;
+    if (insertedId) {
+      return Logger.info(`Added meeting id=${meetingId}`);
+    }
+
+    if (numChanged) {
+      return Logger.info(`Upserted meeting id=${meetingId}`);
+    }
+  };
+
+  return Meetings.upsert(selector, modifier, cb);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
deleted file mode 100755
index b04121aa12a990eaa77c0861e3692fbce4394178..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { initializeCursor } from '/imports/api/cursor/server/modifiers/initializeCursor';
-import Meetings from '/imports/api/meetings';
-import { logger } from '/imports/startup/server/logger';
-
-export function addMeetingToCollection(meetingId, name, intendedForRecording,
-                                       voiceConf, duration, callback) {
-  const APP_CONFIG = Meteor.settings.public.app;
-
-  //check if the meeting is already in the collection
-  Meetings.upsert({
-    meetingId: meetingId,
-  }, {
-    $set: {
-      meetingName: name,
-      intendedForRecording: intendedForRecording,
-      currentlyBeingRecorded: false,
-      voiceConf: voiceConf,
-      duration: duration,
-      roomLockSettings: {
-        // by default the lock settings will be disabled on meeting create
-        disablePrivateChat: false,
-        disableCam: false,
-        disableMic: false,
-        lockOnJoin: APP_CONFIG.lockOnJoin,
-        lockedLayout: false,
-        disablePublicChat: false,
-        lockOnJoinConfigurable: false, // TODO
-      },
-    },
-  }, (_this => function (err, numChanged) {
-      let funct;
-      if (numChanged.insertedId != null) {
-        funct = function (cbk) {
-          logger.info(`__added MEETING ${meetingId}`);
-          return cbk();
-        };
-
-        return funct(callback);
-      } else {
-        logger.info('the meeting already existed so no information was added');
-        return callback();
-      }
-    }
-  )(this));
-
-  // initialize the cursor in the meeting
-  return initializeCursor(meetingId);
-};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetings.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetings.js
new file mode 100755
index 0000000000000000000000000000000000000000..627b1491142927531b0726269441ce5c08d2a877
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetings.js
@@ -0,0 +1,29 @@
+import Meetings from '/imports/api/chat';
+import Logger from '/imports/startup/server/logger';
+import removeMeeting from './removeMeeting';
+
+import { clearUsersCollection } from '/imports/api/users/server/modifiers/clearUsersCollection';
+import clearChats from '/imports/api/chat/server/modifiers/clearChats';
+import { clearShapesCollection } from '/imports/api/shapes/server/modifiers/clearShapesCollection';
+import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection';
+import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection';
+import { clearCursorCollection } from '/imports/api/cursor/server/modifiers/clearCursorCollection';
+import { clearCaptionsCollection }
+  from '/imports/api/captions/server/modifiers/clearCaptionsCollection';
+import { clearPresentationsCollection }
+  from '/imports/api/presentations/server/modifiers/clearPresentationsCollection';
+
+export default function clearMeetings() {
+  return Meetings.remove({}, (err) => {
+    clearCaptionsCollection();
+    clearChats();
+    clearCursorCollection();
+    clearPollCollection();
+    clearPresentationsCollection();
+    clearShapesCollection();
+    clearSlidesCollection();
+    clearUsersCollection();
+
+    return Logger.info('Cleared Meetings (all)');
+  });
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js
deleted file mode 100755
index aacbcb726fe14375468d5cf58fdfec34b3c038e6..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Meetings from '/imports/api/meetings';
-import { logger } from '/imports/startup/server/logger';
-
-export function clearMeetingsCollection() {
-  const meetingId = arguments[0];
-  if (meetingId != null) {
-    return Meetings.remove({
-      meetingId: meetingId,
-    }, logger.info(`cleared Meetings Collection (meetingId: ${meetingId}!`));
-  } else {
-    return Meetings.remove({}, logger.info('cleared Meetings Collection (all meetings)!'));
-  }
-};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js
deleted file mode 100755
index ad59ebc1fe0c8fb009bc3118c98fae40cd4a8fbc..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { eventEmitter } from '/imports/startup/server';
-import { logger } from '/imports/startup/server/logger';
-import Meetings from '/imports/api/meetings';
-import { handleLockingMic } from '/imports/api/users/server/modifiers/handleLockingMic';
-import { addMeetingToCollection } from './addMeetingToCollection';
-import { removeMeetingFromCollection } from './removeMeetingFromCollection';
-
-eventEmitter.on('meeting_ended_message', function (arg) {
-  handleEndOfMeeting(arg);
-});
-
-eventEmitter.on('send_stun_turn_info_reply_message', function (arg) {
-  const stuns = arg.payload.stuns;
-  const turns = arg.payload.turns;
-  const meetingId = arg.payload.meeting_id;
-
-  Meetings.update({
-    meetingId: meetingId,
-  }, {
-    $set: {
-      stuns: stuns,
-      turns: turns,
-    },
-  });
-  return arg.callback();
-});
-
-eventEmitter.on('meeting_destroyed_event', function (arg) {
-  handleEndOfMeeting(arg);
-});
-
-eventEmitter.on('recording_status_changed_message', function (arg) {
-  const intendedForRecording = arg.payload.recorded;
-  const currentlyBeingRecorded = arg.payload.recording;
-  const meetingId = arg.payload.meeting_id;
-
-  Meetings.update({
-    meetingId: meetingId,
-    intendedForRecording: intendedForRecording,
-  }, {
-    $set: {
-      currentlyBeingRecorded: currentlyBeingRecorded,
-    },
-  });
-  return arg.callback();
-});
-
-eventEmitter.on('new_permission_settings', function (arg) {
-  const meetingId = arg.payload.meeting_id;
-  const payload = arg.payload;
-  const meetingObject = Meetings.findOne({
-    meetingId: meetingId,
-  });
-  if (meetingObject != null && payload != null) {
-    const oldSettings = meetingObject.roomLockSettings;
-    const newSettings = payload.permissions;
-
-    // if the disableMic setting was turned on
-    if (oldSettings != null && !oldSettings.disableMic && newSettings.disableMic) {
-      handleLockingMic(meetingId, newSettings);
-    }
-
-    const settingsObj = {
-      disablePrivateChat: newSettings.disablePrivateChat,
-      disableCam: newSettings.disableCam,
-      disableMic: newSettings.disableMic,
-      lockOnJoin: newSettings.lockOnJoin,
-      lockedLayout: newSettings.lockedLayout,
-      disablePublicChat: newSettings.disablePublicChat,
-      lockOnJoinConfigurable: newSettings.lockOnJoinConfigurable,
-    };
-
-    // substitute with the new lock settings
-    Meetings.update({
-      meetingId: meetingId,
-    }, {
-      $set: {
-        roomLockSettings: settingsObj,
-      },
-    });
-  }
-
-  return arg.callback();
-});
-
-eventEmitter.on('meeting_created_message', function (arg) {
-  const meetingName = arg.payload.name;
-  const intendedForRecording = arg.payload.recorded;
-  const voiceConf = arg.payload.voice_conf;
-  const duration = arg.payload.duration;
-  const meetingId = arg.payload.meeting_id;
-  return addMeetingToCollection(meetingId, meetingName, intendedForRecording,
-    voiceConf, duration, arg.callback);
-});
-
-eventEmitter.on('get_all_meetings_reply_message', function (arg) {
-  logger.info('Let\'s store some data for the running meetings so that when an' +
-    ' HTML5 client joins everything is ready!');
-  logger.info(JSON.stringify(arg.payload));
-  const listOfMeetings = arg.payload.meetings;
-
-  // Processing the meetings recursively with a callback to notify us,
-  // ensuring that we update the meeting collection serially
-  let processMeeting = function () {
-    let meeting = listOfMeetings.pop();
-    if (meeting != null) {
-      return addMeetingToCollection(meeting.meetingID, meeting.meetingName,
-        meeting.recorded, meeting.voiceBridge, meeting.duration, processMeeting);
-    } else {
-      return arg.callback(); // all meeting arrays (if any) have been processed
-    }
-  };
-
-  return processMeeting();
-});
-
-export const handleEndOfMeeting = function (arg) {
-  const meetingId = arg.payload.meeting_id;
-  logger.info(`DESTROYING MEETING ${meetingId}`);
-  return removeMeetingFromCollection(meetingId, arg.callback);
-};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeeting.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeeting.js
new file mode 100755
index 0000000000000000000000000000000000000000..2fc7118f68df219f22593d9911f144e522454154
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeeting.js
@@ -0,0 +1,43 @@
+import { check } from 'meteor/check';
+import Meetings from '/imports/api/meetings';
+import Logger from '/imports/startup/server/logger';
+
+import { clearUsersCollection } from '/imports/api/users/server/modifiers/clearUsersCollection';
+import clearChats from '/imports/api/chat/server/modifiers/clearChats';
+import { clearShapesCollection } from '/imports/api/shapes/server/modifiers/clearShapesCollection';
+import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection';
+import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection';
+import { clearCursorCollection } from '/imports/api/cursor/server/modifiers/clearCursorCollection';
+import { clearCaptionsCollection }
+  from '/imports/api/captions/server/modifiers/clearCaptionsCollection';
+import { clearPresentationsCollection }
+  from '/imports/api/presentations/server/modifiers/clearPresentationsCollection';
+
+export default function removeMeeting(meetingId) {
+  check(meetingId, String);
+
+  const selector = {
+    meetingId,
+  };
+
+  const cb = (err, numChanged) => {
+    if (err) {
+      return Logger.error(`Removing meeting from collection: ${err}`);
+    }
+
+    if (numChanged) {
+      clearCaptionsCollection(meetingId);
+      clearChats(meetingId);
+      clearCursorCollection(meetingId);
+      clearPollCollection(meetingId);
+      clearPresentationsCollection(meetingId);
+      clearShapesCollection(meetingId);
+      clearSlidesCollection(meetingId);
+      clearUsersCollection(meetingId);
+
+      return Logger.info(`Removed meeting id=${meetingId}`);
+    }
+  };
+
+  return Meetings.remove(selector, cb);
+};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js
deleted file mode 100755
index 2c79d14595266463f7090ccb898c8e6c9514b905..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { clearCollections } from '/imports/api/common/server/helpers';
-import Meetings from '/imports/api/meetings';
-import { logger } from '/imports/startup/server/logger';
-
-//clean up upon a meeting's end
-export function removeMeetingFromCollection(meetingId, callback) {
-  if (Meetings.findOne({
-    meetingId: meetingId,
-  }) != null) {
-    logger.info(`end of meeting ${meetingId}. Clear the meeting data from all collections`);
-
-    clearCollections(meetingId);
-
-    return callback();
-  } else {
-    let funct = function (localCallback) {
-      logger.error(`Error! There was no such meeting ${meetingId}`);
-      return localCallback();
-    };
-
-    return funct(callback);
-  }
-};
diff --git a/bigbluebutton-html5/imports/api/meetings/server/publications.js b/bigbluebutton-html5/imports/api/meetings/server/publications.js
deleted file mode 100755
index 12adaa0d13c3243ab2234cde59f261822c3f42b2..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/imports/api/meetings/server/publications.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Meetings from '/imports/api/meetings';
-import { logger } from '/imports/startup/server/logger';
-
-Meteor.publish('meetings', function (credentials) {
-  const { meetingId } = credentials;
-  logger.info(`publishing meetings for ${meetingId}`);
-  return Meetings.find({
-    meetingId: meetingId,
-  });
-});
diff --git a/bigbluebutton-html5/imports/api/meetings/server/publishers.js b/bigbluebutton-html5/imports/api/meetings/server/publishers.js
new file mode 100644
index 0000000000000000000000000000000000000000..acf6c3282697f56b4f759f1a3b80da63de9fb3ab
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/meetings/server/publishers.js
@@ -0,0 +1,18 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import Meetings from '/imports/api/meetings';
+import Logger from '/imports/startup/server/logger';
+
+Meteor.publish('meetings', (credentials) => {
+  const { meetingId, requesterUserId, requesterToken } = credentials;
+
+  check(meetingId, String);
+  check(requesterUserId, String);
+  check(requesterToken, String);
+
+  Logger.info(`Publishing meeting=${meetingId} ${requesterUserId} ${requesterToken}`);
+
+  return Meetings.find({
+    meetingId,
+  });
+});
diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js
index fb99e6aa046618f787dbd85e856451fcd21584ff..89b3f7e8c68fce48a16b7e329c60e5603c1f689f 100755
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js
@@ -1,6 +1,5 @@
 import { logger } from '/imports/startup/server/logger';
 import { eventEmitter } from '/imports/startup/server';
-import { handleEndOfMeeting } from '/imports/api/meetings/server/modifiers/eventHandlers';
 import { userJoined } from './userJoined';
 import { setUserLockedStatus } from './setUserLockedStatus';
 import { markUserOffline } from './markUserOffline';
@@ -15,14 +14,6 @@ eventEmitter.on('disconnect_user_message', function (arg) {
   handleRemoveUserEvent(arg);
 });
 
-eventEmitter.on('end_and_kick_all_message', function (arg) {
-  handleEndOfMeeting(arg);
-});
-
-eventEmitter.on('disconnect_all_users_message', function (arg) {
-  handleEndOfMeeting(arg);
-});
-
 eventEmitter.on('user_left_message', function (arg) {
   handleRemoveUserEvent(arg);
 });
diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js
index 1178b24730f6f60fe42cdb92ed2dbb82eac39a14..dab0d93bc9f005df3d01de3417250690e1988604 100755
--- a/bigbluebutton-html5/imports/startup/server/index.js
+++ b/bigbluebutton-html5/imports/startup/server/index.js
@@ -1,25 +1,11 @@
+import { Meteor } from 'meteor/meteor';
 import Locales from '/imports/locales';
 import Logger from './logger';
 import Redis from './redis';
-import { clearCollections } from '/imports/api/common/server/helpers';
 
 Meteor.startup(() => {
-  clearCollections();
   const APP_CONFIG = Meteor.settings.public.app;
-
-  let determineConnectionType = function () {
-    let baseConnection = 'HTTP';
-    if (APP_CONFIG.httpsConnection) {
-      baseConnection += ('S');
-    }
-
-    return baseConnection;
-  };
-
-  Logger.info(`server start. Connection type:${determineConnectionType()}`);
-  Logger.info('APP_CONFIG=');
-  Logger.info(APP_CONFIG);
-  Logger.info('Running in environment type:' + Meteor.settings.runtime.env);
+  Logger.info(`SERVER STARTED. ENV=${Meteor.settings.runtime.env}`, APP_CONFIG);
 });
 
 WebApp.connectHandlers.use('/check', (req, res, next) => {
diff --git a/bigbluebutton-html5/server/main.js b/bigbluebutton-html5/server/main.js
index eb20f0fd160a23953928d248529d77c8c08dacc6..5facc6226190a8b7fc1e1a08db990f0b03bb6764 100755
--- a/bigbluebutton-html5/server/main.js
+++ b/bigbluebutton-html5/server/main.js
@@ -13,11 +13,7 @@ import '/imports/api/deskshare/server/modifiers/handleDeskShareChange';
 import '/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage';
 import '/imports/api/deskshare/server/modifiers/eventHandlers';
 
-import '/imports/api/meetings/server/publications';
-import '/imports/api/meetings/server/modifiers/addMeetingToCollection';
-import '/imports/api/meetings/server/modifiers/clearMeetingsCollection';
-import '/imports/api/meetings/server/modifiers/removeMeetingFromCollection';
-import '/imports/api/meetings/server/modifiers/eventHandlers';
+import '/imports/api/meetings/server';
 
 import '/imports/api/phone/server/modifiers/eventHandlers';
 
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index cb9a9ffbfb21087aa9285e888ad4fcad7c672d51..01e641cd98585163e011b320640b1f20eb256f61 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -18,6 +18,8 @@
  */
 package org.bigbluebutton.web.controllers
 
+import com.google.gson.Gson
+
 import javax.servlet.ServletRequest;
 
 import java.net.URI;
@@ -1455,7 +1457,7 @@ class ApiController {
       reject = true
     } else {
       sessionToken = StringUtils.strip(params.sessionToken)
-      log.info("SessionToken = " + sessionToken)
+      log.info("Getting ConfigXml for SessionToken = " + sessionToken)
       if (!session[sessionToken]) {
           reject = true
       } else {
@@ -1478,6 +1480,20 @@ class ApiController {
         }
       }
     } else {
+      Map<String, Object> logData = new HashMap<String, Object>();
+      logData.put("meetingId", us.meetingID);
+      logData.put("externalMeetingId", us.externMeetingID);
+      logData.put("name", us.fullname);
+      logData.put("userId", us.internalUserId);
+      logData.put("sessionToken", sessionToken);
+      logData.put("message", "handle_configxml_api");
+      logData.put("description", "Handling ConfigXml API.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.info(logStr);
+
       response.addHeader("Cache-Control", "no-cache")
       render text: us.configXML, contentType: 'text/xml'
     }
@@ -1544,7 +1560,20 @@ class ApiController {
       // how many times a user reconnects or refresh the browser.
       String newInternalUserID = us.internalUserId + "_" + us.incrementConnectionNum()
 
-      log.info("Found conference for " + us.fullname)
+      Map<String, Object> logData = new HashMap<String, Object>();
+      logData.put("meetingId", us.meetingID);
+      logData.put("externalMeetingId", us.externMeetingID);
+      logData.put("name", us.fullname);
+      logData.put("userId", newInternalUserID);
+      logData.put("sessionToken", sessionToken);
+      logData.put("message", "handle_enter_api");
+      logData.put("description", "Handling ENTER API.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.info(logStr);
+
       response.addHeader("Cache-Control", "no-cache")
       withFormat {
         json {
diff --git a/bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl b/bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
index 2ff4cf55ec36ca04b7369b605d468390066bc761..6bef7e87f84453c6a97cdf6f27461efeee524692 100644
--- a/bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
+++ b/bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
@@ -38,10 +38,10 @@
                   <${property}>
                     <#if properties[property]["image"]?? && properties[property]["image"]?is_hash>
                     <#assign image = properties[property]["image"]>
-                    <image <#if image["attributes"]?? && image["attributes"]["width"]??>width="${image["attributes"]["width"]}"</#if> <#if image["attributes"]?? && image["attributes"]["height"]??>height="${image["attributes"]["height"]}"</#if> <#if image["attributes"]?? && image["attributes"]["alt"]??>alt="${image["attributes"]["alt"]}"</#if>>${image["text"]}</image>
+                    <image <#if image["attributes"]?? && image["attributes"]["width"]??>width="${image["attributes"]["width"]}"</#if> <#if image["attributes"]?? && image["attributes"]["height"]??>height="${image["attributes"]["height"]}"</#if> <#if image["attributes"]?? && image["attributes"]["alt"]??>alt="<#escape x as x?xml>${image["attributes"]["alt"]}</#escape>"</#if>>${image["text"]}</image>
                     <#elseif properties[property]["image"]?is_enumerable>
                     <#list properties[property]["image"] as image>
-                    <image <#if image["attributes"]?? && image["attributes"]["width"]??>width="${image["attributes"]["width"]}"</#if> <#if image["attributes"]?? && image["attributes"]["height"]??>height="${image["attributes"]["height"]}"</#if> <#if image["attributes"]?? && image["attributes"]["alt"]??>alt="${image["attributes"]["alt"]}"</#if>>${image["text"]}</image>
+                    <image <#if image["attributes"]?? && image["attributes"]["width"]??>width="${image["attributes"]["width"]}"</#if> <#if image["attributes"]?? && image["attributes"]["height"]??>height="${image["attributes"]["height"]}"</#if> <#if image["attributes"]?? && image["attributes"]["alt"]??>alt="<#escape x as x?xml>${image["attributes"]["alt"]}</#escape>"</#if>>${image["text"]}</image>
                     </#list>
                     </#if>
                   </${property}>
diff --git a/record-and-playback/core/Gemfile.lock b/record-and-playback/core/Gemfile.lock
index 16e319e4073c5e1eae440674a67af97b779b217e..c708d7d2f809817332301df0c40978d97a9fbb57 100644
--- a/record-and-playback/core/Gemfile.lock
+++ b/record-and-playback/core/Gemfile.lock
@@ -2,37 +2,41 @@ GEM
   remote: http://rubygems.org/
   specs:
     absolute_time (1.0.0)
-    addressable (2.3.6)
+    addressable (2.4.0)
     builder (3.2.2)
-    curb (0.8.6)
-    fastimage (1.6.4)
-      addressable (~> 2.3, >= 2.3.5)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
+    curb (0.9.3)
+    fastimage (2.0.0)
+      addressable (~> 2)
+    mime-types (2.6.2)
+    mini_portile2 (2.1.0)
     mono_logger (1.1.0)
-    multi_json (1.10.1)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     open4 (1.3.4)
-    rack (1.5.2)
+    pkg-config (1.1.7)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    redis (3.1.0)
-    redis-namespace (1.5.1)
+    redis (3.3.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
+    resque (1.26.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rubyzip (1.1.6)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    rubyzip (1.2.0)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
-    trollop (2.0)
+      tilt (>= 1.3, < 3)
+    streamio-ffmpeg (2.1.0)
+      multi_json (~> 1.8)
+    tilt (2.0.5)
+    trollop (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -44,13 +48,15 @@ DEPENDENCIES
   builder
   curb
   fastimage
-  mime-types
+  mime-types (= 2.6.2)
   nokogiri
   open4
   redis
   resque
   rubyzip
+  streamio-ffmpeg
   trollop
 
 BUNDLED WITH
-   1.10.6
+   1.12.5
+
diff --git a/record-and-playback/core/lib/recordandplayback/edl/audio.rb b/record-and-playback/core/lib/recordandplayback/edl/audio.rb
index 943200b6b823fb866af1cb7e6509489560db8f6d..316a7d07954555b58af2751637baa7d4545a6a89 100644
--- a/record-and-playback/core/lib/recordandplayback/edl/audio.rb
+++ b/record-and-playback/core/lib/recordandplayback/edl/audio.rb
@@ -172,15 +172,22 @@ module BigBlueButton
 
       def self.audio_info(filename)
         IO.popen([*FFPROBE, filename]) do |probe|
-          info = JSON.parse(probe.read, :symbolize_names => true)
-          if !info[:streams]
-            return {}
+          info = nil
+          begin
+            info = JSON.parse(probe.read, :symbolize_names => true)
+          rescue StandardError => e
+            BigBlueButton.logger.warn("Couldn't parse audio info: #{e}")
           end
-          info[:audio] = info[:streams].find { |stream| stream[:codec_type] == 'audio' }
+          return {} if !info
+          return {} if !info[:streams]
+          return {} if !info[:format]
 
-          if info[:audio]
-            info[:sample_rate] = info[:audio][:sample_rate].to_i
+          info[:audio] = info[:streams].find do |stream|
+            stream[:codec_type] == 'audio'
           end
+          return {} if !info[:audio]
+
+          info[:sample_rate] = info[:audio][:sample_rate].to_i
 
           if info[:format][:format_name] == 'wav'
             # wav files generated by freeswitch can have incorrect length
diff --git a/record-and-playback/core/lib/recordandplayback/edl/video.rb b/record-and-playback/core/lib/recordandplayback/edl/video.rb
index 2e5d1429829eb22db9349382a3fa552a3837cd0e..c5e4084928f084531b7146af8a6365fd30945939 100644
--- a/record-and-playback/core/lib/recordandplayback/edl/video.rb
+++ b/record-and-playback/core/lib/recordandplayback/edl/video.rb
@@ -269,33 +269,35 @@ module BigBlueButton
 
       def self.video_info(filename)
         IO.popen([*FFPROBE, filename]) do |probe|
-          info = JSON.parse(probe.read, :symbolize_names => true)
+          info = nil
+          begin
+            info = JSON.parse(probe.read, :symbolize_names => true)
+          rescue StandardError => e
+            BigBlueButton.logger.warn("Couldn't parse video info: #{e}")
+          end
           return {} if !info
+          return {} if !info[:streams]
+          return {} if !info[:format]
 
-          if info[:streams]
-            info[:video] = info[:streams].find { |stream| stream[:codec_type] == 'video' }
-            info[:audio] = info[:streams].find { |stream| stream[:codec_type] == 'audio' }
+          info[:video] = info[:streams].find do |stream|
+            stream[:codec_type] == 'audio'
           end
 
-          if info[:video]
-            info[:width] = info[:video][:width].to_i
-            info[:height] = info[:video][:height].to_i
+          return {} if !info[:video]
 
-            return {} if info[:width] == 0 or info[:height] == 0
-            return {} if info[:video][:display_aspect_ratio] == '0:0'
+          info[:width] = info[:video][:width].to_i
+          info[:height] = info[:video][:height].to_i
 
-            info[:aspect_ratio] = info[:video][:display_aspect_ratio].to_r
-            if info[:aspect_ratio] == 0
-              info[:aspect_ratio] = Rational(info[:width], info[:height])
-            end
+          return {} if info[:width] == 0 or info[:height] == 0
+          return {} if info[:video][:display_aspect_ratio] == '0:0'
+
+          info[:aspect_ratio] = Rational(*(info[:video][:display_aspect_ratio].split(':')))
+          if info[:aspect_ratio] == 0
+            info[:aspect_ratio] = Rational(info[:width], info[:height])
           end
 
           # Convert the duration to milliseconds
-          if info[:format]
-            info[:duration] = (info[:format][:duration].to_r * 1000).to_i
-          else
-            info[:duration] = 0
-          end
+          info[:duration] = (info[:format][:duration].to_r * 1000).to_i
 
           return info
         end
diff --git a/record-and-playback/core/lib/recordandplayback/generators/presentation.rb b/record-and-playback/core/lib/recordandplayback/generators/presentation.rb
index 833c89ac82e0c9abbf16650ea68bae60fccbb491..99d5d004a4a2b7fa92ba386d5019c12a31af1eec 100755
--- a/record-and-playback/core/lib/recordandplayback/generators/presentation.rb
+++ b/record-and-playback/core/lib/recordandplayback/generators/presentation.rb
@@ -99,11 +99,11 @@ module BigBlueButton
         # Set textfile directory
         textfiles_dir = "#{process_dir}/presentation/#{presentation_id}/textfiles"
         # Set presentation hashmap to be returned
-        presentation[:id] = presentation_id
-        presentation[:filename] = presentation_filename
-        presentation[:slides] = {}
-        presentation[:slides][1] = { :alt => self.get_text_from_slide(textfiles_dir, 1) }
         unless presentation_filename == "default.pdf"
+          presentation[:id] = presentation_id
+          presentation[:filename] = presentation_filename
+          presentation[:slides] = {}
+          presentation[:slides][1] = { :alt => self.get_text_from_slide(textfiles_dir, 1) } if File.file?("#{textfiles_dir}/slide-1.txt")
           presentation[:slides][2] = { :alt => self.get_text_from_slide(textfiles_dir, 2) } if File.file?("#{textfiles_dir}/slide-2.txt")
           presentation[:slides][3] = { :alt => self.get_text_from_slide(textfiles_dir, 3) } if File.file?("#{textfiles_dir}/slide-3.txt")
           # Break because something else than default.pdf was found