diff --git a/bbb-webhooks/hook.coffee b/bbb-webhooks/hook.coffee
index 8fd236ee2693ccc870b954659ced5a46c42475cb..0e4cd3b88229c1bc6255b5a69aca76cba938b4a1 100644
--- a/bbb-webhooks/hook.coffee
+++ b/bbb-webhooks/hook.coffee
@@ -105,7 +105,7 @@ module.exports = class Hook
# gave up trying to perform the callback, remove the hook forever
@emitter.on "stopped", (error) =>
- Logger.warn "Hook: too many failed attempts to perform a callback call, removing the hook", JSON.stringify(hook)
+ Logger.warn "Hook: too many failed attempts to perform a callback call, removing the hook for", @callbackURL
@destroy()
@addSubscription = (callbackURL, meetingID=null, callback) ->
diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
index 96f5ac1d62a84a801a34b445fbb6befd615821cd..6a62cbd3500daa2a3928acd2d92175ac89157f1f 100755
--- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css
+++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
@@ -566,10 +566,6 @@ TitleWindow {
cornerRadius: 5;
}
-.micSettingsWindowMicProgressBarStyle {
-
-}
-
.micSettingsWindowHelpButtonStyle {
paddingLeft: 4;
paddingRight: 4;
@@ -589,7 +585,7 @@ MDIWindow { /*None of the following properties are overridden by the MDIWindow c
cornerRadius: 5;
dropShadowEnabled: false;
- titleStyleName: "mypanelTitle";
+ titleStyleName: "mdiWindowTitle";
cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
cornerResizeWidth: 2;
@@ -744,7 +740,7 @@ MDIWindow { /*None of the following properties are overridden by the MDIWindow c
borderThicknessRight: 3;
}
-.mypanelTitle {
+.mdiWindowTitle {
color: #5e5f63;
fontFamily: Arial;
fontSize: 12;
diff --git a/bigbluebutton-client/locale/am_ET/bbbResources.properties b/bigbluebutton-client/locale/am_ET/bbbResources.properties
index 5afc3ffd6d0ff8b572b3f117f0ce1919d7c2d179..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/am_ET/bbbResources.properties
+++ b/bigbluebutton-client/locale/am_ET/bbbResources.properties
@@ -76,6 +76,7 @@
# 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
diff --git a/bigbluebutton-client/locale/ar_EG/bbbResources.properties b/bigbluebutton-client/locale/ar_EG/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/ar_EG/bbbResources.properties
+++ b/bigbluebutton-client/locale/ar_EG/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/ar_SA/bbbResources.properties b/bigbluebutton-client/locale/ar_SA/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/ar_SA/bbbResources.properties
+++ b/bigbluebutton-client/locale/ar_SA/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/az_AZ/bbbResources.properties b/bigbluebutton-client/locale/az_AZ/bbbResources.properties
index b94d1d43db28f80cbc381158d1f840cde7d7cccb..c435d446cc6a3be238dac986227dcfc499dddf08 100644
--- a/bigbluebutton-client/locale/az_AZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/az_AZ/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.oldlocalewindow.windowTitle = Diqqət\: köhnə dil ayarları
# 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
diff --git a/bigbluebutton-client/locale/be_BY/bbbResources.properties b/bigbluebutton-client/locale/be_BY/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/be_BY/bbbResources.properties
+++ b/bigbluebutton-client/locale/be_BY/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/bg_BG/bbbResources.properties b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
index e114f1f3ea988236fa166c70a86f23188eae194b..4132c4e935b14a51f9ebfd6df18fd4f877769401 100644
--- a/bigbluebutton-client/locale/bg_BG/bbbResources.properties
+++ b/bigbluebutton-client/locale/bg_BG/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1005 = Грешка 1005\: Повикването
# 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 = \ Грешка {0}\: Ðепознат код на грешка.
# bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
# bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
diff --git a/bigbluebutton-client/locale/bn_IN/bbbResources.properties b/bigbluebutton-client/locale/bn_IN/bbbResources.properties
index fd9450d579853dc2172baabead7c3008e41f01fb..df7a4651fd62766c88ee78f46a4029db1a33f54f 100644
--- a/bigbluebutton-client/locale/bn_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/bn_IN/bbbResources.properties
@@ -76,6 +76,7 @@
# 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
diff --git a/bigbluebutton-client/locale/bs_BA/bbbResources.properties b/bigbluebutton-client/locale/bs_BA/bbbResources.properties
index 5afc3ffd6d0ff8b572b3f117f0ce1919d7c2d179..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/bs_BA/bbbResources.properties
+++ b/bigbluebutton-client/locale/bs_BA/bbbResources.properties
@@ -76,6 +76,7 @@
# 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
diff --git a/bigbluebutton-client/locale/ca_ES/bbbResources.properties b/bigbluebutton-client/locale/ca_ES/bbbResources.properties
index 7cfd459cfcc27150ec8d299fc671c14bd298c157..14344753987bd7edadc4914d9fd9b80325e456ab 100644
--- a/bigbluebutton-client/locale/ca_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/ca_ES/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Configuracions d'Àudio. Aquesta finestra romandr
# 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
diff --git a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
index e2d03318705139e473861649796016021b733b0b..ec6fde1271313fee0679b76c583e517e283f96bf 100644
--- a/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/cs_CZ/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1007 = Chyba 1007\: ICE komunikace selhala
bbb.webrtcWarning.failedError.1008 = Chyba 1008\: Přenos selhal
bbb.webrtcWarning.failedError.1009 = Chyba 1009\: Nebylo možné stáhnout STUN/TURN informace serveru
# bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Chyba {0}\: Neznámý chybový kód
bbb.webrtcWarning.failedError.mediamissing = Váš mikrofon nemohl byl použit pro WebRTC volánÃ
bbb.webrtcWarning.failedError.endedunexpectedly = OzvÄ›nový test WebRTC byl neoÄekávanÄ› ukonÄen
diff --git a/bigbluebutton-client/locale/cy_GB/bbbResources.properties b/bigbluebutton-client/locale/cy_GB/bbbResources.properties
index 4aae262638538f396d382c0616d7132d9c0ad5a3..6d1d6cf0209dfaf46d8edd09481d91f376854078 100644
--- a/bigbluebutton-client/locale/cy_GB/bbbResources.properties
+++ b/bigbluebutton-client/locale/cy_GB/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micWarning.message = Nid yw eich meicroffon wedi dangos unrhyw weithgaredd,
# 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
diff --git a/bigbluebutton-client/locale/da_DK/bbbResources.properties b/bigbluebutton-client/locale/da_DK/bbbResources.properties
index 1d13aa408b0f1846b0054ea058a635ad678be8e4..ea634b0e37da171822a952141153f2823baaea15 100644
--- a/bigbluebutton-client/locale/da_DK/bbbResources.properties
+++ b/bigbluebutton-client/locale/da_DK/bbbResources.properties
@@ -1,191 +1,192 @@
-# bbb.mainshell.locale.version = 0.9.0
+bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = Tilslutter til serveren
bbb.mainshell.statusProgress.loading = Henter {0} moduler
bbb.mainshell.statusProgress.cannotConnectServer = Vi kan desværre ikke oprette forbindelse til serveren.
-# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [ {0}] - For yderligere information besøg <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Ã…bn log-vinduet
-# bbb.mainshell.meetingNotFound = Meeting Not Found
-# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.meetingNotFound = Ingen møde fundet.
+bbb.mainshell.invalidAuthToken = Ugyldig godkendelse
bbb.mainshell.resetLayoutBtn.toolTip = Nulstil layout på værktøjsbjælke
-# bbb.mainshell.notification.tunnelling = Tunnelling
-# bbb.mainshell.notification.webrtc = WebRTC Audio
+bbb.mainshell.notification.tunnelling = Tunnel
+bbb.mainshell.notification.webrtc = WebRTC Audio
bbb.oldlocalewindow.reminder1 = Du har måske en gammel oversættelse af BigBlueButton.
bbb.oldlocalewindow.reminder2 = Tøm din browsers cache og prøv igen.
bbb.oldlocalewindow.windowTitle = Advarsel\: gamle oversættelser
-# 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.audioSelection.title = Hvorledes vil du deltage i audio.
+bbb.audioSelection.btnMicrophone.label = Mikrofon
+bbb.audioSelection.btnMicrophone.toolTip = Deltag i audio med din mikrofon.
+bbb.audioSelection.btnListenOnly.label = Kun lyt.
+bbb.audioSelection.btnListenOnly.toolTip = Kun lyt
+bbb.audioSelection.txtPhone.text = For at deltage i dette møde via telefon, ring\: {0} eller indtast {1} som konference pin nummer.
+bbb.micSettings.title = Lydtest
+bbb.micSettings.speakers.header = Test dine højtaler
+bbb.micSettings.microphone.header = Test din mikrofon
bbb.micSettings.playSound = Afprøv højttalere
bbb.micSettings.playSound.toolTip = Spil musik for at teste højttalerne
bbb.micSettings.hearFromHeadset = Du burde nu høre lyd i dit headset, og ikke i dine computerhøjttalere.
-# 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 = Du burde nu høre lyd i dit headset.
+bbb.micSettings.echoTestMicPrompt = Dette er en privat Echo test. Tal venligst i mikrofonen, kan du høre det?
+bbb.micSettings.echoTestAudioYes = Ja
+bbb.micSettings.echoTestAudioNo = Nej
+bbb.micSettings.speakIntoMicTestLevel = Tal venligst i mikrofonen. Du skulle gerne se lyd ikonet aktiveres. Hvis ikke, så vælg en anden mikrofon.
+bbb.micSettings.recommendHeadset = Anvend et headset med en mikrofon for det bedste lydoplevelse.
bbb.micSettings.changeMic = Afprøv/skift mikrofon
-# 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.changeMic.toolTip = Ã…bn venligst din Flash Player mikrofon indstillinger
+bbb.micSettings.comboMicList.toolTip = Vælg en mikrofon
+bbb.micSettings.micRecordVolume.label = Vælg
+bbb.micSettings.micRecordVolume.toolTip = Aktiver mikrofon
+bbb.micSettings.nextButton = Næste
+bbb.micSettings.nextButton.toolTip = Start Echo test
bbb.micSettings.join = Forbind lyd
-# 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 = Open tutorial videos in a 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.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.micSettings.join.toolTip = Deltag med lyd
+bbb.micSettings.cancel = Fortryd
+bbb.micSettings.connectingtoecho = Forbinder
+bbb.micSettings.connectingtoecho.error = Echo test fejl\: Venligst kontakt administratoren.
+bbb.micSettings.cancel.toolTip = Fortryd deltagelse i audio konference
+bbb.micSettings.access.helpButton = Ã…bn tutorial videoer i nyt vindue
+bbb.micSettings.access.title = Lydindstillinger. Fokus vil forblive i dette lydindstillingsvindue indtil vinduet er lukket.
+bbb.micSettings.webrtc.title = WebTRC Support
+bbb.micSettings.webrtc.capableBrowser = Din browser understøtter WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit = Klik, ikke for at anvende WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Klik her, hvis du ikke ønsker at anvende WebRTC technology (Dette er anbefalet i tilfælde af, at du har problemer med det)
+bbb.micSettings.webrtc.notCapableBrowser = WebRTC er ikke understøttet i din browser. Venligst anvend Google Chrome (minimum version 32), du kan også anvende Mozilla Firefox (minimum version 26). Du kan også deltage verbalt ved anvendelse af Adobe Flash Platform.
+bbb.micSettings.webrtc.connecting = Ringer
+bbb.micSettings.webrtc.waitingforice = Forbinder
+bbb.micSettings.webrtc.transferring = Overfør
+bbb.micSettings.webrtc.endingecho = Deltager med lyd
+bbb.micSettings.webrtc.endedecho = Echo testen er slut.
+bbb.micPermissions.firefox.title = Firefox Mikrofon tilladelser
+bbb.micPermissions.firefox.message1 = Vælg din mikrofon og tryk på del
+bbb.micPermissions.firefox.message2 = I tilfælde af, at du ikke kan se listen over mikrofoner, klik venligst på mikrofon ikonet.
+bbb.micPermissions.chrome.title = Chrome mikrofon tillladelser
+bbb.micPermissions.chrome.message1 = Giv venligst Chrome tilladelse til at anvende din mikrofon.
+bbb.micWarning.title = Advarsel - lyd
+bbb.micWarning.joinBtn.label = Deltage alligevel
+bbb.micWarning.testAgain.label = Test igen
+bbb.micWarning.message = Din mikrofon lader ikke til at virke, de andre deltagere vil sikkert ikke være i stand til at høre dig.
+bbb.webrtcWarning.message = Har opdaget følgende WebRTC problem\: {0}. Vil du som alternativt anvende Flash?
+bbb.webrtcWarning.title = WebRTC Audio fejl.
+bbb.webrtcWarning.failedError.1001 = Fejl 1001\: WebSocket mistede forbindelsen
+bbb.webrtcWarning.failedError.1002 = Error 1002\: Kunne ikke forbinde WebSocket
+bbb.webrtcWarning.failedError.1003 = Fejl 1003\: Browser version er ikke understøttet.
+bbb.webrtcWarning.failedError.1004 = Fejl 1004\: Fejl i forbindelse med opringning (Grunden til dette er\={0})
+bbb.webrtcWarning.failedError.1005 = Fejl 1005\: Opkald sluttet pludselig.
+bbb.webrtcWarning.failedError.1006 = Fejl 1006\: Opkaldstiden er slut
+bbb.webrtcWarning.failedError.1007 = Fejl 1007\: ICE forhandling fejl
+bbb.webrtcWarning.failedError.1008 = Fejl 1008\: Overførelsen afbrudt
+bbb.webrtcWarning.failedError.1009 = Fejl 1009\: Kunne ikke fetch STUN/TURN server information
+bbb.webrtcWarning.failedError.1010 = Fejl 1010\: ICE forhandling timeout
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.unknown = Fejl {0}\: Ukendt fejl kode
+bbb.webrtcWarning.failedError.mediamissing = Systemet kunne ikke anvende din WebRTC opkald
+bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC Echo testen sluttede pludseligt
bbb.mainToolbar.helpBtn = Hjælp
bbb.mainToolbar.logoutBtn = Log ud
-# bbb.mainToolbar.logoutBtn.toolTip = Log Out
-# bbb.mainToolbar.langSelector = Select language
+bbb.mainToolbar.logoutBtn.toolTip = Log ud
+bbb.mainToolbar.langSelector = Vælg sprog
bbb.mainToolbar.settingsBtn = Indstillinger
bbb.mainToolbar.settingsBtn.toolTip = Ã…bn indstillinger
-# 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.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.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
-# 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.raiseHand = Hand Raised
-# bbb.users.usersGrid.statusItemRenderer.happy = Happy
-# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
-# bbb.users.usersGrid.statusItemRenderer.confused = Confused
-# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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.raiseHand = Raise hand
-# bbb.users.emojiStatus.happy = Happy
-# bbb.users.emojiStatus.smile = Smile
-# bbb.users.emojiStatus.sad = Sad
-# bbb.users.emojiStatus.confused = Confused
-# bbb.users.emojiStatus.neutral = Neutral
-# bbb.users.emojiStatus.away = Away
+bbb.mainToolbar.shortcutBtn = Genvejstaster
+bbb.mainToolbar.shortcutBtn.toolTip = Ã…bn genvejstast indstillingsvinduet
+bbb.mainToolbar.recordBtn.toolTip.start = Start optagelse
+bbb.mainToolbar.recordBtn.toolTip.stop = Stop optagelse
+bbb.mainToolbar.recordBtn.toolTip.recording = Denne session er blevet optaget
+bbb.mainToolbar.recordBtn.toolTip.notRecording = Denne session er ikke blevet optaget
+bbb.mainToolbar.recordBtn.confirm.title = Bekræft optagelse
+bbb.mainToolbar.recordBtn.confirm.message.start = Er du sikker på, at du ønsker at optage?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Er du sikker på, at du ønsker at stoppe optagelse?
+bbb.mainToolbar.recordBtn..notification.title = Optage notifikation.
+bbb.mainToolbar.recordBtn..notification.message1 = Du kan optage denne session.
+bbb.mainToolbar.recordBtn..notification.message2 = Du skal klikke på Start/Stop optage knappen for at begynde samt slutte optagelsen.
+bbb.mainToolbar.recordingLabel.recording = (Optager)
+bbb.mainToolbar.recordingLabel.notRecording = Optager ikke
+bbb.clientstatus.title = Konfigurations meddelelser
+bbb.clientstatus.notification = Ikke læst notifikationer
+bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.tunneling.message = En firewall forhindrer din klient i at forbinde direkte med port 1935. Vi anbefaler at deltage i en mindre restriktiv netværk for at opnå en mere stabil forbindelse.
+bbb.clientstatus.browser.title = Browser version
+bbb.clientstatus.browser.message = Din browser ({0}) er ikke op til date. Vi anbefaler at du opdatere til den seneste version.
+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
+bbb.videoDock.titleBar = Webcam vindue titel bar
+bbb.presentation.titleBar = Præsentationsvindue titel bar
+bbb.chat.titleBar = Chat-vindue titel bar
+bbb.users.title = Brugere{0} {1}
+bbb.users.titleBar = Brugere vindue titel bar
+bbb.users.quickLink.label = Deltagervinduet
+bbb.users.minimizeBtn.accessibilityName = Minimer brugerevinduet
+bbb.users.maximizeRestoreBtn.accessibilityName = Maksimer brugerevinduet
+bbb.users.settings.buttonTooltip = Indstillinger
+bbb.users.settings.audioSettings = Lydtest
+bbb.users.settings.webcamSettings = Webcam indstilinger
+bbb.users.settings.muteAll = Gør samtlige deltagere lydløse
+bbb.users.settings.muteAllExcept = Gør samtlige deltagere undtagen foredragsholderen lydløse
+bbb.users.settings.unmuteAll = Tillad lyd fra samtlige deltagere
+bbb.users.settings.clearAllStatus = Clear alle mine status ikoner
+bbb.users.emojiStatusBtn.toolTip = Opdatere mit status ikon
+bbb.users.roomMuted.text = Deltagere muted
+bbb.users.roomLocked.text = Deltagere låst
+bbb.users.pushToTalk.toolTip = Tal
+bbb.users.pushToMute.toolTip = Blev lydløs overfor andre
+bbb.users.muteMeBtnTxt.talk = Sæt lyd på
+bbb.users.muteMeBtnTxt.mute = Mute
+bbb.users.muteMeBtnTxt.muted = Muted
+bbb.users.muteMeBtnTxt.unmuted = Unmuted
+bbb.users.usersGrid.contextmenu.exportusers = Kopier brugernavnene
+bbb.users.usersGrid.accessibilityName = Brugerliste. Brug tastepilene til at navigere
+bbb.users.usersGrid.nameItemRenderer = Navn
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = dig
+bbb.users.usersGrid.statusItemRenderer = Status
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Gør vedkommende til foredragsholder
+bbb.users.usersGrid.statusItemRenderer.presenter = Foredragsholder
+bbb.users.usersGrid.statusItemRenderer.moderator = Ordfører
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Løft hånden
+bbb.users.usersGrid.statusItemRenderer.happy = Glad
+bbb.users.usersGrid.statusItemRenderer.unhappy = Trist
+bbb.users.usersGrid.statusItemRenderer.confused = Forvirret
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear mit status
+bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Deler webcam
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = er oplægsholder
+bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.mediaItemRenderer.talking = Taler
+bbb.users.usersGrid.mediaItemRenderer.webcam = Dele webcam
+bbb.users.usersGrid.mediaItemRenderer.webcamBtn = Se webcam
+bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Unmute {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToMute = Mute {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToLock = LÃ¥s {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = LÃ¥s op {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Spark {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Dele webcam
+bbb.users.usersGrid.mediaItemRenderer.micOff = Luk mikrofon
+bbb.users.usersGrid.mediaItemRenderer.micOn = Tænd mikrofon
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Deltager ikke i lyd konference
+bbb.users.emojiStatus.clear = Clear
+bbb.users.emojiStatus.raiseHand = Hæv hånden
+bbb.users.emojiStatus.happy = Glad
+bbb.users.emojiStatus.smile = Smil
+bbb.users.emojiStatus.sad = Trist
+bbb.users.emojiStatus.confused = Forvirret
+bbb.users.emojiStatus.neutral = Neutral
+bbb.users.emojiStatus.away = Ikke til stede
bbb.presentation.title = Præsentation
-# 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 = Præsentation\: {0}
+bbb.presentation.quickLink.label = Præsentationsvinduet
+bbb.presentation.fitToWidth.toolTip = Tilpas preæsentationen
+bbb.presentation.fitToPage.toolTip = Tilpas præsentationen til siden
+bbb.presentation.uploadPresBtn.toolTip = Upload din præsentation
bbb.presentation.backBtn.toolTip = Forrige slide.
-# bbb.presentation.btnSlideNum.accessibilityName = Slide {0} of {1}
-# bbb.presentation.btnSlideNum.toolTip = Select a slide
+bbb.presentation.btnSlideNum.accessibilityName = Slide {0} af {1}
+bbb.presentation.btnSlideNum.toolTip = Vælg slide
bbb.presentation.forwardBtn.toolTip = Næste slide
bbb.presentation.maxUploadFileExceededAlert = Fejl\: Filen er større end tilladt.
bbb.presentation.uploadcomplete = Upload fuldført. Vent venligst mens vi konverterer dokumentet.
@@ -200,20 +201,20 @@ bbb.presentation.error.convert.nbpage = Fejl\: Kunne ikke bestemme antallet af s
bbb.presentation.error.convert.maxnbpagereach = Fejl\: Det uploadede dokument har for mange sider.
bbb.presentation.converted = Konverterede {0} af {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.slider = Præsentation zoom niveau
+bbb.presentation.slideloader.starttext = Slide tekst begynd
+bbb.presentation.slideloader.endtext = Slide tekst slut
bbb.presentation.uploadwindow.presentationfile = Præsentationsfil
bbb.presentation.uploadwindow.pdf = PDF
bbb.presentation.uploadwindow.word = WORD
bbb.presentation.uploadwindow.excel = EXCEL
bbb.presentation.uploadwindow.powerpoint = POWERPOINT
bbb.presentation.uploadwindow.image = BILLEDE
-# 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.presentation.minimizeBtn.accessibilityName = Minimer præsentationsvinduet
+bbb.presentation.maximizeRestoreBtn.accessibilityName = Maksimer præsentationsvinduet
+bbb.presentation.closeBtn.accessibilityName = Luk præsentationsvinduet
bbb.fileupload.title = Tilføj filer til din præsentation
-# bbb.fileupload.lblFileName.defaultText = No file selected
+bbb.fileupload.lblFileName.defaultText = Ingen fil er valgt
bbb.fileupload.selectBtn.label = Vælg fil
bbb.fileupload.selectBtn.toolTip = Vælg fil
bbb.fileupload.uploadBtn = Upload
@@ -222,128 +223,128 @@ bbb.fileupload.deleteBtn.toolTip = Slet præsentation
bbb.fileupload.showBtn = Vis
bbb.fileupload.showBtn.toolTip = Vis præsentation
bbb.fileupload.okCancelBtn = Annuller
-# bbb.fileupload.okCancelBtn.toolTip = Close the File Upload dialog box
+bbb.fileupload.okCancelBtn.toolTip = Luk fil upload boksen
bbb.fileupload.genThumbText = Genererer thumbnails..
bbb.fileupload.progBarLbl = Fremskridt\:
-# bbb.fileupload.fileFormatHint = Upload any office document or Portable Document Format (PDF) file. For best results upload PDF.
+bbb.fileupload.fileFormatHint = Upload hvilken som helst office dokument. PDF filer virker dog bedst.
bbb.chat.title = Chat
-# bbb.chat.quickLink.label = Chat Window
+bbb.chat.quickLink.label = Chatvinduet
bbb.chat.cmpColorPicker.toolTip = Tekstfarve i chatvindue
-# bbb.chat.input.accessibilityName = Chat Message Editing Field
+bbb.chat.input.accessibilityName = Chat besked editoren
bbb.chat.sendBtn = Send
bbb.chat.sendBtn.toolTip = Send besked
-# bbb.chat.sendBtn.accessibilityName = Send chat message
-# bbb.chat.contextmenu.copyalltext = Copy All Text
+bbb.chat.sendBtn.accessibilityName = Send chat besked
+bbb.chat.contextmenu.copyalltext = Kopi al tekst
bbb.chat.publicChatUsername = Alle
-# bbb.chat.optionsTabName = Options
+bbb.chat.optionsTabName = Indstillinger
bbb.chat.privateChatSelect = Vælg en person at chatte med privat
-# bbb.chat.private.userLeft = The user has left.
-# bbb.chat.private.userJoined = The user has joined.
-# bbb.chat.usersList.toolTip = Select User To Open Private Chat
+bbb.chat.private.userLeft = Deltageren er smuttet
+bbb.chat.private.userJoined = Brugeren har ankommet
+bbb.chat.usersList.toolTip = Vælg deltager til privat chat
bbb.chat.chatOptions = Chatindstillinger
bbb.chat.fontSize = Skriftstørrelse
-# 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.chat.cmbFontSize.toolTip = Vælg skriftstørrelse for dine chatbeskeder
+bbb.chat.messageList = Besked felt
+bbb.chat.minimizeBtn.accessibilityName = Minimer chatvindue
+bbb.chat.maximizeRestoreBtn.accessibilityName = Maksimer chatvinduet
+bbb.chat.closeBtn.accessibilityName = Luk chatvinduet
+bbb.chat.chatTabs.accessibleNotice = Nye beskeder
+bbb.chat.chatMessage.systemMessage = System
+bbb.chat.chatMessage.tooLong = Denne besked er {0} tegn for lang
bbb.publishVideo.changeCameraBtn.labelText = Skift kamera
-# bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
-# bbb.publishVideo.cmbResolution.tooltip = Select a webcam resolution
+bbb.publishVideo.changeCameraBtn.toolTip = Ã…bn skift webcam vinduet
+bbb.publishVideo.cmbResolution.tooltip = Vælg din webcam opløsning
bbb.publishVideo.startPublishBtn.labelText = PÃ¥begynd deling
bbb.publishVideo.startPublishBtn.toolTip = Start deling
-# bbb.webcamPermissions.chrome.title = Chrome Webcam Permissions
-# bbb.webcamPermissions.chrome.message1 = Click Allow to give Chrome permission to use your webcam.
+bbb.webcamPermissions.chrome.title = Chrome Webcam tilladelser
+bbb.webcamPermissions.chrome.message1 = Giv Chrome tilladelsen til at bruge dit webcam.
bbb.videodock.title = Video-dok
-# 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.videodock.quickLink.label = Webcam vindue
+bbb.video.minimizeBtn.accessibilityName = Minimer webcam vinduet
+bbb.video.maximizeRestoreBtn.accessibilityName = Maksimer webcam vinduet
+bbb.video.controls.muteButton.toolTip = Mute eller unmute {0}
+bbb.video.controls.switchPresenter.toolTip = Gør {0} til foredragsholder
+bbb.video.controls.ejectUserBtn.toolTip = Afvis {0} til et møde
+bbb.video.controls.privateChatBtn.toolTip = Chat med {0}
+bbb.video.publish.hint.noCamera = Ingen webcam er tilgængelige
+bbb.video.publish.hint.cantOpenCamera = Dit webcam kan ikke åbnes
+bbb.video.publish.hint.waitingApproval = Afventer godkendelse
+bbb.video.publish.hint.videoPreview = Webcam forhåndsvisning
+bbb.video.publish.hint.openingCamera = Ã…bn webcam
+bbb.video.publish.hint.cameraDenied = Webcam adgang nægtet
+bbb.video.publish.hint.cameraIsBeingUsed = Dit webcam kan ikke åbnes - det bliver formentlig anvendt et andet sted i øjeblikket
+bbb.video.publish.hint.publishing = Offentliggøres...
+bbb.video.publish.closeBtn.accessName = Luk webcam indstillingsvinduet
+bbb.video.publish.closeBtn.label = Fortryd
+bbb.video.publish.titleBar = Offentliggør webcam vindue
bbb.desktopPublish.title = Skrivebordsdeling\: Præsentators forhåndsvisning
-# bbb.desktopPublish.fullscreen.tooltip = Share Your Main Screen
+bbb.desktopPublish.fullscreen.tooltip = Del dit skærm
bbb.desktopPublish.fullscreen.label = Fuld skærm
-# bbb.desktopPublish.region.tooltip = Share a Part of Your Screen
+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 = 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.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.minimizeBtn.toolTip = Minimer dette vindue
-# 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.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 = 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.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.layout.addButton.toolTip = Add the custom layout to the list
-# bbb.layout.broadcastButton.toolTip = Apply Current Layout to All Viewers
-# bbb.layout.combo.toolTip = Change Your Layout
-# bbb.layout.loadButton.toolTip = Load layouts from a file
-# bbb.layout.saveButton.toolTip = Save layouts to a file
-# bbb.layout.lockButton.toolTip = Lock layout
-# bbb.layout.combo.prompt = Apply a layout
-# bbb.layout.combo.custom = * Custom layout
-# bbb.layout.combo.customName = Custom layout
-# bbb.layout.combo.remote = Remote
-# bbb.layout.save.complete = Layouts were successfully saved
-# bbb.layout.load.complete = Layouts were successfully loaded
-# bbb.layout.load.failed = Failed to load the layouts
-# bbb.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.desktopView.minimizeBtn.accessibilityName = Minimer skriveborddelingsvinduet
+bbb.desktopView.maximizeRestoreBtn.accessibilityName = Maksimer skriveborddelingsvinduet
+bbb.desktopView.closeBtn.accessibilityName = Luk skrivebord delingsvinduet
+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.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
+bbb.layout.broadcastButton.toolTip = Anvend din egen layout til alle deltagere.
+bbb.layout.combo.toolTip = Ændre din layout
+bbb.layout.loadButton.toolTip = Upload layouts fra en fil
+bbb.layout.saveButton.toolTip = Gen layout til en fil
+bbb.layout.lockButton.toolTip = LÃ¥s layout
+bbb.layout.combo.prompt = Anvend en layout
+bbb.layout.combo.custom = *Skræddersyet layout
+bbb.layout.combo.customName = Skræddersyet layout
+bbb.layout.combo.remote = Fjern
+bbb.layout.save.complete = Layouts er gemt
+bbb.layout.load.complete = Layouts er uploaded
+bbb.layout.load.failed = Upload af layouts mislykkedes
+bbb.layout.name.defaultlayout = Default Layout
+bbb.layout.name.videochat = Video Chat
+bbb.layout.name.webcamsfocus = Webcam møde
+bbb.layout.name.presentfocus = Præsentationsmøde
+bbb.layout.name.lectureassistant = Undervisningsassistent
+bbb.layout.name.lecture = Undervisning
bbb.highlighter.toolbar.pencil = Highlighter
-# bbb.highlighter.toolbar.pencil.accessibilityName = Switch whiteboard cursor to pencil
+bbb.highlighter.toolbar.pencil.accessibilityName = Skift whiteboard cursoren til en pen
bbb.highlighter.toolbar.ellipse = Cirkel
-# bbb.highlighter.toolbar.ellipse.accessibilityName = Switch whiteboard cursor to circle
+bbb.highlighter.toolbar.ellipse.accessibilityName = Skift whiteboard cursoren til en cirkel
bbb.highlighter.toolbar.rectangle = Rektangel
-# 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.rectangle.accessibilityName = Skift whiteboard cursoren til en rektangel
+bbb.highlighter.toolbar.panzoom = Pan og zoom
+bbb.highlighter.toolbar.panzoom.accessibilityName = Skift whiteboard cursoren til pan og zoom
+bbb.highlighter.toolbar.clear = Ryd alle anmærkninger
+bbb.highlighter.toolbar.clear.accessibilityName = Ryd whiteboard siden
+bbb.highlighter.toolbar.undo = Fortryd anmærkning
+bbb.highlighter.toolbar.undo.accessibilityName = Fortryd det sidste whiteboard form
bbb.highlighter.toolbar.color = Vælg farve
-# bbb.highlighter.toolbar.color.accessibilityName = Whiteboard mark draw color
+bbb.highlighter.toolbar.color.accessibilityName = Whiteboard tegnefarve
bbb.highlighter.toolbar.thickness = Skift tykkelse
-# bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard draw thickness
-# bbb.logout.title = Logged Out
+bbb.highlighter.toolbar.thickness.accessibilityName = Whiteboard tegne tykkelse
+bbb.logout.title = Du har forladt sessionen
bbb.logout.button.label = OK
bbb.logout.appshutdown = Serverens program er lukket ned
bbb.logout.asyncerror = En asynkron fejl opstod
@@ -353,23 +354,23 @@ 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.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.logout.refresh.message = I tilfælde af at forbindelsen pludselig forsvandt, klik på knappen for at forbinde igen.
+bbb.logout.refresh.label = Forbind igen.
+bbb.logout.confirm.title = Bekræft log ud
+bbb.logout.confirm.message = Er du helt sikker på, du vil forlade sessionen?
+bbb.logout.confirm.yes = Ja
+bbb.logout.confirm.no = Nej
+bbb.connection.failure=Har opdaget tilslutningsproblemer
+bbb.connection.reconnecting=Forbinder igen
+bbb.connection.reestablished=Forbindelsen er etableret igen.
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Deleskrivebord
+bbb.notes.title = Noter
+bbb.notes.cmpColorPicker.toolTip = Tekst farver
+bbb.notes.saveBtn = Gem
+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
@@ -386,189 +387,189 @@ bbb.settings.warning.label = Advarsel
bbb.settings.warning.close = Luk denne advarsel
bbb.settings.noissues = Ingen alvorlige fejl blev fundet.
bbb.settings.instructions = Accepter Flash-prompten der spørger om kameratilladelser. Hvis du kan se og høre dig selv, er din browser opsat korrekt. Andre potentielle problemer er vist forneden. Klik på hver enkelt for at finde en løsning.
-# 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
+ltbcustom.bbb.highlighter.toolbar.triangle = Trekant
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Skift whiteboard cursoren til en trekant
+ltbcustom.bbb.highlighter.toolbar.line = Linje
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Skift whiteboard cursoren til en linje
+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.accessibility.clientReady = Ready
+bbb.accessibility.clientReady = Klar
-# bbb.accessibility.chat.chatBox.reachedFirst = You have reached the first message.
-# bbb.accessibility.chat.chatBox.reachedLatest = You have reached the latest message.
-# bbb.accessibility.chat.chatBox.navigatedFirst = You have navigated to the first message.
-# bbb.accessibility.chat.chatBox.navigatedLatest = You have navigated to the latest message.
-# bbb.accessibility.chat.chatBox.navigatedLatestRead = You have navigated to the most recent message you have read.
-# bbb.accessibility.chat.chatwindow.input = Chat input
+bbb.accessibility.chat.chatBox.reachedFirst = Du har modtaget den første besked
+bbb.accessibility.chat.chatBox.reachedLatest = Du har modtaget den sidste besked
+bbb.accessibility.chat.chatBox.navigatedFirst = Du har navigeret til den første besked
+bbb.accessibility.chat.chatBox.navigatedLatest = Du har navigeret til den sidste besked
+bbb.accessibility.chat.chatBox.navigatedLatestRead = Du har navigeret til den seneste modtaget besked, du har læst.
+bbb.accessibility.chat.chatwindow.input = Chat input
-# bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+bbb.accessibility.chat.initialDescription = Venligst anvend tasteturpilene for at navigere i chatbeskederne
-# bbb.accessibility.notes.notesview.input = Notes input
+bbb.accessibility.notes.notesview.input = Input til noter
-# 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.shortcuthelp.title = Genvejstaster
+bbb.shortcuthelp.minimizeBtn.accessibilityName = Minimer genvejsvinduet for hjælp
+bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = Maksimer genvejsvinduet for hjælp
+bbb.shortcuthelp.closeBtn.accessibilityName = Luk genvejsvinduet for hjælp
+bbb.shortcuthelp.dropdown.general = Globale genveje
+bbb.shortcuthelp.dropdown.presentation = Præsentations genveje
+bbb.shortcuthelp.dropdown.chat = Chat genveje
+bbb.shortcuthelp.dropdown.users = Brugere genveje
+bbb.shortcuthelp.headers.shortcut = Genveje
+bbb.shortcuthelp.headers.function = Funktion
-# 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.general.minimize = 189
+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.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.flash.exit = 81
+bbb.shortcutkey.flash.exit.function = Fokuser ikke på flashvinduet
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Mute og unmute din mikrofon
+bbb.shortcutkey.chat.chatinput = 73
+bbb.shortcutkey.chat.chatinput.function = Fokuser på chat input feltet
+bbb.shortcutkey.present.focusslide = 67
+bbb.shortcutkey.present.focusslide.function = Fokuser på præsentation slide
+bbb.shortcutkey.whiteboard.undo = 90
+bbb.shortcutkey.whiteboard.undo.function = Fortryd det sidste whiteboard mærke
-# 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.focus.users = 49
+bbb.shortcutkey.focus.users.function = Ret fokus på brugervinduet
+bbb.shortcutkey.focus.video = 50
+bbb.shortcutkey.focus.video.function = Ret fokus til webcam vinduet
+bbb.shortcutkey.focus.presentation = 51
+bbb.shortcutkey.focus.presentation.function = Ret fokus på præsentationsvinduet
+bbb.shortcutkey.focus.chat = 52
+bbb.shortcutkey.focus.chat.function = Ret fokus på chatboksen
-# 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
+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
-# 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.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Åben hjælpe-vinduet til genveje
+bbb.shortcutkey.logout = 76
+bbb.shortcutkey.logout.function = Forlad sessionen
+bbb.shortcutkey.raiseHand = 82
+bbb.shortcutkey.raiseHand.function = Løft hånden
-# 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.present.upload = 85
+bbb.shortcutkey.present.upload.function = Upload din præsentation
+bbb.shortcutkey.present.previous = 65
+bbb.shortcutkey.present.previous.function = GÃ¥ til forrige slide
+bbb.shortcutkey.present.select = 83
+bbb.shortcutkey.present.select.function = Se alle slides
+bbb.shortcutkey.present.next = 69
+bbb.shortcutkey.present.next.function = Gå til næste slide
+bbb.shortcutkey.present.fitWidth = 70
+bbb.shortcutkey.present.fitWidth.function = Tilpas slides til bredde
+bbb.shortcutkey.present.fitPage = 80
+bbb.shortcutkey.present.fitPage.function = Tilpas slides til vinduet
-# 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.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Gør deltageren til foredragsholder
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = Smid deltageren ud af sessionen
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Mute eller unmute pågældende deltager
+bbb.shortcutkey.users.muteall = 65v
+bbb.shortcutkey.users.muteall.function = Mute eller unmute alle brugere
+bbb.shortcutkey.users.focusUsers = 85
+bbb.shortcutkey.users.focusUsers.function = Fokuser på deltagerlisten
+bbb.shortcutkey.users.muteAllButPres = 65
+bbb.shortcutkey.users.muteAllButPres.function = Mute alle deltager - undtagen foredragsholderen
-# 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.explanation = ----
-# bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+bbb.shortcutkey.chat.focusTabs = 89
+bbb.shortcutkey.chat.focusTabs.function = Fokus på chat tabs
+bbb.shortcutkey.chat.focusBox = 66
+bbb.shortcutkey.chat.focusBox.function = Fokus på chat box
+bbb.shortcutkey.chat.changeColour = 67
+bbb.shortcutkey.chat.changeColour.function = Fokus på skriftfarve
+bbb.shortcutkey.chat.sendMessage = 83
+bbb.shortcutkey.chat.sendMessage.function = Send chat besked
+bbb.shortcutkey.chat.explanation = ----
+bbb.shortcutkey.chat.explanation.function = For besked navigering, fokuser 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.shortcutkey.chat.chatbox.advance = 40
+bbb.shortcutkey.chat.chatbox.advance.function = Gå til den næste besked
+bbb.shortcutkey.chat.chatbox.goback = 38
+bbb.shortcutkey.chat.chatbox.goback.function = GÃ¥ til forrige besked
+bbb.shortcutkey.chat.chatbox.repeat = 32
+bbb.shortcutkey.chat.chatbox.repeat.function = Gentag forrige besked
+bbb.shortcutkey.chat.chatbox.golatest = 39
+bbb.shortcutkey.chat.chatbox.golatest.function = GÃ¥ til sidste besked
+bbb.shortcutkey.chat.chatbox.gofirst = 37
+bbb.shortcutkey.chat.chatbox.gofirst.function = Gå til første besked
+bbb.shortcutkey.chat.chatbox.goread = 75
+bbb.shortcutkey.chat.chatbox.goread.function = Gå til den sidste besked, du har læst
+bbb.shortcutkey.chat.chatbox.debug = 71
+bbb.shortcutkey.chat.chatbox.debug.function = Midlertidig debug hotkey
-# bbb.polling.startButton.tooltip = Start a poll
-# bbb.polling.startButton.label = Start Poll
-# bbb.polling.publishButton.label = Publish
+bbb.polling.startButton.tooltip = Start en undersøgelse
+bbb.polling.startButton.label = Start undersøgelse
+bbb.polling.publishButton.label = Offentliggør
bbb.polling.closeButton.label = Luk
-# 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.polling.pollModal.title = Live undersøgelse resultater
+bbb.polling.customChoices.title = Indtast svarmuligheder
+bbb.polling.respondersLabel.novotes = Venter på svar
+bbb.polling.respondersLabel.text = {0} brugere har svaret
+bbb.polling.respondersLabel.finished = Færdig
+bbb.polling.answer.Yes = Ja
+bbb.polling.answer.No = Nej
+bbb.polling.answer.True = Sand
+bbb.polling.answer.False = Falsk
+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 = Undersøgelse resultater.
+bbb.polling.results.accessible.answer = Besvar {0} havde {1} stemmer.
bbb.publishVideo.startPublishBtn.labelText = PÃ¥begynd deling
bbb.publishVideo.changeCameraBtn.labelText = Skift kamera
-# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
-# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+bbb.accessibility.alerts.madePresenter = Du er nu foredragsholder
+bbb.accessibility.alerts.madeViewer = Du er nu en observant
-# 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.shortcutkey.specialKeys.space = Spacebar
+bbb.shortcutkey.specialKeys.left = Venstrepil
+bbb.shortcutkey.specialKeys.right = Højrepil
+bbb.shortcutkey.specialKeys.up = Pil op
+bbb.shortcutkey.specialKeys.down = Pil ned
+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 = 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.unlockAll=Ã…ben alle deltagere
+bbb.users.settings.roomIsLocked=LÃ¥s som default
+bbb.users.settings.roomIsMuted=Muted som 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.save = Anvend
+bbb.lockSettings.save.tooltip = Anvend låseindstillinger
+bbb.lockSettings.cancel = Fortryd
+bbb.lockSettings.cancel.toolTip = Lukke dette vindue uden at gemme
-# 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.lockSettings.moderatorLocking = Lås ordfører
+bbb.lockSettings.privateChat = Chat privat
+bbb.lockSettings.publicChat = Ã…ben chat
+bbb.lockSettings.webcam = Webcam
+bbb.lockSettings.microphone = Mikrofon
+bbb.lockSettings.layout = Layout
+bbb.lockSettings.title=LÃ¥s deltagere
+bbb.lockSettings.feature=Funktioner
+bbb.lockSettings.locked=LÃ¥st
+bbb.lockSettings.lockOnJoin=Lås på deltagelse
diff --git a/bigbluebutton-client/locale/de_DE/bbbResources.properties b/bigbluebutton-client/locale/de_DE/bbbResources.properties
index f397898c87c73195a06fc5b37e6b73be2734d92b..5ce4a52e8d548018614a948b41ae47de7ff68fc0 100644
--- a/bigbluebutton-client/locale/de_DE/bbbResources.properties
+++ b/bigbluebutton-client/locale/de_DE/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1007 = Fehler 1007\: ICE Ãœbertragung fehlgeschlag
bbb.webrtcWarning.failedError.1008 = Fehler 1008\: Ãœbertragung fehlgeschlagen
bbb.webrtcWarning.failedError.1009 = Fehler 1009\: STUN/TURN Serverinformation konnte nicht abgerufen werden
bbb.webrtcWarning.failedError.1010 = Fehler 1010\: ICE Verbindungs-Timeout
+bbb.webrtcWarning.failedError.1011 = Fehler 1011\: Zeitüberschreitung beim ICE gathering
bbb.webrtcWarning.failedError.unknown = Fehler {0}\: Unbekannter Fehlercode
bbb.webrtcWarning.failedError.mediamissing = Es konnte nicht auf Ihr Mikrofon für den WebRTC Anruf zugegriffen werden
bbb.webrtcWarning.failedError.endedunexpectedly = Der WebRTC Echotest wurde unerwartet beendet
diff --git a/bigbluebutton-client/locale/el_GR/bbbResources.properties b/bigbluebutton-client/locale/el_GR/bbbResources.properties
index 36652440292ddace49bf187418b487e4205cc78a..ec76d60fe9bfe9352ab56fefa378879fa6355f2c 100644
--- a/bigbluebutton-client/locale/el_GR/bbbResources.properties
+++ b/bigbluebutton-client/locale/el_GR/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) 2015 BigBlueButton Inc. [build {0}] - Για πεÏισσότεÏες πληÏοφοÏίες συνδεθείτε εδώ\: <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Ανοίξτε το παÏάθυÏο καταγÏαφής
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@ bbb.micWarning.message = Το μικÏόφωνό σας δεν Îδειξε ση
# 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
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = Ρυθμίσεις ΚάμεÏας
bbb.users.settings.muteAll = Σίγαση όλων
bbb.users.settings.muteAllExcept = Σίγαση όλων εκτός του παÏουσιαστή
bbb.users.settings.unmuteAll = ΕνεÏγοποίηση ήχου όλων
-bbb.users.settings.lowerAllHands = Κατεβάστε όλα τα χÎÏια
-bbb.users.raiseHandBtn.toolTip = Σήκωμα χεÏιοÏ
-bbb.users.raiseHandBtn.toolTip2 = KατÎβασμα χεÏιοÏ
+# 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 = Κάντε κλικ για να μιλήσετε
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Κατάσταση
# bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
bbb.users.usersGrid.statusItemRenderer.presenter = ΠαÏουσιαστής
bbb.users.usersGrid.statusItemRenderer.moderator = ΔιαχειÏιστής
-bbb.users.usersGrid.statusItemRenderer.lowerHand = KατÎβασμα χεÏιοÏ
-bbb.users.usersGrid.statusItemRenderer.handRaised = ΣηκωμÎνο χÎÏι
+bbb.users.usersGrid.statusItemRenderer.raiseHand = ΣηκωμÎνο χÎÏι
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = ΑκÏοατής
+# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = ÎœÎσα
bbb.users.usersGrid.mediaItemRenderer.talking = Μιλάει
bbb.users.usersGrid.mediaItemRenderer.webcam = Η κάμεÏα διαμοιÏάζεται
@@ -164,6 +170,14 @@ 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = ΠαÏουσίαση
bbb.presentation.titleWithPres = ΠαÏουσίαση\: {0}
bbb.presentation.quickLink.label = ΠαÏάθυÏο ΠαÏουσίασης
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Ελαχιστοποίηση του π
bbb.chat.maximizeRestoreBtn.accessibilityName = Μεγιστοποίηση του παÏαθÏÏου συνομιλίας
bbb.chat.closeBtn.accessibilityName = Κλείσιμο του παÏαθÏÏου συνομιλίας
bbb.chat.chatTabs.accessibleNotice = ÎÎα μηνÏματα στε αυτή την καÏÏ„Îλα.
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = Αλλαγή ΚάμεÏας
bbb.publishVideo.changeCameraBtn.toolTip = Άνοιγμα του διαλόγου αλλαγής κάμεÏας
bbb.publishVideo.cmbResolution.tooltip = Επιλογή ανάλυσης της κάμεÏας
@@ -256,7 +272,7 @@ 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 = Η κάμεÏά σας χÏησιμοποιείται από άλλη εφαÏμογή
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = Δημοσίευση...
bbb.video.publish.closeBtn.accessName = Κλείσιμο παÏαθÏÏου της κάμεÏας
bbb.video.publish.closeBtn.label = ΑκÏÏωση
@@ -270,7 +286,8 @@ 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Ελαχιστοποίηση
bbb.desktopPublish.minimizeBtn.accessibilityName = Ελαχιστοποίηση του παÏαθÏÏου διαμοιÏÎ±ÏƒÎ¼Î¿Ï ÎµÏ€Î¹Ï†Î¬Î½ÎµÎ¹Î±Ï‚ εÏγασίας
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Μεγιστοποίηση του παÏαθÏÏου διαμοιÏÎ±ÏƒÎ¼Î¿Ï ÎµÏ€Î¹Ï†Î¬Î½ÎµÎ¹Î±Ï‚ εÏγασίας
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Επιβεβαίωση ΑποσÏνδεσης
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.bigbluebutton=BigBlueButton
+# bbb.connection.sip=SIP
+# bbb.connection.video=Video
+# bbb.connection.deskshare=Deskshare
bbb.notes.title = Σημειώσεις
bbb.notes.cmpColorPicker.toolTip = ΧÏώμα κειμÎνου
bbb.notes.saveBtn = Αποθήκευση
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = ΚαθολικÎÏ‚ συντομεÏσεις
bbb.shortcuthelp.dropdown.presentation = ΣυντομεÏσεις παÏουσίασης
bbb.shortcuthelp.dropdown.chat = ΣυντομεÏσεις συνομιλίας
bbb.shortcuthelp.dropdown.users = ΣυντευμεÏσεις χÏηστών
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-bbb.shortcuthelp.dropdown.polling2 = ΣυντομεÏσεις δημοψηφίσματος ακÏοατή
bbb.shortcuthelp.headers.shortcut = Συντόμευση
bbb.shortcuthelp.headers.function = ΛειτουÏγία
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Μετακίνηση της εστίασης στο παÏάθυÏο της ΠαÏουσίασης
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = ΜεταφοÏά της εστίασης στο παÏάθυÏο συνομιλίας
-bbb.shortcutkey.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = ΜεταφοÏά της εστίασης στο παÏάθυÏο ψηφίσματος, εαν είναι ανοιχτό.
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Άνοιγμα του παÏαθÏÏου διαμοιÏÎ±ÏƒÎ¼Î¿Ï Ï„Î·Ï‚ επιφάνειας εÏγασίας
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Πλοήγηση στο πιο π
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Î ÏοσωÏινό ενεÏγό κουμπί αποσφαλμάτωσης
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-bbb.polling.createPoll = ΔημιουÏγία νÎας δημοσκόπησης
-bbb.polling.createPoll.moreThanOneResponse = Îα επιτÏÎπεται στους χÏήστες η επιλογή πεÏισσοτÎÏων της μίας απάντησης
-bbb.polling.createPoll.hint = Συμβουλή\: Ξεκινήστε κάθε απάντηση σε νÎα γÏαμμή
-bbb.polling.createPoll.answers = Απαντήσεις\:
-bbb.polling.createPoll.question = ΕÏώτηση\:
-bbb.polling.createPoll.title = Τίτλος\:
-bbb.polling.createPoll.publishToWeb = ΕνεÏγοποίηση ηλεκτÏονικής δημοσκόπησης
-
-bbb.polling.pollPreview = Î Ïοεπισκόπηση δημοσκόπησης
-bbb.polling.pollPreview.modify = ΕπεξεÏγασία
-bbb.polling.pollPreview.publish = Δημοσίευση
-bbb.polling.pollPreview.preview = Î Ïοεπισκόπηση
-bbb.polling.pollPreview.save = Αποθήκευση
-bbb.polling.pollPreview.cancel = ΑκÏÏωση
-bbb.polling.pollPreview.modify = ΕπεξεÏγασία
-bbb.polling.pollPreview.hereIsYourPoll = Αυτή είναι η δημοσκόπησή σου\:
-bbb.polling.pollPreview.ifYouWantChanges = εάν θÎλετε να κάνετε αλλαγÎÏ‚ πιÎστε το κουμπί 'ΕπεξεÏγασία'
-bbb.polling.pollPreview.checkAll = (επιλÎξτε όλα όσα θÎλετε να εφαÏμοστοÏν)
-bbb.polling.pollPreview.pollWillPublishOnline = Αυτή η δημοσκόπηση θα είναι διαθÎσιμη
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.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.results.accessible.header = Poll Results.
+# bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
bbb.publishVideo.startPublishBtn.labelText = Κοινή χÏήση
bbb.publishVideo.changeCameraBtn.labelText = Αλλαγή ΚάμεÏας
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Αλλαγή ΚάμεÏας
bbb.accessibility.alerts.madePresenter = ΠλÎον είστε ο ΠαÏουσιαστής
bbb.accessibility.alerts.madeViewer = ΠλÎον είστε ακÏοατής
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Άνοιγμα του Î¼ÎµÎ½Î¿Ï Î”Î·Î¼Î¿ÏˆÎ·Ï†Î¯ÏƒÎ¼Î±Ï„Ï‰Î½
-bbb.shortcutkey.polling.focusTitle = 6767
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Εστίαση στην επιλογή "ΕπιτÏÎπονται οι πολλαπλÎÏ‚ επιλογÎÏ‚".
-bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Î Ïοεπισκόπηση του δημοψηφίσματος και συνÎχεια.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = ΑκÏÏωση και Îξοδος απο την δημιουÏγία δημοψηφίσματος.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Πίσω και διαμόÏφωση της δημοσκόπησης σας.
-bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-bbb.shortcutkey.polling.save = 8383
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Τα αποτελÎσματα του δημοψηφίσματος είναι διαθÎσιμα μόνο Î±Ï†Î¿Ï Ï„Î¿ δημοψήφισμα Îχει δημοσιευτεί
-bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = ΑνανÎωση των αποτελεσμάτων του δημοψηφίσματος
-bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Επαναδημοσίευση του δημοψηφίσματος.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
bbb.shortcutkey.specialKeys.space = ΠλήκτÏο κενοÏ
bbb.shortcutkey.specialKeys.left = ΑÏιστεÏÏŒ Î’Îλος
bbb.shortcutkey.specialKeys.right = Δεξί Î’Îλος
diff --git a/bigbluebutton-client/locale/en_AU/bbbResources.properties b/bigbluebutton-client/locale/en_AU/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/en_AU/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_AU/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 3693b151b398d2d0f368e9aca6c877334e55a3fc..d59ed03306f390399e569bdb03225e6d80dd73e0 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -76,6 +76,7 @@ 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
diff --git a/bigbluebutton-client/locale/es_419/bbbResources.properties b/bigbluebutton-client/locale/es_419/bbbResources.properties
index ecfbc574041129fe82cba654476c9995b9e23715..a4f30859cefb2c55c8d6e486b2c890fd3e43a60a 100644
--- a/bigbluebutton-client/locale/es_419/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_419/bbbResources.properties
@@ -76,6 +76,7 @@ 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 obtener información del servidor
bbb.webrtcWarning.failedError.1010 = Error 1010\: La negociación ICE agotó el tiempo de espera
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Error {0}\: Código de error desconocido
bbb.webrtcWarning.failedError.mediamissing = Su micrófono no pudo ser utilizarse para una llamada mediante WebRTC.
bbb.webrtcWarning.failedError.endedunexpectedly = El test de eco WebRTC finalizó de forma inesperada.
diff --git a/bigbluebutton-client/locale/es_CL/bbbResources.properties b/bigbluebutton-client/locale/es_CL/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/es_CL/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_CL/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/es_ES/bbbResources.properties b/bigbluebutton-client/locale/es_ES/bbbResources.properties
index 3fa3bde352be679f1958be3b66541297e3ff9166..77dca949ef78cd56b980245638609cb2bbbed8a2 100644
--- a/bigbluebutton-client/locale/es_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_ES/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = Conectando con el servidor
bbb.mainshell.statusProgress.loading = Cargando {0} módulos
bbb.mainshell.statusProgress.cannotConnectServer = Lo sentimos, no pudimos conectar con el servidor.
-# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - Para más información visita <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
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
@@ -52,7 +52,7 @@ bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Pulse aquà si no dese
bbb.micSettings.webrtc.notCapableBrowser = Su navegador no soporta WebRTC. Por favor, utilice Google Chrome (versión 32 o superior); o Mozilla Firefox (versión 26 o superior). Aún podrá unirse a la videoconferencia utilizando la Plataforma Adobe Flash.
bbb.micSettings.webrtc.connecting = Llamando
bbb.micSettings.webrtc.waitingforice = Conectando
-# bbb.micSettings.webrtc.transferring = Transferring
+bbb.micSettings.webrtc.transferring = Transfiriendo
bbb.micSettings.webrtc.endingecho = Uniéndose al audio
bbb.micSettings.webrtc.endedecho = Test de Eco finalizado.
bbb.micPermissions.firefox.title = Permisos de Micrófono de Firefox
@@ -69,13 +69,14 @@ bbb.webrtcWarning.title = Conexión WebRTC fallida
bbb.webrtcWarning.failedError.1001 = Error 1001\: Socket Web desconectado
bbb.webrtcWarning.failedError.1002 = Error 1002\: No se pudo establecer una conexión de Socket Web
bbb.webrtcWarning.failedError.1003 = Error 1003\: Versión de navegador no soportada
-# bbb.webrtcWarning.failedError.1004 = Error 1004\: Failure on call (reason\={0})
+bbb.webrtcWarning.failedError.1004 = Error 1004\: Fallo en la llamada (motivo\={0})
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\: 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.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
bbb.webrtcWarning.failedError.mediamissing = No se pudo adquirir su micrófono para la llamada WebRTC.
bbb.webrtcWarning.failedError.endedunexpectedly = El test de eco WebRTC finalizó de forma inesperada.
@@ -130,8 +131,8 @@ 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.clearAllStatus = Clear all status icons
-# bbb.users.emojiStatusBtn.toolTip = Update my status icon
+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.roomLocked.text = Audiencia Bloqueada
bbb.users.pushToTalk.toolTip = Pulse para hablar
@@ -140,7 +141,7 @@ 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 = Copy User Names
+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
@@ -149,13 +150,13 @@ bbb.users.usersGrid.statusItemRenderer.changePresenter = Haga click para cambiar
bbb.users.usersGrid.statusItemRenderer.presenter = Presentador
bbb.users.usersGrid.statusItemRenderer.moderator = Moderador
bbb.users.usersGrid.statusItemRenderer.raiseHand = Mano Alzada
-# bbb.users.usersGrid.statusItemRenderer.happy = Happy
-# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
-# bbb.users.usersGrid.statusItemRenderer.confused = Confused
-# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
+bbb.users.usersGrid.statusItemRenderer.happy = Feliz
+bbb.users.usersGrid.statusItemRenderer.unhappy = Triste
+bbb.users.usersGrid.statusItemRenderer.confused = Confundido
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Limpiar mi estado
bbb.users.usersGrid.statusItemRenderer.viewer = Espectador
-# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
-# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Compartiendo webcam.
+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,14 +170,14 @@ 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.emojiStatus.clear = Clear
-# bbb.users.emojiStatus.raiseHand = Raise hand
-# bbb.users.emojiStatus.happy = Happy
-# bbb.users.emojiStatus.smile = Smile
-# bbb.users.emojiStatus.sad = Sad
-# bbb.users.emojiStatus.confused = Confused
-# bbb.users.emojiStatus.neutral = Neutral
-# bbb.users.emojiStatus.away = Away
+bbb.users.emojiStatus.clear = Limpiar
+bbb.users.emojiStatus.raiseHand = Levantar la mano
+bbb.users.emojiStatus.happy = Feliz
+bbb.users.emojiStatus.smile = Sonrisa
+bbb.users.emojiStatus.sad = Triste
+bbb.users.emojiStatus.confused = Confundido
+bbb.users.emojiStatus.neutral = Neutral
+bbb.users.emojiStatus.away = Inactivo
bbb.presentation.title = Presentación
bbb.presentation.titleWithPres = Presentación\: {0}
bbb.presentation.quickLink.label = Ventana de Presentación
@@ -248,8 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Minimizar la ventana del charla
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 = System
-# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
+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.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
@@ -271,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Esperando por aprobación
bbb.video.publish.hint.videoPreview = Vista previa vÃdeo
bbb.video.publish.hint.openingCamera = Abriendo cámara...
bbb.video.publish.hint.cameraDenied = Acceso denegado a cámara
-# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.cameraIsBeingUsed = No se pudo abrir su cámara - Debe estar en uso por parte de otra aplicación
bbb.video.publish.hint.publishing = Publicando...
bbb.video.publish.closeBtn.accessName = Cerrar la ventana de configuraciones de la cámara web
bbb.video.publish.closeBtn.label = Cancelar
@@ -285,8 +286,8 @@ 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 = 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.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.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
@@ -359,13 +360,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=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.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.notes.title = Notas
bbb.notes.cmpColorPicker.toolTip = Color de Texto
bbb.notes.saveBtn = Guardar
@@ -395,7 +396,7 @@ ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Cambiar Cursos de piz
ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Color de texto
ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Tamaño de letra
-# bbb.accessibility.clientReady = Ready
+bbb.accessibility.clientReady = Listo
bbb.accessibility.chat.chatBox.reachedFirst = Has llegado al primer mensaje
bbb.accessibility.chat.chatBox.reachedLatest = Has llegado al último mensaje
@@ -512,28 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Navegar al mensaje leÃdo más re
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Tecla de acceso rápido para depurar temporalmente
-# bbb.polling.startButton.tooltip = Start a poll
-# bbb.polling.startButton.label = Start Poll
+bbb.polling.startButton.tooltip = Iniciar una encuesta
+bbb.polling.startButton.label = Iniciar Encuesta
bbb.polling.publishButton.label = Publicar
bbb.polling.closeButton.label = Cerrar
-# 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 = 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
bbb.polling.answer.Yes = Si
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.polling.answer.True = Verdadero
+bbb.polling.answer.False = Falso
+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 = 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
@@ -571,4 +572,4 @@ bbb.lockSettings.layout = Diseño
bbb.lockSettings.title=Bloquear Audiencia
bbb.lockSettings.feature=CaracterÃstica
bbb.lockSettings.locked=Bloqueado
-# bbb.lockSettings.lockOnJoin=Lock On Join
+bbb.lockSettings.lockOnJoin=Bloquear al Unirse
diff --git a/bigbluebutton-client/locale/es_LA/bbbResources.properties b/bigbluebutton-client/locale/es_LA/bbbResources.properties
index ecfbc574041129fe82cba654476c9995b9e23715..a4f30859cefb2c55c8d6e486b2c890fd3e43a60a 100644
--- a/bigbluebutton-client/locale/es_LA/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_LA/bbbResources.properties
@@ -76,6 +76,7 @@ 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 obtener información del servidor
bbb.webrtcWarning.failedError.1010 = Error 1010\: La negociación ICE agotó el tiempo de espera
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Error {0}\: Código de error desconocido
bbb.webrtcWarning.failedError.mediamissing = Su micrófono no pudo ser utilizarse para una llamada mediante WebRTC.
bbb.webrtcWarning.failedError.endedunexpectedly = El test de eco WebRTC finalizó de forma inesperada.
diff --git a/bigbluebutton-client/locale/et_EE/bbbResources.properties b/bigbluebutton-client/locale/et_EE/bbbResources.properties
index 80db13a0c8ed5eafe380675b62ef5d58af8e62ab..85e9d65ab167e8eab6941e5ea68ae51c73cce542 100644
--- a/bigbluebutton-client/locale/et_EE/bbbResources.properties
+++ b/bigbluebutton-client/locale/et_EE/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1007 = Viga 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 = Viga {0}\: Tundmatu veakood
bbb.webrtcWarning.failedError.mediamissing = Sinu mikrofoni ühendamine WebRTC kõnega ebaõnnestus
bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC kaja-test lõppes ootamatult
diff --git a/bigbluebutton-client/locale/eu_ES/bbbResources.properties b/bigbluebutton-client/locale/eu_ES/bbbResources.properties
index e2f7271bb98e4f95ec8951ef473e36b42d9285fa..3c1c055183cc48d76ebf56d30b22ac3d93074698 100644
--- a/bigbluebutton-client/locale/eu_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/eu_ES/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Audio-ezarpenak. Audio-ezarpenen leiho honetan f
# 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
diff --git a/bigbluebutton-client/locale/fa_IR/bbbResources.properties b/bigbluebutton-client/locale/fa_IR/bbbResources.properties
index 3f245ba46d506584adc4e04de6bee6456a6ecdc5..98c6a64fc1e4fffba38b61cb114e4366f00c78ed 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = برای اطلاعات بیشتر به <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>اینجا</u></a> رجوع کنید
bbb.mainshell.logBtn.toolTip = باز کردن پنجره تنظیمات میکروÙون
bbb.mainshell.meetingNotFound = جلسه یاÙت نشد
bbb.mainshell.invalidAuthToken = توکن اØراز هویت نامعتبر
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = خطا 1006\: تایم اوت در تماس
bbb.webrtcWarning.failedError.1007 = خطا\: 1007\: Ú¯Ùتگو ICE با شکست روبرو شد
bbb.webrtcWarning.failedError.1008 = خطای 1008\: انتقال با شکست مواجه شد
bbb.webrtcWarning.failedError.1009 = خطای 1009\: امکان دریاÙت اطلاعات سرور STUN/TURN وجود ندارد
+# bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = خطا {0}\: کد خطای ناشناخته
bbb.webrtcWarning.failedError.mediamissing = امکان استÙاده از میکروÙون شما برای تماس WebRTC وجود ندارد
bbb.webrtcWarning.failedError.endedunexpectedly = آزمون اکو مربوط به WebRTC به صورت غیر منتظره پایان یاÙت
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = تنظیمات دوربین
bbb.users.settings.muteAll = قطع صدای همه کاربران
bbb.users.settings.muteAllExcept = قطع صدای همه غیر از ارائه دهنده
bbb.users.settings.unmuteAll = وصل کردن صدای همه
-bbb.users.settings.lowerAllHands = پایین اوردن دست همه اÙراد
-bbb.users.raiseHandBtn.toolTip = بالا بردن دست
-bbb.users.raiseHandBtn.toolTip2 = پایین آوردن دست
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = صدای مشاهده کنندگان قطع شد
bbb.users.roomLocked.text = مشاهده کنندگان Ù‚ÙÙ„ شدند
bbb.users.pushToTalk.toolTip = برای صØبت کردن کلیک کنید
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = وضعیت
bbb.users.usersGrid.statusItemRenderer.changePresenter = برای تبدیل وضعیت به ارائه دهنده کلیک کنید
bbb.users.usersGrid.statusItemRenderer.presenter = ارائه دهنده
bbb.users.usersGrid.statusItemRenderer.moderator = مدیر
-bbb.users.usersGrid.statusItemRenderer.lowerHand = پایین آوردن دست
-bbb.users.usersGrid.statusItemRenderer.handRaised = اجازه گرÙته
+bbb.users.usersGrid.statusItemRenderer.raiseHand = اجازه گرÙته
+bbb.users.usersGrid.statusItemRenderer.happy = خوشØال
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = مشاهده کننده
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = به اشتراک گذاری دوربین
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = رسانه
bbb.users.usersGrid.mediaItemRenderer.talking = در Øال صØبت
bbb.users.usersGrid.mediaItemRenderer.webcam = به اشتراک گذاری دوربین
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = به اشتراک گذاری دو
bbb.users.usersGrid.mediaItemRenderer.micOff = میکروÙون خاموش
bbb.users.usersGrid.mediaItemRenderer.micOn = میکروÙون روشن
bbb.users.usersGrid.mediaItemRenderer.noAudio = عدم Øضور در Ú©Ù†Ùراس صوتی
+bbb.users.emojiStatus.clear = پاک کردن
+# bbb.users.emojiStatus.raiseHand = Raise hand
+bbb.users.emojiStatus.happy = خوشØال
+bbb.users.emojiStatus.smile = لبخند
+bbb.users.emojiStatus.sad = ناراØت
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = ارائه
bbb.presentation.titleWithPres = ارائه\: {0}
bbb.presentation.quickLink.label = پنجره ارائه
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = کمینه کردن پنجره Ú¯Ùتگ
bbb.chat.maximizeRestoreBtn.accessibilityName = بیشینه کردن پنجره Ú¯Ùتگوی متنی
bbb.chat.closeBtn.accessibilityName = بستن پنجره Ú¯Ùتگوی متنی
bbb.chat.chatTabs.accessibleNotice = پیام های جدید در این زبانه
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = تغییر تنظیمات دوربین
bbb.publishVideo.changeCameraBtn.toolTip = باز کردن جعبه Ù…Øاوره ای تغییر دوربین
bbb.publishVideo.cmbResolution.tooltip = ÙˆØ¶ÙˆØ Ø¯ÙˆØ±Ø¨ÛŒÙ† را انتخاب کنید
@@ -256,7 +272,7 @@ 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 = دوربین شما توسط برنامه دیگری در Øال استÙاده Ù…ÛŒ باشد
+bbb.video.publish.hint.cameraIsBeingUsed = وب‌کم شما باز نشد - شاید توسط برنامه دیگری در Øال استÙاده باشد.
bbb.video.publish.hint.publishing = در Øال پخش...
bbb.video.publish.closeBtn.accessName = بستن جعبه Ù…Øاوره ای تنظیمات دوربین
bbb.video.publish.closeBtn.label = انصراÙ
@@ -270,7 +286,8 @@ bbb.desktopPublish.stop.tooltip = بستن پنجره اشتراک صÙØÙ‡
bbb.desktopPublish.stop.label = خروج
bbb.desktopPublish.maximizeRestoreBtn.toolTip = شما قادر به بیشینه کردن این پنجره نیستید
bbb.desktopPublish.closeBtn.toolTip = توق٠اشتراک گذاری و خروج
-bbb.desktopPublish.chromeOnMacUnsupportedHint = اشتراک میزکار در Øال Øاضر در مرورگر کروم تØت سیستم عامل Ù…Ú© پشتیبانی نمی شود.پیشنهاد Ù…ÛŒ شود برای اشتراک میز کار از ÙایرÙاکس استÙاده کنید.
+# 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.minimizeBtn.toolTip = کمینه کردن
bbb.desktopPublish.minimizeBtn.accessibilityName = کمینه کردن پنجره نمایش اشتراک صÙØÙ‡
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = بیشینه کردن پنجره نمایش اشتراک صÙØÙ‡
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = تایید خروج از سیستم
bbb.logout.confirm.message = آیا مطمئن هستید میخواهید از سیستم خارج شوید؟
bbb.logout.confirm.yes = بله
bbb.logout.confirm.no = خیر
+# bbb.connection.failure=Detected Connectivity Problems
+bbb.connection.reconnecting=برقراری مجدد ارتباط
+bbb.connection.reestablished=ارتباط مجددا برقرار شد
+# bbb.connection.bigbluebutton=BigBlueButton
+# bbb.connection.sip=SIP
+# bbb.connection.video=Video
+# bbb.connection.deskshare=Deskshare
bbb.notes.title = یادداشت ها
bbb.notes.cmpColorPicker.toolTip = رنگ متن
bbb.notes.saveBtn = ذخیره
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = کلیدهای میانبر سراسری
bbb.shortcuthelp.dropdown.presentation = کلیدهای میانبر ارائه
bbb.shortcuthelp.dropdown.chat = کلیدهای میانبرگÙتگوی متنی
bbb.shortcuthelp.dropdown.users = میانبرهای کاربران
-bbb.shortcuthelp.dropdown.polling = میانبرهای نظرسنجی ارائه دهنده
-bbb.shortcuthelp.dropdown.polling2 = میانبرهای نظرسنجی مشاهده کننده
bbb.shortcuthelp.headers.shortcut = میانبر
bbb.shortcuthelp.headers.function = عملیات
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = انتقال قسمت Ùعال به پنجره ارائه
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = انتقال قسمت Ùعال به پنجره Ú¯Ùتگوی متنی
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Ùعال سازی پنجره ایجاد نظرسنجی، اگر در Øال اجرا است
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Ùعال سازی پنجره امار نظرسنجی، اگر در Øال اجرا است
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Ùعال سازی پنجره رای دهی، اگر در Øال اجرا است
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = باز کردن پنجره اشتراک صÙØÙ‡
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = رÙتن به جدیدترین Ù¾
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = کلید اشکال یابی موقت
-bbb.polling.toolbar.toolTip = مدیریت نظرسنجی ها
-bbb.polling.buttonName = مدیریت نظرسنجی ها
-bbb.polling.createPoll = ایجاد نظرسنجی جدید
-bbb.polling.createPoll.moreThanOneResponse = اجازه انتخاب بيش از يک پاسخ به کاربران
-bbb.polling.createPoll.hint = نکته\: هر پاسخ را در یک خط جدید بنویسید
-bbb.polling.createPoll.answers = پاسخ ها\:
-bbb.polling.createPoll.question = سوال\:
-bbb.polling.createPoll.title = عنوان
-bbb.polling.createPoll.publishToWeb = Ùعال سازی نظرسنجی تØت وب
-
-bbb.polling.pollPreview = پیش نمایش نظرسنجی
-bbb.polling.pollPreview.modify = ویرایش
-bbb.polling.pollPreview.publish = انتشار
-bbb.polling.pollPreview.preview = پیش نمایش
-bbb.polling.pollPreview.save = ذخیره
-bbb.polling.pollPreview.cancel = لغو
-bbb.polling.pollPreview.modify = ویرایش
-bbb.polling.pollPreview.hereIsYourPoll = نظر سنجي شما آماده است\:
-bbb.polling.pollPreview.ifYouWantChanges = برای ايجاد تغييرات روي دکمه "ويرايش" کليک کنيد
-bbb.polling.pollPreview.checkAll = (مواردي که ممکن است به کار بروند را انتخاب کنيد)
-bbb.polling.pollPreview.pollWillPublishOnline = این نظرسنجی برای رای گیری آنلاین در دسترس خواهد بود
-
-bbb.polling.resultBtn.label=نتایج
-bbb.polling.resultBtn.toolTip=نمایش نتایج نظرسنجی
-bbb.polling.startBtn.label=شروع
-bbb.polling.startBtn.toolTip=شروع نظرسنجی
-bbb.polling.editBtn.label=ویرایش
-bbb.polling.editBtn.toolTip=ویرایش نظرسنجی
-bbb.polling.deleteBtn.toolTip=Øذ٠نظرسنجی
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.answer.Yes = بله
+bbb.polling.answer.No = خير
+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 = نتایج نظرسنجی
+bbb.polling.results.accessible.answer = گزینه {0}، {1} رأی دارد.
bbb.publishVideo.startPublishBtn.labelText = آغاز اشتراک گذاری
bbb.publishVideo.changeCameraBtn.labelText = تغییر تنظیمات دوربین
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = تغییر تنظیمات دورب
bbb.accessibility.alerts.madePresenter = شما هم اکنون ارائه دهنده هستید
bbb.accessibility.alerts.madeViewer = شما هم اکنون مشاهده کننده هستید
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = باز کردن منوی نظرسنجی
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Ùعال سازی جعبه ورودی عنوان
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Ùعال سازی جعبه ورودی سوال
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Ùعال سازی جعبه ورودی پاسخ ها
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Ùعال کردن جعبه انتخاب "امکان انتخاب چندین گزینه"
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Ùعال سازی Ú†Ú© باکس "قعال سازی نظرسنجی انلاین"
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = پیش نمایش نظرسنجی Ùˆ رÙتن به مرØله بعد
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = لغو و خروج از ایجاد نظرسنجی
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = برگشت به عقب و تغییر نظرسنجی
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = انتشار نتایج نظر سنجی و شروع رای گیری
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = ذخیره کردن نظرسنجی برای استÙاده در اینده
-
-bbb.shortcutkey.pollStats.explanation = ---
-bbb.shortcutkey.pollStats.explanation.function = نتایج نظرسنجی تنها یعد از اتمام رای گیری قابل مشاهده خواهد بود
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Ùعال سازی نتایج نظرسنجی
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = دوباره سازی نتایج نظرسنجی
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Ùعال سازی جعبه آدرس نظرسنجی آنلاین
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = توق٠نظرسنجی و اتمام رای گیری
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = باز انتشار نتایج نظرسنجی
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = بستن پنجره نتایج نظر سنجی
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = گرÙتن رای برای گزینه های انتخاب شده
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = تمرکز روی سوال
-
bbb.shortcutkey.specialKeys.space = کلید Ùاصله
bbb.shortcutkey.specialKeys.left = کلید جهتی چپ
bbb.shortcutkey.specialKeys.right = کلید جهتی راست
diff --git a/bigbluebutton-client/locale/fi_FI/bbbResources.properties b/bigbluebutton-client/locale/fi_FI/bbbResources.properties
index 8a82ea91da9b3bc0302bcd0ac469963cf34dcfbf..e6e84ea8844bf6cc713599a95903ac7f3bfb26f0 100644
--- a/bigbluebutton-client/locale/fi_FI/bbbResources.properties
+++ b/bigbluebutton-client/locale/fi_FI/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Ääniasetukset. Ääniasetukset ovat päällimm
# 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
diff --git a/bigbluebutton-client/locale/fr_CA/bbbResources.properties b/bigbluebutton-client/locale/fr_CA/bbbResources.properties
index bd988b513d3049e7c08a89840096c73f2b0275cf..cb406b237fa800dc43955eca8beb596c6dba4d1f 100644
--- a/bigbluebutton-client/locale/fr_CA/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_CA/bbbResources.properties
@@ -76,6 +76,7 @@ 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
diff --git a/bigbluebutton-client/locale/fr_FR/bbbResources.properties b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
index 13f0ec6ac546e9c6589a097eff89f8d0ffe18b92..c828011123c28ee3525ebbcc179ac0136a8bb0f8 100644
--- a/bigbluebutton-client/locale/fr_FR/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = Connexion au serveur
bbb.mainshell.statusProgress.loading = Chargement de {0} modules
bbb.mainshell.statusProgress.cannotConnectServer = Désolé, impossible d'établir une connexion au serveur.
-# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [version {0}] - Pour plus d'information, visitez <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Ouvrir la fenêtre de log
bbb.mainshell.meetingNotFound = Conférence introuvable
bbb.mainshell.invalidAuthToken = Jeton d'authentification invalide
@@ -15,7 +15,7 @@ bbb.oldlocalewindow.windowTitle = Avertissement \: Les traductions ne sont pas
bbb.audioSelection.title = Comment souhaitez-vous rejoindre la conversation audio ?
bbb.audioSelection.btnMicrophone.label = Microphone
bbb.audioSelection.btnMicrophone.toolTip = Joindre la conférence audio avec votre microphone
-bbb.audioSelection.btnListenOnly.label = Sans Microphone
+bbb.audioSelection.btnListenOnly.label = Écoute seulement
bbb.audioSelection.btnListenOnly.toolTip = Joindre la conférence audio seulement en écoute
bbb.audioSelection.txtPhone.text = Pour rejoindre cette conférence par téléphone, composez le \: {0} puis entrez {1} comme code de conférence.
bbb.micSettings.title = Test Audio
@@ -54,17 +54,17 @@ bbb.micSettings.webrtc.connecting = Appel
bbb.micSettings.webrtc.waitingforice = Connexion
bbb.micSettings.webrtc.transferring = Transfert en cours
bbb.micSettings.webrtc.endingecho = Connexion à la conversation audio en cours
-bbb.micSettings.webrtc.endedecho = Test d'echo terminé.
+bbb.micSettings.webrtc.endedecho = Test d'écho terminé.
bbb.micPermissions.firefox.title = Permission d'utilisation du microphone par Firefox
bbb.micPermissions.firefox.message1 = Choisissez votre microphone et cliquez sur Partager.
-bbb.micPermissions.firefox.message2 = Si vous ne voyez pas la liste des microphones, cliquez sur l'icone de microphone.
+bbb.micPermissions.firefox.message2 = Si vous ne voyez pas la liste des microphones, cliquez sur l'icône de microphone.
bbb.micPermissions.chrome.title = Permission d'utilisation du microphone par Chrome
bbb.micPermissions.chrome.message1 = Cliquez sur Autoriser pour donner à Chrome la permission d'utiliser votre microphone
bbb.micWarning.title = Avertissement audio
bbb.micWarning.joinBtn.label = Joindre malgré tout
bbb.micWarning.testAgain.label = Tester à nouveau
bbb.micWarning.message = Votre microphone n'a montré aucune activité, les autres participants ne pourront certainement pas vous entendre durant cette session.
-bbb.webrtcWarning.message = Les problèmes WebRTC suivants ont été détectés\: {0}. Voulez-vous essayer Flash à la place ?
+bbb.webrtcWarning.message = Les problèmes WebRTC suivants ont été détectés \: {0}. Voulez-vous essayer Flash à la place ?
bbb.webrtcWarning.title = Échec d'audio via WebRTC
bbb.webrtcWarning.failedError.1001 = Erreur 1001 \: WebSocket déconnectée
bbb.webrtcWarning.failedError.1002 = Erreur 1002 \: Impossible d'établir une connexion WebSocket
@@ -75,7 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Erreur 1006 \: L'appel a expiré
bbb.webrtcWarning.failedError.1007 = Erreur 1007 \: Échec de la négociation ICE
bbb.webrtcWarning.failedError.1008 = Erreur 1008 \: Échec du transfert
bbb.webrtcWarning.failedError.1009 = Erreur 1009 \: Impossible de récupérer les informations du serveur STUN/TURN
-# bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+bbb.webrtcWarning.failedError.1010 = Erreur 1010\: ICE temps de négociation dépassé
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Erreur {0} \: Code d'erreur inconnu
bbb.webrtcWarning.failedError.mediamissing = Il n'a pas été possible d'utiliser votre microphone pour un appel WebRTC
bbb.webrtcWarning.failedError.endedunexpectedly = Le test d'echo WebRTC s'est terminé de façon inattendue
@@ -130,8 +131,8 @@ bbb.users.settings.webcamSettings = Paramètres de la webcam
bbb.users.settings.muteAll = Rendre silencieux tous les utilisateurs
bbb.users.settings.muteAllExcept = Rendre silencieux tous les utilisateurs sauf le présentateur
bbb.users.settings.unmuteAll = Activer le microphone pour tous les utilisateurs
-# bbb.users.settings.clearAllStatus = Clear all status icons
-# bbb.users.emojiStatusBtn.toolTip = Update my status icon
+bbb.users.settings.clearAllStatus = Supprimer toutes les icônes de status
+bbb.users.emojiStatusBtn.toolTip = Actualiser mon icône de statut
bbb.users.roomMuted.text = Participants en sourdine
bbb.users.roomLocked.text = Participants bloqués
bbb.users.pushToTalk.toolTip = Parler
@@ -149,13 +150,13 @@ bbb.users.usersGrid.statusItemRenderer.changePresenter = Cliquer pour définir c
bbb.users.usersGrid.statusItemRenderer.presenter = Présentateur
bbb.users.usersGrid.statusItemRenderer.moderator = Modérateur
bbb.users.usersGrid.statusItemRenderer.raiseHand = Main levée
-# bbb.users.usersGrid.statusItemRenderer.happy = Happy
-# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
-# bbb.users.usersGrid.statusItemRenderer.confused = Confused
-# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
+bbb.users.usersGrid.statusItemRenderer.happy = Joyeux
+bbb.users.usersGrid.statusItemRenderer.unhappy = Faché
+bbb.users.usersGrid.statusItemRenderer.confused = Confus
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Supprimer mon 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.streamIcon.toolTip = webcam en cours de partage
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Est présentateur
bbb.users.usersGrid.mediaItemRenderer = Média
bbb.users.usersGrid.mediaItemRenderer.talking = Parler
bbb.users.usersGrid.mediaItemRenderer.webcam = Partager la webcam
@@ -169,14 +170,14 @@ 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.emojiStatus.clear = Clear
-# bbb.users.emojiStatus.raiseHand = Raise hand
-# bbb.users.emojiStatus.happy = Happy
-# bbb.users.emojiStatus.smile = Smile
-# bbb.users.emojiStatus.sad = Sad
-# bbb.users.emojiStatus.confused = Confused
-# bbb.users.emojiStatus.neutral = Neutral
-# bbb.users.emojiStatus.away = Away
+bbb.users.emojiStatus.clear = Supprimer
+bbb.users.emojiStatus.raiseHand = Lever la main
+bbb.users.emojiStatus.happy = Joyeux
+bbb.users.emojiStatus.smile = Sourire
+bbb.users.emojiStatus.sad = Faché
+bbb.users.emojiStatus.confused = Confus
+bbb.users.emojiStatus.neutral = Neutre
+bbb.users.emojiStatus.away = Loin
bbb.presentation.title = Présentation
bbb.presentation.titleWithPres = Présentation \: {0}
bbb.presentation.quickLink.label = Fenêtre présentation
@@ -248,8 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Réduire la fenêtre de discussion
bbb.chat.maximizeRestoreBtn.accessibilityName = Agrandir la fenêtre de discussion
bbb.chat.closeBtn.accessibilityName = Fermer la fenêtre de discussion
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 = Le message est {0} caractère(s) trop long
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
@@ -271,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Attend l'approbation
bbb.video.publish.hint.videoPreview = Prévisualisation vidéo
bbb.video.publish.hint.openingCamera = Ouverture de la webcam...
bbb.video.publish.hint.cameraDenied = Accès à la webcam refusé
-# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
+bbb.video.publish.hint.cameraIsBeingUsed = Votre webcam n'a pas pu s'ouvrir - elle est peut-être utilisée par une autre application
bbb.video.publish.hint.publishing = Publication...
bbb.video.publish.closeBtn.accessName = Fermer la fenêtre de paramètres pour la webcam
bbb.video.publish.closeBtn.label = Annuler
@@ -285,8 +286,8 @@ 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.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.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
@@ -353,19 +354,19 @@ 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.logout.refresh.message = Si cette déconnexion était innatendue, cliquez sur le bouton ci-dessous pour vous reconnecter.
+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
bbb.logout.confirm.title = Confirmer la déconnexion
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.bigbluebutton=BigBlueButton
-# bbb.connection.sip=SIP
-# bbb.connection.video=Video
-# bbb.connection.deskshare=Deskshare
+bbb.connection.failure=Problèmes de connectivité détectés
+bbb.connection.reconnecting=Reconnexion en cours
+bbb.connection.reestablished=Connexion rétablie
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Vidéo
+bbb.connection.deskshare=Partage d'écran
bbb.notes.title = Notes
bbb.notes.cmpColorPicker.toolTip = Couleur du texte
bbb.notes.saveBtn = Sauvegarder
@@ -395,7 +396,7 @@ ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Changer le curseur du
ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Couleur du texte
ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Taille de caractère
-# 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.
@@ -512,28 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Naviguer jusqu'au dernier message
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 = Démarrer un vote
+bbb.polling.startButton.label = Démarrer le vote
bbb.polling.publishButton.label = Publier
bbb.polling.closeButton.label = Fermer
-# 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 = Les résultats du vote en direct
+bbb.polling.customChoices.title = Entrer les choix du vote
+bbb.polling.respondersLabel.novotes = En attente des réponses
+bbb.polling.respondersLabel.text = {0} Utilisateurs ont répondu
+bbb.polling.respondersLabel.finished = Fait
bbb.polling.answer.Yes = Oui
bbb.polling.answer.No = Non
-# 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.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.D = D
+bbb.polling.answer.E = E
+bbb.polling.answer.F = F
+bbb.polling.answer.G = G
+bbb.polling.results.accessible.header = Résultats du vote
+bbb.polling.results.accessible.answer = La réponse {0} avait {1} votes.
bbb.publishVideo.startPublishBtn.labelText = Démarrer le partage
bbb.publishVideo.changeCameraBtn.labelText = Changer la webcam
@@ -571,4 +572,4 @@ bbb.lockSettings.layout = Disposition
bbb.lockSettings.title=Verrouiller les participants
bbb.lockSettings.feature=Fonctionnalité
bbb.lockSettings.locked=Verrouillé
-# bbb.lockSettings.lockOnJoin=Lock On Join
+bbb.lockSettings.lockOnJoin=Verrouiller à la connexion
diff --git a/bigbluebutton-client/locale/gl_ES/bbbResources.properties b/bigbluebutton-client/locale/gl_ES/bbbResources.properties
new file mode 100644
index 0000000000000000000000000000000000000000..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b
--- /dev/null
+++ b/bigbluebutton-client/locale/gl_ES/bbbResources.properties
@@ -0,0 +1,575 @@
+# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# 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 = Open tutorial videos in a 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.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.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.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
+# 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.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
+# 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\: Failed 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.usersList.toolTip = Select User To Open Private Chat
+# 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.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.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.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.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.layout.addButton.toolTip = Add the custom layout to the list
+# bbb.layout.broadcastButton.toolTip = Apply Current Layout to All Viewers
+# bbb.layout.combo.toolTip = Change Your Layout
+# bbb.layout.loadButton.toolTip = Load layouts from a file
+# bbb.layout.saveButton.toolTip = Save layouts to a file
+# bbb.layout.lockButton.toolTip = Lock layout
+# bbb.layout.combo.prompt = Apply a layout
+# bbb.layout.combo.custom = * Custom layout
+# bbb.layout.combo.customName = Custom layout
+# bbb.layout.combo.remote = Remote
+# bbb.layout.save.complete = Layouts were successfully saved
+# bbb.layout.load.complete = Layouts were successfully loaded
+# bbb.layout.load.failed = Failed to load the layouts
+# bbb.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.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 failed
+# 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.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.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
+# 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.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.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 = 81
+# 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.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
+
+# 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.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.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
diff --git a/bigbluebutton-client/locale/he_IL/bbbResources.properties b/bigbluebutton-client/locale/he_IL/bbbResources.properties
index 3b1184e9db56116be311236d2750b1a03161cd66..49ee565b11c0b408d398d3a424d83962fe0c7ba1 100644
--- a/bigbluebutton-client/locale/he_IL/bbbResources.properties
+++ b/bigbluebutton-client/locale/he_IL/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = הגדרות ×ודיו. הפוקוס ייש×ר
# 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
diff --git a/bigbluebutton-client/locale/hr_HR/bbbResources.properties b/bigbluebutton-client/locale/hr_HR/bbbResources.properties
index 17957dae7aa786b4ac379cc8d8775ebb35d2204b..39ea703052e2e68be8e33a4eb415def120861e5d 100644
--- a/bigbluebutton-client/locale/hr_HR/bbbResources.properties
+++ b/bigbluebutton-client/locale/hr_HR/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micWarning.message = Vaš mikrofon nije aktivan, ostali vas vjerovatno neće
# 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
diff --git a/bigbluebutton-client/locale/hu_HU/bbbResources.properties b/bigbluebutton-client/locale/hu_HU/bbbResources.properties
index f1c79ff39efff4ff806fd8cd4ea70281bc82a4cc..94961181b1dc53f7eb97addae44a54ad2fd52b05 100644
--- a/bigbluebutton-client/locale/hu_HU/bbbResources.properties
+++ b/bigbluebutton-client/locale/hu_HU/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = Csatlakozás a szerverhez
bbb.mainshell.statusProgress.loading = {0} modul töltése
bbb.mainshell.statusProgress.cannotConnectServer = Sajnos nem sikerült csatlakozni a szerverhez.
-bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - További információ\: <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = (c) 2015, BigBlueButton Inc. [build {0}] - További információk a <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a> oldalon.
bbb.mainshell.logBtn.toolTip = Naplózási ablak megnyitása
bbb.mainshell.meetingNotFound = A találkozó nem található
bbb.mainshell.invalidAuthToken = Érvénytelen hitelesÃtési token
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Hiba 1006\: HÃvás idÅ‘túllépése
bbb.webrtcWarning.failedError.1007 = Hiba 1007\: ICE egyezkedés sikertelen
bbb.webrtcWarning.failedError.1008 = Hiba 1008\: Ãtvitel sikertelen
bbb.webrtcWarning.failedError.1009 = Hiba 1009\: Nem sikerült hozzájutni a STUN/TURN szerverinformációhoz
+bbb.webrtcWarning.failedError.1010 = Hiba 1010\: ICE egyezkedési időtúllépés
+bbb.webrtcWarning.failedError.1011 = Hiba 1011\: ICE gyűjtési időtúllépés
bbb.webrtcWarning.failedError.unknown = Hiba {0}\: Ismeretlen hibakód
bbb.webrtcWarning.failedError.mediamissing = Nem sikerül mikrofonjával WebRTC hÃvás
bbb.webrtcWarning.failedError.endedunexpectedly = A WebRTC tesztelése váratlanul véget ért.
@@ -107,7 +109,7 @@ bbb.clientstatus.browser.message = Böngészője ({0}) nem naprakész. Javasolju
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 = A jobb hangátvitel kedvéért Firefox vagy Chrome használatát javasoljuk.
+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.
@@ -129,9 +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 az elÅ‘adó kivételével
bbb.users.settings.unmuteAll = Mindenki hangosÃtása
-bbb.users.settings.lowerAllHands = Összes kéz le
-bbb.users.raiseHandBtn.toolTip = Jelentkezés
-bbb.users.raiseHandBtn.toolTip2 = Kéz letétele
+bbb.users.settings.clearAllStatus = Összes állapotikon törlése
+bbb.users.emojiStatusBtn.toolTip = Ãllapotikonom frissÃtése
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
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Státusz
bbb.users.usersGrid.statusItemRenderer.changePresenter = Legyen előadó
bbb.users.usersGrid.statusItemRenderer.presenter = Előadó
bbb.users.usersGrid.statusItemRenderer.moderator = Moderátor
-bbb.users.usersGrid.statusItemRenderer.lowerHand = Kéz letétele
-bbb.users.usersGrid.statusItemRenderer.handRaised = Valaki jelentkezik
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Valaki jelentkezik
+bbb.users.usersGrid.statusItemRenderer.happy = Boldog
+bbb.users.usersGrid.statusItemRenderer.unhappy = Boldogtalan
+bbb.users.usersGrid.statusItemRenderer.confused = Összezavarodott
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Ãllapotom törlése
bbb.users.usersGrid.statusItemRenderer.viewer = Résztvevő
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Webkamera megosztása.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = előadó.
bbb.users.usersGrid.mediaItemRenderer = Média
bbb.users.usersGrid.mediaItemRenderer.talking = Beszéd
bbb.users.usersGrid.mediaItemRenderer.webcam = Webkamera megosztása
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Webkamera megosztása
bbb.users.usersGrid.mediaItemRenderer.micOff = Mikrofon kikapcsolva
bbb.users.usersGrid.mediaItemRenderer.micOn = Mikrofon bekapcsolva
bbb.users.usersGrid.mediaItemRenderer.noAudio = Nincs beszélgetésben
+bbb.users.emojiStatus.clear = Törlés
+bbb.users.emojiStatus.raiseHand = Jelentkezés
+bbb.users.emojiStatus.happy = Boldog
+bbb.users.emojiStatus.smile = Mosoly
+bbb.users.emojiStatus.sad = Szomorú
+bbb.users.emojiStatus.confused = Összezavarodott
+bbb.users.emojiStatus.neutral = Semleges
+bbb.users.emojiStatus.away = Távol
bbb.presentation.title = Prezentáció
bbb.presentation.titleWithPres = Prezentáció\: {0}
bbb.presentation.quickLink.label = Prezentáció ablak
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Chat ablak kis méretűre
bbb.chat.maximizeRestoreBtn.accessibilityName = Chat ablak teljes méretűre
bbb.chat.closeBtn.accessibilityName = Chat ablak bezárása
bbb.chat.chatTabs.accessibleNotice = Új üzenet ezen a fülön.
+bbb.chat.chatMessage.systemMessage = Rendszer
+bbb.chat.chatMessage.tooLong = Az üzenet {0} karakterrel túl hosszú
bbb.publishVideo.changeCameraBtn.labelText = Webkamera cseréje
bbb.publishVideo.changeCameraBtn.toolTip = Webkamera beállÃtások megnyitása
bbb.publishVideo.cmbResolution.tooltip = Válassza ki a webkamera felbontását
@@ -256,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Jóváhagyásra vár
bbb.video.publish.hint.videoPreview = Webkamera előnézet
bbb.video.publish.hint.openingCamera = Webkamera megnyitása...
bbb.video.publish.hint.cameraDenied = Hozzáférés a webkamerához nincs engedélyezve
-bbb.video.publish.hint.cameraIsBeingUsed = A webkameráját jelenleg másik alkalmazás használja
+bbb.video.publish.hint.cameraIsBeingUsed = Webkamráját nem sikerült megnyitni - azt valószÃnű másik alkalmazás használja
bbb.video.publish.hint.publishing = Adásban van...
bbb.video.publish.closeBtn.accessName = Webkamera beállÃtások bezárása
bbb.video.publish.closeBtn.label = Mégsem
@@ -270,7 +286,8 @@ 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 használjon inkább Firefox-ot.
+bbb.desktopPublish.chromeOnMacUnsupportedHint = Mac OS X alatt Chrome használatával a képernyőmegosztás nem támogatott. Képernyő megosztásához 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.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
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Kilépés megerÅ‘sÃtése
bbb.logout.confirm.message = Biztos kilép?
bbb.logout.confirm.yes = Igen
bbb.logout.confirm.no = Nem
+bbb.connection.failure=FelderÃtett csatlakozási problémák
+bbb.connection.reconnecting=Újracsatlakozás
+bbb.connection.reestablished=Csatlakozás helyreállt
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Videó
+bbb.connection.deskshare=Táblamegosztás
bbb.notes.title = Jegyzetek
bbb.notes.cmpColorPicker.toolTip = Szöveg szÃne
bbb.notes.saveBtn = Mentés
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Ãltalános gyorsbillentyűk
bbb.shortcuthelp.dropdown.presentation = Prezentáció gyorsbillentyűk
bbb.shortcuthelp.dropdown.chat = Chat gyorsbillentyűk
bbb.shortcuthelp.dropdown.users = Felhasználók gyorsbillentyűk
-bbb.shortcuthelp.dropdown.polling = ElÅ‘adó KérdÅ‘Ãv gyorsbillentyűk
-bbb.shortcuthelp.dropdown.polling2 = RésztvevÅ‘ KérdÅ‘Ãv gyorsbillentyűk.
bbb.shortcuthelp.headers.shortcut = Gyorsbillentyű
bbb.shortcuthelp.headers.function = Funkció
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Fókusz mozgatása a Prezentáció ablakra
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Fókusz mozgatása a Chat ablakra
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Mozgassa a fókuszt a KérdÅ‘Ãv KészÃtÅ‘ ablakra, amennyiben az nyitva van.
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Mozgasa a fókuszt a KérdÅ‘Ãv Statisztika ablakra, amennyiben az nyitva van.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Mozgassa a fókuszt a Szavaztás ablakra, amennyiben az nyitva van.
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Képernyőm megosztása
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Ugrás az utolsó olvasott üzene
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Ideiglenes debug gyorsbillentyű
-bbb.polling.toolbar.toolTip = Szavazások kezelése
-bbb.polling.buttonName = Szavazások kezelése
-bbb.polling.createPoll = Új kérdÅ‘Ãv létrehozása
-bbb.polling.createPoll.moreThanOneResponse = Felhasználók több választ is adhassanak
-bbb.polling.createPoll.hint = Megjegyzés\: Minden választ új sorba kezdjen
-bbb.polling.createPoll.answers = Válasz\:
-bbb.polling.createPoll.question = Kérdés\:
-bbb.polling.createPoll.title = CÃm\:
-bbb.polling.createPoll.publishToWeb = Webes kérdÅ‘Ãv bekapcsolása
-
-bbb.polling.pollPreview = KérdÅ‘Ãv elÅ‘nézete
-bbb.polling.pollPreview.modify = MódosÃt
-bbb.polling.pollPreview.publish = Közzététel
-bbb.polling.pollPreview.preview = Előnézet
-bbb.polling.pollPreview.save = Mentés
-bbb.polling.pollPreview.cancel = Mégsem
-bbb.polling.pollPreview.modify = MódosÃt
-bbb.polling.pollPreview.hereIsYourPoll = Ãme a kérdÅ‘Ãve\:
-bbb.polling.pollPreview.ifYouWantChanges = ha változtatni szeretne, kattintson a 'MódosÃtás' gombra
-bbb.polling.pollPreview.checkAll = (az összes ráillőt jelölje meg)
-bbb.polling.pollPreview.pollWillPublishOnline = Ez a kérdÅ‘Ãv a weben elérhetÅ‘vé válik.
-
-bbb.polling.resultBtn.label=Végeredmény
-bbb.polling.resultBtn.toolTip=Szavazás végeredményének megjelenÃtése
-bbb.polling.startBtn.label=IndÃtás
-bbb.polling.startBtn.toolTip=Szavazás indÃtása
-bbb.polling.editBtn.label=MódosÃtás
-bbb.polling.editBtn.toolTip=Szavazás módosÃtása
-bbb.polling.deleteBtn.toolTip=Szavazás törlése
+bbb.polling.startButton.tooltip = Egy új szavazás indÃtása
+bbb.polling.startButton.label = Szavazás indÃtása
+bbb.polling.publishButton.label = Közzététel
+bbb.polling.closeButton.label = Bezárás
+bbb.polling.pollModal.title = Szavazás jelenlegi állása
+bbb.polling.customChoices.title = Adja meg a szavazási lehetőségeket
+bbb.polling.respondersLabel.novotes = Válaszokra várakozás
+bbb.polling.respondersLabel.text = {0} felhasználó válaszolt
+bbb.polling.respondersLabel.finished = Kész
+bbb.polling.answer.Yes = Igen
+bbb.polling.answer.No = Nem
+bbb.polling.answer.True = Igaz
+bbb.polling.answer.False = Hamis
+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 = Szavazás végeredménye.
+bbb.polling.results.accessible.answer = {0} válaszból {1} szavazat.
bbb.publishVideo.startPublishBtn.labelText = Megosztás indÃtása
bbb.publishVideo.changeCameraBtn.labelText = Webkamera cseréje
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Webkamera cseréje
bbb.accessibility.alerts.madePresenter = Most Ön az előadó.
bbb.accessibility.alerts.madeViewer = Most résztvevő lett.
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = KérdÅ‘Ãv menü megnyitása.
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Fókusz a CÃm beviteli mezÅ‘re.
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Fókusz a Kérdés beviteli mezőre.
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Fókusz a Válaszok beviteli mezőre.
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = A "Több kiválasztás engedélyezése" jelölőnégyzetre fókuszál.
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Fókusz a "Webes kérdÅ‘Ãv bekapcsolása" jelölÅ‘négyzetre.
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = KérdÅ‘Ãv elÅ‘nézete és folytatás.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Mégsem, kilépés a kérdÅ‘Ãv készÃtésébÅ‘l.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Vissza, majd a kérdÅ‘Ãv módosÃtása
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = KérdÅ‘Ãv közzététele és a szavazás megnyitása.
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = KérdÅ‘Ãve mentése késÅ‘bbi használatra.
-
-bbb.shortcutkey.pollStats.explanation = ---
-bbb.shortcutkey.pollStats.explanation.function = A kérdÅ‘Ãv eredménye csak a kérdÅ‘Ãv közzététele után érhetÅ‘ el.
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Fókuszálás a kérdÅ‘Ãv eredményekre.
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = KérdÅ‘Ãv eredmények frissÃtése.
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Fókusz a webes kérdÅ‘Ãv URL mezÅ‘re.
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = KérdÅ‘Ãv leállÃtása és a szavazás befejezése.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = KérdÅ‘Ãv újra közzététele.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = KérdÅ‘Ãv eredmény ablak bezárása.
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Szavazzon a kiválasztott lehetőség szerint.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Fókusz a kérdésekre.
-
bbb.shortcutkey.specialKeys.space = Szóköz
bbb.shortcutkey.specialKeys.left = Bal nyÃl
bbb.shortcutkey.specialKeys.right = Jobb nyÃl
diff --git a/bigbluebutton-client/locale/hy_AM/bbbResources.properties b/bigbluebutton-client/locale/hy_AM/bbbResources.properties
index febea5ae12c237c333b3229db219d131d4d2f2fd..fdafa5830f4afaac9e3488f564f673326674ea32 100644
--- a/bigbluebutton-client/locale/hy_AM/bbbResources.properties
+++ b/bigbluebutton-client/locale/hy_AM/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) 2015 BigBlueButton Inc. [build {0}] - Ô±Õ¾Õ¥Õ¬Õ«Õ¶ Õ«Õ´Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¡ÕµÖÕ¥Õ¬Õ¥Ö„ <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Ô²Õ¡ÖÕ¥Õ¬ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Õ´Õ¡Õ¿ÕµÕ¡Õ¶Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
bbb.mainshell.meetingNotFound = Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö Õ£Õ¿Õ¶Õ¥Õ¬ Õ¾Õ¥Õ¢Õ«Õ¶Õ¡Ö€Õ¨
bbb.mainshell.invalidAuthToken = Õ„Õ¸Ö‚Õ¿Ö„Õ« Õ½ÕÕ¡Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = ÕÕÕ¡Õ¬ 1006․ Ô¶Õ¡Õ¶Õ£Õ« ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯
bbb.webrtcWarning.failedError.1007 = ÕÕÕ¡Õ¬ 1007․ ICE-Õ« Õ°Õ¥Õ¿ Õ¯Õ¡ÕºÕ¨ ÕÕ¡ÖƒÕ¡Õ¶Õ¾Õ¥Õ¬ Õ§
bbb.webrtcWarning.failedError.1008 = Error 1008. Õ“Õ¸ÕÕ¡Õ¶ÖÕ¸Ö‚Õ´ Õ±Õ¡ÕÕ¸Õ²Õ¾Õ¥Ö
# 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 = ÕÕÕ¡Õ¬ {0}․ Ô±Õ¶Õ®Õ¡Õ¶Õ¸Õ© Õ½ÕÕ¡Õ¬ Õ¯Õ¸Õ¤
bbb.webrtcWarning.failedError.mediamissing = Õ‰Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö Õ£Õ¿Õ¶Õ¥Õ¬ Õ±Õ¥Ö€ Õ´Õ«Õ¯Ö€Õ¸Ö†Õ¸Õ¶Õ¨ WebRTC Õ¦Õ¡Õ¶Õ£Õ« Õ°Õ¡Õ´Õ¡Ö€
bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC Õ¡Ö€Õ±Õ¡Õ£Õ¡Õ¶Ö„Õ« ÖƒÕ¸Ö€Õ±Õ¡Ö€Õ¯Õ¸Ö‚Õ´Õ¨ Õ¡Õ¶Õ½ÕºÕ¡Õ½Õ¥Õ¬Õ« Õ¡Õ¾Õ¡Ö€Õ¿Õ¾Õ¥Õ¬ Õ§
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = ÕŽÕ¥Õ¢ ÕÖÕ«Õ¯Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥
bbb.users.settings.muteAll = Ô±Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ ÕÕ¸Õ½Õ¡ÖƒÕ¸Õ²Õ¶Õ¥Ö€Õ¨
bbb.users.settings.muteAllExcept = Ô½Õ¬Õ¡ÖÕ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Ö…Õ£Õ¿Õ¾Õ¸Õ²Õ¶Õ¥Ö€Õ«Õ¶, Õ¢Õ¡ÖÕ« Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¶Õ¸Õ²Õ«Ö
bbb.users.settings.unmuteAll = Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€Õ« ÕÕ¸Õ½Õ¡ÖƒÕ¸Õ²Õ¶Õ¥Ö€Õ¨
-bbb.users.settings.lowerAllHands = Ô²Õ¸Õ¬Õ¸Ö€Õ« Õ±Õ¥Õ¼Ö„Õ¥Ö€Õ¨ Õ«Õ»Õ¥ÖÕ¶Õ¥Õ¬
-bbb.users.raiseHandBtn.toolTip = ÕÕ¥Õ¼Ö„ Õ¢Õ¡Ö€Õ±Ö€Õ¡ÖÕ¶Õ¥Õ¬
-bbb.users.raiseHandBtn.toolTip2 = ÕÕ¥Õ¼Ö„Õ¥Ö€Õ¨ Õ«Õ»Õ¥ÖÕ¶Õ¥Õ¬
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«ÖÕ¶Õ¥Ö€Õ¨ ÕÕ¥Õ½Õ¡ÖƒÕ¸Õ²Õ¶Õ¥Ö€Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¡Õ® Õ¥Õ¶
bbb.users.roomLocked.text = Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«ÖÕ¶Õ¥Ö€Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¡Õ´Ö€Õ¡ÖÕ¾Õ¡Õ® Õ¥Õ¶
bbb.users.pushToTalk.toolTip = Ô½Õ¸Õ½Õ¥Õ¬
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Ô»Ö€Õ¡Õ¾Õ«Õ³Õ¡Õ¯
bbb.users.usersGrid.statusItemRenderer.changePresenter = ÕÕÕ´Õ¥Ö„, Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¶Õ¸Õ² Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€
bbb.users.usersGrid.statusItemRenderer.presenter = Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¶Õ¸Õ²
bbb.users.usersGrid.statusItemRenderer.moderator = Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ«Õ¹
-bbb.users.usersGrid.statusItemRenderer.lowerHand = ÕÕ¥Õ¼Ö„Õ¥Ö€Õ¨ Õ«Õ»Õ¥ÖÕ¶Õ¥Õ¬
-bbb.users.usersGrid.statusItemRenderer.handRaised = ÕÕ¥Õ¼Ö„Õ¨ Õ¢Õ¡Ö€Õ±Ö€Õ¡ÖÖ€Õ¡Õ® Õ§
+bbb.users.usersGrid.statusItemRenderer.raiseHand = ÕÕ¥Õ¼Ö„Õ¨ Õ¢Õ¡Ö€Õ±Ö€Õ¡ÖÖ€Õ¡Õ® Õ§
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = Õ„Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö
+# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = Õ„Õ¥Õ¤Õ«Õ¡
bbb.users.usersGrid.mediaItemRenderer.talking = Ô½Õ¸Õ½Õ¥Õ¬
bbb.users.usersGrid.mediaItemRenderer.webcam = ÕŽÕ¥Õ¢ ÕÖÕ«Õ¯Õ« Õ¢Õ¡Õ·ÕÕ¸Ö‚Õ´
@@ -164,6 +170,14 @@ 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = Õ‡Õ¶Õ¸Õ¥Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½
bbb.presentation.titleWithPres = Õ‡Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½\: {0}
bbb.presentation.quickLink.label = Õ‡Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Õ“Õ¸Ö„Ö€Õ¡ÖÕ¶Õ¥Õ¬ Õ¦Ö€Õ¸Ö‚ÖÕ¡Ö€Õ¡Õ¶Õ«
bbb.chat.maximizeRestoreBtn.accessibilityName = Õ„Õ¥Õ®Õ¡ÖÕ¶Õ¥Õ¬ Õ¦Ö€Õ¸Ö‚ÖÕ¡Ö€Õ¡Õ¶Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
bbb.chat.closeBtn.accessibilityName = Õ“Õ¡Õ¯Õ¥Õ¬ Õ¦Ö€Õ¸Ö‚ÖÕ¡Ö€Õ¡Õ¶Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
bbb.chat.chatTabs.accessibleNotice = Õ†Õ¸Ö€ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¡ÕµÕ½ Õ§Õ»Õ¡Õ¶Õ·Õ¡Õ¶Õ« Õ¾Ö€Õ¡
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = Õ“Õ¸ÕÕ¥Ö„ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ¨
bbb.publishVideo.changeCameraBtn.toolTip = Ô²Õ¡ÖÕ¥Ö„ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ« ÖƒÕ¸ÕÕ¥Õ¬Õ¸Ö‚ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
bbb.publishVideo.cmbResolution.tooltip = Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ« Õ¬Õ¸Ö‚Õ®Õ¸Ö‚Õ´Õ¬Õ¸Ö‚Õ®Õ¸Ö‚ÕµÕ©Õ¨
@@ -256,7 +272,7 @@ 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 = ÕÕ¥Ö€ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ¨ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¸Ö‚Õ´ Õ§ Õ¸Ö‚Ö€Õ«Õ· Õ®Ö€Õ¡Õ£Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = Õ€Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¸Ö‚Õ´ Õ¥Õ¶Ö„...
bbb.video.publish.closeBtn.accessName = Õ“Õ¡Õ¯Õ¥Õ¬ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ« Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
bbb.video.publish.closeBtn.label = Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
@@ -270,7 +286,8 @@ 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.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.minimizeBtn.toolTip = Õ“Õ¸Ö„Ö€Õ¡ÖÕ¶Õ¥Õ¬
bbb.desktopPublish.minimizeBtn.accessibilityName = Õ“Õ¸Ö„Ö€Õ¡ÖÕ¶Õ¥Õ¬ Õ§Õ¯Ö€Õ¡Õ¶Õ« Õ¢Õ¡Õ·ÕÕ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Õ„Õ¥Õ®Õ¡ÖÕ¶Õ¥Õ¬ Õ§Õ¯Ö€Õ¡Õ¶Õ« Õ¢Õ¡Õ·ÕÕ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬ Õ¥Õ¬Ö„Õ¨
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.bigbluebutton=BigBlueButton
+# bbb.connection.sip=SIP
+# bbb.connection.video=Video
+# bbb.connection.deskshare=Deskshare
bbb.notes.title = Õ†Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€
bbb.notes.cmpColorPicker.toolTip = ÕÕ¥Ö„Õ½Õ¿Õ« Õ£Õ¸Ö‚ÕµÕ¶Õ¨
bbb.notes.saveBtn = ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Ô¸Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€ Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶
bbb.shortcuthelp.dropdown.presentation = Õ‡Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½Õ« Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
bbb.shortcuthelp.dropdown.chat = Ô¶Ö€Õ¸Ö‚ÖÕ¡Ö€Õ¡Õ¶Õ« Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
bbb.shortcuthelp.dropdown.users = Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
-bbb.shortcuthelp.dropdown.polling = Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¸Õ²Õ« Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
-bbb.shortcuthelp.dropdown.polling2 = Õ€Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¶Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€
bbb.shortcuthelp.headers.shortcut = Ô´ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ¸Ö‚Õ´
bbb.shortcuthelp.headers.function = Õ–Õ¸Ö‚Õ¶Õ¯ÖÕ«Õ¡
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ·Õ¶Õ¸Ö€Õ°Õ¡Õ¶Õ¤Õ¥Õ½Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¦Ö€Õ¸Ö‚ÖÕ¡Ö€Õ¡Õ¶Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬Õ¸Ö‚ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶, Õ¥Õ©Õ¥ Õ¡ÕµÕ¶ Õ¢Õ¡Ö Õ§Ö‰
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶, Õ¥Õ©Õ¥ Õ¡ÕµÕ¶ Õ¢Õ¡Ö Õ§
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶, Õ¥Õ©Õ¥ Õ¡ÕµÕ¶ Õ¢Õ¡Ö Õ§
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Ô²Õ¡ÖÕ¥Õ¬ Õ§Õ¯Ö€Õ¡Õ¶Õ« Õ¢Õ¡Õ·ÕÕ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¾Õ¥Ö€Õ»Õ«Õ¶ Õ¯Õ¡Ö€
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = ÔºÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ¾Õ¸Ö€ Õ¤ÕµÕ¸Ö‚Ö€Õ¡Õ¶ÖÕ´Õ¶Õ¥Ö€ Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€
-bbb.polling.toolbar.toolTip = Õ€Õ¡Ö€ÖÕ¡Ö€Õ·Õ¡Ö€Õ« Õ²Õ¥Õ¯Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´
-bbb.polling.buttonName = Õ€Õ¡Ö€ÖÕ¡Ö€Õ·Õ¡Ö€Õ« Õ²Õ¥Õ¯Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´
-bbb.polling.createPoll = ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¶Õ¸Ö€ Õ°Õ¡Ö€ÖÕ¡Õ·Õ¡Ö€
-bbb.polling.createPoll.moreThanOneResponse = Ô¹Õ¸Ö‚ÕµÕ¬ Õ¿Õ¡Õ¬ Ö…Õ£Õ¿Õ¾Õ¸Õ²Õ¶Õ¥Ö€Õ«Õ¶ Õ´Õ¥Õ¯Õ«Ö Õ¡Õ¾Õ¥Õ¬ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶
-bbb.polling.createPoll.hint = Ô±Õ¯Õ¶Õ¡Ö€Õ¯Ö‰ ÕÕ¯Õ½Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€Õ¨ Õ¶Õ¸Ö€ Õ¿Õ¸Õ²Õ«Ö
-bbb.polling.createPoll.answers = ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€
-bbb.polling.createPoll.question = Õ€Õ¡Ö€Ö
-bbb.polling.createPoll.title = ÕŽÕ¥Ö€Õ¶Õ¡Õ£Õ«Ö€
-bbb.polling.createPoll.publishToWeb = Ô¹Õ¸Ö‚ÕµÕ¬ Õ¿Õ¡Õ¬ Õ¾Õ¥Õ¢-Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´
-
-bbb.polling.pollPreview = Õ€Õ¡Ö€ÖÕ´Õ¡Õ¶ Õ¶Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´
-bbb.polling.pollPreview.modify = ÕÖ‡Õ¡ÖƒÕ¸ÕÕ¥Õ¬
-bbb.polling.pollPreview.publish = Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¥Õ¬
-bbb.polling.pollPreview.preview = Õ†Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ¸Ö‚Õ´
-bbb.polling.pollPreview.save = ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬
-bbb.polling.pollPreview.cancel = Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
-bbb.polling.pollPreview.modify = ÕÖ‡Õ¡ÖƒÕ¸ÕÕ¥Õ¬
-bbb.polling.pollPreview.hereIsYourPoll = ÕÕ¥Ö€ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨Ö‰
-bbb.polling.pollPreview.ifYouWantChanges = ÔµÕ©Õ¥ Õ¤Õ¸Ö‚Ö„ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Ö„ ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬, Õ½Õ¥Õ²Õ´Õ¥Ö„ Õ±Ö‡Õ¡ÖƒÕ¸ÕÕ¥Õ¬ Õ¯Õ¸Õ³Õ¡Õ¯Õ¨
-bbb.polling.pollPreview.checkAll = (Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¡Õ´Õ¡ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€Õ¨)
-bbb.polling.pollPreview.pollWillPublishOnline = ÕÕ¾ÕµÕ¡Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ´Õ¡Õ¿Õ¹Õ¥Õ¬Õ« Õ§ Õ¾Õ¥Õ¢-Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€
-
-bbb.polling.resultBtn.label=Ô±Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€
-bbb.polling.resultBtn.toolTip=Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨
-bbb.polling.startBtn.label=ÕÕ¯Õ½Õ¥Õ¬
-bbb.polling.startBtn.toolTip=ÕÕ¯Õ½Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
-bbb.polling.editBtn.label=Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬
-bbb.polling.editBtn.toolTip=Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
-bbb.polling.deleteBtn.toolTip=Õ‹Õ¶Õ»Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.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.results.accessible.header = Poll Results.
+# bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
bbb.publishVideo.startPublishBtn.labelText = ÕÕ¯Õ½Õ¥Õ¬ Õ¢Õ¡Õ·ÕÕ¸Ö‚Õ´Õ¨
bbb.publishVideo.changeCameraBtn.labelText = Õ“Õ¸ÕÕ¥Ö„ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ¨
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Õ“Õ¸ÕÕ¥Ö„ Õ¾Õ¥Õ¢ ÕÖÕ«Õ¯Õ¨
bbb.accessibility.alerts.madePresenter = Ô´Õ¸Ö‚Ö„ Õ°Õ«Õ´Õ¡ Õ°Õ¡Õ¶Õ¤Õ«Õ½Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¶Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¶Õ¸Õ²
bbb.accessibility.alerts.madeViewer = Ô´Õ¸Ö‚Ö„ Õ°Õ«Õ´Õ¡ Õ°Õ¡Õ¶Õ¤Õ«Õ½Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ´Õ¡Õ½Õ¶Õ¡Õ¯Õ«Ö
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Ô²Õ¡ÖÕ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ´Õ¥Õ¶ÕµÕ¸Ö‚
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¾Õ¥Ö€Õ¶Õ¡Õ£Ö€Õ« Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ« Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ« Õ´Õ¸Ö‚Õ¿Ö„Õ¡Õ£Ö€Õ´Õ¡Õ¶ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Նշեք որպեսզի «Թույլատրել բազմակի ընտրություններ» կարգաբերումը
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Նշեք որպեսզի «Թույլատրել վեբ-քվեարկություն» կարգաբերումը
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Õ†Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ¥Õ¬ ÕÕ¥Ö€ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Ö‡ Õ¶Ö€Õ¡ Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¨
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Õ‰Õ¥Õ²ÕµÕ¡Õ¬ Õ°Õ¡Õ´Õ¡Ö€Õ¥Õ¬ Ö‡ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ½Õ¿Õ¥Õ²Õ®Õ¸Ö‚Õ´Õ«Ö
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = ÕŽÕ¥Ö€Õ¡Õ¤Õ¡Õ¼Õ¶Õ¡Õ¬ Ö‡ Õ±Ö‡Õ¡ÖƒÕ¸ÕÕ¥Õ¬ ÕÕ¥Ö€ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Õ€Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¥Õ¬ ÕÕ¥Ö€ Õ°Õ¡Ö€ÖÕ¡Õ·Õ¡Ö€Õ¨ Ö‡ Õ¢Õ¡ÖÕ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Õ€Õ«Õ·Õ¥Õ¬ ÕÕ¥Ö€ Õ°Õ¡Ö€ÖÕ¡Õ·Õ¡Ö€Õ¨ Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Õ”Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¬Õ«Õ¶Õ¥Õ¶, Õ¥Ö€Õ¢ Õ¸Ö€ Õ¡ÕµÕ¶ Õ¯Õ°Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¾Õ«
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ«Õ¶
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Ô¹Õ¡Ö€Õ´Õ¡ÖÕ¶Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¾Õ¥Õ¢ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ URL -Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ«Õ¶
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Ô´Õ¡Õ¤Õ¡Ö€Õ¥ÖÕ¶Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Ö‡ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = ÕŽÕ¥Ö€Õ¡Õ°Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Õ“Õ¡Õ¯Õ¥Õ¬ Ö„Õ¾Õ¥Õ¡Ö€Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Õ”Õ¾Õ¥Õ¡Ö€Õ¯Õ¥Õ¬ Õ¨Õ¶Õ¿Ö€Õ¾Õ¡Õ® Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ«Õ¶
-
bbb.shortcutkey.specialKeys.space = Ô²Õ¡ÖÕ¡Õ¿
bbb.shortcutkey.specialKeys.left = ÕÕ¡Õ Õ½Õ¬Õ¡Ö„
bbb.shortcutkey.specialKeys.right = Ô±Õ» Õ½Õ¬Õ¡Ö„
diff --git a/bigbluebutton-client/locale/id_ID/bbbResources.properties b/bigbluebutton-client/locale/id_ID/bbbResources.properties
index 8af78314b7d1551b638748192014ba3924df2df4..48fd14ec8e9a016637e7f6a21d6dd6ff41d55a63 100644
--- a/bigbluebutton-client/locale/id_ID/bbbResources.properties
+++ b/bigbluebutton-client/locale/id_ID/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.helpButton = Buka video tutorial di halaman baru.
# 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
diff --git a/bigbluebutton-client/locale/it_IT/bbbResources.properties b/bigbluebutton-client/locale/it_IT/bbbResources.properties
index 6f36de7b23ba3d9e325acbbc0401f35c1154cf91..1f4e4118e3ac4e861a7e9ed1669bdd7505bb48bf 100644
--- a/bigbluebutton-client/locale/it_IT/bbbResources.properties
+++ b/bigbluebutton-client/locale/it_IT/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1007 = Errore 1007\: Negoziazione ICE fallita
bbb.webrtcWarning.failedError.1008 = Error 1008\: Transferimento fallito
bbb.webrtcWarning.failedError.1009 = Error 1009\: Impossibile accedere al server STUN/TURN
bbb.webrtcWarning.failedError.1010 = Error 1010\: Errore di timeout per ICE
+bbb.webrtcWarning.failedError.1011 = Error 1011\: Tempo esaurito per la chiamata ICE
bbb.webrtcWarning.failedError.unknown = Errore {0}\: Codice di errore sconosciuto
bbb.webrtcWarning.failedError.mediamissing = Impossibile accedere al microfono per una chiamata WebRTC
bbb.webrtcWarning.failedError.endedunexpectedly = Il test audio WebRTC è terminato anormalmente
diff --git a/bigbluebutton-client/locale/ja_JP/bbbResources.properties b/bigbluebutton-client/locale/ja_JP/bbbResources.properties
index f25fecb21a936f0c70ae2e04f86b2af791f0710b..791c4d7be79728d87e3b907ee8ead8e29f228ced 100644
--- a/bigbluebutton-client/locale/ja_JP/bbbResources.properties
+++ b/bigbluebutton-client/locale/ja_JP/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) 2015 BigBlueButton Inc. [ビルド {0}] - より詳ã—ã㯠<a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = ãƒã‚°ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‹ãã¾ã™
bbb.mainshell.meetingNotFound = ミーティングãŒé–‹è¨ã•ã‚Œã¦ã„ã¾ã›ã‚“
bbb.mainshell.invalidAuthToken = èªè¨¼éµãŒç•°å¸¸ã§ã™
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Error 1006\: 呼ã³å‡ºã—タイムアウト
bbb.webrtcWarning.failedError.1007 = Error 1007\: ICE ãƒã‚´ã‚·ã‚¨ãƒ¼ã‚·ãƒ§ãƒ³å¤±æ•—
bbb.webrtcWarning.failedError.1008 = Error 1008\: 転é€å¤±æ•—
bbb.webrtcWarning.failedError.1009 = Error 1009\: STUN/TURN サーãƒãƒ¼ã‚’フェッãƒã§ãã¾ã›ã‚“
+# bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Error {0}\: 未確定ãªã‚¨ãƒ©ãƒ¼ã‚³ãƒ¼ãƒ‰
bbb.webrtcWarning.failedError.mediamissing = WebRTC ã§ã®æŽ¥ç¶šã¯ã§ãã¾ã›ã‚“ã§ã—ãŸ
bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC エコーテスト ãŒéœè‰²ãªã終了ã—ã¾ã—ãŸ
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = ウェブカメラã®è¨å®š
bbb.users.settings.muteAll = ã™ã¹ã¦ã‚’ミュート
bbb.users.settings.muteAllExcept = プレゼンターを除ãã™ã¹ã¦ã‚’ミュート
bbb.users.settings.unmuteAll = ã™ã¹ã¦ã®ãƒŸãƒ¥ãƒ¼ãƒˆã‚’解除
-bbb.users.settings.lowerAllHands = ã™ã¹ã¦ã®æŒ™æ‰‹ã®è§£é™¤
-bbb.users.raiseHandBtn.toolTip = 挙手
-bbb.users.raiseHandBtn.toolTip2 = 手を下ã’ã‚‹
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = å…¬è´è€…ミュート
bbb.users.roomLocked.text = å…¬è´è€…ãƒãƒƒã‚¯
bbb.users.pushToTalk.toolTip = クリックã—ã¦ãƒˆãƒ¼ã‚¯ã‚’開始
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = ステータス
bbb.users.usersGrid.statusItemRenderer.changePresenter = プレゼンターã«ãªã‚‹
bbb.users.usersGrid.statusItemRenderer.presenter = プレゼンター
bbb.users.usersGrid.statusItemRenderer.moderator = å¸ä¼š
-bbb.users.usersGrid.statusItemRenderer.lowerHand = 手を下ã’ã‚‹
-bbb.users.usersGrid.statusItemRenderer.handRaised = 挙手
+bbb.users.usersGrid.statusItemRenderer.raiseHand = 挙手
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = ビューアー
+# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = メディア
bbb.users.usersGrid.mediaItemRenderer.talking = 会話
bbb.users.usersGrid.mediaItemRenderer.webcam = 共有ウェブカメラ
@@ -164,6 +170,14 @@ 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = プレゼンテーション
bbb.presentation.titleWithPres = プレゼンテーション [0]
bbb.presentation.quickLink.label = プレゼンテーションウインドウ
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’最å°åŒ–
bbb.chat.maximizeRestoreBtn.accessibilityName = ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’最大化
bbb.chat.closeBtn.accessibilityName = ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™
bbb.chat.chatTabs.accessibleNotice = ã“ã®ã‚¿ãƒ–ã«æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã§ã™
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = カメラを変更
bbb.publishVideo.changeCameraBtn.toolTip = ウェブカムã®è¨å®š
bbb.publishVideo.cmbResolution.tooltip = ウェブカムã®è§£åƒåº¦ã‚’é¸æŠž
@@ -256,7 +272,7 @@ 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 = ã‚ãªãŸã®ã‚«ãƒ¡ãƒ©ã¯åˆ¥ã®ã‚¢ãƒ—リケーションã«ã‚ˆã£ã¦ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = パブリッシングä¸...
bbb.video.publish.closeBtn.accessName = ウェブカメラウィンドウ ウィンドウを閉ã˜ã‚‹
bbb.video.publish.closeBtn.label = ã‚ャンセル
@@ -270,7 +286,8 @@ bbb.desktopPublish.stop.tooltip = ç”»é¢å…±æœ‰ã‚’é–‰ã˜ã‚‹
bbb.desktopPublish.stop.label = クãƒãƒ¼ã‚º
bbb.desktopPublish.maximizeRestoreBtn.toolTip = ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’最大化ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
bbb.desktopPublish.closeBtn.toolTip = 共有をåœæ¢ã—ã€é–‰ã˜ã‚‹
-bbb.desktopPublish.chromeOnMacUnsupportedHint = デスクトップシェアリングã¯OSX版Chromeã§ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。Firefoxã®åˆ©ç”¨ãŒå¿…è¦ã§ã™
+# 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.minimizeBtn.toolTip = 最å°åŒ–
bbb.desktopPublish.minimizeBtn.accessibilityName = デスクトップ共有ã®å…¬é–‹ã‚¦ã‚£ãƒ³â€‹â€‹ãƒ‰ã‚¦ã‚’最å°åŒ–
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = デスクトップ共有ã®å…¬é–‹ã‚¦ã‚£ãƒ³â€‹â€‹ãƒ‰ã‚¦ã‚’最大化
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = ãƒã‚°ã‚¢ã‚¦ãƒˆç¢ºèª
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.bigbluebutton=BigBlueButton
+# bbb.connection.sip=SIP
+# bbb.connection.video=Video
+# bbb.connection.deskshare=Deskshare
bbb.notes.title = 注釈
bbb.notes.cmpColorPicker.toolTip = テã‚ストã®è‰²
bbb.notes.saveBtn = ä¿å˜
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = ã‚°ãƒãƒ¼ãƒãƒ«ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆ
bbb.shortcuthelp.dropdown.presentation = プレゼンテーションã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆ
bbb.shortcuthelp.dropdown.chat = ショートカットã®ãƒãƒ£ãƒƒãƒˆ
bbb.shortcuthelp.dropdown.users = ユーザーã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆ
-bbb.shortcuthelp.dropdown.polling = プレゼンテーター投票ショートカット
-bbb.shortcuthelp.dropdown.polling2 = å…¬è´è€…投票ショートカット
bbb.shortcuthelp.headers.shortcut = ショートカット
bbb.shortcuthelp.headers.function = 機能
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = プレゼンテーションウィンドウã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’移動
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = ãƒãƒ£ãƒƒãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’移動
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = 投票制作ウインドウã¸ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’移動ã—ã¾ã™
-bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = 投函ウインドウã¸ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’移動ã—ã¾ã™
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = オープンデスクトップ共有ウィンドウ
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = ã‚ãªãŸãŒèªã‚“ã 最新ã®ãƒ¡
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = 一時的ãªãƒ‡ãƒãƒƒã‚°ãƒ›ãƒƒãƒˆã‚ー
-bbb.polling.toolbar.toolTip = 投票ã®ç®¡ç†
-bbb.polling.buttonName = 投票を管ç†
-bbb.polling.createPoll = æ–°ã—ã„投票を作æˆ
-bbb.polling.createPoll.moreThanOneResponse = 複数ã®å›žç”ã‚’é¸æŠžã™ã‚‹ã“ã¨ã‚’ユーザーã«è¨±å¯
-bbb.polling.createPoll.hint = ヒント：改行ã—ã¦å›žç”をスタート
-bbb.polling.createPoll.answers = 回ç”：
-bbb.polling.createPoll.question = 質å•ï¼š
-bbb.polling.createPoll.title = タイトル：
-bbb.polling.createPoll.publishToWeb = ウェブ投票を有効ã«ã™ã‚‹
-
-bbb.polling.pollPreview = 投票ã®ãƒ—レビュー
-bbb.polling.pollPreview.modify = ä¿®æ£ã™ã‚‹
-bbb.polling.pollPreview.publish = パブリッシュ
-bbb.polling.pollPreview.preview = プレビュー
-bbb.polling.pollPreview.save = ä¿å˜
-bbb.polling.pollPreview.cancel = ã‚ャンセル
-bbb.polling.pollPreview.modify = ä¿®æ£ã™ã‚‹
-bbb.polling.pollPreview.hereIsYourPoll = ã‚ãªãŸã®æŠ•ç¥¨ã¯ã€æ¬¡ã®ã¨ãŠã‚Šã§ã™ã€‚
-bbb.polling.pollPreview.ifYouWantChanges = ã‚‚ã—変更ã—ãŸã„å ´åˆã¯ã€"変更"ボタンをクリック
-bbb.polling.pollPreview.checkAll = （é©ç”¨ã•ã‚Œã‚‹å¯èƒ½æ€§ã®ã‚ã‚‹ã™ã¹ã¦ã‚’ãƒã‚§ãƒƒã‚¯ï¼‰
-bbb.polling.pollPreview.pollWillPublishOnline = ã“ã®æŠ•ç¥¨ã¯ã€Web投票ã§åˆ©ç”¨ã§ãã¾ã™ã€‚
-
-bbb.polling.resultBtn.label=レザルト
-bbb.polling.resultBtn.toolTip=投票çµæžœã‚’見る
-bbb.polling.startBtn.label=開始
-bbb.polling.startBtn.toolTip=投票開始
-bbb.polling.editBtn.label=編集
-bbb.polling.editBtn.toolTip=投票編集
-bbb.polling.deleteBtn.toolTip=投票を削除
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.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.results.accessible.header = Poll Results.
+# bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
bbb.publishVideo.startPublishBtn.labelText = 共有を開始
bbb.publishVideo.changeCameraBtn.labelText = カメラを変更
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = カメラを変更
bbb.accessibility.alerts.madePresenter = ã‚ãªãŸã¯ç¾åœ¨ã€ãƒ—レゼンテーターã§ã™
bbb.accessibility.alerts.madeViewer = ã‚ãªãŸã¯ç¾åœ¨ã€é–²è¦§è€…ã§ã™
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = 投票メニューを開ãã¾ã™
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = タイトルを入力ã—ã¾ã™
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = è¨å•ã‚’入力ã—ã¾ã™
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = 回ç”を入力ã—ã¾ã™
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = 複数é¸æŠžæœ‰åŠ¹ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã§ã™
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = ウェブ投票有効ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã§ã™
-bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = 投票ã®ä½œæˆã‚’ã‚ャンセルã—ã¦çµ‚了ã—ã¾ã™
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = 全画é¢ã¸æˆ»ã‚Šã€æŠ•ç¥¨ã‚’編集ã—ã¾ã™
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = 投票を公開ã—ã€æŠ•å‡½ã‚’å¯èƒ½ã«ã—ã¾ã™
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = 以後ã€åˆ©ç”¨ã™ã‚‹ç‚ºã«ä¿å˜
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = 開票çµæžœã¯å˜ä¸€ã§ã‚ã‚Šã€æ—¢ã«å…¬é–‹ã•ã‚Œã¦ã„ã¾ã™
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = 開票çµæžœã§ã™
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = 投票çµæžœã®ãƒªã‚»ãƒƒãƒˆ
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = ウェブ投票ã®URLã§ã™
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = 投票ãŠã‚ˆã³æŠ•å‡½ã‚’終了ã—ã¾ã™
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = 投票をå†æŽ²è¼‰
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = 投票çµæžœã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = オプションをé¸æŠžã—ãŸæŠ•ç¥¨ã‚’è¡Œã†
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = è¨å•ã‚’フォーカス
-
bbb.shortcutkey.specialKeys.space = スペースãƒãƒ¼
bbb.shortcutkey.specialKeys.left = 左矢å°
bbb.shortcutkey.specialKeys.right = å³çŸ¢å°
diff --git a/bigbluebutton-client/locale/ka_GE/bbbResources.properties b/bigbluebutton-client/locale/ka_GE/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/ka_GE/bbbResources.properties
+++ b/bigbluebutton-client/locale/ka_GE/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
index dcd60232d1dc827f1ab29d9b49b9cf91c7674ae4..b225e5279a53369d1593a377c53e566c6c7d1f56 100644
--- a/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
+++ b/bigbluebutton-client/locale/kk_KZ/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.mainshell.statusProgress.cannotConnectServer = Серверге қоÑылу
# 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
diff --git a/bigbluebutton-client/locale/km_KH/bbbResources.properties b/bigbluebutton-client/locale/km_KH/bbbResources.properties
index 5afc3ffd6d0ff8b572b3f117f0ce1919d7c2d179..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/km_KH/bbbResources.properties
+++ b/bigbluebutton-client/locale/km_KH/bbbResources.properties
@@ -76,6 +76,7 @@
# 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
diff --git a/bigbluebutton-client/locale/ko_KR/bbbResources.properties b/bigbluebutton-client/locale/ko_KR/bbbResources.properties
index af608398b089a16450ac2eee91311ba05fa16d3e..0f6466a69e03ec6a19b013c09b63a83346a072e9 100644
--- a/bigbluebutton-client/locale/ko_KR/bbbResources.properties
+++ b/bigbluebutton-client/locale/ko_KR/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = ìŒì„± 세팅, 윈ë„ìš°ê°€ ë‹«ížë•Œê¹Œì§€ëŠ”
# 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
diff --git a/bigbluebutton-client/locale/lt_LT/bbbResources.properties b/bigbluebutton-client/locale/lt_LT/bbbResources.properties
index 8dfb72b01efb2fa1ecedfc8bc8edd44be352c0aa..46d513303adedd0d0b13da13b8b71988a1f8d428 100644
--- a/bigbluebutton-client/locale/lt_LT/bbbResources.properties
+++ b/bigbluebutton-client/locale/lt_LT/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.cancel.toolTip = Atšaukti prisijungimą prie garso konferencijo
# 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
diff --git a/bigbluebutton-client/locale/lv_LV/bbbResources.properties b/bigbluebutton-client/locale/lv_LV/bbbResources.properties
index 4f83b706fbbf1fb1de81464cb437f095ba40da51..7744be6b6bcfe8dfd395ae9a38a4a1f0d64392e3 100644
--- a/bigbluebutton-client/locale/lv_LV/bbbResources.properties
+++ b/bigbluebutton-client/locale/lv_LV/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.oldlocalewindow.windowTitle = Br?din?jums\: Tulkojums ir novecojis.
# 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
diff --git a/bigbluebutton-client/locale/mk_MK/bbbResources.properties b/bigbluebutton-client/locale/mk_MK/bbbResources.properties
index 6a00f3af1b658ef5b712f78a6ce1dd5bd2e4657f..cb1882906f2e4ccf7a863c74e21c448348aff9be 100644
--- a/bigbluebutton-client/locale/mk_MK/bbbResources.properties
+++ b/bigbluebutton-client/locale/mk_MK/bbbResources.properties
@@ -1,83 +1,85 @@
-# bbb.mainshell.locale.version = 0.9.0
+bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = \nПоврзување Ñо Ñерверот
bbb.mainshell.statusProgress.loading = Вчитување {0} модули
bbb.mainshell.statusProgress.cannotConnectServer = Извинете, не можете да Ñе поврзете Ñо Ñерверот.
-# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
-# bbb.mainshell.logBtn.toolTip = Open Log Window
-# bbb.mainshell.meetingNotFound = Meeting Not Found
-# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [креирај {0}] - За повеќе информации поÑетете ја <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.logBtn.toolTip = Отвори прозорец за логови
+bbb.mainshell.meetingNotFound = Ðе е пронајдена Ñредба
+bbb.mainshell.invalidAuthToken = Ðеправилен автентикациÑки токен
bbb.mainshell.resetLayoutBtn.toolTip = реÑетирање на ПодеÑувањето
-# 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.mainshell.notification.tunnelling = Тунелирање
+bbb.mainshell.notification.webrtc = WebRTC Ðудио
+bbb.oldlocalewindow.reminder1 = Вие можеби имате Ñтар јазик за преведување на BigBlueButton.
+bbb.oldlocalewindow.reminder2 = Ве молиме, иÑчиÑтете го кешот на пребарувачот и обидете Ñе повторно.
+bbb.oldlocalewindow.windowTitle = Предупредување\: Стар јазик за преведување
+bbb.audioSelection.title = Како би Ñакале да Ñе приклучите во аудиото ?
+bbb.audioSelection.btnMicrophone.label = Микрофон
+bbb.audioSelection.btnMicrophone.toolTip = Приклучете Ñе на аудиото Ñо Вашиот микрофон
+bbb.audioSelection.btnListenOnly.label = Само Ñлушање
+bbb.audioSelection.btnListenOnly.toolTip = Приклучете Ñе на аудиото Ñамо Ñо Ñлушање
+bbb.audioSelection.txtPhone.text = За да Ñе приклучите на оваа Ñредба преку телефон, повикајте {0} потоа внеÑете {1} како конференциÑки пин број.
+bbb.micSettings.title = ТеÑÑ‚ на Звук
bbb.micSettings.speakers.header = ТеÑÑ‚ за звучници
-# bbb.micSettings.microphone.header = Test Microphone
+bbb.micSettings.microphone.header = ТеÑÑ‚ за Микрофон
bbb.micSettings.playSound = ТеÑÑ‚ за звучници
bbb.micSettings.playSound.toolTip = Пушти музика за теÑÑ‚ на звучници
bbb.micSettings.hearFromHeadset = Треба да Ñлушнете звук од вашите Ñлушалки, не од вашите звучници.
bbb.micSettings.speakIntoMic = Треба да Ñлушнете звук од вашите Ñлушалки, не од вашите звучници.
-# 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.echoTestMicPrompt = Ова е приватно eхо теÑÑ‚. Зборувајте неколку зборови. Дали го Ñлушате аудиото?
+bbb.micSettings.echoTestAudioYes = Да
+bbb.micSettings.echoTestAudioNo = Ðе
+bbb.micSettings.speakIntoMicTestLevel = Зборувајте на Вашиот микрофон. Треба да видите дека лентата Ñе движи. Ðко не, изберете друг микрофон.
+bbb.micSettings.recommendHeadset = КориÑтите Ñлушалки Ñо микрофон за најдобро аудио доживување.
bbb.micSettings.changeMic = ТеÑтирај или Ñмени микрофон.
bbb.micSettings.changeMic.toolTip = Отвори го дијалог прозорецот за подеÑувања на микрофон Ñо Flash Player
-# 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.comboMicList.toolTip = Селектирај микрофон
+bbb.micSettings.micRecordVolume.label = Јачина на Ñигнал
+bbb.micSettings.micRecordVolume.toolTip = ПоÑтавете ја јачината на Ñигналот на микрофонот
+bbb.micSettings.nextButton = Следно
+bbb.micSettings.nextButton.toolTip = Започнете го ехо теÑтот
bbb.micSettings.join = Вклучи Звук
-# bbb.micSettings.join.toolTip = Join the audio conference
+bbb.micSettings.join.toolTip = Приклучете Ñе во аудио конференција
bbb.micSettings.cancel = Откажи
-# bbb.micSettings.connectingtoecho = Connecting
-# bbb.micSettings.connectingtoecho.error = Echo Test Error\: Please contact administrator.
+bbb.micSettings.connectingtoecho = Поврзување
+bbb.micSettings.connectingtoecho.error = Ехо теÑÑ‚ грешка\: Ве молиме контактирајте го админиÑтраторот.
bbb.micSettings.cancel.toolTip = Откажете Ñе од вклучување на аудио конференција
-# bbb.micSettings.access.helpButton = Open tutorial videos in a new page.
+bbb.micSettings.access.helpButton = Отворете видео туторијали во нова Ñтраница.
bbb.micSettings.access.title = Ðудио поÑтавки. ФокуÑот ќе оÑтане во главниот прозорец додека прозорецот не Ñе затвори.
-# 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.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.micSettings.webrtc.title = WebRTC подршка
+bbb.micSettings.webrtc.capableBrowser = Вашиот пребарувач подржува WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit = Кликнете не за да кориÑтите WebRTC
+bbb.micSettings.webrtc.capableBrowser.dontuseit.toolTip = Кликнете тука ако не Ñакате да кориÑтите WebRTC технологија (препорачано ако имате проблем кориÑтејќи го)
+bbb.micSettings.webrtc.notCapableBrowser = WebRTC не едозволен од вашиот пребарувач. Ве молиме кориÑтете го Google Chrome (верзија 32 или понова); или Mozilla Firefox (верзија 26 или понова). Вие Ñеуште ќе можете да Ñе приклучете на глаÑовната конференција кориÑтејќи ја Adobe Flash платформата.
+bbb.micSettings.webrtc.connecting = Повикување
+bbb.micSettings.webrtc.waitingforice = Поврзување
+bbb.micSettings.webrtc.transferring = ПренеÑување
+bbb.micSettings.webrtc.endingecho = Приклучување на аудио
+bbb.micSettings.webrtc.endedecho = Ехо теÑтот заврши.
+bbb.micPermissions.firefox.title = Firefox микрофон дозвола
+bbb.micPermissions.firefox.message1 = Изберете го Вашиот микрофон и потоа кликнете Сподели.
+bbb.micPermissions.firefox.message2 = Ðко не ја гледате лиÑтата на микрофони, кликнете на иконата Ñо микрофон.
+bbb.micPermissions.chrome.title = Chrome микрофон дозвола
+bbb.micPermissions.chrome.message1 = Кликнете Дозволи за да дадете дозвола на Chrome да го кориÑти Вашиот микрофон.
+bbb.micWarning.title = Ðудио предупредување
+bbb.micWarning.joinBtn.label = Приклучете Ñе во Ñекој Ñлучај
+bbb.micWarning.testAgain.label = ТеÑÑ‚ повторно
+bbb.micWarning.message = Вашиот микрофон не покажува некаква активноÑÑ‚, другите не би биле во можноÑÑ‚ да ве Ñлушаат за време на ÑеÑијата
+bbb.webrtcWarning.message = Детектирана е Ñледнава WebRTC грешка\: {0}. Дали Ñакате да Ñе обидете Ñо Flash ?
+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 = Грешка 1004\: ÐеуÑпех на повик (причина\={0})
+bbb.webrtcWarning.failedError.1005 = Грешка 1005\: Повикот заврши неочекувано
+bbb.webrtcWarning.failedError.1006 = Грешка 1006\: Повикот заврши
+bbb.webrtcWarning.failedError.1007 = Грешка 1007\: ICE неуÑпешен преговор
+bbb.webrtcWarning.failedError.1008 = Грешка 1008\: ТранÑферот е неуÑпешен
+bbb.webrtcWarning.failedError.1009 = Грешка 1009\: Ðеможе да Ñе пренеÑи ÐЖУРИРÐЈ / ВКЛУЧИ ÑерверÑката информација
+bbb.webrtcWarning.failedError.1010 = Грешка 1010\: ICE преговорот иÑтече
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
+bbb.webrtcWarning.failedError.unknown = Грешка {0}\: Ðепознат код на грешка
+bbb.webrtcWarning.failedError.mediamissing = Ðеможе да Ñе добие вашиот микрофон за WebRTC повик
+bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC ехо теÑтот заврши неочекувано
bbb.mainToolbar.helpBtn = Помош
bbb.mainToolbar.logoutBtn = Одјава
bbb.mainToolbar.logoutBtn.toolTip = Одјава
@@ -86,524 +88,488 @@ bbb.mainToolbar.settingsBtn = ПоÑтавувања
bbb.mainToolbar.settingsBtn.toolTip = Отвори ПоÑтавувања
bbb.mainToolbar.shortcutBtn = Кратенки
bbb.mainToolbar.shortcutBtn.toolTip = Отвори прозорец за кратенки
-# 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.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.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.mainToolbar.recordBtn.toolTip.start = Започни Ñнимање
+bbb.mainToolbar.recordBtn.toolTip.stop = Стопирај Ñнимање
+bbb.mainToolbar.recordBtn.toolTip.recording = Оваа ÑеÑија е Ñнимена
+bbb.mainToolbar.recordBtn.toolTip.notRecording = Оваа ÑеÑија не е Ñнимена
+bbb.mainToolbar.recordBtn.confirm.title = Потврди Ñнимање
+bbb.mainToolbar.recordBtn.confirm.message.start = Дали Ñте Ñигурни дека Ñакате да започнете Ñнимање на ÑеÑијата?
+bbb.mainToolbar.recordBtn.confirm.message.stop = Дали Ñте Ñигурни дека Ñакате да го Ñтопирате Ñнимањете на ÑеÑијата?
+bbb.mainToolbar.recordBtn..notification.title = ИзвеÑтување за Ñнимање
+bbb.mainToolbar.recordBtn..notification.message1 = Вие можете да ја Ñнимите оваа Ñредба.
+bbb.mainToolbar.recordBtn..notification.message2 = Вие мора да кликнете Старт/Стоп на копчето за Ñнимање во наÑловната лента во започни/заврши Ñнимање.
+bbb.mainToolbar.recordingLabel.recording = (Снимање)
+bbb.mainToolbar.recordingLabel.notRecording = Ðе Снимај
+bbb.clientstatus.title = КонфигурациÑко извеÑтување
+bbb.clientstatus.notification = Ðепрочитани извеÑтувања
+bbb.clientstatus.tunneling.title = Firewall
+bbb.clientstatus.tunneling.message = Firewall Ñпречува вашиот клиент директно да Ñе поврзи на порта 1935 до далечинÑкиот Ñервер. Препорачано е приклучување на помала реÑтриктивна мрежа за поÑтабилна конекција.
+bbb.clientstatus.browser.title = Верзија на пребарувач
+bbb.clientstatus.browser.message = Вашиот пребарувач ({0}) не е актуелен. Препорачано е ажурирање до најновата верзија.
+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 = Затвори
-# 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.videoDock.titleBar = ÐаÑловна лента на прозорецот за камера.
+bbb.presentation.titleBar = ÐаÑловна лента на прозорецот за презентација
+bbb.chat.titleBar = ÐаÑловна лента на прозорецот за разговор
+bbb.users.title = КориÑници{0} {1}
+bbb.users.titleBar = ÐаÑловна лента на прозорецот за кориÑници
+bbb.users.quickLink.label = КориÑнички прозорец
+bbb.users.minimizeBtn.accessibilityName = Ðамали го КориÑничкиот Прозорец
+bbb.users.maximizeRestoreBtn.accessibilityName = Зголеми го КориÑничкиот Прозорец
bbb.users.settings.buttonTooltip = ПоÑтавувања
-# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
-# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
-# bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
-# 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.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\: Failed 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.users.settings.audioSettings = ТеÑÑ‚ на Звук
+bbb.users.settings.webcamSettings = Прилагодување на камера
+bbb.users.settings.muteAll = ИÑклучи звук за Ñите кориÑници
+bbb.users.settings.muteAllExcept = ИÑклучете звук за Ñите кориÑници оÑвен презентер
+bbb.users.settings.unmuteAll = Вклучете звук за Ñите кориÑници
+bbb.users.settings.clearAllStatus = ИÑчиÑтете ги Ñите ÑтатуÑни икони
+bbb.users.emojiStatusBtn.toolTip = Ðжурирај ја мојата ÑтатуÑна икона
+bbb.users.roomMuted.text = ИÑклучен звук на гледачите
+bbb.users.roomLocked.text = Гледачите Ñе заклучени
+bbb.users.pushToTalk.toolTip = Разговор
+bbb.users.pushToMute.toolTip = ИÑклучете звук за Ñебе
+bbb.users.muteMeBtnTxt.talk = Вклучете звук
+bbb.users.muteMeBtnTxt.mute = ИÑклучете звук
+bbb.users.muteMeBtnTxt.muted = ИÑклучен звук
+bbb.users.muteMeBtnTxt.unmuted = Вклучен звук
+bbb.users.usersGrid.contextmenu.exportusers = Копирајте ги кориÑничките имиња
+bbb.users.usersGrid.accessibilityName = КориÑничка лиÑта. КориÑтете ги копчињата Ñо Ñтрелки за навигација
+bbb.users.usersGrid.nameItemRenderer = Име
+bbb.users.usersGrid.nameItemRenderer.youIdentifier = ти
+bbb.users.usersGrid.statusItemRenderer = СтатуÑти
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Кликнете за да креирате презентер
+bbb.users.usersGrid.statusItemRenderer.presenter = Презентер
+bbb.users.usersGrid.statusItemRenderer.moderator = Модератор
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Крената рака
+bbb.users.usersGrid.statusItemRenderer.happy = Среќен
+bbb.users.usersGrid.statusItemRenderer.unhappy = ÐеÑреќен
+bbb.users.usersGrid.statusItemRenderer.confused = Збунет
+bbb.users.usersGrid.statusItemRenderer.clearStatus = ИÑчиÑти го мојот ÑтатуÑ
+bbb.users.usersGrid.statusItemRenderer.viewer = Гледач
+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 = Делење на камера
+bbb.users.usersGrid.mediaItemRenderer.webcamBtn = Поглед на веб камерата
+bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Вклучете звук {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToMute = ИÑклучете звук {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToLock = Заклучи {0}
+bbb.users.usersGrid.mediaItemRenderer.pushToUnlock = Отклучи {0}
+bbb.users.usersGrid.mediaItemRenderer.kickUser = ИÑфрли {0}
+bbb.users.usersGrid.mediaItemRenderer.webcam = Делење на камера
+bbb.users.usersGrid.mediaItemRenderer.micOff = Микрофон иÑклучен
+bbb.users.usersGrid.mediaItemRenderer.micOn = Микрофон вклучен
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Ðе Ñте вклучени во аудио конференцијата
+bbb.users.emojiStatus.clear = ИÑчиÑти
+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.presentation.title = Презентација
+bbb.presentation.titleWithPres = Презентација \: {0}
+bbb.presentation.quickLink.label = ПрезентациÑки прозорец
+bbb.presentation.fitToWidth.toolTip = Прилагодете ја презентацијата Ñо ширината
+bbb.presentation.fitToPage.toolTip = Прилагодете ја презентацијата на Ñтраната
+bbb.presentation.uploadPresBtn.toolTip = Прикачете презентација
+bbb.presentation.backBtn.toolTip = Претходен Ñлајд
+bbb.presentation.btnSlideNum.accessibilityName = Слајд {0} од {1}
+bbb.presentation.btnSlideNum.toolTip = Селектирајте Ñлајд
+bbb.presentation.forwardBtn.toolTip = Следен Ñлајд
+bbb.presentation.maxUploadFileExceededAlert = Грешка\: Фајлот е поголем од дозволената големина
+bbb.presentation.uploadcomplete = Прикачувањето е уÑпешно. Ве молиме почекајте додека го конвертираме документот
+bbb.presentation.uploaded = Прикачено.
+bbb.presentation.document.supported = Прикачувањето на документот е дозволено. Започнете Ñо конвертирањето ...
+bbb.presentation.document.converted = УÑпешно е конвертиран канцелариÑкиот документ.
+bbb.presentation.error.document.convert.failed = Грешка\: Конвертирањето на канцелариÑкиот документ е неуÑпешно.
+bbb.presentation.error.io = IO Грешка\: Ве молиме контактирајте го админиÑтраторот.
+bbb.presentation.error.security = БезбедноÑна грешка\: Ве молиме контактирајте го админиÑтраторот.
+bbb.presentation.error.convert.notsupported = Грешка\: Прикачениот документ е недозволен. Ве молиме прикачете компатибилен фајл.
+bbb.presentation.error.convert.nbpage = Грешка \: ÐеуÑпешно детерминирање на бројот на Ñтраниците на прикачениот документ.
+bbb.presentation.error.convert.maxnbpagereach = Грешка\: Прикачениот документ има премногу Ñтраници
+bbb.presentation.converted = Конвертирани {0} од {1} Ñлајдови.
+bbb.presentation.ok = Ок
+bbb.presentation.slider = Зум на презентациÑко ниво
+bbb.presentation.slideloader.starttext = Слајд текÑÑ‚ почеток
+bbb.presentation.slideloader.endtext = Слајд текÑÑ‚ крај
+bbb.presentation.uploadwindow.presentationfile = ПрезентациÑки фајл
+bbb.presentation.uploadwindow.pdf = PDF
+bbb.presentation.uploadwindow.word = WORD
+bbb.presentation.uploadwindow.excel = EXCEL
+bbb.presentation.uploadwindow.powerpoint = POWERPOINT
+bbb.presentation.uploadwindow.image = СЛИКÐ
+bbb.presentation.minimizeBtn.accessibilityName = Минимизирајте го презентациÑкиот прозорец
+bbb.presentation.maximizeRestoreBtn.accessibilityName = МакÑимизирајте го презентациÑкиот прозорец
+bbb.presentation.closeBtn.accessibilityName = Затворете го презентациÑкиот прозорец
+bbb.fileupload.title = Додадете фајлови на Вашата презентација
+bbb.fileupload.lblFileName.defaultText = Ðе е Ñелектиран фајл
+bbb.fileupload.selectBtn.label = Селектирајте фајл
+bbb.fileupload.selectBtn.toolTip = Отворете дијалог за да Ñелектирате фајл
+bbb.fileupload.uploadBtn = Прикачете
+bbb.fileupload.uploadBtn.toolTip = Прикачете го Ñелектираниот фајл
+bbb.fileupload.deleteBtn.toolTip = Избришете презентација
+bbb.fileupload.showBtn = Приказ
+bbb.fileupload.showBtn.toolTip = Прикажи презентација
bbb.fileupload.okCancelBtn = Затвори
-# 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.usersList.toolTip = Select User To Open Private Chat
-# 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.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.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 is being used by another application
-# bbb.video.publish.hint.publishing = Publishing...
-# bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box
+bbb.fileupload.okCancelBtn.toolTip = Затворете го дијалогот за прикачување
+bbb.fileupload.genThumbText = Генерирање на Ñликички
+bbb.fileupload.progBarLbl = Ðапредување\:
+bbb.fileupload.fileFormatHint = Прикачи било кој канцелариÑки документ или Portable Document Format (PDF) фајл. За најдобри резултати прикачете PDF.
+bbb.chat.title = Разговор
+bbb.chat.quickLink.label = Разговорен прозорец
+bbb.chat.cmpColorPicker.toolTip = Боја на текÑÑ‚
+bbb.chat.input.accessibilityName = Поле за едитирање на разговорните пораки
+bbb.chat.sendBtn = ИÑпрати
+bbb.chat.sendBtn.toolTip = ИÑпрати порака
+bbb.chat.sendBtn.accessibilityName = ИÑпрати чат порака
+bbb.chat.contextmenu.copyalltext = Копирај го целиот текÑÑ‚
+bbb.chat.publicChatUsername = Јавно
+bbb.chat.optionsTabName = Опции
+bbb.chat.privateChatSelect = Селектирајте личноÑÑ‚ за разговор Ñо приватноÑÑ‚
+bbb.chat.private.userLeft = КориÑникот е заминат
+bbb.chat.private.userJoined = КориÑникот Ñе приклучи.
+bbb.chat.usersList.toolTip = Селектирајте за да отворите приватен разговор
+bbb.chat.chatOptions = Опции за разговор
+bbb.chat.fontSize = Големина на фонт за порака
+bbb.chat.cmbFontSize.toolTip = Селектирајте големина на фонт за порака
+bbb.chat.messageList = Сандаче за пораки
+bbb.chat.minimizeBtn.accessibilityName = Минимизирајте го прозорецот за пораки
+bbb.chat.maximizeRestoreBtn.accessibilityName = МакÑимизирајте го прозорецот за пораки
+bbb.chat.closeBtn.accessibilityName = Затворете го прозорецот за пораки
+bbb.chat.chatTabs.accessibleNotice = Ðови пораки во ова јазиче
+bbb.chat.chatMessage.systemMessage = СиÑтем
+bbb.chat.chatMessage.tooLong = Пораката е {0} карактер(и) подолга
+bbb.publishVideo.changeCameraBtn.labelText = Промена на веб камера
+bbb.publishVideo.changeCameraBtn.toolTip = Отворете го дијалог прозорецот за промента на веб камерата
+bbb.publishVideo.cmbResolution.tooltip = Селектирајте ја резолуцијата на веб камерата
+bbb.publishVideo.startPublishBtn.labelText = Започнете Ñподелување
+bbb.publishVideo.startPublishBtn.toolTip = Започнете Ñподелување на веб камерата
+bbb.webcamPermissions.chrome.title = Chrome веб камера дозвола
+bbb.webcamPermissions.chrome.message1 = Кликнете Дозволи за да дадете дозвола на Chrome да ја кориÑти Вашата веб камера.
+bbb.videodock.title = Веб камери
+bbb.videodock.quickLink.label = Прозорец за веб камера
+bbb.video.minimizeBtn.accessibilityName = Минимизирајте го прозорецот за веб камера
+bbb.video.maximizeRestoreBtn.accessibilityName = МакÑимизирајте го прозорецот за веб камера
+bbb.video.controls.muteButton.toolTip = ИÑклучи или вклучи звук {0}
+bbb.video.controls.switchPresenter.toolTip = Ðаправете {0} презентер
+bbb.video.controls.ejectUserBtn.toolTip = ИÑфреле {0} од Ñредба
+bbb.video.controls.privateChatBtn.toolTip = Разговарајте Ñо {0}
+bbb.video.publish.hint.noCamera = Веб камерата е недоÑтапна
+bbb.video.publish.hint.cantOpenCamera = Ðеможе да Ñе вклучи Вашата веб камера
+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 = Вашата веб камера неможе да биде отворена - можеби е кориÑтена од други апликации
+bbb.video.publish.hint.publishing = Објавување ...
+bbb.video.publish.closeBtn.accessName = Затворете го прозорецот за подеÑувања на веб камерата
bbb.video.publish.closeBtn.label = Откажи
-# bbb.video.publish.titleBar = Publish Webcam Window
-# 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.video.publish.titleBar = Прозорец за објавување на веб камера
+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 = 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. Recommend you use FireFox to share desktop.
+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.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.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.layout.addButton.toolTip = Add the custom layout to the list
-# bbb.layout.broadcastButton.toolTip = Apply Current Layout to All Viewers
-# bbb.layout.combo.toolTip = Change Your Layout
-# bbb.layout.loadButton.toolTip = Load layouts from a file
-# bbb.layout.saveButton.toolTip = Save layouts to a file
-# bbb.layout.lockButton.toolTip = Lock layout
-# bbb.layout.combo.prompt = Apply a layout
-# bbb.layout.combo.custom = * Custom layout
-# bbb.layout.combo.customName = Custom layout
-# bbb.layout.combo.remote = Remote
-# bbb.layout.save.complete = Layouts were successfully saved
-# bbb.layout.load.complete = Layouts were successfully loaded
-# bbb.layout.load.failed = Failed to load the layouts
-# bbb.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.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 failed
-# 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.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.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.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
-# 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.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.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.video.toolTip.start = Споделете ја Вашата веб камера
+bbb.toolbar.video.toolTip.stop = Стопирајте го Ñподелувањето на Вашата веб камера
+bbb.layout.addButton.toolTip = Додадете ÑопÑтвен раÑпоред на лиÑтата
+bbb.layout.broadcastButton.toolTip = ПоÑтавете го моменталниот раÑпоред за Ñите гледачи
+bbb.layout.combo.toolTip = Изменете го Вашиот раÑпоред
+bbb.layout.loadButton.toolTip = Превземете раÑпореди од фајл
+bbb.layout.saveButton.toolTip = Зачувај раÑпореди во фајл
+bbb.layout.lockButton.toolTip = Заклучете раÑпоред
+bbb.layout.combo.prompt = Примени раÑпоред
+bbb.layout.combo.custom = * СопÑтвен раÑпоред
+bbb.layout.combo.customName = СопÑтвен раÑпоред
+bbb.layout.combo.remote = ДалечинÑко
+bbb.layout.save.complete = РаÑпоредите беа уÑпешно зачувани
+bbb.layout.load.complete = РаÑпоредите беа уÑпешно превземени
+bbb.layout.load.failed = Грешка при превземање на раÑпоред
+bbb.layout.name.defaultlayout = Стандарден раÑпоред
+bbb.layout.name.videochat = Видео разговор
+bbb.layout.name.webcamsfocus = Веб камера Ñредба
+bbb.layout.name.presentfocus = ПрезентациÑка Ñредба
+bbb.layout.name.lectureassistant = ÐÑиÑтент на предавање
+bbb.layout.name.lecture = Предавање
+bbb.highlighter.toolbar.pencil = Молив
+bbb.highlighter.toolbar.pencil.accessibilityName = Сменете курÑор Ñо молив
+bbb.highlighter.toolbar.ellipse = Круг
+bbb.highlighter.toolbar.ellipse.accessibilityName = Сменете курÑор Ñо круг
+bbb.highlighter.toolbar.rectangle = Правоаголник
+bbb.highlighter.toolbar.rectangle.accessibilityName = Сменете курÑор Ñо правоаголник
+bbb.highlighter.toolbar.panzoom = Развлекување и зголемување
+bbb.highlighter.toolbar.panzoom.accessibilityName = Сменете го курÑорот на белата табела во зум
+bbb.highlighter.toolbar.clear = ИÑчиÑтете ги Ñите прибелешки
+bbb.highlighter.toolbar.clear.accessibilityName = ИÑчиÑтете ја Ñтраната Ñо белата табела
+bbb.highlighter.toolbar.undo = Вратете прибелешка
+bbb.highlighter.toolbar.undo.accessibilityName = Вратете ја поÑледната форма на белата табла
+bbb.highlighter.toolbar.color = Избери Боја
+bbb.highlighter.toolbar.color.accessibilityName = Боја на маркер за цртање
+bbb.highlighter.toolbar.thickness = Промени дебелина
+bbb.highlighter.toolbar.thickness.accessibilityName = Дебелина на цртање на табла
+bbb.logout.title = Одјавени
+bbb.logout.button.label = Ок
+bbb.logout.appshutdown = Сервер апликацијата беше иÑклучена
+bbb.logout.asyncerror = Се Ñлучи аÑинхрона грешка
+bbb.logout.connectionclosed = Конекцијата до Ñерверот е затворена
+bbb.logout.connectionfailed = Конекцијата до Ñерверот е неуÑпешна
+bbb.logout.rejected = Конекцијата до Ñерверот е отфрлена
+bbb.logout.invalidapp = red5 апликацијата не поÑтои
+bbb.logout.unknown = Вашиот клиент ја изгуби конекцијата Ñо Ñерверот
+bbb.logout.usercommand = Вие Ñе одјавивте од конференцијата
+bbb.logout.refresh.message = Ðко оваа одјава беше неочекувана, кликнете на копчето подолу за да Ñе конектирате повторно.
+bbb.logout.refresh.label = Конектирајте Ñе повторно
+bbb.logout.confirm.title = Потврдете ја одјавата
+bbb.logout.confirm.message = Дали Ñте Ñигурни дека Ñакате да Ñе одјавите?
+bbb.logout.confirm.yes = Да
+bbb.logout.confirm.no = Ðе
+bbb.connection.failure=Детектирани Ñе конекциÑки проблеми
+bbb.connection.reconnecting=Повторна конекција
+bbb.connection.reestablished=Конекцијата е Ñтабилизирана
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Видео
+bbb.connection.deskshare=Споделување на екран
+bbb.notes.title = Белешки
+bbb.notes.cmpColorPicker.toolTip = Боја на текÑÑ‚
+bbb.notes.saveBtn = Зачувај
+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 = ИнÑталирајте ја најновата верзија на Флеш
+bbb.settings.isight.label = iSight грешка на веб камерата
+bbb.settings.isight.text = Ðко имате проблеми Ñо Вашата iSight веб камера, можеби е бидејќи Вие кориÑтите OS X 10.6.5, кој чеÑто има проблеми Ñо Ñнимање на видео од iSight камера. \nЗа да го решите овој проблем, линкот подолу ќе инÑталира најнова верзија на Флеш плеер, или ке го обнови вашиот ÐœÐ°Ñ Ð²Ð¾ најновата верзија
+bbb.settings.isight.command = ИнÑталирајте Флеш 10.2 RC2
+bbb.settings.warning.label = Предупредување
+bbb.settings.warning.close = Затворете го предупредувањето
+bbb.settings.noissues = Ðема пронајдено иÑклучителни грешки
+bbb.settings.instructions = Прифатете го предупредувањето на Flash кое Ве прашува за дозвола за веб камера. Ðко излезот Ñе Ñовпаѓа Ñо тоа што е очекувано, Вашиот пребаруват е поÑтавен коректно. Други потенцијални грешки Ñе подолу.Прегледајте ги за да Ñе најде можно решение.
+ltbcustom.bbb.highlighter.toolbar.triangle = Триаголник
+ltbcustom.bbb.highlighter.toolbar.triangle.accessibilityName = Сменете го курÑот на белата табла Ñо триаголник
+ltbcustom.bbb.highlighter.toolbar.line = Линија
+ltbcustom.bbb.highlighter.toolbar.line.accessibilityName = Сменете го курÑот на белата табла Ñо линија
+ltbcustom.bbb.highlighter.toolbar.text = ТекÑÑ‚
+ltbcustom.bbb.highlighter.toolbar.text.accessibilityName = Сменете го курÑот на белата табла Ñо текÑÑ‚
+ltbcustom.bbb.highlighter.texttoolbar.textColorPicker = Боја на текÑÑ‚
+ltbcustom.bbb.highlighter.texttoolbar.textSizeMenu = Големина на фонт
-# bbb.accessibility.clientReady = Ready
+bbb.accessibility.clientReady = Подготвено
-# bbb.accessibility.chat.chatBox.reachedFirst = You have reached the first message.
-# bbb.accessibility.chat.chatBox.reachedLatest = You have reached the latest message.
-# bbb.accessibility.chat.chatBox.navigatedFirst = You have navigated to the first message.
-# bbb.accessibility.chat.chatBox.navigatedLatest = You have navigated to the latest message.
-# bbb.accessibility.chat.chatBox.navigatedLatestRead = You have navigated to the most recent message you have read.
-# bbb.accessibility.chat.chatwindow.input = Chat input
+bbb.accessibility.chat.chatBox.reachedFirst = Вие Ñте приÑтигнале до првата порака
+bbb.accessibility.chat.chatBox.reachedLatest = Вие Ñте приÑтигнале до поÑледната порака
+bbb.accessibility.chat.chatBox.navigatedFirst = Вие Ñте позиционирани на првата порака
+bbb.accessibility.chat.chatBox.navigatedLatest = Вие Ñте позиционирани до поÑледната порака
+bbb.accessibility.chat.chatBox.navigatedLatestRead = Вие Ñте позиционирани на најчеÑто читаната порака
+bbb.accessibility.chat.chatwindow.input = Влез за разговор
-# bbb.accessibility.chat.initialDescription = Please use the arrow keys to navigate through chat messages.
+bbb.accessibility.chat.initialDescription = Ве молиме кориÑтете ги копчињта Ñо Ñтрелки за да Ñе позиционирате низ разговорните пораки
-# bbb.accessibility.notes.notesview.input = Notes input
+bbb.accessibility.notes.notesview.input = Влез за забелешки
bbb.shortcuthelp.title = Кратенки
-# 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.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
-# bbb.shortcuthelp.headers.shortcut = Shortcut
-# bbb.shortcuthelp.headers.function = Function
+bbb.shortcuthelp.minimizeBtn.accessibilityName = Минимизирајте го прозорецот Ñо кратенка за помош
+bbb.shortcuthelp.maximizeRestoreBtn.accessibilityName = МакÑимизирајте го прозорецот Ñо кратенка за помош
+bbb.shortcuthelp.closeBtn.accessibilityName = Затворете го прозорецот Ñо кратенка за помош
+bbb.shortcuthelp.dropdown.general = Глобални кратенки
+bbb.shortcuthelp.dropdown.presentation = ПрезентациÑки кратенки
+bbb.shortcuthelp.dropdown.chat = Разговорни кратенки
+bbb.shortcuthelp.dropdown.users = КориÑнички кратенки
+bbb.shortcuthelp.headers.shortcut = Кратенка
+bbb.shortcuthelp.headers.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.general.minimize = 189
+bbb.shortcutkey.general.minimize.function = Минимизирајте го Ñегашниот прозорец
+bbb.shortcutkey.general.maximize = 187
+bbb.shortcutkey.general.maximize.function = МакÑимизирајте го Ñегашниот прозорец
-# bbb.shortcutkey.flash.exit = 81
-# 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.flash.exit = 81
+bbb.shortcutkey.flash.exit.function = ФокуÑирајте Ñе надвор од Flash прозорецот
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Вклучете и иÑклучете звук на Вашиот микрофон
+bbb.shortcutkey.chat.chatinput = 73
+bbb.shortcutkey.chat.chatinput.function = Ð¤Ð¾ÐºÑƒÑ Ð½Ð° влезното поле за разговор
+bbb.shortcutkey.present.focusslide = 67
+bbb.shortcutkey.present.focusslide.function = Ð¤Ð¾ÐºÑƒÑ Ð½Ð° презентациÑки Ñлајд
+bbb.shortcutkey.whiteboard.undo = 90
+bbb.shortcutkey.whiteboard.undo.function = Ðазад на поÑледниот маркер
-# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
+bbb.shortcutkey.focus.users = 49
+bbb.shortcutkey.focus.users.function = ПремеÑтете го фокуÑот на кориÑничкиот прозорец
+bbb.shortcutkey.focus.video = 50
+bbb.shortcutkey.focus.video.function = ПремеÑтете го фокуÑот на прозорецот Ñо веб камера
+bbb.shortcutkey.focus.presentation = 51
+bbb.shortcutkey.focus.presentation.function = ПремеÑтете го фокуÑот на презентациÑкиот прозорец
+bbb.shortcutkey.focus.chat = 52
+bbb.shortcutkey.focus.chat.function = ПремеÑтете го фокуÑот на разговорниот прозорец
-# 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
+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 = Отворете Ñподелувачки прозорец за веб камера
-# 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.shortcutWindow = 72
+bbb.shortcutkey.shortcutWindow.function = Отворете/фокуÑирајте прозорец за кратенка за помош
+bbb.shortcutkey.logout = 76
+bbb.shortcutkey.logout.function = Одјавете Ñе од оваа Ñредба
+bbb.shortcutkey.raiseHand = 82
+bbb.shortcutkey.raiseHand.function = Подигнете рака
-# 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.present.upload = 85
+bbb.shortcutkey.present.upload.function = Прикачете презентација
+bbb.shortcutkey.present.previous = 65
+bbb.shortcutkey.present.previous.function = Претходниот Ñлајд
+bbb.shortcutkey.present.select = 83
+bbb.shortcutkey.present.select.function = Види ги Ñите Ñлајдови
+bbb.shortcutkey.present.next = 69
+bbb.shortcutkey.present.next.function = Следниот Ñлајд
+bbb.shortcutkey.present.fitWidth = 70
+bbb.shortcutkey.present.fitWidth.function = Вклопете ги Ñлајдовите Ñо ширината
+bbb.shortcutkey.present.fitPage = 80
+bbb.shortcutkey.present.fitPage.function = Вклопете ги Ñлајдовите Ñо Ñтраната
-# 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.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Ðаправете ја Ñелектираната личноÑÑ‚ презентер
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = ИÑфрлете ја Ñелектираната личноÑÑ‚ од Ñредбата
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Вклучи или иÑклучи звук на Ñелектираната личноÑÑ‚
+bbb.shortcutkey.users.muteall = 65
+bbb.shortcutkey.users.muteall.function = Вклучи или иÑклучи звук на Ñите кориÑници
+bbb.shortcutkey.users.focusUsers = 85
+bbb.shortcutkey.users.focusUsers.function = ФокуÑирај на лиÑтата на кориÑници
+bbb.shortcutkey.users.muteAllButPres = 65
+bbb.shortcutkey.users.muteAllButPres.function = ИÑклучи звук на Ñите оÑвен на презентерот
-# 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.explanation = ----
-# bbb.shortcutkey.chat.explanation.function = For message navigation, you must focus the chat box.
+bbb.shortcutkey.chat.focusTabs = 89
+bbb.shortcutkey.chat.focusTabs.function = ФокуÑирај на јазичето за разговор
+bbb.shortcutkey.chat.focusBox = 66
+bbb.shortcutkey.chat.focusBox.function = ФокуÑирај на разговорниот прозорец
+bbb.shortcutkey.chat.changeColour = 67
+bbb.shortcutkey.chat.changeColour.function = ФокуÑирај на избирачот за боја на фонт
+bbb.shortcutkey.chat.sendMessage = 83
+bbb.shortcutkey.chat.sendMessage.function = ИÑпрати чат порака
+bbb.shortcutkey.chat.explanation = ----
+bbb.shortcutkey.chat.explanation.function = За навигација на пораките, Вие мора да Ñе фокуÑирате на разговорниот прозорец
-# 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.shortcutkey.chat.chatbox.advance = 40
+bbb.shortcutkey.chat.chatbox.advance.function = Позиционирај на Ñледна порака
+bbb.shortcutkey.chat.chatbox.goback = 38
+bbb.shortcutkey.chat.chatbox.goback.function = Позиционирај на претходна порака
+bbb.shortcutkey.chat.chatbox.repeat = 32
+bbb.shortcutkey.chat.chatbox.repeat.function = Повтори ја моменталната порака
+bbb.shortcutkey.chat.chatbox.golatest = 39
+bbb.shortcutkey.chat.chatbox.golatest.function = Позиционирај на поÑледнта порака
+bbb.shortcutkey.chat.chatbox.gofirst = 37
+bbb.shortcutkey.chat.chatbox.gofirst.function = Позиционирај на првата порака
+bbb.shortcutkey.chat.chatbox.goread = 75
+bbb.shortcutkey.chat.chatbox.goread.function = Позиционирај на најчеÑто читана порака
+bbb.shortcutkey.chat.chatbox.debug = 71
+bbb.shortcutkey.chat.chatbox.debug.function = Привремена кратенка за дебагирање
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
+bbb.polling.startButton.tooltip = Ðаправете анкета
+bbb.polling.startButton.label = Ðаправете анкета
+bbb.polling.publishButton.label = ПоÑтирај
+bbb.polling.closeButton.label = Затвори
+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 = Точно
+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 = Резултати на анкета
+bbb.polling.results.accessible.answer = Прашањето {0} има {1} глаÑови.
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-bbb.polling.pollPreview.cancel = Откажи
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
+bbb.publishVideo.startPublishBtn.labelText = Започнете Ñподелување
+bbb.publishVideo.changeCameraBtn.labelText = Промена на веб камера
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+bbb.accessibility.alerts.madePresenter = Вие Ñега Ñте Презентер
+bbb.accessibility.alerts.madeViewer = Вие Ñега Ñте Гледач.
-# bbb.publishVideo.startPublishBtn.labelText = Start Sharing
-# bbb.publishVideo.changeCameraBtn.labelText = Change Webcam
+bbb.shortcutkey.specialKeys.space = Празно меÑто
+bbb.shortcutkey.specialKeys.left = Лева Стрелка
+bbb.shortcutkey.specialKeys.right = ДеÑна Стрелка
+bbb.shortcutkey.specialKeys.up = Стрелка за горе
+bbb.shortcutkey.specialKeys.down = Стрелка за долу
+bbb.shortcutkey.specialKeys.plus = ПлуÑ
+bbb.shortcutkey.specialKeys.minus = МинуÑ
-# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
-# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
+bbb.toolbar.videodock.toolTip.closeAllVideos = Затвори ги Ñите видеа
+bbb.users.settings.lockAll=Заклучи ги Ñите кориÑници
+bbb.users.settings.lockAllExcept=Закличи ги кориÑниците оÑвен презентерот
+bbb.users.settings.lockSettings=Заклучи ги гледачите ...
+bbb.users.settings.unlockAll=Отклучи ги Ñите гледачи
+bbb.users.settings.roomIsLocked=Стандардно заклучен
+bbb.users.settings.roomIsMuted=Стандардно иÑклучен звук
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
-# 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.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.save = Примени
+bbb.lockSettings.save.tooltip = Примени ги подеÑувањата за заклучување
bbb.lockSettings.cancel = Откажи
-# bbb.lockSettings.cancel.toolTip = Close this window without saving
+bbb.lockSettings.cancel.toolTip = Затвори го прозорецот без зачувувања
-# 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.lockSettings.moderatorLocking = МодераторÑко заклучување
+bbb.lockSettings.privateChat = Приватен Разговор
+bbb.lockSettings.publicChat = Јавен разговор
+bbb.lockSettings.webcam = Веб камера
+bbb.lockSettings.microphone = Микрофон
+bbb.lockSettings.layout = Рапоред
+bbb.lockSettings.title=Заклучи ги гледачите
+bbb.lockSettings.feature=Функција
+bbb.lockSettings.locked=Заклучен
+bbb.lockSettings.lockOnJoin=Заклучување на Приклучување
diff --git a/bigbluebutton-client/locale/ml_IN/bbbResources.properties b/bigbluebutton-client/locale/ml_IN/bbbResources.properties
index 5f630e7fa998b6045a29b2416afbfd9da615d5e8..8b4bf54ec689117f64fef267b366152aea2cd4bc 100644
--- a/bigbluebutton-client/locale/ml_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/ml_IN/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.join = സംസാരതàµà´¤à´¿à´²àµâ€ ചേരാം
# 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
diff --git a/bigbluebutton-client/locale/mn_MN/bbbResources.properties b/bigbluebutton-client/locale/mn_MN/bbbResources.properties
index dfde239035abdac6d2554bbb3d48d981dad53512..e41dd3235fa7376741f1a93417e60a2e03dd6197 100644
--- a/bigbluebutton-client/locale/mn_MN/bbbResources.properties
+++ b/bigbluebutton-client/locale/mn_MN/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) 2015 BigBlueButton Inc. [build {0}] - Илүү ихийг мÑдÑхийг Ñ…Ò¯ÑвÑл <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - Илүү их мÑдÑÑлÑл авахыг Ñ…Ò¯ÑвÑл <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Лог цонхийг нÑÑÑ…
bbb.mainshell.meetingNotFound = Уулзалт олдÑонгүй
bbb.mainshell.invalidAuthToken = Ðууцлалын түлхүүр буруу байна
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Ðлдаа 1006\: Залгах хугаца
bbb.webrtcWarning.failedError.1007 = Ðлдаа 1007\: ICE negotiation алдлаа
bbb.webrtcWarning.failedError.1008 = Ðлдаа 1008\: Дамжуулж чадÑангүй
bbb.webrtcWarning.failedError.1009 = Ðлдаа 1009\: STUN/TURN Ñерверийн мÑдÑÑллийг авч чадÑангүй
+bbb.webrtcWarning.failedError.1010 = Ðлдаа 1010\: ICE дамжуулах хугацаа дууÑÑан
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Ðлдаа {0}\: Үл мÑдÑгдÑÑ… алдааны код
bbb.webrtcWarning.failedError.mediamissing = WebRTC залгахын тулд таны микрофоныг авч чадÑангүй
bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC Цуурай шалгалт гÑнÑÑ‚ зогÑлоо
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = Камерны тохиргоо
bbb.users.settings.muteAll = Бүх хүмүүÑийн дууг хаах
bbb.users.settings.muteAllExcept = Ð¥Ó©Ñ‚Ð»Ó©Ð³Ñ‡Ó©Ó©Ñ Ð±ÑƒÑад хүмүүÑийн дууг хаах
bbb.users.settings.unmuteAll = Бүх хүмүүÑийн дууг нÑÑÑ…
-bbb.users.settings.lowerAllHands = Бүх гарыг буулгах
-bbb.users.raiseHandBtn.toolTip = Гараа өргөх
-bbb.users.raiseHandBtn.toolTip2 = Гараа буулгах
+bbb.users.settings.clearAllStatus = Бүх төлөвийн Ñ‚Ñмдгийг арилгах
+bbb.users.emojiStatusBtn.toolTip = Миний төлөвийн Ñ‚Ñмдгийг шинÑчлÑÑ…
bbb.users.roomMuted.text = ҮзÑгчид дуугүй байна
bbb.users.roomLocked.text = ҮзÑгчид түгжигдÑÑн байна
bbb.users.pushToTalk.toolTip = Ярих
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Төлөв
bbb.users.usersGrid.statusItemRenderer.changePresenter = Хөтлөгч болгох
bbb.users.usersGrid.statusItemRenderer.presenter = Хөтлөгч
bbb.users.usersGrid.statusItemRenderer.moderator = Зохицуулагч
-bbb.users.usersGrid.statusItemRenderer.lowerHand = Гараа буулгах
-bbb.users.usersGrid.statusItemRenderer.handRaised = Гар өргөгдÑөн
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Гар өргөгдÑөн
+bbb.users.usersGrid.statusItemRenderer.happy = Жаргалтай
+bbb.users.usersGrid.statusItemRenderer.unhappy = Жаргалгүй
+bbb.users.usersGrid.statusItemRenderer.confused = ÐргÑлзÑÑн
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Миний төлөвийг цÑвÑрлÑÑ…
bbb.users.usersGrid.statusItemRenderer.viewer = ҮзÑгч
+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 = Камерыг түгÑÑж байна
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Камерыг түгÑÑж ба
bbb.users.usersGrid.mediaItemRenderer.micOff = Микрофон унтарÑан
bbb.users.usersGrid.mediaItemRenderer.micOn = Микрофон аÑаалттай
bbb.users.usersGrid.mediaItemRenderer.noAudio = Ðудиод холбогдоогүй байна
+bbb.users.emojiStatus.clear = ЦÑвÑрлÑÑ…
+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.presentation.title = Танилцуулга файл
bbb.presentation.titleWithPres = Танилцуулга файл {0}
bbb.presentation.quickLink.label = Танилцуулга
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = ЗурваÑын тавцанг буу
bbb.chat.maximizeRestoreBtn.accessibilityName = ЗурваÑын тавцанг өргөх
bbb.chat.closeBtn.accessibilityName = ЗурваÑын тавцанг хаах
bbb.chat.chatTabs.accessibleNotice = Ð¨Ð¸Ð½Ñ Ð·ÑƒÑ€Ð²Ð°Ñ
+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 = Камерын Ñ…ÑмжÑÑг тодорхойлно уу
@@ -256,7 +272,7 @@ 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 = Камерыг өөр програм ачааллаж байна
+bbb.video.publish.hint.cameraIsBeingUsed = Таны камер нÑÑгдÑÑгүй байна. Ó¨Ó©Ñ€ газар ашиглаж байгаа байх.
bbb.video.publish.hint.publishing = ÐийтлÑж байна
bbb.video.publish.closeBtn.accessName = Камер тохиргоо цонхыг хаах
bbb.video.publish.closeBtn.label = Цуцлах
@@ -270,7 +286,8 @@ 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.chromeOnMacUnsupportedHint = Mac OS X -ийн Chrome дÑÑÑ€ дÑлгÑц хамтарч ашиглах боломжгүй. Та Ó©Ó©Ñ€ веб хөтөч ашиглана уу. ( Firefox-г Ñанал болгож байна).
+bbb.desktopPublish.chrome42UnsupportedHint = Chrome Java Applets дÑмжихÑÑ Ð±Ð¾Ð»Ð¸Ñон. Та Ó©Ó©Ñ€ веб хөтөч ашиглана уу. ( Firefox-г Ñанал болгож байна).
bbb.desktopPublish.minimizeBtn.toolTip = Цонхыг нуух
bbb.desktopPublish.minimizeBtn.accessibilityName = ДÑлгÑц түгÑÑлтийн тавцанг буулгах
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = ДÑлгÑц түгÑÑлтийн тавцанг өргөх
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Гарах
bbb.logout.confirm.message = Ó¨Ñ€Ó©Ó©Ð½Ó©Ó©Ñ Ð³Ð°Ñ€Ð°Ñ… уу?
bbb.logout.confirm.yes = Тийм
bbb.logout.confirm.no = Үгүй
+bbb.connection.failure=Холболтын алдаа гарлаа
+bbb.connection.reconnecting=Дахин холбогдох
+bbb.connection.reestablished=Холболт хийгдÑÑн
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Видео
+bbb.connection.deskshare=ДÑлгÑц хуваалцах
bbb.notes.title = ТÑмдÑглÑл
bbb.notes.cmpColorPicker.toolTip = ТекÑÑ‚ өнгө
bbb.notes.saveBtn = Хадгалах
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Богино холбооÑ
bbb.shortcuthelp.dropdown.presentation = Танилцуулгын холбооÑ
bbb.shortcuthelp.dropdown.chat = Чатны холбооÑ
bbb.shortcuthelp.dropdown.users = Ð¥ÑÑ€ÑглÑгчийн холбооÑ
-bbb.shortcuthelp.dropdown.polling = Хөтлөгчын Ñанал аÑуулгын товчилбор
-bbb.shortcuthelp.dropdown.polling2 = Ð¥ÑÑ€ÑглÑгчийн Ñанал аÑуулгын товчилбор
bbb.shortcuthelp.headers.shortcut = ХолбооÑ
bbb.shortcuthelp.headers.function = Функц
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Танилцуулга тавцан
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Чат тавцан
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = .
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = .
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = .
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = ДÑлгÑц түгÑÑлт
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Сүүлд уншÑан зурв
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Түр дебаг товчлуур
-bbb.polling.toolbar.toolTip = Санал аÑуулгуудын тохиргоо
-bbb.polling.buttonName = Санал аÑуулгуудын тохиргоо
-bbb.polling.createPoll = Ð¨Ð¸Ð½Ñ Ñанал аÑуулга Ò¯Ò¯ÑгÑÑ…
-bbb.polling.createPoll.moreThanOneResponse = Ð¥ÑÑ€ÑглÑгчидийг нÑгÑÑÑ Ð¸Ð»Ò¯Ò¯ Ñанал Ñонгохыг зөвшөөрөх
-bbb.polling.createPoll.hint = Сануулга\: Бүх аÑуултыг ÑˆÐ¸Ð½Ñ Ð¼Ó©Ñ€Ó©Ð½Ð´ Ò¯Ò¯ÑгÑÑ…
-bbb.polling.createPoll.answers = Хариулт\:
-bbb.polling.createPoll.question = ÐÑуулт\:
-bbb.polling.createPoll.title = Гарчиг\:
-bbb.polling.createPoll.publishToWeb = Веб Ñанал аÑуулгыг идÑвхижүүлÑÑ…
-
-bbb.polling.pollPreview = Санал аÑуулгыг турших
-bbb.polling.pollPreview.modify = Өөрчилөх
-bbb.polling.pollPreview.publish = ÐийтлÑÑ…
-bbb.polling.pollPreview.preview = Турших
-bbb.polling.pollPreview.save = Хадгалах
-bbb.polling.pollPreview.cancel = Цуцлах
-bbb.polling.pollPreview.modify = Өөрчилөх
-bbb.polling.pollPreview.hereIsYourPoll = Таны Ñанал аÑуулга\:
-bbb.polling.pollPreview.ifYouWantChanges = Ð¥ÑрвÑÑ Ñ‚Ð° 'Өөрчилөх' товчлуурыг Ñолихыг Ñ…Ò¯ÑвÑл
-bbb.polling.pollPreview.checkAll = (ИдÑвхижүүлÑÑ… цонхнуудыг Ñонгоно уу)
-bbb.polling.pollPreview.pollWillPublishOnline = ÐÐ½Ñ Ð¡Ð°Ð½Ð°Ð» аÑуулга веб Ñанал аÑуулгыг идÑвхижүүлÑний дараа идÑвхитÑй болохыг анхаарна уу.
-
-bbb.polling.resultBtn.label=Үр дүн
-bbb.polling.resultBtn.toolTip=Санал аÑуулгын үр дүнг харах
-bbb.polling.startBtn.label=ÐхлÑÑ…
-bbb.polling.startBtn.toolTip=Санал аÑуулга ÑхлүүлÑÑ…
-bbb.polling.editBtn.label=ЗаÑах
-bbb.polling.editBtn.toolTip=Санал аÑуулга заÑах
-bbb.polling.deleteBtn.toolTip=Санал аÑуулга уÑтгах
+bbb.polling.startButton.tooltip = Санал аÑуулга ÑхлүүлÑÑ…
+bbb.polling.startButton.label = Санал аÑуулга ÑхлүүлÑÑ…
+bbb.polling.publishButton.label = ÐийтлÑÑ…
+bbb.polling.closeButton.label = Хаах
+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 = Тийм
+bbb.polling.answer.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 = Санал аÑуулгын үр дүн
+bbb.polling.results.accessible.answer = {0} аÑуулт {1} Ñанал авÑан байна.
bbb.publishVideo.startPublishBtn.labelText = ТүгÑÑж ÑхлÑÑ…
bbb.publishVideo.changeCameraBtn.labelText = Камер Ñолих
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Камер Ñолих
bbb.accessibility.alerts.madePresenter = Та хөтлөгч биш байна
bbb.accessibility.alerts.madeViewer = Та одоо үзÑгч болоо
-bbb.shortcutkey.polling.buttonClick = 8080
-bbb.shortcutkey.polling.buttonClick.function = Санал аÑуулгын тохиргоог нÑÑÑ…
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Гарчигын цонхонд Ð¤Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = ÐÑуултын цонхонд Ð¤Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Хариултын цонхонд Ð¤Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = "Олныг нÑг Ñонгох" цонхонд Ð¤Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ….
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = "Веб Ñанал аÑуулга" цонхонд Ð¤Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Санал аÑуулгыг туршаад нийтлÑÑ…
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Санал аÑуулгыг цуцлаад гаргах
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Буцаад Ñанал аÑуулгыг өөрчилөх
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Санал аÑуулгыг нийтлÑÑд Ñанал өгөх цонхыг нÑÑÑ…
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Санал аÑуулгыг дараа Ñ…ÑÑ€ÑглÑÑ…ÑÑÑ€ хадгалах
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Санал аÑуулгын хариуг зөвхөн Ñанал аÑуулга нийтлÑгдÑÑний дараа харж болно
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Санал аÑуулгын хариу цонхонд Ñ„Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Санал аÑуулгын үр дүнг шинÑчлÑÑ…
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = "Веб Ñанал аÑуулга" цонхонд Ð¤Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Санал аÑуулгыг дууÑгаж зогÑоох
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Санал аÑуулгыг дахин нийтлÑÑ…
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Санал аÑуулгын үр дүнгийн цонхыг хаах
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Өөрийн Ñаналыг ÑонгоÑон Ñонголтонд тохируулах
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = ÐÑуултанд Ñ„Ð¾ÐºÑƒÑ Ñ…Ð¸Ð¹Ñ…
-
bbb.shortcutkey.specialKeys.space = ХооÑон зай
bbb.shortcutkey.specialKeys.left = Зүүн Ñум
bbb.shortcutkey.specialKeys.right = Баруун Ñум
diff --git a/bigbluebutton-client/locale/ms_MY/bbbResources.properties b/bigbluebutton-client/locale/ms_MY/bbbResources.properties
index 5743c40e212bdfadec624b4b61277fa7d02cabb9..effe81e3b7e1954407a9b3012371679a5a9e155a 100644
--- a/bigbluebutton-client/locale/ms_MY/bbbResources.properties
+++ b/bigbluebutton-client/locale/ms_MY/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Tetapan Audio. Fokus akan kekal di dalam tetapan
# 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
diff --git a/bigbluebutton-client/locale/ne_NP/bbbResources.properties b/bigbluebutton-client/locale/ne_NP/bbbResources.properties
index 56acaba228dc375588ca6bd5dee28abb23170288..4b62b4c898823b1af5b9928f5cdd9d4f8937241e 100644
--- a/bigbluebutton-client/locale/ne_NP/bbbResources.properties
+++ b/bigbluebutton-client/locale/ne_NP/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Audio instellingen. Enkel dit venster is editeerb
# 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
diff --git a/bigbluebutton-client/locale/nl_NL/bbbResources.properties b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
index b914a94416da624dd9bf9a9fca8da42f36e178c8..4d0cea12df578169d53c4109d489083278e70b4d 100644
--- a/bigbluebutton-client/locale/nl_NL/bbbResources.properties
+++ b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
@@ -2,7 +2,7 @@ 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.cannotConnectServer = We kunnen geen verbinding maken met de server.
-bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - Voor meer informatie bezoek <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Open log scherm
bbb.mainshell.meetingNotFound = Meeting kan niet worden gevonden
bbb.mainshell.invalidAuthToken = Ongeldig authenticatie Token
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Fout 1006\: Gesprek timed out
bbb.webrtcWarning.failedError.1007 = Fout 1007\: ICE onderhandeling mislukt
bbb.webrtcWarning.failedError.1008 = Fout 1008\: Overdracht mislukt
bbb.webrtcWarning.failedError.1009 = Fout 1009\: kan geen STUN/TURN server informatie ophalen
+# bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Fout {0} \: Onbekende fout
bbb.webrtcWarning.failedError.mediamissing = We kunnen je microfoon niet vionden voor een WebRTC gesprek
bbb.webrtcWarning.failedError.endedunexpectedly = De WebRTC echo test is onverwacht beeindigd
@@ -129,9 +131,8 @@ 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.lowerAllHands = Alle handen omlaag
-bbb.users.raiseHandBtn.toolTip = Hand opsteken
-bbb.users.raiseHandBtn.toolTip2 = Hand omlaag
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = Kijkers gedempt
bbb.users.roomLocked.text = Kijkers vergrendeld
bbb.users.pushToTalk.toolTip = Klik om te praten
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Status
bbb.users.usersGrid.statusItemRenderer.changePresenter = Wijzig presentator
bbb.users.usersGrid.statusItemRenderer.presenter = Presentator
bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
-bbb.users.usersGrid.statusItemRenderer.lowerHand = Hand omlaag
-bbb.users.usersGrid.statusItemRenderer.handRaised = Hand opgestoken
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand opgestoken
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = Kijker\n
+# 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 = Aan het spreken
bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam gedeeld
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam gedeeld
bbb.users.usersGrid.mediaItemRenderer.micOff = Microfoon uit\n
bbb.users.usersGrid.mediaItemRenderer.micOn = Microfoon aan\n
bbb.users.usersGrid.mediaItemRenderer.noAudio = Niet in conferentie gesprek
+# bbb.users.emojiStatus.clear = Clear
+# bbb.users.emojiStatus.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = Presentatie
bbb.presentation.titleWithPres = Presentatie {0}
bbb.presentation.quickLink.label = Presentatie venster
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Minimaliseer het chat venster
bbb.chat.maximizeRestoreBtn.accessibilityName = Maximaliseer het chat venster
bbb.chat.closeBtn.accessibilityName = Sluit het chat venster
bbb.chat.chatTabs.accessibleNotice = Nieuwe berichten in deze tab
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = Wijzig camera
bbb.publishVideo.changeCameraBtn.toolTip = Open het webcam aanpassen venster
bbb.publishVideo.cmbResolution.tooltip = Selecteer een webcam resolutie
@@ -256,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Wachtend op toestemming
bbb.video.publish.hint.videoPreview = Webcam preview
bbb.video.publish.hint.openingCamera = Webcam aan het openen...
bbb.video.publish.hint.cameraDenied = Webcam toegang ontzegd
-bbb.video.publish.hint.cameraIsBeingUsed = Je camera wordt momenteel door een andere toepassing gebruikt
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = Publiceren...
bbb.video.publish.closeBtn.accessName = Sluit webcam instellingen venster
bbb.video.publish.closeBtn.label = Annuleren
@@ -270,7 +286,8 @@ 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 = Scherm delen wordt momenteel niet ondersteunt in Chrome draaiend onder Mac OS X. We raden aan om Firefox te gebruiken voor het delen van je 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.minimizeBtn.toolTip = Minimaliseer
bbb.desktopPublish.minimizeBtn.accessibilityName = Minimaliseer het desktop delen venster
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximaliseer het desktop delen venster
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Bevestig uitloggen
bbb.logout.confirm.message = Weet je zeker dat je wilt uitloggen?
bbb.logout.confirm.yes = Ja
bbb.logout.confirm.no = Nee
+# 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 = Notities
bbb.notes.cmpColorPicker.toolTip = Tekst kleur
bbb.notes.saveBtn = Opslaan
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Algemene sneltoetsen
bbb.shortcuthelp.dropdown.presentation = Presentatie sneltoetsen
bbb.shortcuthelp.dropdown.chat = Chat sneltoetsen
bbb.shortcuthelp.dropdown.users = Gebruikers sneltoetsen
-bbb.shortcuthelp.dropdown.polling = Presentator vragen sneltoetsen
-bbb.shortcuthelp.dropdown.polling2 = Kijker vragen sneltoetsen
bbb.shortcuthelp.headers.shortcut = Sneltoets
bbb.shortcuthelp.headers.function = Functie
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Focus op het presentatie venster
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Focus op het chat vernster
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Focus op het vraagvenster als het geopend is
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Focus op de statistieken van het vraagvenster als het geopend is
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Focus op kies venster als het geopend is
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Open het scherm delen venster
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Navigeer naar het laatst gelezen
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Tijdelijk probleem met sneltoets
-bbb.polling.toolbar.toolTip = Beheer stemmingen
-bbb.polling.buttonName = Beheer stemmingen
-bbb.polling.createPoll = Creeer een nieuwe vraag
-bbb.polling.createPoll.moreThanOneResponse = Geef gebruikers toestemming om meer dan 1 antwoord te geven
-bbb.polling.createPoll.hint = Tip\: Begin elk antwoord op een nieuwe regel
-bbb.polling.createPoll.answers = Antwoorden
-bbb.polling.createPoll.question = Vraag\:
-bbb.polling.createPoll.title = Titel\:
-bbb.polling.createPoll.publishToWeb = Web vragen inschakelen
-
-bbb.polling.pollPreview = Vooruitblik op de stemming
-bbb.polling.pollPreview.modify = Aanpassen
-bbb.polling.pollPreview.publish = Publiceren
-bbb.polling.pollPreview.preview = Vooruitblik
-bbb.polling.pollPreview.save = Opslaan
-bbb.polling.pollPreview.cancel = Annuleren
-bbb.polling.pollPreview.modify = Aanpassen
-bbb.polling.pollPreview.hereIsYourPoll = Hier is jouw stemming\:
-bbb.polling.pollPreview.ifYouWantChanges = Als je zaken wil veranderen gebruik dan de "Aanpassen" knop
-bbb.polling.pollPreview.checkAll = (Alles selecteren wat van toepassing is)
-bbb.polling.pollPreview.pollWillPublishOnline = Deze stemming zal beschikbaar zijn voor het stemmen via het web
-
-bbb.polling.resultBtn.label=Resultaat
-bbb.polling.resultBtn.toolTip=Laat het stemming resultaat zien
-bbb.polling.startBtn.label=Start
-bbb.polling.startBtn.toolTip=Start stemming
-bbb.polling.editBtn.label=Bewerken
-bbb.polling.editBtn.toolTip=Bewerk stemming
-bbb.polling.deleteBtn.toolTip=Verwijder stemming
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+bbb.polling.publishButton.label = Publiceren
+bbb.polling.closeButton.label = Sluiten
+# 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 = Ja
+bbb.polling.answer.No = Nee
+# 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 delen
bbb.publishVideo.changeCameraBtn.labelText = Wijzig camera
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Wijzig camera
bbb.accessibility.alerts.madePresenter = Je bent nu de presentator\:
bbb.accessibility.alerts.madeViewer = Je bent nu een kijker\:
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Open het stemmingen menu
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Focus op de titel invoer box
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Focus op de vragen invoer box
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Focus op de antwoorden box
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Focus op de "meerdere selecties toegestaan" box
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Focus op "web stemmignen toegestaan" box
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Controleer jouw stemming en ga door
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Annuleren en stemmingen verlaten
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Ga terug en pas je stemming aan
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Publiceer je stemming en open de mogelijkheid om te stemmen
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Bewaar je stemming voor later
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Stem resultaten zijn pas beschikbaar na het publiceren van de stemming
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Focus op stem resultaten
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Ververs stem resultaten
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Focus op de web stemming URL box
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Eindig de stemming
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Publiceer nogmaals de stemming
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Sluit het stemming resultaat venster
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Breng je stem uit voor de geslecteerde opties
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Focus op de vraag
-
bbb.shortcutkey.specialKeys.space = Toetsenbalk
bbb.shortcutkey.specialKeys.left = Linker pijltje
bbb.shortcutkey.specialKeys.right = Rechter pijltje
diff --git a/bigbluebutton-client/locale/no_NO/bbbResources.properties b/bigbluebutton-client/locale/no_NO/bbbResources.properties
index 0a9fa272d9381cd382bd9ba75f5d771314318e53..f877244806998c2023412de7800d8929e06c5928 100644
--- a/bigbluebutton-client/locale/no_NO/bbbResources.properties
+++ b/bigbluebutton-client/locale/no_NO/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1007 = Feil 1007\: ICE kontroll feilet
# 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 = Feil {0}\: Ukjent feilkode
# bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
# bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
diff --git a/bigbluebutton-client/locale/or_IN/bbbResources.properties b/bigbluebutton-client/locale/or_IN/bbbResources.properties
index 63f850d0cb1b2fa9453b78f9744f584f543fe234..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b 100644
--- a/bigbluebutton-client/locale/or_IN/bbbResources.properties
+++ b/bigbluebutton-client/locale/or_IN/bbbResources.properties
@@ -2,7 +2,7 @@
# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
# bbb.mainshell.logBtn.toolTip = Open Log Window
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@
# 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
@@ -129,9 +131,8 @@
# 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.lowerAllHands = Lower All Hands
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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
@@ -148,9 +149,14 @@
# 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.lowerHand = Lower Hand
-# bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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
@@ -164,6 +170,14 @@
# 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
# bbb.presentation.title = Presentation
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@
# 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
@@ -256,7 +272,7 @@
# 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 is being used by another application
+# 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
@@ -270,7 +286,8 @@
# 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = Minimize
# bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
# bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window
@@ -343,6 +360,13 @@
# 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
@@ -393,8 +417,6 @@
# bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
# bbb.shortcuthelp.dropdown.chat = Chat shortcuts
# bbb.shortcuthelp.dropdown.users = Users shortcuts
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@
# 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.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
# bbb.shortcutkey.share.desktop.function = Open desktop sharing window
@@ -497,35 +513,28 @@
# bbb.shortcutkey.chat.chatbox.debug = 71
# bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-# bbb.polling.createPoll = Create New Poll
-# bbb.polling.createPoll.moreThanOneResponse = Allow users to choose more than one response
-# bbb.polling.createPoll.hint = Hint\: Start every answer with a new line
-# bbb.polling.createPoll.answers = Answers\:
-# bbb.polling.createPoll.question = Question\:
-# bbb.polling.createPoll.title = Title\:
-# bbb.polling.createPoll.publishToWeb = Enable web polling
-
-# bbb.polling.pollPreview = Poll Preview
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.publish = Publish
-# bbb.polling.pollPreview.preview = Preview
-# bbb.polling.pollPreview.save = Save
-# bbb.polling.pollPreview.cancel = Cancel
-# bbb.polling.pollPreview.modify = Modify
-# bbb.polling.pollPreview.hereIsYourPoll = Here is your poll\:
-# bbb.polling.pollPreview.ifYouWantChanges = if you want to make any changes use the 'Modify' button
-# bbb.polling.pollPreview.checkAll = (check all that may apply)
-# bbb.polling.pollPreview.pollWillPublishOnline = This poll will be available for web polling.
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# 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
@@ -533,49 +542,6 @@
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/locale/pl_PL/bbbResources.properties b/bigbluebutton-client/locale/pl_PL/bbbResources.properties
index 3ab74ceb151116e4bf6199306108ecf2adbea673..d66ce033d3d345ed959e514f687e545b3d452263 100644
--- a/bigbluebutton-client/locale/pl_PL/bbbResources.properties
+++ b/bigbluebutton-client/locale/pl_PL/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = ÅÄ…czenie z serwerem
bbb.mainshell.statusProgress.loading = Proszę czekać, ładowanie {0} modułów w toku\:
bbb.mainshell.statusProgress.cannotConnectServer = Przepraszamy, brak połączenia z serwerem.
-# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Otwórz okno dziennika
bbb.mainshell.meetingNotFound = Nie Znaleziono Spotkania
bbb.mainshell.invalidAuthToken = Nieprawidłowe Potwierdzenie Autentyczności Żetonu
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1005 = Błąd 1005\: Połączenie zostało niespod
# 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 = Błąd {0}\: Nieznany kod błędu
# bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
# bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = Ustawienia kamery
bbb.users.settings.muteAll = Wycisz wszystkich
bbb.users.settings.muteAllExcept = Wycisz wszystkich z wyjÄ…tkiem prezentera
bbb.users.settings.unmuteAll = Włącz głos wszystkim
-bbb.users.settings.lowerAllHands = Opuść wszystkie ręce
-bbb.users.raiseHandBtn.toolTip = Podnieś Rękę
-bbb.users.raiseHandBtn.toolTip2 = Opuść Rękę
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = Widzowie Wyciszeni
bbb.users.roomLocked.text = Widzowie Zablokowani
bbb.users.pushToTalk.toolTip = Kliknij aby mówić
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Status
bbb.users.usersGrid.statusItemRenderer.changePresenter = Naciśnij by uczynić Prezenterem
bbb.users.usersGrid.statusItemRenderer.presenter = Prezenter
bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
-bbb.users.usersGrid.statusItemRenderer.lowerHand = Opuść Rękę
-bbb.users.usersGrid.statusItemRenderer.handRaised = Podniesiona ręka
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Podniesiona ręka
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = Uczestnik
+# 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 = Mówienie
bbb.users.usersGrid.mediaItemRenderer.webcam = Udostępnij kamerę
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Udostępnij kamerę
bbb.users.usersGrid.mediaItemRenderer.micOff = Mikrofon wyłączony
bbb.users.usersGrid.mediaItemRenderer.micOn = Mikrofon włączony
bbb.users.usersGrid.mediaItemRenderer.noAudio = Nie w konferencji audio
+# bbb.users.emojiStatus.clear = Clear
+# bbb.users.emojiStatus.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = Prezentacja
bbb.presentation.titleWithPres = Prezentacja\: {0}
bbb.presentation.quickLink.label = Okno Prezentacji
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Zwiń okno czatu
bbb.chat.maximizeRestoreBtn.accessibilityName = Powiększ okno czatu
bbb.chat.closeBtn.accessibilityName = Zamknij okno czatu
bbb.chat.chatTabs.accessibleNotice = Nowa wiadomość w tej zakładce.
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = Zmień kamerę
bbb.publishVideo.changeCameraBtn.toolTip = Kliknij aby otworzyć okno zmiany kamery
bbb.publishVideo.cmbResolution.tooltip = Wybierz rozdzielczość kamery
@@ -256,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Oczekuje na zatwierdzenie
bbb.video.publish.hint.videoPreview = PodlÄ…d wideo
bbb.video.publish.hint.openingCamera = Otwieranie kamery...
bbb.video.publish.hint.cameraDenied = Brak dostępu do kamery
-bbb.video.publish.hint.cameraIsBeingUsed = Prawdopodobnie kamera jest używana przez inną aplikację
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = Publikowanie...
bbb.video.publish.closeBtn.accessName = Zamknij okno dialogowe ustawień kamery
bbb.video.publish.closeBtn.label = Anuluj
@@ -270,7 +286,8 @@ 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 ekranu nie jest aktualnie wspierane przez Chrome działającym na Mac OS X. Zalecamy używanie przeglądarki Firefox w celu udostępniania ekranu.
+# 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.minimizeBtn.toolTip = Zwiń
bbb.desktopPublish.minimizeBtn.accessibilityName = Zwiń okno udostępniania pulpitu
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Powiększ okno udostępniania pulpitu
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Potwierdź Wylogowanie Się
bbb.logout.confirm.message = Czy jesteś pewien, że chcesz się wylogować?
bbb.logout.confirm.yes = Tak
bbb.logout.confirm.no = Nie
+# 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 = Notatki
bbb.notes.cmpColorPicker.toolTip = Kolor tekstu
bbb.notes.saveBtn = Zapisz
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Globalne skróty
bbb.shortcuthelp.dropdown.presentation = Skróty prezentacji
bbb.shortcuthelp.dropdown.chat = Skróty czatu
bbb.shortcuthelp.dropdown.users = Skróty użytkownika
-bbb.shortcuthelp.dropdown.polling = Skróty klawiszowe Prezentera Ankiety
-bbb.shortcuthelp.dropdown.polling2 = Skróty klawiszowe Ankietowanego
bbb.shortcuthelp.headers.shortcut = Sktót
bbb.shortcuthelp.headers.function = Funkcja
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Aktywuj prezentacjÄ™
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Aktywuj okno czatu
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Pokaż okno Kreatora Ankiety, jeśli jest otwarte.
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Pokaż okno Statystyk Ankiety, jeśli jest otwarte.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Pokaż okno Głosowania, jeśli jest otwarte.
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Otwórz okno udostępniania pulpitu
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Idź do najnowszej przeczytanej w
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Debugowanie
-bbb.polling.toolbar.toolTip = ZarzÄ…dzaj Ankietami
-bbb.polling.buttonName = ZarzÄ…dzaj ankietami
-bbb.polling.createPoll = Stwórz nową ankietę
-bbb.polling.createPoll.moreThanOneResponse = Pozwól użytkownikom wybrać więcej niż jedną odpowiedź
-bbb.polling.createPoll.hint = Wskazówka\: Zacznij każdą odpowiedź z nowej linii
-bbb.polling.createPoll.answers = Odpowiedzi\:
-bbb.polling.createPoll.question = Pytanie\:
-bbb.polling.createPoll.title = Tytuł\:
-bbb.polling.createPoll.publishToWeb = WÅ‚Ä…cz widok ankiety na stronie
-
-bbb.polling.pollPreview = PodglÄ…d ankiety
-bbb.polling.pollPreview.modify = Modyfikuj
-bbb.polling.pollPreview.publish = Publikuj
-bbb.polling.pollPreview.preview = PodglÄ…d
-bbb.polling.pollPreview.save = Zapisz
-bbb.polling.pollPreview.cancel = Anuluj
-bbb.polling.pollPreview.modify = Modyfikuj
-bbb.polling.pollPreview.hereIsYourPoll = Oto Twoja ankieta\:
-bbb.polling.pollPreview.ifYouWantChanges = jeśli chcesz dokonać zmian kliknij przycisk 'Modyfikuj'
-bbb.polling.pollPreview.checkAll = (zaznacz wszystkie które mogą wystąpić)
-bbb.polling.pollPreview.pollWillPublishOnline = Ankieta będzie dostępna przez stronę
-
-bbb.polling.resultBtn.label=Rezulaty
-bbb.polling.resultBtn.toolTip=Pokaż rezultaty ankiety
-bbb.polling.startBtn.label=Start
-bbb.polling.startBtn.toolTip=Rozpocznij ankietÄ™
-bbb.polling.editBtn.label=Edytuj
-bbb.polling.editBtn.toolTip=Edytuj ankietÄ™
-bbb.polling.deleteBtn.toolTip=Usuń ankietę
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+bbb.polling.publishButton.label = Publikuj
+bbb.polling.closeButton.label = Zamknij
+# 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 = Tak
+bbb.polling.answer.No = Nie
+# 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 = Rozpoczęcie udostępniania
bbb.publishVideo.changeCameraBtn.labelText = Zmień kamerę
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Zmień kamerę
bbb.accessibility.alerts.madePresenter = Teraz Ty jesteÅ› Prezenterem
bbb.accessibility.alerts.madeViewer = Teraz Ty jesteÅ› Widzem.
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Otwórz Menu Ankietowania
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Pokaż pole Tytuł.
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Pokaż pole Pytanie.
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Pokaż pole Odpowiedź.
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Pokaż pole wyboru "Umożliwiaj wielokrotne wybieranie".
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Pokaż pole wyboru "Umożliwiaj ankietowanie on-line".
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Zobacz swojÄ… ankietÄ™ i kontynuuj.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Anuluj i zamknij tworzenie Ankiety.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Cofnij i zmodyfikuj swojÄ… ankietÄ™.
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Opublikuj swoją ankietę i rozpocznij głosowanie.
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Zapisz swoją ankietę do późniejszego użytku.
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Rezultaty ankiety są dostępne tylko gdy ankieta została opublikowana.
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Pokaż wyniki ankiety.
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Odśwież rezultaty ankiety.
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Pokaż pole URL ankiety on-line.
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Zatrzymaj ankietę i zakończ głosowanie.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Ponownie opublikuj ankietÄ™.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Zamknij okno Rezultatów Ankietowania.
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Zagłosuj dla wybranych opcji.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Pokaż pytanie.
-
bbb.shortcutkey.specialKeys.space = Spacja
bbb.shortcutkey.specialKeys.left = Lewa Strzałka
bbb.shortcutkey.specialKeys.right = Prawa Strzałka
diff --git a/bigbluebutton-client/locale/pt_BR/bbbResources.properties b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
index ef1eb7b9e7ae0ed743aa59fc7192fb78716e4003..540a4c5dfc98d900415e85a1ff25f3f05eb040f3 100755
--- a/bigbluebutton-client/locale/pt_BR/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = Conectando ao servidor
bbb.mainshell.statusProgress.loading = Carregando {0} módulos
bbb.mainshell.statusProgress.cannotConnectServer = Desculpe, não foi possÃvel conectar ao servidor.
-bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - Para mais informações, acesse <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [compilação {0}] - Para mais informações, acesse <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Abrir janela de log
bbb.mainshell.meetingNotFound = Sala não encontrada
bbb.mainshell.invalidAuthToken = Token de autenticação inválido
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Erro 1006\: Tempo de espera da chamada expi
bbb.webrtcWarning.failedError.1007 = Erro 1007\: Negociação ICE falhou
bbb.webrtcWarning.failedError.1008 = Erro 1008\: Falha na transferência
bbb.webrtcWarning.failedError.1009 = Erro 1009\: Não foi possÃvel recuperar as informações do servidor STUN/TURN
+bbb.webrtcWarning.failedError.1010 = Erro 1010\: Negociação ICE expirou
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Erro {0}\: Código de erro desconhecido
bbb.webrtcWarning.failedError.mediamissing = Não foi possÃvel acessar seu microfone para a chamada WebRTC
bbb.webrtcWarning.failedError.endedunexpectedly = O teste de eco WebRTC terminou inesperadamente
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = Configurações de webcam
bbb.users.settings.muteAll = Silenciar todos
bbb.users.settings.muteAllExcept = Silenciar todos exceto o apresentador
bbb.users.settings.unmuteAll = Acionar microfone de todos
-bbb.users.settings.lowerAllHands = Baixar todas as mãos
-bbb.users.raiseHandBtn.toolTip = Levantar a mão
-bbb.users.raiseHandBtn.toolTip2 = Abaixar a mão
+bbb.users.settings.clearAllStatus = Limpar todos os Ãcones de status
+bbb.users.emojiStatusBtn.toolTip = Atualizar meu Ãcone de status
bbb.users.roomMuted.text = Participantes silenciados
bbb.users.roomLocked.text = Participantes bloqueados
bbb.users.pushToTalk.toolTip = Falar
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Papel
bbb.users.usersGrid.statusItemRenderer.changePresenter = Clique para tornar apresentador
bbb.users.usersGrid.statusItemRenderer.presenter = Apresentador
bbb.users.usersGrid.statusItemRenderer.moderator = Moderador
-bbb.users.usersGrid.statusItemRenderer.lowerHand = Abaixar a mão
-bbb.users.usersGrid.statusItemRenderer.handRaised = Mão levantada
+bbb.users.usersGrid.statusItemRenderer.raiseHand = Mão levantada
+bbb.users.usersGrid.statusItemRenderer.happy = Alegre
+bbb.users.usersGrid.statusItemRenderer.unhappy = Triste
+bbb.users.usersGrid.statusItemRenderer.confused = Confuso
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Limpar meu status
bbb.users.usersGrid.statusItemRenderer.viewer = Participante
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Compartilhando webcam
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = É apresentador.
bbb.users.usersGrid.mediaItemRenderer = MÃdia
bbb.users.usersGrid.mediaItemRenderer.talking = Falando
bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam sendo transmitida
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam sendo transmitida
bbb.users.usersGrid.mediaItemRenderer.micOff = Microfone desativado
bbb.users.usersGrid.mediaItemRenderer.micOn = Microfone ativado
bbb.users.usersGrid.mediaItemRenderer.noAudio = Não está na conferência de voz
+bbb.users.emojiStatus.clear = Lmpar
+bbb.users.emojiStatus.raiseHand = Levantar a mão
+bbb.users.emojiStatus.happy = Alegre
+bbb.users.emojiStatus.smile = Sorriso
+bbb.users.emojiStatus.sad = Triste
+bbb.users.emojiStatus.confused = Confuso
+bbb.users.emojiStatus.neutral = Neutro
+bbb.users.emojiStatus.away = Ausente
bbb.presentation.title = Apresentação
bbb.presentation.titleWithPres = Apresentação\: {0}
bbb.presentation.quickLink.label = Janela de apresentação
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Minimizar janela de bate-papo
bbb.chat.maximizeRestoreBtn.accessibilityName = Maximizar janela de bate-papo
bbb.chat.closeBtn.accessibilityName = Fechar janela de bate-papo
bbb.chat.chatTabs.accessibleNotice = Novas mensagens nessa aba.
+bbb.chat.chatMessage.systemMessage = Sistema
+bbb.chat.chatMessage.tooLong = A mensagem excedeu o tamanho máximo em {0} caracter(es)
bbb.publishVideo.changeCameraBtn.labelText = Modificar câmera
bbb.publishVideo.changeCameraBtn.toolTip = Aabrir a caixa de diálogo para modificar a câmera
bbb.publishVideo.cmbResolution.tooltip = Selecione uma resolução para a webcam
@@ -256,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Aguardando permissão
bbb.video.publish.hint.videoPreview = Preview do vÃdeo
bbb.video.publish.hint.openingCamera = Abrindo câmera...
bbb.video.publish.hint.cameraDenied = Acesso à câmera negado
-bbb.video.publish.hint.cameraIsBeingUsed = Sua câmera não pôde ser aberta - ela pode estar sendo usada por outro aplicativo
+bbb.video.publish.hint.cameraIsBeingUsed = Sua webcam não pode ser aberta - ela pode estar sendo usada por outro aplicativo
bbb.video.publish.hint.publishing = Transmitindo vÃdeo...
bbb.video.publish.closeBtn.accessName = Fechar caixa de diálogo de configuração da webcam
bbb.video.publish.closeBtn.label = Cancelar
@@ -270,7 +286,8 @@ 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 no Chrome rodando no Mac OS X. Recomendamos o uso do Mozilla Firefox para compartilhar sua 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.minimizeBtn.toolTip = Minimizar
bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Confirmação de saÃda
bbb.logout.confirm.message = Você tem certeza que deseja sair da sessão?
bbb.logout.confirm.yes = Sim
bbb.logout.confirm.no = Não
+bbb.connection.failure=Problemas de conectividade detectados
+bbb.connection.reconnecting=Reconectando
+bbb.connection.reestablished=Conexão restabelecida
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Deskshare
bbb.notes.title = Notas
bbb.notes.cmpColorPicker.toolTip = Cor do texto
bbb.notes.saveBtn = Salvar
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Atalhos globais
bbb.shortcuthelp.dropdown.presentation = Atalhos de apresentação
bbb.shortcuthelp.dropdown.chat = Atalhos de bate-papo
bbb.shortcuthelp.dropdown.users = Atalhos de usuários
-bbb.shortcuthelp.dropdown.polling = Atalhos de enquete para apresentador
-bbb.shortcuthelp.dropdown.polling2 = Atalhos de enquete para participantes
bbb.shortcuthelp.headers.shortcut = Atalho
bbb.shortcuthelp.headers.function = Função
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Mudar foco para a janela de apresentação
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Mudar foco para a janela de bate-papo
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Mudar foco para a janela de criação de enquete, se ela estiver aberta
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Mudar foco para a janela de estatÃsticas da enquente, se ela estiver aberta
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Mudar foco para a janela de votação, se ela estiver aberta
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Abrir janela de compartilhamento de tela
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Navegar para a mensagem mais rece
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Tecla de atalho temporária de depuração
-bbb.polling.toolbar.toolTip = Gerenciar enquetes
-bbb.polling.buttonName = Gerenciar enquetes
-bbb.polling.createPoll = Criar nova enquete
-bbb.polling.createPoll.moreThanOneResponse = Permitir que os usuários escolham mais de uma resposta
-bbb.polling.createPoll.hint = Dica\: comece cada resposta com uma nova linha
-bbb.polling.createPoll.answers = Respostas\:
-bbb.polling.createPoll.question = Pergunta\:
-bbb.polling.createPoll.title = TÃtulo\:
-bbb.polling.createPoll.publishToWeb = Habilitar enquete na web
-
-bbb.polling.pollPreview = Visualizar enquete
-bbb.polling.pollPreview.modify = Modificar
-bbb.polling.pollPreview.publish = Publicar
-bbb.polling.pollPreview.preview = Preview
-bbb.polling.pollPreview.save = Salvar
-bbb.polling.pollPreview.cancel = Cancelar
-bbb.polling.pollPreview.modify = Modificar
-bbb.polling.pollPreview.hereIsYourPoll = Aqui está a sua enquete\:
-bbb.polling.pollPreview.ifYouWantChanges = Se você deseja fazer qualquer alteração, clique no botão 'Modificar'
-bbb.polling.pollPreview.checkAll = (marque todas que se aplicam)
-bbb.polling.pollPreview.pollWillPublishOnline = Essa enquete estará disponÃvel como enquete na web.
-
-bbb.polling.resultBtn.label=Resultado
-bbb.polling.resultBtn.toolTip=Mostrar resultado da enquete
-bbb.polling.startBtn.label=Iniciar
-bbb.polling.startBtn.toolTip=Iniciar enquete
-bbb.polling.editBtn.label=Alterar
-bbb.polling.editBtn.toolTip=Alterar enquete
-bbb.polling.deleteBtn.toolTip=Remover enquete
+bbb.polling.startButton.tooltip = Começar uma enquete
+bbb.polling.startButton.label = Iniciar enquete
+bbb.polling.publishButton.label = Publicar
+bbb.polling.closeButton.label = Cancelar
+bbb.polling.pollModal.title = Resultados da enquete em tempo real
+bbb.polling.customChoices.title = Entre com as opções da enquete
+bbb.polling.respondersLabel.novotes = Aguardando respostas
+bbb.polling.respondersLabel.text = {0} usuários responderam
+bbb.polling.respondersLabel.finished = Feito
+bbb.polling.answer.Yes = Sim
+bbb.polling.answer.No = Não
+bbb.polling.answer.True = Verdadeiro
+bbb.polling.answer.False = Falso
+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 = Resultados da enquete.
+bbb.polling.results.accessible.answer = Resposta {0} teve {1} votos.
bbb.publishVideo.startPublishBtn.labelText = Iniciar transmissão
bbb.publishVideo.changeCameraBtn.labelText = Modificar câmera
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Modificar câmera
bbb.accessibility.alerts.madePresenter = Você agora é o apresentador.
bbb.accessibility.alerts.madeViewer = Você agora é um visualizador.
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Abrir menu de enquete.
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Mudar foco para a caixa de entrada de tÃtulo.
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Mudar foco para a caixa de entrada de pergunta.
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Mudar foco para a caixa de entrada de respostas.
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Mudar foco para o campo "Permitir múltiplas respostas".
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Mudar foco para a caixa "Habilitar enquete na web".
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Visualize a enquete e continue.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Cancelar e sair da criação da enquete.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Voltar e modificar enquete.
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Publicar enquete e abrir votação.
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Salvar enquete para usar mais tarde.
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Os resultados da enquete só ficam disponÃveis depois que a enquete for publicada.
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Mudar foco para o resultado da enquete.
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Atualizar resultado da enquete.
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Mudar foco para a URL da enquete na web.
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Interromper a enquete e encerrar votação.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Publicar novamente a enquete.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Fechar janela de resultado da enquete.
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Registrar seu voto para as opções selecionadas.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Mudar foco para a pergunta.
-
bbb.shortcutkey.specialKeys.space = Barra de espaço
bbb.shortcutkey.specialKeys.left = Seta para a esquerda
bbb.shortcutkey.specialKeys.right = Seta para a direita
diff --git a/bigbluebutton-client/locale/pt_PT/bbbResources.properties b/bigbluebutton-client/locale/pt_PT/bbbResources.properties
index 593296d14380e9632c524ad8422e133518c9809c..e09a359d52f6ba0e41b2516b5f54245c683d9464 100644
--- a/bigbluebutton-client/locale/pt_PT/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_PT/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.cancel = Cancelar
# 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
diff --git a/bigbluebutton-client/locale/ro_RO/bbbResources.properties b/bigbluebutton-client/locale/ro_RO/bbbResources.properties
index 9e65a3f577a8c6662a9367d80f820c663010a8f1..652a55e763bc6d4709586b04b5380596504d765d 100644
--- a/bigbluebutton-client/locale/ro_RO/bbbResources.properties
+++ b/bigbluebutton-client/locale/ro_RO/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.join = Intrați în convorbire
# 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
diff --git a/bigbluebutton-client/locale/ru_RU/bbbResources.properties b/bigbluebutton-client/locale/ru_RU/bbbResources.properties
index bf7f63e5b90e9b65b2b9f9bd0628d8beed44b7d7..0df0dc7075880eee4a2e9629ee6669bf0a16299e 100755
--- a/bigbluebutton-client/locale/ru_RU/bbbResources.properties
+++ b/bigbluebutton-client/locale/ru_RU/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) 2015 BigBlueButton Inc. [build {0}] - Больше информации доÑтупно по адреÑу <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Открыть окно журнала
bbb.mainshell.meetingNotFound = ÐšÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ð¸Ñ Ð½Ðµ найдена
bbb.mainshell.invalidAuthToken = Ðеверный ключ аутентификации
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Ошибка 1006\: Ð’Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð°
bbb.webrtcWarning.failedError.1007 = Ошибка 1007\: СоглаÑование ICE не ÑоÑтоÑлоÑÑŒ
bbb.webrtcWarning.failedError.1008 = Ошибка 1008\: Передача не удалаÑÑŒ
bbb.webrtcWarning.failedError.1009 = Ошибка 1009\: Ðе удалоÑÑŒ получить STUN/TURN информацию Ñ Ñервера
+# bbb.webrtcWarning.failedError.1010 = Error 1010\: ICE negotiation timeout
+# bbb.webrtcWarning.failedError.1011 = Error 1011\: ICE gathering timeout
bbb.webrtcWarning.failedError.unknown = Ошибка {0}\: ÐеизвеÑтный код ошибки
bbb.webrtcWarning.failedError.mediamissing = Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ доÑтуп к Вашему микрофону Ð´Ð»Ñ WebRTC вызова.
bbb.webrtcWarning.failedError.endedunexpectedly = Ðхо-теÑÑ‚ Ñ Ð¸Ñпользованием WebRTC внезапно прервалÑÑ
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = ÐаÑтройки веб-камеры
bbb.users.settings.muteAll = Выкл. вÑех
bbb.users.settings.muteAllExcept = Выключить микрофоны у вÑех кроме ведущего
bbb.users.settings.unmuteAll = Включить микрофоны у вÑех
-bbb.users.settings.lowerAllHands = ОпуÑтить вÑем руки
-bbb.users.raiseHandBtn.toolTip = ПоднÑÑ‚ÑŒ руку
-bbb.users.raiseHandBtn.toolTip2 = ОпуÑтить руку
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = УчаÑтники Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ð¼ микрофоном
bbb.users.roomLocked.text = УчаÑтники заблокированы
bbb.users.pushToTalk.toolTip = Кликните чтоб говорить
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = СтатуÑ
bbb.users.usersGrid.statusItemRenderer.changePresenter = Ðажмите, чтобы Ñделать ведущим
bbb.users.usersGrid.statusItemRenderer.presenter = Ведущий
bbb.users.usersGrid.statusItemRenderer.moderator = Модератор
-bbb.users.usersGrid.statusItemRenderer.lowerHand = ОпуÑтить руку
-bbb.users.usersGrid.statusItemRenderer.handRaised = ПоднÑÑ‚Ð°Ñ Ñ€ÑƒÐºÐ°
+bbb.users.usersGrid.statusItemRenderer.raiseHand = ПоднÑÑ‚Ð°Ñ Ñ€ÑƒÐºÐ°
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = УчаÑтник
+# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = Медиа
bbb.users.usersGrid.mediaItemRenderer.talking = ГоворÑщий
bbb.users.usersGrid.mediaItemRenderer.webcam = Веб-камера включена
@@ -164,6 +170,14 @@ 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = ПрезентациÑ
bbb.presentation.titleWithPres = ПрезентациÑ\: {0}
bbb.presentation.quickLink.label = Окно презентаций
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Свернуть окно чата
bbb.chat.maximizeRestoreBtn.accessibilityName = Развернуть окно чата
bbb.chat.closeBtn.accessibilityName = Закрыть окно чата
bbb.chat.chatTabs.accessibleNotice = Ðовые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² Ñтой вкладке.
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = Изменить наÑтройки веб-камеры
bbb.publishVideo.changeCameraBtn.toolTip = Кликните, чтобы открыть окно Ñмены веб-камеры
bbb.publishVideo.cmbResolution.tooltip = Выбрать разрешение веб-камеры
@@ -256,7 +272,7 @@ 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 = Ваша веб-камера иÑпользуетÑÑ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ приложением
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = ПубликациÑ...
bbb.video.publish.closeBtn.accessName = Закрыть окно наÑтроек веб-камеры
bbb.video.publish.closeBtn.label = Отмена
@@ -270,7 +286,8 @@ 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.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.minimizeBtn.toolTip = Свернуть
bbb.desktopPublish.minimizeBtn.accessibilityName = Свернуть окно транÑлÑции рабочего Ñтола
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Развернуть окно транÑлÑции рабочего Ñтола
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Подтвердите выход
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.bigbluebutton=BigBlueButton
+# bbb.connection.sip=SIP
+# bbb.connection.video=Video
+# bbb.connection.deskshare=Deskshare
bbb.notes.title = Заметки
bbb.notes.cmpColorPicker.toolTip = Цвет текÑта
bbb.notes.saveBtn = Сохранить
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Глобальные клавиши быÑÑ‚
bbb.shortcuthelp.dropdown.presentation = Клавиши быÑтрого доÑтупа презентации
bbb.shortcuthelp.dropdown.chat = Клавиши быÑтрого доÑтупа чата
bbb.shortcuthelp.dropdown.users = Клавиши быÑтрого доÑтупа пользователей
-bbb.shortcuthelp.dropdown.polling = Клавиши быÑтрого доÑтупа опроÑов ведущего
-bbb.shortcuthelp.dropdown.polling2 = Клавиши быÑтрого доÑтупа проÑмотра опроÑов
bbb.shortcuthelp.headers.shortcut = Клавиши быÑтрого доÑтупа
bbb.shortcuthelp.headers.function = ФункциÑ
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Перейти к окну презентации
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Перейти к окну чата
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Переключить Ñ„Ð¾ÐºÑƒÑ Ð½Ð° окно ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ€Ð¾Ñа, еÑли он открыт.
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Переключить Ñ„Ð¾ÐºÑƒÑ Ð½Ð° окно ÑтатиÑтики опроÑа, еÑли он открыт.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Переключить Ñ„Ð¾ÐºÑƒÑ Ð½Ð° окно голоÑованиÑ, еÑли оно открыто.
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Открыть окно транÑлÑции рабочего Ñтола
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Перейти к поÑледн
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Временные быÑтрые клавиши Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸
-bbb.polling.toolbar.toolTip = Управление опроÑами
-bbb.polling.buttonName = Управление опроÑами
-bbb.polling.createPoll = Создать новый опроÑ
-bbb.polling.createPoll.moreThanOneResponse = Разрешить пользователÑм выбирать более одного ответа
-bbb.polling.createPoll.hint = ПодÑказка\: Ðачинайте каждый ответ Ñ Ð½Ð¾Ð²Ð¾Ð¹ Ñтроки
-bbb.polling.createPoll.answers = Ответы\:
-bbb.polling.createPoll.question = ВопроÑ\:
-bbb.polling.createPoll.title = Заголовок\:
-bbb.polling.createPoll.publishToWeb = Ðктивировать веб-опроÑ
-
-bbb.polling.pollPreview = Предварительный проÑмотр опроÑа
-bbb.polling.pollPreview.modify = Изменить
-bbb.polling.pollPreview.publish = Опубликовать
-bbb.polling.pollPreview.preview = Предварительный проÑмотр
-bbb.polling.pollPreview.save = Сохранить
-bbb.polling.pollPreview.cancel = Отменить
-bbb.polling.pollPreview.modify = Изменить
-bbb.polling.pollPreview.hereIsYourPoll = Ваш опроÑ\:
-bbb.polling.pollPreview.ifYouWantChanges = ЕÑли вы хотите внеÑти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ кнопку "Изменить"
-bbb.polling.pollPreview.checkAll = (выберите вÑе подходÑщие варианты)
-bbb.polling.pollPreview.pollWillPublishOnline = Ðтот Ð¾Ð¿Ñ€Ð¾Ñ Ð±ÑƒÐ´ÐµÑ‚ доÑтупен Ð´Ð»Ñ Ð²ÐµÐ±-опроÑа.
-
-bbb.polling.resultBtn.label=Результаты
-bbb.polling.resultBtn.toolTip=Показать результаты опроÑа
-bbb.polling.startBtn.label=Ðачать
-bbb.polling.startBtn.toolTip=Ðачать опроÑ
-bbb.polling.editBtn.label=Изменить
-bbb.polling.editBtn.toolTip=Редактировать опроÑ
-bbb.polling.deleteBtn.toolTip=Удалить опроÑ
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.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.results.accessible.header = Poll Results.
+# bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
bbb.publishVideo.startPublishBtn.labelText = Ðачать транÑлÑцию
bbb.publishVideo.changeCameraBtn.labelText = Изменить наÑтройки веб-камеры
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Изменить наÑтройки
bbb.accessibility.alerts.madePresenter = Теперь вы ведущий.
bbb.accessibility.alerts.madeViewer = Теперь вы учаÑтник.
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Открыть меню опроÑов.
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Перейти в окно ввода названиÑ.
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Перейти к окну ввода вопроÑа.
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Перейти к окну ввода ответов.
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Ðаведите чтобы "Разрешить множеÑтвенный выбор".
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Перейти к "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð²ÐµÐ±-опроÑа".
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = ПроÑмотреть ваш Ð¾Ð¿Ñ€Ð¾Ñ Ð¸ продолжить.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Отменить и выйти из ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ€Ð¾Ñа.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = ВернутьÑÑ Ð¸ изменить ваш опроÑ.
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Опубликовать ваш Ð¾Ð¿Ñ€Ð¾Ñ Ð¸ открыть голоÑование.
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Сохранить ваш Ð¾Ð¿Ñ€Ð¾Ñ Ð´Ð»Ñ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐµÐ³Ð¾ иÑпользованиÑ.
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Результаты опроÑа будут доÑтупны, как только голоÑование будет опубликовано.
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Перейти к результатам опроÑа.
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Обновить результаты опроÑа.
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Перейти к окну URL веб-опроÑа.
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = ОÑтановить Ð¾Ð¿Ñ€Ð¾Ñ Ð¸ завершить голоÑование.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Повторно опубликовать опроÑ.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Закрыть окно результатов опроÑа.
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = ПроголоÑовать за выбранные варианты.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Перейти к вопроÑу.
-
bbb.shortcutkey.specialKeys.space = Пробел
bbb.shortcutkey.specialKeys.left = Стрелка влево
bbb.shortcutkey.specialKeys.right = Стрелка вправо
diff --git a/bigbluebutton-client/locale/ru_lv/bbbResources.properties b/bigbluebutton-client/locale/ru_lv/bbbResources.properties
new file mode 100644
index 0000000000000000000000000000000000000000..0b441e4602c83f8b5cf27e49b031b37d70c1fa0b
--- /dev/null
+++ b/bigbluebutton-client/locale/ru_lv/bbbResources.properties
@@ -0,0 +1,575 @@
+# 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) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# 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 = Open tutorial videos in a 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.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.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.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
+# 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.raiseHand = Hand Raised
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
+# 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\: Failed 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.usersList.toolTip = Select User To Open Private Chat
+# 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.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.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.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.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.layout.addButton.toolTip = Add the custom layout to the list
+# bbb.layout.broadcastButton.toolTip = Apply Current Layout to All Viewers
+# bbb.layout.combo.toolTip = Change Your Layout
+# bbb.layout.loadButton.toolTip = Load layouts from a file
+# bbb.layout.saveButton.toolTip = Save layouts to a file
+# bbb.layout.lockButton.toolTip = Lock layout
+# bbb.layout.combo.prompt = Apply a layout
+# bbb.layout.combo.custom = * Custom layout
+# bbb.layout.combo.customName = Custom layout
+# bbb.layout.combo.remote = Remote
+# bbb.layout.save.complete = Layouts were successfully saved
+# bbb.layout.load.complete = Layouts were successfully loaded
+# bbb.layout.load.failed = Failed to load the layouts
+# bbb.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.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 failed
+# 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.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.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
+# 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.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.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 = 81
+# 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.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
+
+# 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.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.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
diff --git a/bigbluebutton-client/locale/si_LK/bbbResources.properties b/bigbluebutton-client/locale/si_LK/bbbResources.properties
index c08c2649661bd35dd7ccbe03ebfb6c1ba5f8c686..94bf8386b7665ffc81f127b0184c7b8cb7ebea82 100644
--- a/bigbluebutton-client/locale/si_LK/bbbResources.properties
+++ b/bigbluebutton-client/locale/si_LK/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.join = à·à·Šâ€à¶»à·€à·Šâ€à¶º පද්ධà¶à·’ය à·„à· à·ƒ
# 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
diff --git a/bigbluebutton-client/locale/sk_SK/bbbResources.properties b/bigbluebutton-client/locale/sk_SK/bbbResources.properties
index 498164a691117a27c1925b93d1680283601c3bdf..ce88f56b7347898f8d143441068b78723ac8d881 100644
--- a/bigbluebutton-client/locale/sk_SK/bbbResources.properties
+++ b/bigbluebutton-client/locale/sk_SK/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.webrtcWarning.failedError.1007 = Chyba 1007\: ICE jednanie zlyhalo
# 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 = Chyba {0}\: Neznámy kód chyby
# bbb.webrtcWarning.failedError.mediamissing = Could not get your microphone for a WebRTC call
# bbb.webrtcWarning.failedError.endedunexpectedly = The WebRTC echo test ended unexpectedly
diff --git a/bigbluebutton-client/locale/sl_SI/bbbResources.properties b/bigbluebutton-client/locale/sl_SI/bbbResources.properties
index 571167637b1a7cc5fb8170f3e6404f0541991918..1d28d41cb1ec3e2a70cf651482359a472eb0a44c 100644
--- a/bigbluebutton-client/locale/sl_SI/bbbResources.properties
+++ b/bigbluebutton-client/locale/sl_SI/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.join = Združi avdio
# 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
diff --git a/bigbluebutton-client/locale/sr_RS/bbbResources.properties b/bigbluebutton-client/locale/sr_RS/bbbResources.properties
index cebe6c1119b878f20926c7746d61effe46c699af..da9085ee1f489a2beabb0f17516e85ea5e564900 100644
--- a/bigbluebutton-client/locale/sr_RS/bbbResources.properties
+++ b/bigbluebutton-client/locale/sr_RS/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.oldlocalewindow.windowTitle = Upozorenje\: Stara verzija prevoda
# 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
diff --git a/bigbluebutton-client/locale/sv_SE/bbbResources.properties b/bigbluebutton-client/locale/sv_SE/bbbResources.properties
index 4736964eac48edd083f591a9d90bfa98b2ecce4f..8aade63c17be67d9cab24690c8f8c338243a0e9a 100644
--- a/bigbluebutton-client/locale/sv_SE/bbbResources.properties
+++ b/bigbluebutton-client/locale/sv_SE/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Ljudinställningar. Ljudinställningar kommer var
# 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
diff --git a/bigbluebutton-client/locale/th_TH/bbbResources.properties b/bigbluebutton-client/locale/th_TH/bbbResources.properties
index 6be55b7bed8559cbf1ee4757d4190177b83b8379..298c0c88d349b71a704e15561cffd5311b282691 100644
--- a/bigbluebutton-client/locale/th_TH/bbbResources.properties
+++ b/bigbluebutton-client/locale/th_TH/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.oldlocalewindow.windowTitle = คำเตืà¸à¸™ \: à¸à¸²à¸£à¹à¸›à¸¥à¸
# 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
diff --git a/bigbluebutton-client/locale/tr_TR/bbbResources.properties b/bigbluebutton-client/locale/tr_TR/bbbResources.properties
index e6af1c1ef67726411647d05c3d48c5cf35d05cba..fe90086ec6a089812d5f0128446b310290ad2409 100644
--- a/bigbluebutton-client/locale/tr_TR/bbbResources.properties
+++ b/bigbluebutton-client/locale/tr_TR/bbbResources.properties
@@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0
bbb.mainshell.statusProgress.connecting = Sunucuya bağlanıyor
bbb.mainshell.statusProgress.loading = {0} bileşen yüklendi
bbb.mainshell.statusProgress.cannotConnectServer = Üzgünüz, sunucuya bağlanamıyoruz.
-bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [sürüm {0}] - Daha fazla bilgi için <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a> ziyaret edin.
+bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [sürüm {0}] - Daha fazla bilgi için <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Sistem Kayıtlarını Aç
bbb.mainshell.meetingNotFound = Görüşme Bulunamadı
bbb.mainshell.invalidAuthToken = Kimlik Doğrulama Dizesi Hatalı
@@ -75,6 +75,8 @@ bbb.webrtcWarning.failedError.1006 = Hata 1006\: Arama zaman aşımına uğradı
bbb.webrtcWarning.failedError.1007 = Hata 1007\: ICE görüşmesi başarız
bbb.webrtcWarning.failedError.1008 = Hata 1008\: Gönderim başarısız
bbb.webrtcWarning.failedError.1009 = Hata 1009\: STUN/TURN sunucu bilgileri alaınamadı
+bbb.webrtcWarning.failedError.1010 = Hata 1010\: ICE zaman aşamı
+bbb.webrtcWarning.failedError.1011 = Hata1011\: ICE toplantı zaman aşımı
bbb.webrtcWarning.failedError.unknown = Error {0}\: Bilinmeyen hata kodu
bbb.webrtcWarning.failedError.mediamissing = WebRTC araması için mikrofonunuz bulunamadı
bbb.webrtcWarning.failedError.endedunexpectedly = WebRTC ses denemesi beklenmedik biçimde sonlandı
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = Kamera Ayarları
bbb.users.settings.muteAll = Tümünü Sessiz Yap
bbb.users.settings.muteAllExcept = Sunucu Hariç Tümünü Sessiz yap
bbb.users.settings.unmuteAll = Tümünü Sesli Yap
-bbb.users.settings.lowerAllHands = Tüm Elleri İndir
-bbb.users.raiseHandBtn.toolTip = El Kaldır
-bbb.users.raiseHandBtn.toolTip2 = Eli Ä°ndir
+bbb.users.settings.clearAllStatus = Tüm durum simgelerini temizle
+bbb.users.emojiStatusBtn.toolTip = Durum simgemi güncelle
bbb.users.roomMuted.text = Izleyiciler susturuldu
bbb.users.roomLocked.text = Izleyiciler kilitlendi
bbb.users.pushToTalk.toolTip = KonuÅŸ
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = Durumu
bbb.users.usersGrid.statusItemRenderer.changePresenter = Sunucuyu DeÄŸiÅŸtir
bbb.users.usersGrid.statusItemRenderer.presenter = Sunucu
bbb.users.usersGrid.statusItemRenderer.moderator = Yönetici
-bbb.users.usersGrid.statusItemRenderer.lowerHand = Eli Ä°ndir
-bbb.users.usersGrid.statusItemRenderer.handRaised = El Kaldırıldı
+bbb.users.usersGrid.statusItemRenderer.raiseHand = El Kaldırıldı
+bbb.users.usersGrid.statusItemRenderer.happy = Mutlu
+bbb.users.usersGrid.statusItemRenderer.unhappy = Mutsuz
+bbb.users.usersGrid.statusItemRenderer.confused = Karmaşık
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Durumumu temizle
bbb.users.usersGrid.statusItemRenderer.viewer = Ä°zleyici
+bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Kamerayı paylaşılıyor.
+bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Sunuyor.
bbb.users.usersGrid.mediaItemRenderer = Medya
bbb.users.usersGrid.mediaItemRenderer.talking = KonuÅŸuyor
bbb.users.usersGrid.mediaItemRenderer.webcam = Kamera Paylaşılıyor
@@ -164,6 +170,14 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Kamera Paylaşılıyor
bbb.users.usersGrid.mediaItemRenderer.micOff = Mikrofon devre dışı
bbb.users.usersGrid.mediaItemRenderer.micOn = Mikrofon devrede
bbb.users.usersGrid.mediaItemRenderer.noAudio = Sesli görüşmede değil
+bbb.users.emojiStatus.clear = Temizle
+bbb.users.emojiStatus.raiseHand = El Kaldır
+bbb.users.emojiStatus.happy = Mutlu
+bbb.users.emojiStatus.smile = Gülümseme
+bbb.users.emojiStatus.sad = Mutsuz
+bbb.users.emojiStatus.confused = Kafası Karışık
+bbb.users.emojiStatus.neutral = Normal
+bbb.users.emojiStatus.away = Dışarda
bbb.presentation.title = Sunum
bbb.presentation.titleWithPres = Sunum\: {0}
bbb.presentation.quickLink.label = Sunum Penceresi
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Sohbet Penceresini Küçült
bbb.chat.maximizeRestoreBtn.accessibilityName = Sohbet Penceresini Büyült
bbb.chat.closeBtn.accessibilityName = Sohbet Penceresini Kapat
bbb.chat.chatTabs.accessibleNotice = Bu sekmedeki yeni mesajlar
+bbb.chat.chatMessage.systemMessage = Sistem
+bbb.chat.chatMessage.tooLong = Mesaj {0} karakter daha uzun
bbb.publishVideo.changeCameraBtn.labelText = Kamerayı Değiştir
bbb.publishVideo.changeCameraBtn.toolTip = Kamera değiştirme iletişim kutusunu aç
bbb.publishVideo.cmbResolution.tooltip = Kamera çözünürlüğünü seç
@@ -256,7 +272,7 @@ bbb.video.publish.hint.waitingApproval = Onay için bekleniyor
bbb.video.publish.hint.videoPreview = Kamera önizleme
bbb.video.publish.hint.openingCamera = Kamera açılıyor...
bbb.video.publish.hint.cameraDenied = Kamera eriÅŸimi reddedildi
-bbb.video.publish.hint.cameraIsBeingUsed = Kameranız başka bir uygulama tarafından kullanılıyor
+bbb.video.publish.hint.cameraIsBeingUsed = Kameranız açılamadı - Başka bir uygulama tarafından kullanılıyor olabilir
bbb.video.publish.hint.publishing = Yayımlanıyor...
bbb.video.publish.closeBtn.accessName = Kamera ayarları iletişim kutusunu kapat
bbb.video.publish.closeBtn.label = Vazgeç
@@ -270,7 +286,8 @@ 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 Firefox kullanmanız önerilir.
+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.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
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Çıkışı Onayla
bbb.logout.confirm.message = Çıkmak istediğinizden emin misiniz?
bbb.logout.confirm.yes = Evet
bbb.logout.confirm.no = Hayır
+bbb.connection.failure=Bağlantı Sorunları Algılandı
+bbb.connection.reconnecting=Yeniden bağlanılıyor
+bbb.connection.reestablished=Bağlantı yeniden kuruldu
+bbb.connection.bigbluebutton=BigBlueButton
+bbb.connection.sip=SIP
+bbb.connection.video=Video
+bbb.connection.deskshare=Masaüstü Paylaşma
bbb.notes.title = Notlar
bbb.notes.cmpColorPicker.toolTip = Metin Rengi
bbb.notes.saveBtn = Kaydet
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Genel Kısayollar
bbb.shortcuthelp.dropdown.presentation = Sunum kısayolları
bbb.shortcuthelp.dropdown.chat = Sohbet kısayolları
bbb.shortcuthelp.dropdown.users = Kullanıcı kısayolları
-bbb.shortcuthelp.dropdown.polling = Sunucu Seçim kısayolları
-bbb.shortcuthelp.dropdown.polling2 = İzleyici Oylama kısayolları
bbb.shortcuthelp.headers.shortcut = Kısayol
bbb.shortcuthelp.headers.function = Ä°ÅŸlev
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Odaklamayı Sunum penceresine kaydır
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Odaklamayı Sohbet penceresine kaydır
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = Odaklamayı Anket Oluşturma penceresine kaydır. Eğer açıksa.
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = Odaklamayı Anket İstatistikleri penceresine kaydır. Eğer açıksa.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = Odaklamayı Oylama penceresine kaydır. Eğer açıksa.
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Masaüstü paylaşım penceresini aç
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = OkuduÄŸunuz en son mesaja git
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = Geçici hata ayıklama kısayolu
-bbb.polling.toolbar.toolTip = Anketleri Yönet
-bbb.polling.buttonName = Anketleri Yönet
-bbb.polling.createPoll = Yeni Anket OluÅŸtur
-bbb.polling.createPoll.moreThanOneResponse = Kullanıcıların birden fazla cevap vermelerine izin ver
-bbb.polling.createPoll.hint = İpucu\: Her cevabı yeni satırda başlatın
-bbb.polling.createPoll.answers = Cevaplar\:
-bbb.polling.createPoll.question = Soru\:
-bbb.polling.createPoll.title = Başlık\:
-bbb.polling.createPoll.publishToWeb = Web oylamasına izin ver
-
-bbb.polling.pollPreview = Anket Önizlemesi
-bbb.polling.pollPreview.modify = Düzenle
-bbb.polling.pollPreview.publish = Yayımla
-bbb.polling.pollPreview.preview = Önizleme
-bbb.polling.pollPreview.save = Kaydet
-bbb.polling.pollPreview.cancel = Vazgeç
-bbb.polling.pollPreview.modify = Düzenle
-bbb.polling.pollPreview.hereIsYourPoll = Anketiniz\:
-bbb.polling.pollPreview.ifYouWantChanges = Eğer bir değişiklik yapmak isterseniz 'Düzenle' düğmesine tıklayın
-bbb.polling.pollPreview.checkAll = (uygun olanları işaretleyin)
-bbb.polling.pollPreview.pollWillPublishOnline = Bu anket web oylaması için uygun olacak.
-
-bbb.polling.resultBtn.label=Sonuç
-bbb.polling.resultBtn.toolTip=Anket sonucunu göster
-bbb.polling.startBtn.label=BaÅŸlat
-bbb.polling.startBtn.toolTip=Anketi baÅŸlat
-bbb.polling.editBtn.label=Düzenle
-bbb.polling.editBtn.toolTip=Anketi düzenle
-bbb.polling.deleteBtn.toolTip=Anketi sil
+bbb.polling.startButton.tooltip = Bir anket oluÅŸtur
+bbb.polling.startButton.label = Anketi BaÅŸlat
+bbb.polling.publishButton.label = Yayımla
+bbb.polling.closeButton.label = Kapat
+bbb.polling.pollModal.title = Canlı Anket Sonuçları
+bbb.polling.customChoices.title = Anket Seçeneklerini Girin
+bbb.polling.respondersLabel.novotes = Cevaplar bekleniyor
+bbb.polling.respondersLabel.text = {0} Kullanıcı Cevapladı
+bbb.polling.respondersLabel.finished = Yapıldı
+bbb.polling.answer.Yes = Evet
+bbb.polling.answer.No = Hayır
+bbb.polling.answer.True = DoÄŸru
+bbb.polling.answer.False = Yanlış
+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 = Anket Sonuçları
+bbb.polling.results.accessible.answer = {0} seçeneği için {1} oy kullanıldı.
bbb.publishVideo.startPublishBtn.labelText = Paylaşımı Başlat
bbb.publishVideo.changeCameraBtn.labelText = Kamerayı Değiştir
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Kamerayı Değiştir
bbb.accessibility.alerts.madePresenter = Åžu an Sunucu sizsiniz.
bbb.accessibility.alerts.madeViewer = Åžu an bir Ä°zleyicisiniz.
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Anket Menüsünü açın
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Başlık girdi kutusuna odaklan
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Soru girdi kutusuna odaklan
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Cevap girdi kutusuna odaklan
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = "Çoklu seçimlere izin ver" onay kutusuna odaklan
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = "Web oylamasını etkinleştir" onay kutusuna odaklan
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = Anketinizi Önizleme yapıp ve devam edin.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = Vazgeç ve Anket oluşturmadan çık.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = Geri dön ve anketini düzenle.
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Anketini yayımla ve oylamaya aç.
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Anketini sonra kullanmak için kaydet.
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Anket sonuçları sadece anket yayımlandığında uygun olacak.
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Anket sonuçlarına odaklan
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Anket sonuçlarını yenile.
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Web oylama URL kutusuna odaklan.
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Anketi durdur ve oylamayı sonlandır.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Anketi yeniden yayımla.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Oylama Sonuçları penceresini kapat.
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = Seçilen seçenekler için oyunuzu verin.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Soruya odaklan
-
bbb.shortcutkey.specialKeys.space = Boşluk Çubuğu
bbb.shortcutkey.specialKeys.left = Sol Ok
bbb.shortcutkey.specialKeys.right = SaÄŸ Ok
diff --git a/bigbluebutton-client/locale/uk_UA/bbbResources.properties b/bigbluebutton-client/locale/uk_UA/bbbResources.properties
index a80da895ef62220f6e16b642c289f614a4e4d0d9..cbedd7f3a368526463ae54b83321059f5435a9d3 100644
--- a/bigbluebutton-client/locale/uk_UA/bbbResources.properties
+++ b/bigbluebutton-client/locale/uk_UA/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) 2015 BigBlueButton Inc. [build {0}] - Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації відвідайте <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = Відкрити вікно журналу
bbb.mainshell.meetingNotFound = ÐšÐ¾Ð½Ñ„ÐµÑ€ÐµÐ½Ñ†Ñ–Ñ Ð½Ðµ знайдена
bbb.mainshell.invalidAuthToken = Ðевірний ключ аутентифікації
@@ -75,6 +75,8 @@ 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.unknown = Помилка {0}\: Ðевідомий код помилки
bbb.webrtcWarning.failedError.mediamissing = Ð”Ð»Ñ WebRTC виклику не вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до вашого мікрофону
bbb.webrtcWarning.failedError.endedunexpectedly = Ехо-теÑÑ‚ з викориÑтаннÑм WebRTC раптово перервавÑÑ
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-камери
bbb.users.settings.muteAll = Вимкн. вÑÑ–Ñ…
bbb.users.settings.muteAllExcept = Вимкнути мікрофони у вÑÑ–Ñ… окрім ведучого
bbb.users.settings.unmuteAll = Увімкнути мікрофони у вÑÑ–Ñ…
-bbb.users.settings.lowerAllHands = ОпуÑтити вÑім руки
-bbb.users.raiseHandBtn.toolTip = ПіднÑти руку
-bbb.users.raiseHandBtn.toolTip2 = ОпуÑтити руку
+# bbb.users.settings.clearAllStatus = Clear all status icons
+# bbb.users.emojiStatusBtn.toolTip = Update my status icon
bbb.users.roomMuted.text = УчаÑники з вимкненим мікрофоном
bbb.users.roomLocked.text = УчаÑники заблоковані
bbb.users.pushToTalk.toolTip = Клацніть щоб говорити
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = СтатуÑ
bbb.users.usersGrid.statusItemRenderer.changePresenter = ÐатиÑніть, щоб зробити ведучим
bbb.users.usersGrid.statusItemRenderer.presenter = Ведучий
bbb.users.usersGrid.statusItemRenderer.moderator = Модератор
-bbb.users.usersGrid.statusItemRenderer.lowerHand = ОпуÑтити руку
-bbb.users.usersGrid.statusItemRenderer.handRaised = ПіднÑта рука
+bbb.users.usersGrid.statusItemRenderer.raiseHand = ПіднÑта рука
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = ГлÑдач
+# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = Медіа
bbb.users.usersGrid.mediaItemRenderer.talking = Говорить
bbb.users.usersGrid.mediaItemRenderer.webcam = Веб-камера увімкнена
@@ -164,6 +170,14 @@ 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = ПрезентаціÑ
bbb.presentation.titleWithPres = ПрезентаціÑ\: {0}
bbb.presentation.quickLink.label = Вікно презентації
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = Згорнути вікно чату
bbb.chat.maximizeRestoreBtn.accessibilityName = Розгорнути вікно чату
bbb.chat.closeBtn.accessibilityName = Закрити вікно чату
bbb.chat.chatTabs.accessibleNotice = Ðові Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð² цій вкладці.
+# bbb.chat.chatMessage.systemMessage = System
+# bbb.chat.chatMessage.tooLong = The message is {0} character(s) too long
bbb.publishVideo.changeCameraBtn.labelText = Змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-камери
bbb.publishVideo.changeCameraBtn.toolTip = Клацніть, щоб відкрити вікно зміни веб-камери
bbb.publishVideo.cmbResolution.tooltip = Вибрати роздільну здатніÑÑ‚ÑŒ веб-камери
@@ -256,7 +272,7 @@ 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 = Ваша веб-камера викориÑтовуєтьÑÑ Ñ–Ð½ÑˆÐ¾ÑŽ програмою
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = ПублікаціÑ...
bbb.video.publish.closeBtn.accessName = Закрити вікно налаштувань веб-камери
bbb.video.publish.closeBtn.label = СкаÑувати
@@ -270,7 +286,8 @@ 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.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.minimizeBtn.toolTip = Згорнути
bbb.desktopPublish.minimizeBtn.accessibilityName = Згорнути вікно транÑлÑції робочого Ñтолу
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Розгорнути вікно транÑлÑції робочого Ñтолу
@@ -343,6 +360,13 @@ bbb.logout.confirm.title = Підтвердіть вихід
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.bigbluebutton=BigBlueButton
+# bbb.connection.sip=SIP
+# bbb.connection.video=Video
+# bbb.connection.deskshare=Deskshare
bbb.notes.title = Примітки
bbb.notes.cmpColorPicker.toolTip = Колір текÑту
bbb.notes.saveBtn = Зберегти
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = Глобальні клавіші швидк
bbb.shortcuthelp.dropdown.presentation = Клавіші швидкого доÑтупу презентації
bbb.shortcuthelp.dropdown.chat = Клавіші швидкого доÑтупу чату
bbb.shortcuthelp.dropdown.users = Клавіші швидкого доÑтупу кориÑтувачів
-bbb.shortcuthelp.dropdown.polling = Клавіші швидкого доÑтупу опитувань ведучого
-bbb.shortcuthelp.dropdown.polling2 = Клавіші швидкого доÑтупу переглÑду опитувань
bbb.shortcuthelp.headers.shortcut = Клавіші швидкого доÑтупу
bbb.shortcuthelp.headers.function = ФункціÑ
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.presentation = 51
bbb.shortcutkey.focus.presentation.function = Перейти до вікна презентації
bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = Перейти до вікна чату
-bbb.shortcutkey.focus.pollingCreate = 67
-bbb.shortcutkey.focus.pollingCreate.function = ПеревеÑти Ñ„Ð¾ÐºÑƒÑ Ð½Ð° вікно ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½ÑŒ, Ñкщо таке відкрите.
-bbb.shortcutkey.focus.pollingStats = 83
-bbb.shortcutkey.focus.pollingStats.function = ПеревеÑти Ñ„Ð¾ÐºÑƒÑ Ð½Ð° вікно ÑтатиÑтики опитувань, Ñкщо таке відкрите.
-bbb.shortcutkey.focus.voting = 89
-bbb.shortcutkey.focus.voting.function = ПеревеÑти Ñ„Ð¾ÐºÑƒÑ Ð½Ð° вікно голоÑувань, Ñкщо таке відкрите.
bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = Відкрити вікно транÑлÑції робочого Ñтолу
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = Перейти до оÑтанн
bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = ТимчаÑові швидкі клавіші Ð´Ð»Ñ Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ
-bbb.polling.toolbar.toolTip = ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñми
-bbb.polling.buttonName = ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñми
-bbb.polling.createPoll = Створити нове опитуваннÑ
-bbb.polling.createPoll.moreThanOneResponse = Дозволити кориÑтувачам вибирати більше однієї відповіді
-bbb.polling.createPoll.hint = Підказка\: починайте кожну відповідь з нового Ñ€Ñдку
-bbb.polling.createPoll.answers = Відповіді\:
-bbb.polling.createPoll.question = ПитаннÑ\:
-bbb.polling.createPoll.title = Заголовок\:
-bbb.polling.createPoll.publishToWeb = Ðктивувати веб-опитуваннÑ
-
-bbb.polling.pollPreview = Попередній переглÑд опитуваннÑ
-bbb.polling.pollPreview.modify = Змінити
-bbb.polling.pollPreview.publish = Публікувати
-bbb.polling.pollPreview.preview = Попередній переглÑд
-bbb.polling.pollPreview.save = Зберегти
-bbb.polling.pollPreview.cancel = СкаÑувати
-bbb.polling.pollPreview.modify = Змінити
-bbb.polling.pollPreview.hereIsYourPoll = Ваше опитуваннÑ\:
-bbb.polling.pollPreview.ifYouWantChanges = Якщо ви хочете внеÑти зміни натиÑніть кнопку "Змінити"
-bbb.polling.pollPreview.checkAll = (виберіть вÑÑ– варіанти, що підходÑÑ‚ÑŒ)
-bbb.polling.pollPreview.pollWillPublishOnline = ÐžÐ¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ доÑтупне Ð´Ð»Ñ Ð²ÐµÐ±-голоÑуваннÑ.
-
-bbb.polling.resultBtn.label=Результати
-bbb.polling.resultBtn.toolTip=Показати результати опитуваннÑ
-bbb.polling.startBtn.label=Почати
-bbb.polling.startBtn.toolTip=Почати опитуваннÑ
-bbb.polling.editBtn.label=Змінити
-bbb.polling.editBtn.toolTip=Редагувати опитуваннÑ
-bbb.polling.deleteBtn.toolTip=Видалити опитуваннÑ
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.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.results.accessible.header = Poll Results.
+# bbb.polling.results.accessible.answer = Answer {0} had {1} votes.
bbb.publishVideo.startPublishBtn.labelText = Розпочати транÑлÑцію
bbb.publishVideo.changeCameraBtn.labelText = Змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-камери
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = Змінити налаштуван
bbb.accessibility.alerts.madePresenter = Тепер ви ведучий.
bbb.accessibility.alerts.madeViewer = Тепер ви учаÑник.
-bbb.shortcutkey.polling.buttonClick = 80
-bbb.shortcutkey.polling.buttonClick.function = Відкрити меню опитувань.
-bbb.shortcutkey.polling.focusTitle = 67
-bbb.shortcutkey.polling.focusTitle.function = Перейти до вікна Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð²Ð¸.
-bbb.shortcutkey.polling.focusQuestion = 81
-bbb.shortcutkey.polling.focusQuestion.function = Перейти до вікна Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð¿Ð¸Ñ‚Ð°Ð½ÑŒ.
-bbb.shortcutkey.polling.focusAnswers = 65
-bbb.shortcutkey.polling.focusAnswers.function = Перейти до вікна Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´ÐµÐ¹.
-bbb.shortcutkey.polling.focusMultipleCB = 77
-bbb.shortcutkey.polling.focusMultipleCB.function = Ðаведіть щоб "Дозволити множинний вибір".
-bbb.shortcutkey.polling.focusWebPollCB = 66
-bbb.shortcutkey.polling.focusWebPollCB.function = Перейти до "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ Ð²ÐµÐ±-опитуваннÑ".
-bbb.shortcutkey.polling.previewClick = 80
-bbb.shortcutkey.polling.previewClick.function = ПереглÑнути ваше Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– продовжити.
-bbb.shortcutkey.polling.cancelClick = 88
-bbb.shortcutkey.polling.cancelClick.function = СкаÑувати та вийти зі ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ.
-bbb.shortcutkey.polling.modify = 69
-bbb.shortcutkey.polling.modify.function = ПовернутиÑÑŒ та змінити ваше опитуваннÑ.
-bbb.shortcutkey.polling.publish = 85
-bbb.shortcutkey.polling.publish.function = Опублікувати ваше Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– відкрити голоÑуваннÑ.
-bbb.shortcutkey.polling.save = 83
-bbb.shortcutkey.polling.save.function = Зберегти ваше Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð°Ð»ÑŒÑˆÐ¾Ð³Ð¾ викориÑтаннÑ.
-
-bbb.shortcutkey.pollStats.explanation = ----
-bbb.shortcutkey.pollStats.explanation.function = Результати Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñтануть доÑтупними, Ñк тільки голоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ опубліковане.
-bbb.shortcutkey.polling.focusData = 68
-bbb.shortcutkey.polling.focusData.function = Перейти до результатів опитуваннÑ.
-bbb.shortcutkey.polling.refresh = 82
-bbb.shortcutkey.polling.refresh.function = Оновити результати опитуваннÑ.
-bbb.shortcutkey.polling.focusWebPoll = 73
-bbb.shortcutkey.polling.focusWebPoll.function = Перейти до вікна URL опитувань.
-bbb.shortcutkey.polling.stopPoll = 79
-bbb.shortcutkey.polling.stopPoll.function = Зупинити Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– голоÑуваннÑ.
-bbb.shortcutkey.polling.repostPoll = 80
-bbb.shortcutkey.polling.repostPoll.function = Повторно опублікувати опитуваннÑ.
-bbb.shortcutkey.polling.closeStatsWindow = 88
-bbb.shortcutkey.polling.closeStatsWindow.function = Закрити вікно результатів опитуваннÑ.
-
-bbb.shortcutkey.polling.vote = 86
-bbb.shortcutkey.polling.vote.function = ГолоÑувати за вибрані варіанти.
-bbb.shortcutkey.polling.focusVoteQuestion = 81
-bbb.shortcutkey.polling.focusVoteQuestion.function = Перейти до питаннÑ.
-
bbb.shortcutkey.specialKeys.space = Пробіл
bbb.shortcutkey.specialKeys.left = Стрілка вліво
bbb.shortcutkey.specialKeys.right = Стрілка вправо
diff --git a/bigbluebutton-client/locale/vi_VN/bbbResources.properties b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
index bd6c8f0df67d1ea5222d4bd7504cf5f49419b880..797a22ae37da8729b9bce11c0dae4a95ba982b36 100644
--- a/bigbluebutton-client/locale/vi_VN/bbbResources.properties
+++ b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
@@ -76,6 +76,7 @@ bbb.micSettings.access.title = Thiết láºp audio. Sẽ táºp trung và o phần
# 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
diff --git a/bigbluebutton-client/locale/zh_CN/bbbResources.properties b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
index cf447f6a51e5bbc19ff63531499af6e53830c290..6e570788b215553f532fc4b588c57ea13a0dbb48 100644
--- a/bigbluebutton-client/locale/zh_CN/bbbResources.properties
+++ b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
@@ -76,6 +76,7 @@ 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.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
diff --git a/bigbluebutton-client/locale/zh_TW/bbbResources.properties b/bigbluebutton-client/locale/zh_TW/bbbResources.properties
index 2453576f346b67221c7fce14ff631a673ebddd37..787f9d11bef81d5060884226595086245e680504 100644
--- a/bigbluebutton-client/locale/zh_TW/bbbResources.properties
+++ b/bigbluebutton-client/locale/zh_TW/bbbResources.properties
@@ -2,7 +2,7 @@
bbb.mainshell.statusProgress.connecting = æ£åœ¨é€£æŽ¥åˆ°ä¼ºæœå™¨
bbb.mainshell.statusProgress.loading = 載入 {0} 模組
bbb.mainshell.statusProgress.cannotConnectServer = 抱æ‰ï¼Œç„¡æ³•é€£æŽ¥åˆ°ä¼ºæœå™¨.
-# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
+# bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href\='event\:http\://www.bigbluebutton.org/' target\='_blank'><u>http\://www.bigbluebutton.org</u></a>
bbb.mainshell.logBtn.toolTip = 打開日誌
# bbb.mainshell.meetingNotFound = Meeting Not Found
# bbb.mainshell.invalidAuthToken = Invalid Authentication Token
@@ -75,6 +75,8 @@ bbb.micSettings.access.title = 語音è¨ç½®ã€‚焦點會一直在這個語音è¨
# 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
@@ -129,9 +131,8 @@ bbb.users.settings.webcamSettings = æ”åƒé è¨ç½®
bbb.users.settings.muteAll = 全部éœéŸ³
bbb.users.settings.muteAllExcept = 除演講人外全部éœéŸ³
bbb.users.settings.unmuteAll = å–消全部éœéŸ³
-bbb.users.settings.lowerAllHands = 放下所有的手
-# bbb.users.raiseHandBtn.toolTip = Raise Hand
-# bbb.users.raiseHandBtn.toolTip2 = Lower Hand
+# 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 = 點擊交談
@@ -148,9 +149,14 @@ bbb.users.usersGrid.statusItemRenderer = 狀態
# bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
bbb.users.usersGrid.statusItemRenderer.presenter = 演講人
bbb.users.usersGrid.statusItemRenderer.moderator = 管ç†å“¡
-# bbb.users.usersGrid.statusItemRenderer.lowerHand = Lower Hand
-bbb.users.usersGrid.statusItemRenderer.handRaised = 舉手
+bbb.users.usersGrid.statusItemRenderer.raiseHand = 舉手
+# bbb.users.usersGrid.statusItemRenderer.happy = Happy
+# bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
+# bbb.users.usersGrid.statusItemRenderer.confused = Confused
+# bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.viewer = 觀看人
+# bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
+# bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
bbb.users.usersGrid.mediaItemRenderer = 媒體
bbb.users.usersGrid.mediaItemRenderer.talking = 會話
bbb.users.usersGrid.mediaItemRenderer.webcam = æ”åƒé 已共享
@@ -164,6 +170,14 @@ 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.raiseHand = Raise hand
+# bbb.users.emojiStatus.happy = Happy
+# bbb.users.emojiStatus.smile = Smile
+# bbb.users.emojiStatus.sad = Sad
+# bbb.users.emojiStatus.confused = Confused
+# bbb.users.emojiStatus.neutral = Neutral
+# bbb.users.emojiStatus.away = Away
bbb.presentation.title = 投影片演示
# bbb.presentation.titleWithPres = Presentation\: {0}
# bbb.presentation.quickLink.label = Presentation Window
@@ -235,6 +249,8 @@ bbb.chat.minimizeBtn.accessibilityName = 最å°åŒ–èŠå¤©çª—é«”
bbb.chat.maximizeRestoreBtn.accessibilityName = 最大化èŠå¤©çª—é«”
bbb.chat.closeBtn.accessibilityName = 關閉èŠå¤©çª—é«”
# 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 = 更改æ”åƒé è¨ç½®
# bbb.publishVideo.changeCameraBtn.toolTip = Open the change webcam dialog box
# bbb.publishVideo.cmbResolution.tooltip = Select a webcam resolution
@@ -256,7 +272,7 @@ 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 = æ”åƒé 已被使用
+# bbb.video.publish.hint.cameraIsBeingUsed = Your webcam couldn't be opened - it may be under use by another application
bbb.video.publish.hint.publishing = 發布ä¸...
bbb.video.publish.closeBtn.accessName = 關閉æ”åƒé 窗體
bbb.video.publish.closeBtn.label = å–消
@@ -270,7 +286,8 @@ 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. Recommend you use FireFox to share desktop.
+# 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.minimizeBtn.toolTip = 最å°åŒ–視窗
bbb.desktopPublish.minimizeBtn.accessibilityName = 最å°åŒ–螢幕共享發佈視窗
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = 最大化螢幕共享發佈視窗
@@ -343,6 +360,13 @@ bbb.logout.usercommand = 妳已經登出會è°
# 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 = ç´€è¦
bbb.notes.cmpColorPicker.toolTip = 文本é¡è‰²
bbb.notes.saveBtn = å˜æª”
@@ -393,8 +417,6 @@ bbb.shortcuthelp.dropdown.general = 所有的快æ·éµ
bbb.shortcuthelp.dropdown.presentation = 演示相關快æ·éµ
bbb.shortcuthelp.dropdown.chat = èŠå¤©ç›¸é—œå¿«æ·éµ
bbb.shortcuthelp.dropdown.users = 用戶相關快æ·éµ
-# bbb.shortcuthelp.dropdown.polling = Presenter Polling shortcuts
-# bbb.shortcuthelp.dropdown.polling2 = Viewer Polling shortcuts
# bbb.shortcuthelp.headers.shortcut = Shortcut
# bbb.shortcuthelp.headers.function = Function
@@ -422,12 +444,6 @@ bbb.shortcutkey.focus.video.function = å°‡ç„¦é»žç§»å‹•åˆ°è¦–é »æ‡¸æµ®è¦–çª—
bbb.shortcutkey.focus.presentation.function = 將焦點移動到演示視窗
# bbb.shortcutkey.focus.chat = 52
bbb.shortcutkey.focus.chat.function = 將焦點移動到èŠå¤©è¦–窗
-# bbb.shortcutkey.focus.pollingCreate = 67
-# bbb.shortcutkey.focus.pollingCreate.function = Move focus to the Poll Creation window, if it is open.
-# bbb.shortcutkey.focus.pollingStats = 83
-# bbb.shortcutkey.focus.pollingStats.function = Move focus to the Poll Statistics window, if it is open.
-# bbb.shortcutkey.focus.voting = 89
-# bbb.shortcutkey.focus.voting.function = Move focus to the Voting window, if it is open.
# bbb.shortcutkey.share.desktop = 68
bbb.shortcutkey.share.desktop.function = é–‹å•Ÿæ¡Œé¢å…±äº«è¦–窗
@@ -497,35 +513,28 @@ bbb.shortcutkey.chat.chatbox.goread.function = ç€è¦½åˆ°æ‚¨å·²è®€çš„最近的消
# bbb.shortcutkey.chat.chatbox.debug = 71
bbb.shortcutkey.chat.chatbox.debug.function = 臨時測試的快æ·éµ
-# bbb.polling.toolbar.toolTip = Manage Polls
-# bbb.polling.buttonName = Manage Polls
-bbb.polling.createPoll = 創建新的投票
-bbb.polling.createPoll.moreThanOneResponse = å…許用戶é¸æ“‡å¤šå€‹é¸é …
-bbb.polling.createPoll.hint = æ示：æ¯å€‹å›žç”å¦èµ·ä¸€è¡Œ
-bbb.polling.createPoll.answers = ç”案：
-bbb.polling.createPoll.question = å•é¡Œï¼š
-bbb.polling.createPoll.title = 標題：
-bbb.polling.createPoll.publishToWeb = 啟用網é 投票
-
-bbb.polling.pollPreview = é 覽投票
-bbb.polling.pollPreview.modify = 修改
-bbb.polling.pollPreview.publish = 發佈
-bbb.polling.pollPreview.preview = é 覽
-bbb.polling.pollPreview.save = å˜æª”
-bbb.polling.pollPreview.cancel = å–消
-bbb.polling.pollPreview.modify = 修改
-bbb.polling.pollPreview.hereIsYourPoll = 您的投票：
-bbb.polling.pollPreview.ifYouWantChanges = 如需修改，請點擊“修改â€æŒ‰éˆ•
-bbb.polling.pollPreview.checkAll = （é¸æ“‡æ‰€æœ‰è¦æ‡‰ç”¨çš„é …ï¼‰
-bbb.polling.pollPreview.pollWillPublishOnline = å¯ä»¥ä½¿ç”¨é é¢æ–¹å¼æŠ•ç¥¨
-
-# bbb.polling.resultBtn.label=Result
-# bbb.polling.resultBtn.toolTip=Show poll result
-# bbb.polling.startBtn.label=Start
-# bbb.polling.startBtn.toolTip=Start poll
-# bbb.polling.editBtn.label=Edit
-# bbb.polling.editBtn.toolTip=Edit poll
-# bbb.polling.deleteBtn.toolTip=Delete poll
+# bbb.polling.startButton.tooltip = Start a poll
+# bbb.polling.startButton.label = Start Poll
+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.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 = 開始共享
bbb.publishVideo.changeCameraBtn.labelText = 更改æ”åƒé è¨ç½®
@@ -533,49 +542,6 @@ bbb.publishVideo.changeCameraBtn.labelText = 更改æ”åƒé è¨ç½®
# bbb.accessibility.alerts.madePresenter = You are now the Presenter.
# bbb.accessibility.alerts.madeViewer = You are now a Viewer.
-# bbb.shortcutkey.polling.buttonClick = 80
-# bbb.shortcutkey.polling.buttonClick.function = Open the Polling Menu.
-# bbb.shortcutkey.polling.focusTitle = 67
-# bbb.shortcutkey.polling.focusTitle.function = Focus to Title input box.
-# bbb.shortcutkey.polling.focusQuestion = 81
-# bbb.shortcutkey.polling.focusQuestion.function = Focus to Question input box.
-# bbb.shortcutkey.polling.focusAnswers = 65
-# bbb.shortcutkey.polling.focusAnswers.function = Focus to Answers input box.
-# bbb.shortcutkey.polling.focusMultipleCB = 77
-# bbb.shortcutkey.polling.focusMultipleCB.function = Focus to "Allow multiple selections" checkbox.
-# bbb.shortcutkey.polling.focusWebPollCB = 66
-# bbb.shortcutkey.polling.focusWebPollCB.function = Focus to "Enable web polling" checkbox.
-# bbb.shortcutkey.polling.previewClick = 80
-# bbb.shortcutkey.polling.previewClick.function = Preview your poll and proceed.
-# bbb.shortcutkey.polling.cancelClick = 88
-# bbb.shortcutkey.polling.cancelClick.function = Cancel and exit Poll creation.
-# bbb.shortcutkey.polling.modify = 69
-# bbb.shortcutkey.polling.modify.function = Go back and modify your poll.
-# bbb.shortcutkey.polling.publish = 85
-# bbb.shortcutkey.polling.publish.function = Publish your poll and open voting.
-# bbb.shortcutkey.polling.save = 83
-# bbb.shortcutkey.polling.save.function = Save your poll to use later.
-
-# bbb.shortcutkey.pollStats.explanation = ----
-# bbb.shortcutkey.pollStats.explanation.function = Poll results are only available once the poll has been published.
-# bbb.shortcutkey.polling.focusData = 68
-# bbb.shortcutkey.polling.focusData.function = Focus to poll results.
-# bbb.shortcutkey.polling.refresh = 82
-# bbb.shortcutkey.polling.refresh.function = Refresh poll results.
-# bbb.shortcutkey.polling.focusWebPoll = 73
-# bbb.shortcutkey.polling.focusWebPoll.function = Focus to web polling URL box.
-# bbb.shortcutkey.polling.stopPoll = 79
-# bbb.shortcutkey.polling.stopPoll.function = Stop the poll and end voting.
-# bbb.shortcutkey.polling.repostPoll = 80
-# bbb.shortcutkey.polling.repostPoll.function = Re-publish the poll.
-# bbb.shortcutkey.polling.closeStatsWindow = 88
-# bbb.shortcutkey.polling.closeStatsWindow.function = Close Polling Results window.
-
-# bbb.shortcutkey.polling.vote = 86
-# bbb.shortcutkey.polling.vote.function = Cast your vote for the options selected.
-# bbb.shortcutkey.polling.focusVoteQuestion = 81
-# bbb.shortcutkey.polling.focusVoteQuestion.function = Focus to question.
-
# bbb.shortcutkey.specialKeys.space = Spacebar
# bbb.shortcutkey.specialKeys.left = Left Arrow
# bbb.shortcutkey.specialKeys.right = Right Arrow
diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index 05edc3b08f13ec9574d8cffa24d12df7144855c6..f9e824c415937678e583b01dbb54f9faf6d4cacd 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -1,5 +1,5 @@
-var userID, callerIdName=null, conferenceVoiceBridge, userAgent=null, userMicMedia, userWebcamMedia, currentSession=null, callTimeout, callActive, callICEConnected, iceConnectedTimeout, callFailCounter, callPurposefullyEnded, uaConnected, transferTimeout;
+var userID, callerIdName=null, conferenceVoiceBridge, userAgent=null, userMicMedia, userWebcamMedia, currentSession=null, callTimeout, callActive, callICEConnected, iceConnectedTimeout, callFailCounter, callPurposefullyEnded, uaConnected, transferTimeout, iceGatheringTimeout;
var inEchoTest = true;
function webRTCCallback(message) {
@@ -367,6 +367,21 @@ function make_call(username, voiceBridge, server, callback, recall, isListenOnly
console.log('call connecting again');
}
+ iceGatheringTimeout = setTimeout(function() {
+ console.log('Thirty seconds without ICE gathering finishing');
+ callback({'status':'failed', 'errorcode': 1011}); // ICE Gathering Failed
+ currentSession = null;
+ if (userAgent != null) {
+ var userAgentTemp = userAgent;
+ userAgent = null;
+ userAgentTemp.stop();
+ }
+ }, 30000);
+
+ currentSession.mediaHandler.on('iceComplete', function() {
+ clearTimeout(iceGatheringTimeout);
+ });
+
// The connecting event fires before the listener can be added
currentSession.on('connecting', function(){
clearTimeout(callTimeout);
@@ -426,7 +441,7 @@ function make_call(username, voiceBridge, server, callback, recall, isListenOnly
console.log('Waiting for ICE negotiation');
iceConnectedTimeout = setTimeout(function() {
console.log('60 seconds without ICE finishing');
- callback({'status':'failed', 'errorcode': 1010}); // Failure on call
+ callback({'status':'failed', 'errorcode': 1010}); // ICE negotiation timeout
currentSession = null;
if (userAgent != null) {
var userAgentTemp = userAgent;
diff --git a/bigbluebutton-client/resources/prod/lib/sip.js b/bigbluebutton-client/resources/prod/lib/sip.js
index 8ff731e808a90a2780be9ff656368ca03e7bc244..7a414ca7e9b227f6d3c75fa87a46b6b5a4aff52f 100755
--- a/bigbluebutton-client/resources/prod/lib/sip.js
+++ b/bigbluebutton-client/resources/prod/lib/sip.js
@@ -1,6 +1,6 @@
/*
* SIP version 0.6.3
- * Copyright (c) 2014-2014 Junction Networks, Inc <http://www.onsip.com>
+ * Copyright (c) 2014-2015 Junction Networks, Inc <http://www.onsip.com>
* Homepage: http://sipjs.com
* License: http://sipjs.com/license/
*
@@ -8884,6 +8884,7 @@ UA.prototype.loadConfig = function(configuration) {
userAgentString: SIP.C.USER_AGENT,
// Session parameters
+ iceCheckingTimeout: 5000,
noAnswerTimeout: 60,
stunServers: ['stun:stun.l.google.com:19302'],
turnServers: [],
@@ -9107,6 +9108,7 @@ UA.configuration_skeleton = (function() {
"hackViaTcp", // false.
"hackIpInContact", //false
"hackWssInTransport", //false
+ "iceCheckingTimeout",
"instanceId",
"noAnswerTimeout", // 30 seconds.
"password",
@@ -9282,6 +9284,12 @@ UA.configuration_check = {
}
},
+ iceCheckingTimeout: function(iceCheckingTimeout) {
+ if(SIP.Utils.isDecimal(iceCheckingTimeout)) {
+ return Math.max(500, iceCheckingTimeout);
+ }
+ },
+
hackWssInTransport: function(hackWssInTransport) {
if (typeof hackWssInTransport === 'boolean') {
return hackWssInTransport;
@@ -10315,6 +10323,10 @@ var MediaHandler = function(session, options) {
this.onIceCompleted.promise.then(function(pc) {
self.logger.log('ICE Gathering Completed');
self.emit('iceComplete', pc);
+ if (self.iceCheckingTimer) {
+ SIP.Timers.clearTimeout(self.iceCheckingTimer);
+ self.iceCheckingTimer = null;
+ }
});
this.peerConnection = new SIP.WebRTC.RTCPeerConnection({'iceServers': servers}, this.RTCConstraints);
@@ -10329,9 +10341,19 @@ var MediaHandler = function(session, options) {
self.logger.log('stream removed: '+ e.stream.id);
};
+ this.startIceCheckingTimer = function () {
+ if (!self.iceCheckingTimer) {
+ self.iceCheckingTimer = SIP.Timers.setTimeout(function() {
+ self.logger.log('RTCIceChecking Timeout Triggered after '+config.iceCheckingTimeout+' milliseconds');
+ self.onIceCompleted.resolve(this);
+ }.bind(this.peerConnection), config.iceCheckingTimeout);
+ }
+ };
+
this.peerConnection.onicecandidate = function(e) {
if (e.candidate) {
self.logger.log('ICE candidate received: '+ (e.candidate.candidate === null ? null : e.candidate.candidate.trim()));
+ self.startIceCheckingTimer();
} else {
self.onIceCompleted.resolve(this);
}
@@ -10350,6 +10372,10 @@ var MediaHandler = function(session, options) {
this.peerConnection.oniceconnectionstatechange = function() { //need e for commented out case
self.logger.log('ICE connection state changed to "'+ this.iceConnectionState +'"');
+ if (this.iceConnectionState === 'checking') {
+ self.startIceCheckingTimer();
+ }
+
if (this.iceConnectionState === 'failed') {
self.emit('iceFailed', this);
}
@@ -10890,7 +10916,9 @@ MediaStreamManager.prototype = Object.create(SIP.EventEmitter.prototype, {
streams.forEach(function (stream) {
var streamId = MediaStreamManager.streamId(stream);
if (this.acquisitions[streamId] === false) {
- stream.stop();
+ stream.getTracks().forEach(function (track) {
+ track.stop();
+ });
}
delete this.acquisitions[streamId];
}, this);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as
index 6a518e4f5f7ef22c8b4c6c88f27832636c05b5d4..b6de5dff39750f86c58aecae63c9b06185664975 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as
@@ -81,11 +81,6 @@ package org.bigbluebutton.main.model
if (videoDock){generalResource.push('bbb.shortcutkey.focus.video');}
if (presentation){generalResource.push('bbb.shortcutkey.focus.presentation');}
if (chat){generalResource.push('bbb.shortcutkey.focus.chat');}
- if (polling){
- generalResource.push('bbb.shortcutkey.focus.pollingCreate');
- generalResource.push('bbb.shortcutkey.focus.pollingStats');
- generalResource.push('bbb.shortcutkey.focus.voting');
- }
if (audio){
generalResource.push('bbb.shortcutkey.share.microphone');
@@ -107,4 +102,4 @@ package org.bigbluebutton.main.model
return "USERS: " + users + " VIDEODOCK: " + videoDock + " PRESENTATION: " + presentation + " CHAT: " + chat + " POLLING: " + polling + " WEBCAM: " + webcam + " DESKSHARE: " + deskshare + " AUDIO: " + audio;
}
}
-}
\ No newline at end of file
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
index c1c31a15395c42963524ee7ef8980b25b0b423a7..7a0a9b608b885d0ebc4f9b578d54a4cd00baaa9e 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
@@ -54,8 +54,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var presKeys:ArrayList;
private var chatKeys:ArrayList;
private var userKeys:ArrayList;
- private var pollKeys:ArrayList;
- private var pollVoteKeys:ArrayList;
private static const LOGGER:ILogger = getClassLogger(ShortcutHelpWindow);
@@ -63,8 +61,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
[Bindable] private var presentationString:String = ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.presentation");
[Bindable] private var chatString:String = ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.chat");
[Bindable] private var userString:String = ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.users");
- [Bindable] private var pollString:String = ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.polling");
- [Bindable] private var pollVoteString:String = ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.polling2");
private var presResource:Array = ['bbb.shortcutkey.present.focusslide', /*'bbb.shortcutkey.whiteboard.undo',*/ 'bbb.shortcutkey.present.upload',
'bbb.shortcutkey.present.previous', 'bbb.shortcutkey.present.select', 'bbb.shortcutkey.present.next',
@@ -78,15 +74,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var userResource:Array = ['bbb.shortcutkey.users.focusUsers', 'bbb.shortcutkey.users.makePresenter', 'bbb.shortcutkey.users.mute',
/*'bbb.shortcutkey.users.kick',*/ 'bbb.shortcutkey.users.muteall'];
- private var pollResource:Array = ['bbb.shortcutkey.polling.focusTitle', 'bbb.shortcutkey.polling.focusQuestion', 'bbb.shortcutkey.polling.focusAnswers',
- 'bbb.shortcutkey.polling.focusMultipleCB', 'bbb.shortcutkey.polling.focusWebPollCB', 'bbb.shortcutkey.polling.previewClick',
- 'bbb.shortcutkey.polling.cancelClick', 'bbb.shortcutkey.polling.modify', 'bbb.shortcutkey.polling.publish',
- 'bbb.shortcutkey.polling.save', 'bbb.shortcutkey.pollStats.explanation', 'bbb.shortcutkey.polling.focusWebPoll',
- 'bbb.shortcutkey.polling.focusData', 'bbb.shortcutkey.polling.refresh', 'bbb.shortcutkey.polling.stopPoll',
- 'bbb.shortcutkey.polling.repostPoll', 'bbb.shortcutkey.polling.closeStatsWindow'];
-
- private var pollVoteResource:Array = ['bbb.shortcutkey.polling.focusVoteQuestion', 'bbb.shortcutkey.polling.vote'];
-
[Bindable]
private var shownKeys:ArrayCollection;
@@ -114,11 +101,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (ShortcutOptions.chatActive)
categoryAC.addItem(chatString);
-
- if (ShortcutOptions.pollingActive){
- categoryAC.addItem(pollString);
- categoryAC.addItem(pollVoteString);
- }
}
private function reloadKeys():void {
@@ -126,8 +108,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
presKeys = loadKeys(presResource);
chatKeys = loadKeys(chatResource);
userKeys = loadKeys(userResource);
- pollKeys = loadKeys(pollResource);
- pollVoteKeys = loadKeys(pollVoteResource);
changeArray();
}
@@ -154,12 +134,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
case categoryAC.getItemIndex(userString): //Users
shownKeys.addAll(userKeys);
break;
- case categoryAC.getItemIndex(pollString): //Polling, Presenter
- shownKeys.addAll(pollKeys);
- break;
- case categoryAC.getItemIndex(pollVoteString): //Polling, Viewer
- shownKeys.addAll(pollVoteKeys);
- break;
}
}
@@ -277,8 +251,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.presentation")}</mx:String>
<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.chat")}</mx:String>
<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.users")}</mx:String>
- <mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.polling")}</mx:String>
- <mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.polling2")}</mx:String>
-->
</mx:ArrayCollection>
</mx:ComboBox>
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 6203bd5f70254c68d626934d277ff4d4e40545e8..8cc7ad818f7926e253b41d9d3340fd1b633d43b2 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
@@ -3,6 +3,9 @@
import com.asfusion.mate.events.Dispatcher;
import flash.external.ExternalInterface;
+ import flash.media.Sound;
+ import flash.media.SoundChannel;
+ import flash.media.SoundTransform;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
@@ -46,7 +49,7 @@
private static const CONNECTING_TO_LISTEN_ONLY_STREAM:String = "CONNECTING_TO_LISTEN_ONLY_STREAM";
private static const ON_LISTEN_ONLY_STREAM:String = "ON_LISTEN_ONLY_STREAM";
- private var state:String = INITED;
+ private var _state:String = INITED;
private var options:PhoneOptions;
private var echoTestDone:Boolean = false;
@@ -61,6 +64,10 @@
private var usingFlash:Boolean = false;
+ [Embed(source="../sounds/LeftCall.mp3")]
+ private var noticeSoundClass:Class;
+ private var noticeSound:Sound = new noticeSoundClass() as Sound;
+
public function FlashCallManager() {
micNames = Media.getMicrophoneNames();
connectionManager = new ConnectionManager();
@@ -75,6 +82,17 @@
connectionManager.setup(uid, UsersUtil.getMyUserID(), uname , UsersUtil.getInternalMeetingID(), options.uri);
}
+ private function get state():String {
+ return _state;
+ }
+
+ private function set state(s:String):void {
+ if (_state == IN_CONFERENCE && _state != s) { // when state changes from IN_CONFERENCE play sound
+ var tSC:SoundChannel = noticeSound.play(0, 0, new SoundTransform(0.25));
+ }
+ _state = s;
+ }
+
private function isWebRTCSupported():Boolean {
return (ExternalInterface.available && ExternalInterface.call("isWebRTCAvailable"));
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/models/WebRTCModel.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/models/WebRTCModel.as
old mode 100644
new mode 100755
index 3affe9984777bf6e75a0af900f684648639b2e46..4a403477c4b92b25ab75338b749421c92508fa32
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/models/WebRTCModel.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/models/WebRTCModel.as
@@ -1,10 +1,18 @@
package org.bigbluebutton.modules.phone.models
{
+ import flash.media.Sound;
+ import flash.media.SoundChannel;
+ import flash.media.SoundTransform;
+
public class WebRTCModel
{
private var _state:String = Constants.INITED;
+ [Embed(source="../sounds/LeftCall.mp3")]
+ private var noticeSoundClass:Class;
+ private var noticeSound:Sound = new noticeSoundClass() as Sound;
+
public function WebRTCModel()
{
}
@@ -14,6 +22,9 @@ package org.bigbluebutton.modules.phone.models
}
public function set state(s:String):void {
+ if (_state == Constants.IN_CONFERENCE && _state != s) { // when state changes from IN_CONFERENCE play sound
+ var tSC:SoundChannel = noticeSound.play(0, 0, new SoundTransform(0.25));
+ }
_state = s;
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/sounds/LeftCall.mp3 b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/sounds/LeftCall.mp3
new file mode 100755
index 0000000000000000000000000000000000000000..9a64f01329ee0d8c92b7b16f331f7a3aecd46b68
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/sounds/LeftCall.mp3 differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 3e87851bc6d19d182c194b63628ac7876c7827fb..6f81352bbab3bf0714930b7258a125ad5f43d5d6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -430,21 +430,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function disableSlideNavigationButtons(pageNumber:int):void {
- if (pageNumber == 1) {
- backButton.mouseEnabled = false;
- backButton.styleName = "presentationBackButtonDisabledStyle";
- } else {
- backButton.mouseEnabled = true;
- backButton.styleName = "presentationBackButtonStyle";
- }
+ backButton.mouseEnabled = pageNumber != 1;
+ forwardButton.mouseEnabled = pageNumber < PresentationModel.getInstance().getNumberOfPages();
- if (pageNumber < PresentationModel.getInstance().getNumberOfPages()) {
- forwardButton.mouseEnabled = true;
- forwardButton.styleName = "presentationForwardButtonStyle";
- } else {
- forwardButton.mouseEnabled = false;
- forwardButton.styleName = "presentationForwardButtonDisabledStyle";
- }
+ backButton.styleName = pageNumber != 1 ? "presentationBackButtonStyle" : "presentationBackButtonDisabledStyle";
+ forwardButton.styleName = pageNumber < PresentationModel.getInstance().getNumberOfPages() ? "presentationForwardButtonStyle" : "presentationForwardButtonDisabledStyle";
}
private function displaySlideNumber(currentSlide:int):void {
@@ -726,19 +716,19 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
var numBtns:int = e.poll.answers.length;
var btnWidth:int = 100/numBtns;
for (var i:int=0, ti:int=slideView.tabIndex; i<numBtns; i++) {
- voteBtn = new Button();
+ voteBtn = new Button();
voteBtn.percentWidth = btnWidth;
voteBtn.height = 70;
voteBtn.setStyle("fontSize", 14);
voteBtn.tabIndex = ++ti;
-
+
var localizedKey: String = ResourceUtil.getInstance().getString('bbb.polling.answer.'+e.poll.answers[i].key);
if (localizedKey == null || localizedKey == "" || localizedKey == "undefined") {
localizedKey = e.poll.answers[i].key;
}
- voteBtn.label = localizedKey;
+ voteBtn.label = localizedKey;
voteBtn.name = e.poll.answers[i].id;
voteBtn.addEventListener(MouseEvent.CLICK, voteButtonClickHandler);
pollVoteBox.addChild(voteBtn);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
old mode 100644
new mode 100755
index 547435302e6602b46c687f61468f698e48e20c12..dd7a250d0d19f3cef43e6797d45f665a585b42fa
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
@@ -35,16 +35,17 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Script>
<![CDATA[
-
import com.asfusion.mate.events.Dispatcher;
-
+
import org.bigbluebutton.common.Images;
import org.bigbluebutton.core.EventConstants;
- import org.bigbluebutton.main.events.BBBEvent;
+ import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.events.CoreEvent;
import org.bigbluebutton.core.events.VoiceConfEvent;
- import org.bigbluebutton.core.UsersUtil;
+ import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.core.model.VideoProfile;
+ import org.bigbluebutton.core.vo.LockSettingsVO;
+ import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.PresenterStatusEvent;
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.modules.videoconf.model.VideoConfOptions;
@@ -147,7 +148,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function hasPermissionToMute():Boolean {
- return (_me || UsersUtil.amIModerator());
+ var me:BBBUser = UserManager.getInstance().getConference().getMyUser();
+
+ return (!me.disableMyMic && (_me || UsersUtil.amIModerator()));
}
private function onMuteBtnClick(event:MouseEvent):void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as
index c06b1a5649dd7b1c7a26bf259a8b0a64efdef6c8..86141c6fc5ee05d3311d11b57911540d6056d73d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasDisplayModel.as
@@ -92,7 +92,7 @@ package org.bigbluebutton.modules.whiteboard
case DrawObject.DRAW_UPDATE:
case DrawObject.DRAW_END:
if (_annotationsList.length > 0) {
- var gobj:DrawObject = _annotationsList.pop();
+ var gobj:Object = _annotationsList.pop();
if (gobj.id == o.id) {
// LogUtil.debug("Removing shape [" + gobj.id + "]");
wbCanvas.removeGraphic(gobj as DisplayObject);
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 0b4d4445707816ee4db1d2be5428eaadf1a240f5..233ebf78676dae3cea6dbd3c18a4d6ee801affc5 100644
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1545,21 +1545,15 @@ if [ -n "$HOST" ]; then
change_yml_value /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml $redis_host playback_host $HOST
fi
- echo -n "Assigning $HOST for playback of recordings: "
-
- TYPES=$(cd /usr/local/bigbluebutton/core/scripts/process; ls *.rb | sed s/.rb//g)
- BASE=/var/bigbluebutton/recording
- for type in $TYPES; do
- for metadata in $(find $BASE/publish/$type -name metadata.xml); do
- echo -n "."
- sed -i "/<link>/{s/http:\/\/\([^\"\/]*\)\/playback\/$type\([^<]\)/http:\/\/$HOST\/playback\/$type\2/g}" $metadata
- done
+ echo -n "Assigning $HOST for playback of recordings: "
+ for metadata in $(find /var/bigbluebutton/published -name metadata.xml); do
+ echo -n "."
+ sed -i "/<link>/{s/http:\/\/\([^\"\/]*\)\/playback\/$type\([^<]\)/http:\/\/$HOST\/playback\/$type\2/g}" $metadata
done
- for type in $TYPES; do
- for metadata in $(find /var/bigbluebutton/published/$type -name metadata.xml); do
- echo -n "."
- sed -i "/<link>/{s/http:\/\/\([^\"\/]*\)\/playback\/$type\([^<]\)/http:\/\/$HOST\/playback\/$type\2/g}" $metadata
- done
+
+ for metadata in $(find /var/bigbluebutton/unpublished -name metadata.xml); do
+ echo -n "."
+ sed -i "/<link>/{s/http:\/\/\([^\"\/]*\)\/playback\/$type\([^<]\)/http:\/\/$HOST\/playback\/$type\2/g}" $metadata
done
echo
diff --git a/bigbluebutton-config/cron.daily/bigbluebutton b/bigbluebutton-config/cron.daily/bigbluebutton
index 92d57383decd4cd0ce969909fd9c245bc909d7b1..245604f5e0fd7f0fd78852820b10c6e203560e36 100755
--- a/bigbluebutton-config/cron.daily/bigbluebutton
+++ b/bigbluebutton-config/cron.daily/bigbluebutton
@@ -24,16 +24,18 @@ test -x /var/bigbluebutton || exit 0
# How N days back to keep files
#
history=5
+unrecorded_days=14
+published_days=14
#
# Delete presentations older than N days
#
-find /var/bigbluebutton/ -maxdepth 1 -type d -name "*-*" -mtime +$history -exec rm -rf '{}' \;
+find /var/bigbluebutton/ -maxdepth 1 -type d -name "*-*" -mtime +$history -exec rm -rf '{}' +
#
# Delete webcam streams in red5 older than N days
#
-find /usr/share/red5/webapps/video/streams/ -name "*.flv" -mtime +$history -exec rm '{}' \;
+find /usr/share/red5/webapps/video/streams/ -name "*.flv" -mtime +$history -exec rm '{}' +
#
# Delete webrtc deskshare streams in red5 older than N days
@@ -43,23 +45,28 @@ find /usr/share/red5/webapps/video-broadcast/streams/ -name "*.flv" -mtime +$his
#
# Delete desktop sharing streams in red5 older than N days
#
-find /var/bigbluebutton/deskshare/ -name "*.flv" -mtime +$history -exec rm '{}' \;
+find /var/bigbluebutton/deskshare/ -name "*.flv" -mtime +$history -exec rm '{}' +
#
# Delete FreeSWITCH wav recordings older than N days
#
-find /var/freeswitch/meetings/ -name "*.wav" -mtime +$history -exec rm '{}' \;
+find /var/freeswitch/meetings/ -name "*.wav" -mtime +$history -exec rm '{}' +
+
+#
+# Delete FreeSWITCH log files and CDR
+#
+find /opt/freeswitch/log/ -name "*.xml" -type f -mtime +$history -exec rm '{}' +
#
# Delete raw files of recordings without recording marks older than N days
#
remove_raw_of_recordings_without_marks() {
- logger "Removing old raw directory of recordings without marks"
- find /var/bigbluebutton/recording/status -name '*.norecord' -mtime +$history | while read archived_norecord; do
- recording_id=${archived_norecord%.norecord}
- recording_id=${recording_id##*/}
- bbb-record --delete $recording_id 2>&1 | logger
- done
+ logger "Removing old raw directory of recordings without marks"
+ find /var/bigbluebutton/recording/status -name '*.norecord' -mtime +$unrecorded_days | while read archived_norecord; do
+ recording_id=${archived_norecord%.norecord}
+ recording_id=${recording_id##*/}
+ bbb-record --delete $recording_id 2>&1 | logger
+ done
}
# Enabled by default; comment to disable.
@@ -73,8 +80,7 @@ remove_raw_of_published_recordings(){
#TYPES=$(cd /usr/local/bigbluebutton/core/scripts/process; ls *.rb | sed s/.rb//g)
logger "Removing raw directory of old recordings:"
TYPES="presentation"
- MIN_DAYS=10
- old_meetings=$(find /var/bigbluebutton/recording/raw/*/events.xml -mtime +$MIN_DAYS | cut -d"/" -f6 )
+ old_meetings=$(find /var/bigbluebutton/recording/raw/*/events.xml -mtime +$published_days | cut -d"/" -f6 )
for meeting in $old_meetings
do
PROPERLY_PUBLISHED="true"
@@ -93,7 +99,7 @@ remove_raw_of_published_recordings(){
else
logger "$meeting was not properly published in [ $FAILED_TYPES ]"
fi
- done
+ done
}
#remove_raw_of_published_recordings
@@ -101,6 +107,6 @@ remove_raw_of_published_recordings(){
#
# Remove old *.afm and *.pfb files from /tmp directory (these were created by Ghostscript)
#
-find /tmp -name "*.afm" -mtime +10 -exec rm '{}' \;
-find /tmp -name "*.pfb" -mtime +10 -exec rm '{}' \;
+find /tmp -name "*.afm" -mtime +$history -delete
+find /tmp -name "*.pfb" -mtime +$history -delete
diff --git a/bigbluebutton-html5/app/.meteor/packages b/bigbluebutton-html5/app/.meteor/packages
index 5e64e28636121fea6b952d805efadfbdd29171b1..f97022697e0b2490a189172eaf8e9eb54c9faa19 100644
--- a/bigbluebutton-html5/app/.meteor/packages
+++ b/bigbluebutton-html5/app/.meteor/packages
@@ -28,4 +28,7 @@ maibaum:foundation-icons
chriswessels:hammer@3.1.1
fastclick
standard-minifiers
-gthacoder:meteor-sled@0.0.1
+cfs:power-queue
+cfs:reactive-list
+cfs:micro-queue
+reactive-var
diff --git a/bigbluebutton-html5/app/.meteor/versions b/bigbluebutton-html5/app/.meteor/versions
index f921d94681cce0da6c6433653dc8af07799e089d..c96a7610d32a4062256b93ad0dd202067d21d903 100644
--- a/bigbluebutton-html5/app/.meteor/versions
+++ b/bigbluebutton-html5/app/.meteor/versions
@@ -16,6 +16,10 @@ caching-compiler@1.0.0
caching-html-compiler@1.0.2
callback-hook@1.0.4
cfs:http-methods@0.0.30
+cfs:micro-queue@0.0.6
+cfs:power-queue@0.9.11
+cfs:reactive-list@0.0.9
+cfs:reactive-property@0.0.4
check@1.0.6
chriswessels:hammer@3.1.1
clinical:nightwatch@2.0.1
@@ -34,7 +38,6 @@ ewall:foundation@5.5.2
fastclick@1.0.7
francocatena:status@1.4.0
geojson-utils@1.0.4
-gthacoder:meteor-sled@0.0.1
html-tools@1.0.5
htmljs@1.0.5
http@1.1.1
@@ -92,7 +95,6 @@ spacebars@1.0.7
spacebars-compiler@1.0.7
standard-app-packages@1.0.6
standard-minifiers@1.0.1
-stevezhu:sass@2.0.0
tap:i18n@1.6.1
templating@1.1.4
templating-tools@1.0.0
diff --git a/bigbluebutton-html5/app/client/NotificationControl.coffee b/bigbluebutton-html5/app/client/NotificationControl.coffee
index 67b37cbc02db8bc9b63a4373bd07f7e3a2ff488b..4d577f322fcf6938013e39f37751fba21dd561ea 100755
--- a/bigbluebutton-html5/app/client/NotificationControl.coffee
+++ b/bigbluebutton-html5/app/client/NotificationControl.coffee
@@ -71,15 +71,14 @@ class @NotificationControl
.registerShow("webRTC_AudioJoining", ->
).display("webRTC_AudioJoining")
# joined. Displayed joined notification and hide the joining notification
- if !BBB.amIInAudio()
- Tracker.autorun (comp) -> # wait until user is in
- if BBB.amIInAudio() # display notification when you are in audio
- comp.stop() # prevents computation from running twice (which can happen occassionally)
- Meteor.NotificationControl.create("webRTC_AudioJoined", 'success ', '', 2500)
- .registerShow("webRTC_AudioJoined", ->
- Meteor.NotificationControl.hideANotification('webRTC_AudioJoining')
- $("#webRTC_AudioJoined").prepend("You've joined the #{if BBB.amIListenOnlyAudio() then 'Listen Only' else ''} audio")
- ).display("webRTC_AudioJoined")
+ Tracker.autorun (comp) -> # wait until user is in
+ if BBB.amIInAudio() # display notification when you are in audio
+ comp.stop() # prevents computation from running twice (which can happen occassionally)
+ Meteor.NotificationControl.create("webRTC_AudioJoined", 'success ', '', 2500)
+ .registerShow("webRTC_AudioJoined", ->
+ Meteor.NotificationControl.hideANotification('webRTC_AudioJoining')
+ $("#webRTC_AudioJoined").prepend("You've joined the #{if BBB.amIListenOnlyAudio() then 'Listen Only' else ''} audio")
+ ).display("webRTC_AudioJoined")
@notification_WebRTCNotSupported = -> # shown when the user's browser does not support WebRTC
# create a new notification at the audio button they clicked to trigger the event
diff --git a/bigbluebutton-html5/app/client/globals.coffee b/bigbluebutton-html5/app/client/globals.coffee
index a5ec23903d70d399fca3ffad4ca07ac85985337c..cc044b628c66ea40f430378fa77f3fc963c21cfa 100755
--- a/bigbluebutton-html5/app/client/globals.coffee
+++ b/bigbluebutton-html5/app/client/globals.coffee
@@ -46,6 +46,10 @@ Handlebars.registerHelper "amIInAudio", ->
Handlebars.registerHelper "amIListenOnlyAudio", ->
BBB.amIListenOnlyAudio()
+# helper to determine whether the user is in the listen only audio stream
+Handlebars.registerHelper "isMyMicLocked", ->
+ BBB.isMyMicLocked()
+
Handlebars.registerHelper "colourToHex", (value) =>
@window.colourToHex(value)
@@ -56,9 +60,7 @@ Handlebars.registerHelper "getCurrentMeeting", ->
Meteor.Meetings.findOne()
Handlebars.registerHelper "getCurrentSlide", ->
- currentPresentation = Meteor.Presentations.findOne({"presentation.current": true})
- presentationId = currentPresentation?.presentation?.id
- Meteor.Slides.find({"presentationId": presentationId, "slide.current": true})
+ getCurrentSlideDoc()
# Allow access through all templates
Handlebars.registerHelper "getInSession", (k) -> SessionAmplify.get k
@@ -155,6 +157,12 @@ Handlebars.registerHelper "pointerLocation", ->
Handlebars.registerHelper "safeName", (str) ->
safeString(str)
+Handlebars.registerHelper "canJoinWithMic", ->
+ if (BBB.isUserPresenter(getInSession('userId')) or !Meteor.config.app.listenOnly) and !BBB.isMyMicLocked()
+ true
+ else
+ false
+
###Handlebars.registerHelper "visibility", (section) ->
if getInSession "display_#{section}"
style: 'display:block;'
@@ -273,10 +281,10 @@ Handlebars.registerHelper "getPollQuestions", ->
BBB.toggleMyMic()
@toggleUsersList = ->
- if $('.sl-left-drawer').hasClass('hiddenInLandscape')
- $('.sl-left-drawer').removeClass('hiddenInLandscape')
+ if $('.userlistMenu').hasClass('hiddenInLandscape')
+ $('.userlistMenu').removeClass('hiddenInLandscape')
else
- $('.sl-left-drawer').addClass('hiddenInLandscape')
+ $('.userlistMenu').addClass('hiddenInLandscape')
setTimeout(scaleWhiteboard, 0)
@populateNotifications = (msg) ->
@@ -330,10 +338,11 @@ Handlebars.registerHelper "getPollQuestions", ->
$('.shield').removeClass('animatedShield')
@removeFullscreenStyles = ->
- $('#whiteboard-paper').removeClass('verticallyCentered')
+ $('#whiteboard-paper').removeClass('vertically-centered')
$('#chat').removeClass('invisible')
$('#users').removeClass('invisible')
$('#navbar').removeClass('invisible')
+ $('.FABTriggerButton').removeClass('invisible')
$('.fullscreenButton').removeClass('exitFullscreenButton')
$('.fullscreenButton').addClass('whiteboardFullscreenButton')
$('.fullscreenButton i').removeClass('ion-arrow-shrink')
@@ -354,11 +363,12 @@ Handlebars.registerHelper "getPollQuestions", ->
$('#chat').addClass('invisible')
$('#users').addClass('invisible')
$('#navbar').addClass('invisible')
+ $('.FABTriggerButton').addClass('invisible')
$('.fullscreenButton').removeClass('whiteboardFullscreenButton')
$('.fullscreenButton').addClass('exitFullscreenButton')
$('.fullscreenButton i').removeClass('ion-arrow-expand')
$('.fullscreenButton i').addClass('ion-arrow-shrink')
- $('#whiteboard-paper').addClass('verticallyCentered')
+ $('#whiteboard-paper').addClass('vertically-centered')
$('#whiteboard').bind 'webkitfullscreenchange', (e) ->
if document.webkitFullscreenElement is null
$('#whiteboard').unbind('webkitfullscreenchange')
@@ -373,16 +383,14 @@ Handlebars.registerHelper "getPollQuestions", ->
scaleWhiteboard()
@closeMenus = ->
- if $('.sl-left-drawer').hasClass('sl-left-drawer-out')
- toggleLeftDrawer()
- toggleLeftArrowClockwise()
- else if $('.sl-right-drawer').hasClass('sl-right-drawer-out')
- toggleRightDrawer()
- toggleRightArrowClockwise()
+ if $('.userlistMenu').hasClass('menuOut')
+ toggleUserlistMenu()
+ else if $('.settingsMenu').hasClass('menuOut')
+ toggleSettingsMenu()
# Periodically check the status of the WebRTC call, when a call has been established attempt to hangup,
# retry if a call is in progress, send the leave voice conference message to BBB
-@exitVoiceCall = (event) ->
+@exitVoiceCall = (event, afterExitCall) ->
# To be called when the hangup is initiated
hangupCallback = ->
console.log "Exiting Voice Conference"
@@ -401,6 +409,8 @@ Handlebars.registerHelper "getPollQuestions", ->
BBB.leaveVoiceConference hangupCallback
getInSession("triedHangup", true) # we have hung up, prevent retries
notification_WebRTCAudioExited()
+ if afterExitCall
+ afterExitCall this, Meteor.config.app.listenOnly
else
console.log "RETRYING hangup on WebRTC call in #{Meteor.config.app.WebRTCHangupRetryInterval} ms"
setTimeout checkToHangupCall, Meteor.config.app.WebRTCHangupRetryInterval # try again periodically
@@ -420,6 +430,7 @@ Handlebars.registerHelper "getPollQuestions", ->
console.log "Beginning WebRTC Conference Call"
notification_WebRTCAudioJoining()
+
if isListenOnly
Meteor.call('listenOnlyRequestToggle', BBB.getMeetingId(), getInSession("userId"), getInSession("authToken"), true)
BBB.joinVoiceConference joinCallback, isListenOnly # make the call #TODO should we apply role permissions to this action?
@@ -451,7 +462,6 @@ Handlebars.registerHelper "getPollQuestions", ->
amplify.store('messageFontSize', null)
amplify.store('tabsRenderedTime', null)
amplify.store('userId', null)
- amplify.store('userName', null)
amplify.store('display_menu', null)
if callback?
callback()
@@ -514,6 +524,14 @@ Handlebars.registerHelper "getPollQuestions", ->
document.location = getInSession 'logoutURL'
})
+ Meteor.Users.find().observe changed: (newUser, oldUser) ->
+ if Meteor.config.app.listenOnly is true and
+ newUser.user.presenter is false and
+ oldUser.user.presenter is true and
+ BBB.getCurrentUser().userId is newUser.userId and
+ oldUser.user.listenOnly is false
+ exitVoiceCall(@, joinVoiceCall)
+
# Detects a mobile device
@isMobile = ->
navigator.userAgent.match(/Android/i) or
@@ -589,6 +607,9 @@ Handlebars.registerHelper "getPollQuestions", ->
else
return null
+@scrollChatDown = () ->
+ $('#chatbody').scrollTop($('#chatbody')[0]?.scrollHeight)
+
# changes the height of the chat input area if needed (based on the textarea content)
@adjustChatInputHeight = () ->
if isLandscape()
@@ -611,4 +632,52 @@ Handlebars.registerHelper "getPollQuestions", ->
else if isPortrait()
$('.panel-footer').attr('style','')
$('#chatbody').attr('style','')
- $('#newMessageInput').attr('style','')
\ No newline at end of file
+ $('#newMessageInput').attr('style','')
+
+@toggleEmojisFAB = () ->
+ if $('.FABContainer').hasClass('openedFAB')
+ $('.FABContainer > button:nth-child(2)').css('opacity', $('.FABContainer > button:nth-child(2)').css('opacity'))
+ $('.FABContainer > button:nth-child(3)').css('opacity', $('.FABContainer > button:nth-child(3)').css('opacity'))
+ $('.FABContainer > button:nth-child(4)').css('opacity', $('.FABContainer > button:nth-child(4)').css('opacity'))
+ $('.FABContainer > button:nth-child(5)').css('opacity', $('.FABContainer > button:nth-child(5)').css('opacity'))
+ $('.FABContainer > button:nth-child(6)').css('opacity', $('.FABContainer > button:nth-child(6)').css('opacity'))
+ $('.FABContainer > button:nth-child(7)').css('opacity', $('.FABContainer > button:nth-child(7)').css('opacity'))
+ $('.FABContainer').removeClass('openedFAB')
+ $('.FABContainer').addClass('closedFAB')
+ else
+ $('.FABContainer > button:nth-child(2)').css('opacity', $('.FABContainer > button:nth-child(2)').css('opacity'))
+ $('.FABContainer > button:nth-child(3)').css('opacity', $('.FABContainer > button:nth-child(3)').css('opacity'))
+ $('.FABContainer > button:nth-child(4)').css('opacity', $('.FABContainer > button:nth-child(4)').css('opacity'))
+ $('.FABContainer > button:nth-child(5)').css('opacity', $('.FABContainer > button:nth-child(5)').css('opacity'))
+ $('.FABContainer > button:nth-child(6)').css('opacity', $('.FABContainer > button:nth-child(6)').css('opacity'))
+ $('.FABContainer > button:nth-child(7)').css('opacity', $('.FABContainer > button:nth-child(7)').css('opacity'))
+ $('.FABContainer').removeClass('closedFAB')
+ $('.FABContainer').addClass('openedFAB')
+
+@toggleUserlistMenu = () ->
+
+ # menu
+ if $('.userlistMenu').hasClass('menuOut')
+ $('.userlistMenu').removeClass('menuOut')
+ else
+ $('.userlistMenu').addClass('menuOut')
+
+ # icon
+ if $('.toggleUserlistButton').hasClass('menuToggledOn')
+ $('.toggleUserlistButton').removeClass('menuToggledOn')
+ else
+ $('.toggleUserlistButton').addClass('menuToggledOn')
+
+@toggleSettingsMenu = () ->
+
+ # menu
+ if $('.settingsMenu').hasClass('menuOut')
+ $('.settingsMenu').removeClass('menuOut')
+ else
+ $('.settingsMenu').addClass('menuOut')
+
+ # icon
+ if $('.toggleMenuButton').hasClass('menuToggledOn')
+ $('.toggleMenuButton').removeClass('menuToggledOn')
+ else
+ $('.toggleMenuButton').addClass('menuToggledOn')
diff --git a/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee b/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
index f8a27a4700743c3a213ef5667287394976b2d475..3a2811ea4664ec1ce455e71b96a046ea444b5fb5 100755
--- a/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
+++ b/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
@@ -222,17 +222,7 @@ https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/
BBB.getMyUserName = (callback) ->
- name = getInSession "userName" # check if we actually have one in the session
-
- if name?
- name # great return it, no database query
- else # we need it from the database
- user = BBB.getCurrentUser()
-
- if user?
- name = BBB.getUserName(user.userId)
- setInSession "userName", name # store in session for fast access next time
- name
+ BBB.getUserName(BBB.getCurrentUser()?.userId)
BBB.getMyVoiceBridge = (callback) ->
res = Meteor.Meetings.findOne({}).voiceConf
diff --git a/bigbluebutton-html5/app/client/main.coffee b/bigbluebutton-html5/app/client/main.coffee
index ff36c06a9e81b5d9bcd6b16dd0fe51ed6b716db1..2367534bfac85a8a46c61d79b6681dbc40366ece 100755
--- a/bigbluebutton-html5/app/client/main.coffee
+++ b/bigbluebutton-html5/app/client/main.coffee
@@ -16,7 +16,7 @@ Meteor.startup ->
loadLib('bbblogger.js')
@SessionAmplify = _.extend({}, Session,
- keys: _.object(_.map(amplify.store(), (value, key) ->
+ keys: _.object(_.map(amplify.store.sessionStorage(), (value, key) ->
[
key
JSON.stringify(value)
@@ -24,7 +24,7 @@ Meteor.startup ->
))
set: (key, value) ->
Session.set.apply this, arguments
- amplify.store key, value
+ amplify.store.sessionStorage key, value
return
)
#
@@ -56,22 +56,19 @@ Template.header.events
if isLandscape() or isLandscapeMobile()
toggleUsersList()
else
- if $('.sl-right-drawer').hasClass('sl-right-drawer-out')
- toggleRightDrawer()
- toggleRightArrowClockwise()
+ if $('.settingsMenu').hasClass('menuOut')
+ toggleSettingsMenu()
else
toggleShield()
- toggleLeftDrawer()
- toggleLeftArrowClockwise()
+ toggleUserlistMenu()
"click .toggleMenuButton": (event) ->
- if $('.sl-left-drawer').hasClass('sl-left-drawer-out')
- toggleLeftDrawer()
- toggleLeftArrowClockwise()
+ if $('.userlistMenu').hasClass('menuOut')
+ toggleUserlistMenu()
else
toggleShield()
- toggleRightDrawer()
- toggleRightArrowClockwise()
+ $('.toggleMenuButton').blur()
+ toggleSettingsMenu()
"click .btn": (event) ->
$(".ui-tooltip").hide()
@@ -79,8 +76,7 @@ Template.header.events
Template.menu.events
'click .slideButton': (event) ->
toggleShield()
- toggleRightDrawer()
- toggleRightArrowClockwise()
+ toggleSettingsMenu()
$('.slideButton').blur()
'click .toggleChatButton': (event) ->
@@ -137,7 +133,12 @@ Template.main.rendered = ->
toggleSlidingMenu()
if Meteor.config.app.autoJoinAudio
- onAudioJoinHelper()
+ if Meteor.config.app.skipCheck
+ joinVoiceCall @, isListenOnly: Meteor.config.app.listenOnly
+ else
+ $("#settingsModal").foundation('reveal', 'open')
+ if Meteor.config.app.listenOnly
+ $('#joinMicrophone').prop('disabled', true)
Template.main.events
'click .shield': (event) ->
@@ -146,7 +147,6 @@ Template.main.events
closeMenus()
'click .settingsIcon': (event) ->
- setInSession("tempFontSize", getInSession("messageFontSize"))
$("#settingsModal").foundation('reveal', 'open');
'click .signOutIcon': (event) ->
@@ -191,16 +191,16 @@ Template.main.gestures
if parseInt($('.left-drawer').css('transform').split(',')[4]) < leftDrawerWidth / 2
$('.shield').removeClass('animatedShield')
$('.shield').css('opacity', '')
- $('.left-drawer').removeClass('sl-left-drawer-out')
+ $('.left-drawer').removeClass('menuOut')
$('.left-drawer').css('transform', '')
- $('.toggleUserlistButton').removeClass('sl-toggled-on')
+ $('.toggleUserlistButton').removeClass('menuToggledOn')
$('.shield').removeClass('darken') # in case it was opened by clicking a button
else
$('.left-drawer').css('transform', 'translateX(' + leftDrawerWidth + 'px)')
$('.shield').css('opacity', 0.5)
- $('.left-drawer').addClass('sl-left-drawer-out')
+ $('.left-drawer').addClass('menuOut')
$('.left-drawer').css('transform', '')
- $('.toggleUserlistButton').addClass('sl-toggled-on')
+ $('.toggleUserlistButton').addClass('menuToggledOn')
if panIsValid and
menuPanned is 'right' and
@@ -210,24 +210,22 @@ Template.main.gestures
$('.shield').removeClass('animatedShield')
$('.shield').css('opacity', '')
$('.right-drawer').css('transform', 'translateX(' + screenWidth + 'px)')
- $('.right-drawer').removeClass('sl-right-drawer-out')
+ $('.right-drawer').removeClass('menuOut')
$('.right-drawer').css('transform', '')
- $('.toggleMenuButton').removeClass('sl-toggled-on')
+ $('.toggleMenuButton').removeClass('menuToggledOn')
$('.shield').removeClass('darken') # in case it was opened by clicking a button
else
$('.shield').css('opacity', 0.5)
$('.right-drawer').css('transform', 'translateX(' + (screenWidth - $('.right-drawer').width()) + 'px)')
- $('.right-drawer').addClass('sl-right-drawer-out')
+ $('.right-drawer').addClass('menuOut')
$('.right-drawer').css('transform', '')
- $('.toggleMenuButton').addClass('sl-toggled-on')
+ $('.toggleMenuButton').addClass('menuToggledOn')
- $('.left-drawer').addClass('sl-left-drawer')
- $('.sl-left-drawer').removeClass('left-drawer')
- $('.sl-left-drawer').addClass('sl-left-drawer-content-delay')
+ $('.left-drawer').addClass('userlistMenu')
+ $('.userlistMenu').removeClass('left-drawer')
- $('.right-drawer').addClass('sl-right-drawer')
- $('.sl-right-drawer').removeClass('right-drawer')
- $('.sl-right-drawer').addClass('sl-right-drawer-content-delay')
+ $('.right-drawer').addClass('settingsMenu')
+ $('.settingsMenu').removeClass('right-drawer')
'panright #container, panleft #container': (event, template) ->
if isPortraitMobile() and isPanHorizontal(event)
@@ -265,26 +263,24 @@ Template.main.gestures
setInSession 'eventType', event.type
if getInSession('menuPanned') is 'left'
- if $('.sl-left-drawer').css('transform') isnt 'none' # menu is already transformed
- setInSession 'initTransform', parseInt($('.sl-left-drawer').css('transform').split(',')[4]) # translateX value
- else if $('.sl-left-drawer').hasClass('sl-left-drawer-out')
- setInSession 'initTransform', $('.sl-left-drawer').width()
+ if $('.userlistMenu').css('transform') isnt 'none' # menu is already transformed
+ setInSession 'initTransform', parseInt($('.userlistMenu').css('transform').split(',')[4]) # translateX value
+ else if $('.userlistMenu').hasClass('menuOut')
+ setInSession 'initTransform', $('.userlistMenu').width()
else
setInSession 'initTransform', 0
- $('.sl-left-drawer').addClass('left-drawer')
- $('.left-drawer').removeClass('sl-left-drawer') # to prevent animations from Sled library
- $('.left-drawer').removeClass('sl-left-drawer-content-delay') # makes the menu content movable too
+ $('.userlistMenu').addClass('left-drawer')
+ $('.left-drawer').removeClass('userlistMenu') # to prevent animations from Sled library
else if getInSession('menuPanned') is 'right'
- if $('.sl-right-drawer').css('transform') isnt 'none' # menu is already transformed
- setInSession 'initTransform', parseInt($('.sl-right-drawer').css('transform').split(',')[4]) # translateX value
- else if $('.sl-right-drawer').hasClass('sl-right-drawer-out')
- setInSession 'initTransform', $('.sl-right-drawer').width()
+ if $('.settingsMenu').css('transform') isnt 'none' # menu is already transformed
+ setInSession 'initTransform', parseInt($('.settingsMenu').css('transform').split(',')[4]) # translateX value
+ else if $('.settingsMenu').hasClass('menuOut')
+ setInSession 'initTransform', $('.settingsMenu').width()
else
setInSession 'initTransform', 0
- $('.sl-right-drawer').addClass('right-drawer')
- $('.right-drawer').removeClass('sl-right-drawer') # to prevent animations from Sled library
- $('.right-drawer').removeClass('sl-right-drawer-content-delay') # makes the menu content movable too
+ $('.settingsMenu').addClass('right-drawer')
+ $('.right-drawer').removeClass('settingsMenu') # to prevent animations from Sled library
initTransformValue = getInSession('initTransform')
panIsValid = getInSession('panIsValid')
@@ -299,9 +295,8 @@ Template.main.gestures
initTransformValue + event.deltaX >= 0 and
initTransformValue + event.deltaX <= leftDrawerWidth
- if $('.sl-right-drawer').hasClass('sl-right-drawer-out')
- toggleRightDrawer()
- toggleRightArrowClockwise()
+ if $('.settingsMenu').hasClass('menuOut')
+ toggleSettingsMenu()
$('.left-drawer').css('transform', 'translateX(' + (initTransformValue + event.deltaX) + 'px)')
@@ -316,9 +311,8 @@ Template.main.gestures
initTransformValue + event.deltaX >= screenWidth - rightDrawerWidth and
initTransformValue + event.deltaX <= screenWidth
- if $('.sl-left-drawer').hasClass('sl-left-drawer-out')
- toggleLeftDrawer()
- toggleLeftArrowClockwise()
+ if $('.userlistMenu').hasClass('menuOut')
+ toggleUserlistMenu()
$('.right-drawer').css('transform', 'translateX(' + (initTransformValue + event.deltaX) + 'px)')
diff --git a/bigbluebutton-html5/app/client/main.html b/bigbluebutton-html5/app/client/main.html
index 8f1b3895dec93a9bd9705be9d4e0c5e0eafa9df1..1711e8ac9b32cffede50ddcee64340722bc9fa94 100755
--- a/bigbluebutton-html5/app/client/main.html
+++ b/bigbluebutton-html5/app/client/main.html
@@ -1,6 +1,6 @@
<template name="header">
<nav id="navbar" class="myNavbar top-bar" role="navigation">
- {{> makeButton btn_class="btn toggleUserlistButton navbarButton sl-hamburger sl-ham-la-cw sl-portrait-mobile sl-portrait-keyboard" rel="tooltip" title="Toggle Userlist" span=true notification="all_chats"}}
+ {{> makeButton btn_class="btn toggleUserlistButton navbarButton" i_class="ion-navicon" rel="tooltip" title="Toggle Userlist" span=true notification="all_chats"}}
{{#if amIInAudio}}
<div class="audioNavbarSection">
@@ -37,7 +37,7 @@
{{> makeButton id="logout" btn_class="signOutIcon navbarButton" i_class="ion-log-out" rel="tooltip"
title="Logout"}}
</div>
- {{> makeButton btn_class="btn toggleMenuButton navbarButton sl-hamburger sl-ham-ra-cw sl-portrait-mobile sl-portrait-keyboard" rel="tooltip" title="Toggle Menu" span=true}}
+ {{> makeButton btn_class="btn toggleMenuButton navbarButton" i_class="ion-android-more-vertical" rel="tooltip" title="Toggle Menu" span=true}}
</nav>
</template>
@@ -50,11 +50,10 @@
{{#if isDisconnected}}
{{>status}}
{{else}}
- <div class="sl-left-drawer sl-left-drawer-content-delay sl-portrait-mobile sl-portrait-keyboard">
+ <div class="userlistMenu">
{{> usersList id="users" name="usersList"}}
</div>
- <div class="sl-right-drawer sl-portrait-mobile sl-portrait-keyboard">
- <div class="titleArea"></div>
+ <div class="settingsMenu">
{{> menu id="menu"}}
</div>
<div id="main">
@@ -92,3 +91,59 @@
{{> makeButton btn_class="slideButton signOutIcon" i_class="ion-log-out" label="Log out"}}
</div>
</template>
+
+<template name="loading">
+<div id="floatingCirclesG">
+ <div class="f_circleG" id="frotateG_01"></div>
+ <div class="f_circleG" id="frotateG_02"></div>
+ <div class="f_circleG" id="frotateG_03"></div>
+ <div class="f_circleG" id="frotateG_04"></div>
+ <div class="f_circleG" id="frotateG_05"></div>
+ <div class="f_circleG" id="frotateG_06"></div>
+ <div class="f_circleG" id="frotateG_07"></div>
+ <div class="f_circleG" id="frotateG_08"></div>
+</div>
+</template>
+
+<template name="icon">
+ <svg width="{{size}}" height="{{size}}" viewBox="0 0 50 50">
+ {{#if equals name "happy-face"}}
+ <circle cx="25" cy="25" r="14" stroke="white" stroke-width="3" fill="transparent"/>
+ <circle cx="19" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <circle cx="31" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <path d="m18 30 C 21 33, 29 33, 32 30" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" fill="none" />
+ {{else}}
+ {{#if equals name "neutral-face"}}
+ <circle cx="25" cy="25" r="14" stroke="white" stroke-width="3" fill="transparent"/>
+ <circle cx="19" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <circle cx="31" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <path d="m18 30 l 14 0" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
+ {{else}}
+ {{#if equals name "confused-face"}}
+ <circle cx="25" cy="25" r="14" stroke="white" stroke-width="3" fill="transparent"/>
+ <circle cx="19" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <circle cx="31" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <path d="M18 30 C 20 28, 22 28, 25 30 S 30 32, 32 30" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
+ {{else}}
+ {{#if equals name "sad-face"}}
+ <circle cx="25" cy="25" r="14" stroke="white" stroke-width="3" fill="transparent"/>
+ <circle cx="19" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <circle cx="31" cy="22" r="1" stroke="white" stroke-width="2" fill="white"/>
+ <path d="m18 30 C 21 27, 29 27, 32 30" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" fill="none" />
+ {{else}}
+ {{#if equals name "clock"}}
+ <circle cx="25" cy="25" r="14" stroke="white" stroke-width="3" fill="transparent"/>
+ <path d="m25 25 l 0 -8" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
+ <path d="m25 25 l 5 5" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
+ {{else}}
+ {{#if equals name "plus"}}
+ <path d="m25 18 l 0 14" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
+ <path d="m18 25 l 14 0" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
+ {{/if}}
+ {{/if}}
+ {{/if}}
+ {{/if}}
+ {{/if}}
+ {{/if}}
+ </svg>
+</template>
diff --git a/bigbluebutton-html5/app/client/stylesheets/chat.less b/bigbluebutton-html5/app/client/stylesheets/chat.less
index 03a71571e1bbcf23f5b485ef591c294e926af3cf..af19a081dbf23c44d86f9506b07417fd5345acce 100755
--- a/bigbluebutton-html5/app/client/stylesheets/chat.less
+++ b/bigbluebutton-html5/app/client/stylesheets/chat.less
@@ -74,6 +74,9 @@
border-top-left-radius: 0px;
overflow: hidden;
}
+ @media @mobile-portrait-with-keyboard, @mobile-portrait {
+ border-top: none;
+ }
order: 3;
}
@@ -111,6 +114,9 @@
}
}
#chatbody {
+ // text will not be hidden as it won't exceed the container boundaries,
+ // but the element will still be given horizontal scroll bars
+ overflow-x: hidden;
@media @desktop-portrait, @landscape {
order: 2;
-webkit-order: 2;
@@ -146,7 +152,7 @@
#fontSizeTable {
border: 1px solid white;
- height: 80px;
+ height: @settingsSectionHeight;
margin-bottom: 0px;
overflow: hidden;
@media @phone-portrait-with-keyboard, @phone-portrait {
@@ -159,7 +165,9 @@
width: calc(~'100% - 70px');
}
#displayLabel {
+ height: @fontSizeControlMaxHeight;
padding: 0;
+ width: @fontSizeControlMaxWidth;
}
tr {
td {
@@ -224,7 +232,7 @@
}
@media @desktop-portrait {
font-size: 25px;
- height: 60px; /* same height as send button */
+ height: @chatControlsHeight;
}
}
@@ -241,7 +249,7 @@
color: extract(@white, 1);
background-color: #3896D3;
font-weight: bold;
- height: 50px;
+ height: @chatControlsHeight;
margin: 0px;
border: 1px solid extract(@lightGrey, 3);
@media @desktop-portrait {
diff --git a/bigbluebutton-html5/app/client/stylesheets/mixins.less b/bigbluebutton-html5/app/client/stylesheets/mixins.less
index 288e88360f2b5ab27d8e278c8ef1b9d52e114ee4..4ec3ad046545f7433cc8703642b5ae70dbb3c98f 100755
--- a/bigbluebutton-html5/app/client/stylesheets/mixins.less
+++ b/bigbluebutton-html5/app/client/stylesheets/mixins.less
@@ -10,9 +10,3 @@
background: -webkit-linear-gradient(@color1, @color2); /* For Safari 5.1 to 6.0 */
background: linear-gradient(@color1, @color2); /* Standard syntax (must be last) */
}
-
-.vertically-centered {
- position: relative;
- top: 50%;
- transform: translateY(-50%);
-}
diff --git a/bigbluebutton-html5/app/client/stylesheets/modals.less b/bigbluebutton-html5/app/client/stylesheets/modals.less
index 211dd702c60791841bc9dff06579da51b2a110b7..84530cf011051db58f407255943932cd4df23ba9 100755
--- a/bigbluebutton-html5/app/client/stylesheets/modals.less
+++ b/bigbluebutton-html5/app/client/stylesheets/modals.less
@@ -76,37 +76,9 @@
height: 55px;
}
border-bottom: 1px solid grey;
- p:first-child {
+ p {
text-align: center;
}
- p:nth-child(2) {
- float: right;
- text-align: right;
- .closeSettings {
- @media @desktop-portrait, @desktop-landscape {
- font-size: 30px;
- }
- @media @phone-landscape {
- font-size: 30px;
- top: 2px;
- right: 10px;
- }
- @media @tablet-landscape {
- font-size: 33px;
- right: 15px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 45px;
- top: 2px;
- right: 10px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 350%;
- top: 0;
- right: 20px;
- }
- }
- }
}
.bottomBar {
border-top: 1px solid grey;
@@ -126,29 +98,6 @@
@media @desktop-portrait, @desktop-landscape {
height: 55px;
}
- .closeSettings {
- @media @desktop-portrait, @desktop-landscape {
- font-size: 16px;
- }
- @media @phone-landscape {
- font-size: 16px;
- margin-right: 10px;
- }
- @media @tablet-landscape {
- font-size: 20px;
- margin-right: 5px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 25px;
- margin-right: 5px; // margin between the Cancel and Save buttons
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 30px;
- margin-right: 10px; // margin between the Cancel and Save buttons
- }
- position: inherit;
- }
-
}
.settingsBody {
padding-top: 1px;
@@ -221,9 +170,13 @@
margin-bottom: 0;
margin-left: auto;
margin-right: auto;
-
- width: calc(~'100% - 20px');
padding: 0px;
+ width: calc(~'100% - 20px');
+
+ #audioButtonContainer {
+ height: @settingsSectionHeight;
+ }
+
@media @mobile-portrait-with-keyboard, @mobile-portrait {
height: 30%;
.settingsButton {
@@ -252,15 +205,15 @@
}
}
}
-#saveSettings {
+#closeSettings {
border-radius: 3px;
padding: 5px 10px 5px 10px;
@media @desktop-portrait, @desktop-landscape {
- margin-top: 5px;
font-size: 16px;
width: 80px;
height: 35px;
+ margin-bottom: 0px; // overrides the value from Foundation
}
@media @phone-landscape {
font-size: 20px;
diff --git a/bigbluebutton-html5/app/client/stylesheets/style.less b/bigbluebutton-html5/app/client/stylesheets/style.less
index 0ae8f3e64d899e310afec01e9d950d2b55cf9306..b8fcca0278eeae8ad080d7a3561c1e0abe0ce931 100755
--- a/bigbluebutton-html5/app/client/stylesheets/style.less
+++ b/bigbluebutton-html5/app/client/stylesheets/style.less
@@ -7,6 +7,10 @@ body {
color: extract(@darkGrey, 1);
left: 0;
right: 0;
+
+ // makes text selectable in Chrome (overrides inline style)
+ -webkit-user-select: all !important;
+
@media @landscape {
height: 100%;
position: absolute;
@@ -25,7 +29,6 @@ body {
}
.component {
- .radius;
background: extract(@white, 1);
border: 1px solid extract(@lightGrey, 3);
float: left;
@@ -36,13 +39,26 @@ body {
}
@media @mobile-portrait {
- .sl-toggled-on .unreadChat {
+ .menuToggledOn .unreadChat {
display: none;
}
}
.navbarButton {
color: #469DCF;
+ &:hover, &:focus {
+ i {
+ color: #2A5E7C;
+ }
+ }
+ @media @phone-portrait-with-keyboard, @phone-portrait, @phone-landscape {
+ padding-top: 2px !important;
+ padding-bottom: 2px !important;
+ }
+ @media @tablet-portrait-with-keyboard, @tablet-portrait, @tablet-landscape {
+ padding-top: 4px !important;
+ padding-bottom: 4px !important;
+ }
.unreadChat {
position: absolute;
z-index: 1;
@@ -63,17 +79,44 @@ body {
}
i {
+
+ // phone
+ @media @phone-portrait-with-keyboard, @phone-portrait {
+ font-size: 42px;
+ }
@media @phone-landscape {
- font-size: 29px;
+ &.ion-navicon {
+ font-size: 35px;
+ }
+ &:not(.ion-navicon) {
+ font-size: 29px;
+ }
}
- @media @desktop-portrait, @desktop-landscape, @tablet-landscape {
- font-size: 30px;
+
+ // tablet
+ @media @tablet-portrait-with-keyboard, @tablet-portrait {
+ font-size: 47px;
}
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 35px;
+ @media @tablet-landscape {
+ &.ion-navicon {
+ font-size: 37px;
+ }
+ &:not(.ion-navicon) {
+ font-size: 30px;
+ }
}
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 40px;
+
+ // desktop
+ @media @desktop-landscape {
+ &.ion-navicon {
+ font-size: 34px;
+ }
+ &:not(.ion-navicon) {
+ font-size: 30px;
+ }
+ }
+ @media @desktop-portrait {
+ font-size: 35px;
}
}
}
@@ -86,7 +129,7 @@ body {
}
@media @mobile-portrait-with-keyboard, @mobile-portrait {
- .linear-gradient(rgb(72,76,85), rgb(65,68,77));
+ background-color: white;
}
.btn {
@@ -177,8 +220,8 @@ body {
text-overflow: ellipsis;
white-space: nowrap;
position: absolute;
+ color: extract(@darkGrey, 1);
@media @mobile-portrait-with-keyboard, @mobile-portrait {
- color: extract(@white, 1);
margin-left: auto;
margin-right: auto;
}
@@ -192,7 +235,6 @@ body {
padding-top: 27.5px; // half the height
font-size: 21px;
}
-
@media @tablet-landscape {
font-size: 18px;
height: 50px;
@@ -212,9 +254,7 @@ body {
height: 50px;
padding-top: 25px; // half the height
}
-
@media @landscape, @desktop-portrait {
- color: extract(@darkGrey, 1);
padding-left: 15px;
padding-right: 15px;
}
@@ -309,7 +349,7 @@ body {
font-weight: bold;
line-height: 2em;
margin: 0;
-
+ color: extract(@darkGrey, 1);
@media @tablet-landscape {
font-size: 18px;
height: 50px;
@@ -328,18 +368,15 @@ body {
}
@media @mobile-portrait, @mobile-portrait-with-keyboard {
- .linear-gradient(rgb(72,76,85), rgb(65,68,77));
- color: white;
+ background-color: white;
height: 50px;
}
@media @desktop-portrait {
background-color: white;
padding-top: 10px;
- color: extract(@darkGrey, 1);
}
@media @landscape {
border-bottom: 1px solid extract(@lightGrey, 1);
- color: extract(@darkGrey, 1);
padding-bottom: 5px;
padding-top: 5px;
}
@@ -373,14 +410,7 @@ body {
height: 100%;
background-color: black;
opacity: 0;
- z-index: 1;
cursor: pointer;
- @media @landscape, @desktop-portrait {
- top: 50px;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- top: 110px;
- }
}
}
}
@@ -409,18 +439,26 @@ body {
}
.slideButton {
+ padding: 0px !important;
+ line-height: 50px !important;
+
@media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
display: block;
- margin-left: auto;
- margin-right: auto;
- width: 90%;
+ width: 100%;
background-color: transparent;
- color: white;
- border-bottom: 2px solid extract(@lightGrey, 4);
+ color: #788897;
+ border-bottom: 1px solid extract(@lightGrey, 5);
margin-top: 0;
margin-bottom: 0;
&:hover {
- background-color: extract(@lightGrey, 1);
+ background-color: white;
+ span{
+ color: #788897;
+ }
+ }
+ i {
+ margin-left: 5%;
+ color: #3B97D3;
}
i, span {
float: left;
@@ -460,9 +498,9 @@ body {
.titleArea {
width: 100%;
+ background-color: white;
@media @mobile-portrait-with-keyboard, @mobile-portrait {
height: 50px;
- .linear-gradient(rgb(72,76,85), rgb(65,68,77));
}
@media @desktop-portrait {
height: 50px;
@@ -521,12 +559,6 @@ body {
.signOutIcon {
@media @landscape {
- &:hover {
- color: #2A5E7C;
- }
- &:focus {
- color: #2A5E7C;
- }
height: 28px;
width: 75px;
margin-left: 10px;
@@ -583,32 +615,21 @@ body {
}
}
-.toggleUserlistButton, .toggleMenuButton {
- z-index: 1001;
-}
-
.toggleUserlistButton, .toggleMenuButton {
outline: none;
}
.settingsIcon {
@media @landscape {
- &:hover {
- color: #2A5E7C;
- }
- &:focus {
- color: #2A5E7C;
- }
width: 57px;
margin-right: 5px;
}
}
#menu {
- width: 85%;
height: 100%;
@media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- .linear-gradient(rgb(65,68,77), rgb(58,60,69));
+ background-color: white;
}
@media @landscape {
display: none;
@@ -731,42 +752,35 @@ body {
.btn {
@media @mobile-portrait-with-keyboard, @mobile-portrait {
- padding-left: 10px;
- padding-right: 10px;
+ padding: 0px;
+ line-height: 50px;
}
}
-.verticallyCentered {
- position: relative;
- top: 50%;
- transform: translateY(-50%);
-}
-
/* Sliding Menu */
@media @desktop-portrait {
- .sl-left-drawer {
- z-index: 1000;
+ .userlistMenu {
position: fixed;
left: -400px;
width: 400px !important; // overrides any width value set manually in landscape
- &.sl-left-drawer-out {
+ &.menuOut {
left: 0px;
}
}
- .sl-right-drawer {
- z-index: 1000;
+ .settingsMenu {
position: fixed;
right: -400px;
width: 400px;
- &.sl-right-drawer-out {
+ &.menuOut {
right: 0px;
}
}
}
-.sl-left-drawer {
+.userlistMenu {
height: 100%;
+ z-index: 1000;
@media @tablet-landscape {
width: 200px;
}
@@ -776,11 +790,93 @@ body {
@media @desktop-landscape {
width: 300px;
}
+ @media @mobile-portrait-with-keyboard, @mobile-portrait {
+ @userListMenuPortaitWidth: (2/3 * 100vw);
+
+ position: fixed;
+ left: -@userListMenuPortaitWidth;
+ width: @userListMenuPortaitWidth;
+
+ transition: transform 0.3s linear;
+ -moz-transition: transform 0.3s linear;
+ -webkit-transition: transform 0.3s linear;
+ -ms-transition: transform 0.3s linear;
+ -o-transition: transform 0.3s linear;
+
+ .userItem {
+ transition: transform 0.7s;
+ -moz-transition: -moz-transform 0.7s;
+ -webkit-transition: -webkit-transform 0.7s;
+ -o-transition: -o-transform 0.7s;
+
+ transform: translateX(-@userListMenuPortaitWidth);
+ -moz-transform: translateX(-@userListMenuPortaitWidth);
+ -webkit-transform: translateX(-@userListMenuPortaitWidth);
+ -ms-transform: translateX(-@userListMenuPortaitWidth);
+ -o-transform: translateX(-@userListMenuPortaitWidth);
+ }
+
+ &.menuOut {
+ transform: translateX(@userListMenuPortaitWidth);
+ -moz-transform: translateX(@userListMenuPortaitWidth);
+ -webkit-transform: translateX(@userListMenuPortaitWidth);
+ -ms-transform: translateX(@userListMenuPortaitWidth);
+ -o-transform: translateX(@userListMenuPortaitWidth);
+
+ .userItem {
+ transform: translateX(0);
+ -moz-transform: translateX(0);
+ -webkit-transform: translateX(0);
+ -ms-transform: translateX(0);
+ -o-transform: translateX(0);
+ }
+
+ .generateUserItemAnimation(@n, @i: 1) when (@i =< @n) {
+ .userItem:nth-child(@{i}) {
+ transform: @i * 50ms;
+ transition-delay: @i * 50ms;
+ -moz-transition-delay: @i * 50ms;
+ -webkit-transition-delay: @i * 50ms;
+ -o-transition-delay: @i * 50ms;
+ }
+ .generateUserItemAnimation(@n, (@i + 1));
+ }
+
+ .generateUserItemAnimation(20);
+ }
+ }
}
-.sl-right-drawer {
+.settingsMenu {
height: 100%;
- .linear-gradient(rgb(65,68,77), rgb(58,60,69));
+ z-index: 1000;
+ position: fixed;
+ transform: translateX(100vw);
+ width: 70vw;
+
+ transition: transform 0.3s linear;
+ -moz-transition: transform 0.3s linear;
+ -webkit-transition: transform 0.3s linear;
+ -ms-transition: transform 0.3s linear;
+ -o-transition: transform 0.3s linear;
+
+ &.menuOut {
+ transform: translate(0vw, 0);
+ -moz-transform: translate(0vw, 0);
+ -webkit-transform: translate(0vw, 0);
+ -ms-transform: translate(0vw, 0);
+ -o-transform: translate(0vw, 0);
+ }
+
+ @media @mobile-portrait-with-keyboard, @mobile-portrait {
+ &.menuOut {
+ transform: translate(30vw, 0);
+ -moz-transform: translate(30vw, 0);
+ -webkit-transform: translate(30vw, 0);
+ -ms-transform: translate(30vw, 0);
+ -o-transform: translate(30vw, 0);
+ }
+ }
}
.hiddenInLandscape {
@@ -796,14 +892,9 @@ body {
height: 100%;
background-color: black;
opacity: 0;
- z-index: 1;
+ z-index: 999;
cursor: pointer;
- @media @desktop-portrait {
- top: 50px;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- top: 50px;
- }
+ top: 0px;
@media @landscape {
display: none;
}
@@ -822,7 +913,7 @@ body {
opacity: 0;
}
100% {
- opacity: 0.5;
+ opacity: 0.8;
}
}
@@ -832,7 +923,6 @@ body {
}
}
-// same as Sled's left drawer except for animations
.left-drawer {
z-index: 1000;
position: fixed;
@@ -841,7 +931,6 @@ body {
height: 100%;
}
-// same as Sled's right drawer except for animations
.right-drawer {
z-index: 1000;
position: fixed;
@@ -850,3 +939,184 @@ body {
.linear-gradient(rgb(65,68,77), rgb(58,60,69));
width: 60vw;
}
+
+/*********************************/
+/*Loading Spinning Bar's Styling */
+/*********************************/
+#floatingCirclesG{
+ top: calc(~'50% - 60px');
+ position:relative;
+ width:128px;
+ height:128px;
+ margin:auto;
+ transform:scale(0.6);
+ -o-transform:scale(0.6);
+ -ms-transform:scale(0.6);
+ -webkit-transform:scale(0.6);
+ -moz-transform:scale(0.6);
+}
+
+.f_circleG{
+ position:absolute;
+ background-color:rgb(238,238,238);
+ height:23px;
+ width:23px;
+ border-radius:12px;
+ -o-border-radius:12px;
+ -ms-border-radius:12px;
+ -webkit-border-radius:12px;
+ -moz-border-radius:12px;
+ animation-name:f_fadeG;
+ -o-animation-name:f_fadeG;
+ -ms-animation-name:f_fadeG;
+ -webkit-animation-name:f_fadeG;
+ -moz-animation-name:f_fadeG;
+ animation-duration:0.672s;
+ -o-animation-duration:0.672s;
+ -ms-animation-duration:0.672s;
+ -webkit-animation-duration:0.672s;
+ -moz-animation-duration:0.672s;
+ animation-iteration-count:infinite;
+ -o-animation-iteration-count:infinite;
+ -ms-animation-iteration-count:infinite;
+ -webkit-animation-iteration-count:infinite;
+ -moz-animation-iteration-count:infinite;
+ animation-direction:normal;
+ -o-animation-direction:normal;
+ -ms-animation-direction:normal;
+ -webkit-animation-direction:normal;
+ -moz-animation-direction:normal;
+}
+
+#frotateG_01{
+ left:0;
+ top:52px;
+ animation-delay:0.2495s;
+ -o-animation-delay:0.2495s;
+ -ms-animation-delay:0.2495s;
+ -webkit-animation-delay:0.2495s;
+ -moz-animation-delay:0.2495s;
+}
+
+#frotateG_02{
+ left:15px;
+ top:15px;
+ animation-delay:0.336s;
+ -o-animation-delay:0.336s;
+ -ms-animation-delay:0.336s;
+ -webkit-animation-delay:0.336s;
+ -moz-animation-delay:0.336s;
+}
+
+#frotateG_03{
+ left:52px;
+ top:0;
+ animation-delay:0.4225s;
+ -o-animation-delay:0.4225s;
+ -ms-animation-delay:0.4225s;
+ -webkit-animation-delay:0.4225s;
+ -moz-animation-delay:0.4225s;
+}
+
+#frotateG_04{
+ right:15px;
+ top:15px;
+ animation-delay:0.509s;
+ -o-animation-delay:0.509s;
+ -ms-animation-delay:0.509s;
+ -webkit-animation-delay:0.509s;
+ -moz-animation-delay:0.509s;
+}
+
+#frotateG_05{
+ right:0;
+ top:52px;
+ animation-delay:0.5955s;
+ -o-animation-delay:0.5955s;
+ -ms-animation-delay:0.5955s;
+ -webkit-animation-delay:0.5955s;
+ -moz-animation-delay:0.5955s;
+}
+
+#frotateG_06{
+ right:15px;
+ bottom:15px;
+ animation-delay:0.672s;
+ -o-animation-delay:0.672s;
+ -ms-animation-delay:0.672s;
+ -webkit-animation-delay:0.672s;
+ -moz-animation-delay:0.672s;
+}
+
+#frotateG_07{
+ left:52px;
+ bottom:0;
+ animation-delay:0.7585s;
+ -o-animation-delay:0.7585s;
+ -ms-animation-delay:0.7585s;
+ -webkit-animation-delay:0.7585s;
+ -moz-animation-delay:0.7585s;
+}
+
+#frotateG_08{
+ left:15px;
+ bottom:15px;
+ animation-delay:0.845s;
+ -o-animation-delay:0.845s;
+ -ms-animation-delay:0.845s;
+ -webkit-animation-delay:0.845s;
+ -moz-animation-delay:0.845s;
+}
+
+@keyframes f_fadeG{
+ 0%{
+ background-color:rgb(0,0,0);
+ }
+
+ 100%{
+ background-color:rgb(238,238,238);
+ }
+}
+
+@-o-keyframes f_fadeG{
+ 0%{
+ background-color:rgb(0,0,0);
+ }
+
+ 100%{
+ background-color:rgb(238,238,238);
+ }
+}
+
+@-ms-keyframes f_fadeG{
+ 0%{
+ background-color:rgb(0,0,0);
+ }
+
+ 100%{
+ background-color:rgb(238,238,238);
+ }
+}
+
+@-webkit-keyframes f_fadeG{
+ 0%{
+ background-color:rgb(0,0,0);
+ }
+
+ 100%{
+ background-color:rgb(238,238,238);
+ }
+}
+
+@-moz-keyframes f_fadeG{
+ 0%{
+ background-color:rgb(0,0,0);
+ }
+
+ 100%{
+ background-color:rgb(238,238,238);
+ }
+}
+/*********************************/
+/*End of Spinning Bar's Styling */
+/*********************************/
diff --git a/bigbluebutton-html5/app/client/stylesheets/users.less b/bigbluebutton-html5/app/client/stylesheets/users.less
index b4ec59db481620b8e169bcfd64835ee2125af697..10b9576ea3e50f549063c219ec564457dfbad315 100755
--- a/bigbluebutton-html5/app/client/stylesheets/users.less
+++ b/bigbluebutton-html5/app/client/stylesheets/users.less
@@ -6,6 +6,8 @@
}
#usericons {
+ float: right;
+ padding: 0 5px;
text-align: right;
color: white;
span i {
@@ -36,7 +38,9 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- width: calc(~'100% - 130px');
+ width: calc(~'100% - 120px');
+ // 120px is size of the icon list with all icons enabled (lock, cam, mic/listen)
+
@media @landscape {
height: 27px;
font-size: 4.5mm;
@@ -54,17 +58,17 @@
}
#users {
+ border-radius: 0px;
@media @landscape {
width: 100%;
border-left: 0px;
border-top: 0px;
- border-top-right-radius: 0px;
}
@media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
width: 100%;
height: 100%;
border: none;
- .linear-gradient(rgb(65,68,77), rgb(58,60,69));
+ background-color: #34495E;
}
order: 0;
height: 100%;
@@ -134,6 +138,7 @@
}
@media @desktop-portrait, @mobile-portrait {
max-height: 58vw; //for longer userlist a scrollbar appears
+ padding-top: 10px;
}
}
}
diff --git a/bigbluebutton-html5/app/client/stylesheets/variables.less b/bigbluebutton-html5/app/client/stylesheets/variables.less
index 45bad4289182ecd477e99e653f3b27f1a10466bf..1b65b05732b9116e1687362fed27fda48e1c12c8 100755
--- a/bigbluebutton-html5/app/client/stylesheets/variables.less
+++ b/bigbluebutton-html5/app/client/stylesheets/variables.less
@@ -1,6 +1,6 @@
/* colors sorted by brightness */
@white: #fff, #f5f5f5, #eee;
-@lightGrey: #d7d7d7, #cccdd1, #ccc, #999;
+@lightGrey: #d7d7d7, #cccdd1, #ccc, #999, #E4E5E7;
@darkGrey: #666, #60636a, #40434c, #32353e;
@azure: #54a7db, #0099FF;
@black: #000;
@@ -39,3 +39,9 @@
font-weight: normal;
font-style: normal;
}
+
+/* variables for dimensions */
+@chatControlsHeight: 60px; // height of the chatbox and send chat button
+@settingsSectionHeight: 60px;
+@fontSizeControlMaxWidth: 170px;
+@fontSizeControlMaxHeight: 60px;
diff --git a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
index 889218a7161cf237e2209ac171ea19a00bbb9f5b..0cad58a4cc87584f8614e37391e995bf4c5c0a94 100755
--- a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
+++ b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
@@ -3,6 +3,11 @@
#whiteboard {
padding: 0 !important;
min-width: 0;
+
+ #whiteboard-container{
+ min-height: 60px;
+ }
+
@media @landscape {
border-top: 0px;
border-left: 0px;
@@ -27,9 +32,6 @@
#whiteboard-paper {
height: 100%;
}
- .raiseHandButton {
- display: none;
- }
}
&:-moz-full-screen {
width: 100%;
@@ -41,9 +43,6 @@
#whiteboard-paper {
height: 100%;
}
- .raiseHandButton {
- display: none;
- }
}
&:fullscreen {
width: 100%;
@@ -55,9 +54,6 @@
#whiteboard-paper {
height: 100%;
}
- .raiseHandButton {
- display: none;
- }
}
}
@@ -84,12 +80,351 @@
align-items: center;
-webkit-align-items: center;
-ms-align-items: center;
- border-bottom: 1px solid extract(@lightGrey, 3);
+ //border-bottom: 1px solid extract(@lightGrey, 3);
+ }
+}
+
+#whiteboard-controls {
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 4em 5px 5px;
+
+ /*
+ opacity: 0;
+ -webkit-transition: opacity .3s;
+ transition: opacity .3s;
+
+ &:hover,
+ &:focus {
+ opacity: 1;
+ }
+ */
+
+ button, .btn {
+ outline: none;
+ display: inline-block;
+ margin: 0;
+ padding: 0;
+ border: none;
+ background: none;
+ color: #fff;
+ height: 50px;
+ width: 50px;
+ border-radius: 50%;
+ background-color: #3896D3;
+ border-color: #007095;
+ font-size: 30px;
+ -webkit-transition: background .3s;
+ transition: background .3s;
+
+ &:focus,
+ &:hover {
+ background-color: #3A82D4;
+ }
+ }
+}
+
+.whiteboard-buttons {
+ &-left,
+ &-center,
+ &-right {
+
+ }
+
+ &-left {
+ float: left;
+ }
+
+ &-center {
+ pointer-events: none;
+ position: absolute;
+ width: 100%;
+ text-align: center;
+ bottom: 5px;
+ }
+
+ &-right {
+ float: right;
+ }
+
+ &-slide {
+ pointer-events: auto;
+ color: #fff;
+ background-color: #3896D3;
+ border-color: #007095;
+ display: inline-block;
+ border-radius: 50px;
+
+ > button, .button {
+ background-color: transparent;
+ }
+
+ .current {
+ color: #fff;
+ font-weight: bold;
+ vertical-align: super;
+ }
+ }
+}
+
+.presenter-uploader {
+ @presenteUploaderBg: #eee;
+ @presenteUploaderColor: rgba(0, 0, 0, .5);
+ @presenteUploaderColorHover: #3A82D4;
+
+ &-control {
+ max-height: 75vh;
+ max-width: 20vw;
+ min-width: 300px;
+ position: relative;
+ z-index: 100;
+
+ &-btn {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+
+ .presenter-uploader-container & {
+ z-index: 1;
+ background-color: @presenteUploaderBg !important;
+ border-color: transparent !important;
+ color: @presenteUploaderColor !important;
+
+ &:focus,
+ &:hover {
+ color: @presenteUploaderColorHover;
+ }
+ }
+ }
+ }
+
+ &-container {
+ overflow: hidden;
+ z-index: 1000;
+ background-color: @presenteUploaderBg;
+ padding: 10px 10px;
+ border-radius: 10px 10px 10px 25px;
+ display: none;
+ transition: all .3s;
+ position: absolute;
+ bottom: 0;
+
+ .is-open & {
+ display: block;
+ box-shadow: 2px 2px 6px rgba(0, 0, 0, .2);
+ }
+ }
+
+ &-tip {
+ padding: 10px 10px 10px 60px;
+ text-transform: uppercase;
+ font-size: 9px;
+ font-weight: bold;
+ margin: -10px;
+ text-align: right;
+ min-height: 50px;
+ color: @presenteUploaderColor;
+ }
+
+ &-dropzone {
+ margin-bottom: 10px;
+ color: @presenteUploaderColor;
+ opacity: .4;
+ transition: opacity 3s;
+ text-align: center;
+ border: 3px dashed;
+ border-radius: 10px;
+ padding: 50px;
+ transition: all .3s;
+ cursor: pointer;
+ position: relative;
+
+ &:focus,
+ &:hover,
+ &.hover {
+ opacity: .8;
+ background-color: rgba(0, 0, 0, .1);
+ }
+
+ &-icon,
+ &-label {
+ display: block;
+ color: inherit;
+ }
+
+ &-icon {
+ font-size: 70px;
+ line-height: 1;
+ }
+
+ &-label {
+ color: inherit;
+ text-transform: uppercase;
+ font-size: 11px;
+ font-weight: bold;
+ }
+
+ &-fileinput {
+ cursor: pointer;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ opacity: 0;
+ }
+ }
+
+ &-file {
+ &-list {
+ &::-webkit-scrollbar{width:5px;height:5px}
+ &::-webkit-scrollbar-button{width:0;height:0}
+ &::-webkit-scrollbar-thumb{background:rgba(0,0,0,.25);border:none;border-radius:50px}
+ &::-webkit-scrollbar-thumb:hover{background:rgba(0,0,0,.5)}
+ &::-webkit-scrollbar-thumb:active{background:rgba(0,0,0,.25)}
+ &::-webkit-scrollbar-track{background:rgba(0,0,0,.25);border:none;border-radius:50px}
+ &::-webkit-scrollbar-track:hover{background:rgba(0,0,0,.25)}
+ &::-webkit-scrollbar-track:active{background:rgba(0,0,0,.25)}
+ &::-webkit-scrollbar-corner{background:0 0}
+
+ display: block;
+ margin: -10px;
+ margin-bottom: 10px;
+ list-style: none;
+ overflow-y: auto;
+ overflow-x: hidden;
+ max-height: 200px;
+ background:
+ linear-gradient(@presenteUploaderBg 30%, rgba(255,255,255,0)),
+ linear-gradient(rgba(255,255,255,0), @presenteUploaderBg 70%) 0 100%,
+ radial-gradient(50% 0, farthest-side, rgba(0,0,0,.2), rgba(0,0,0,0)),
+ radial-gradient(50% 100%,farthest-side, rgba(0,0,0,.2), rgba(0,0,0,0)) 0 100%;
+ background:
+ linear-gradient(@presenteUploaderBg 30%, rgba(255,255,255,0)),
+ linear-gradient(rgba(255,255,255,0), @presenteUploaderBg 70%) 0 100%,
+ radial-gradient(farthest-side at 50% 0, rgba(0,0,0,.2), rgba(0,0,0,0)),
+ radial-gradient(farthest-side at 50% 100%, rgba(0,0,0,.2), rgba(0,0,0,0)) 0 100%;
+ background-repeat: no-repeat;
+ background-color: @presenteUploaderBg;
+ background-size: 100% 40px, 100% 40px, 100% 14px, 100% 14px;
+ background-attachment: local, local, scroll, scroll;
+ }
+
+ &-item {
+ color: @presenteUploaderColor;
+ display: table;
+ table-layout: fixed;
+ width: 100%;
+ padding: 10px;
+ border-bottom: 1px solid darken(@presenteUploaderBg, 10%);
+ border-top: 1px solid lighten(@presenteUploaderBg, 10%);
+
+ &:nth-child(odd) {
+ background-color: rgba(255, 255, 255, .5);
+ }
+
+ &.current {
+ background-color: fade(@presenteUploaderColorHover, 15%);
+ }
+
+ &.is-uploading {
+ background-image: -webkit-linear-gradient(-45deg, fade(@presenteUploaderColorHover, 15%) 25%,transparent 25%,transparent 50%, fade(@presenteUploaderColorHover, 15%) 50%, fade(@presenteUploaderColorHover, 15%) 75%,transparent 75%,transparent);
+ background-image: -o-linear-gradient(-45deg, fade(@presenteUploaderColorHover, 15%) 25%,transparent 25%,transparent 50%, fade(@presenteUploaderColorHover, 15%) 50%, fade(@presenteUploaderColorHover, 15%) 75%,transparent 75%,transparent);
+ background-image: linear-gradient(-45deg, fade(@presenteUploaderColorHover, 15%) 25%,transparent 25%,transparent 50%, fade(@presenteUploaderColorHover, 15%) 50%, fade(@presenteUploaderColorHover, 15%) 75%,transparent 75%,transparent);
+ -webkit-background-size: 40px 40px;
+ background-size: 40px 40px;
+
+ -webkit-animation: progress-bar-stripes 2s linear infinite;
+ -o-animation: progress-bar-stripes 2s linear infinite;
+ animation: progress-bar-stripes 2s linear infinite;
+ pointer-events: none;
+ }
+
+ &-name,
+ &-actions {
+ vertical-align: middle;
+ }
+
+ &-name {
+ display: table-cell;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 11px;
+ font-weight: 600;
+ cursor: pointer;
+
+ .is-uploading & {
+ opacity: .4;
+ }
+
+ :not(.current) &:hover,
+ :not(.current) &:focus {
+ text-decoration: underline;
+ color: @presenteUploaderColorHover;
+ }
+ }
+
+ &-actions,
+ &-progress {
+ display: table-cell;
+ width: 65px;
+ text-align: right;
+ }
+
+ &-actions {
+ .is-uploading & {
+ display: none;
+ }
+
+ > i {
+ display: inline-block;
+ width: 30px;
+ height: 30px;
+ text-align: center;
+ cursor: pointer;
+ font-size: 20px;
+ line-height: 30px;
+ transition: background .3s;
+
+ &:focus,
+ &:hover {
+ color: @presenteUploaderColorHover;
+ }
+
+ &:active {
+ background-color: fade(@presenteUploaderColor, 5%);
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+ box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+ }
+ }
+ }
+
+ &-progress {
+ color: #3A82D4;
+ font-weight: bold;
+ }
+ }
}
}
+@-webkit-keyframes progress-bar-stripes {
+ from { background-position: 0 0; }
+ to { background-position: 40px 0; }
+}
+
+@keyframes progress-bar-stripes {
+ from { background-position: 0 0; }
+ to { background-position: 40px 0; }
+}
+
.presenter-whiteboard {
- height: calc(~'100% - 40px');
+ height: calc(~'100% - 2px');
+ //-2px is for something who is going of the canvas an generating scroll
+ padding-bottom: 60px;
}
.poll-whiteboard {
@@ -132,156 +467,58 @@
height: 100%;
}
-.presentationNavigationControls {
- width:54px;
- font-size:28px;
- float:right;
- margin-right:90px;
-}
-
.vertically-centered {
position: relative;
top: 50%;
transform: translateY(-50%);
}
-#controllers {
- width: 100%;
- height: 40px;
-}
-
-#switchSlideSection {
- display: block;
- margin-left: auto;
- margin-right: auto;
- width: 138px;
- height: 100%;
-}
-
-.switchSlideButton {
- outline: none;
- width: 50px;
- height: 100%;
- margin-bottom: 0;
- color: extract(@black, 1);
- background-color: extract(@white, 1);
- border: 1px solid extract(@lightGrey, 3);
- border-radius: 10px;
- padding: 0;
- &:hover {
- background-color: extract(@lightGrey, 3);
- color: extract(@black, 1);
- }
- &:focus {
- background-color: extract(@white, 1);
- color: extract(@black, 1);
- }
-}
-
-.previousSlide {
- float: left;
-}
-
-.nextSlide {
- float: right;
-}
-
-#presentationProgress {
- font-size: 25px;
-}
-
.whiteboardFullscreenButton {
- @media @desktop-landscape {
+ @media @desktop-landscape, @phone-landscape, @tablet-landscape,
+ @phone-portrait-with-keyboard, @phone-portrait, @desktop-portrait {
height: 50px;
width: 50px;
+ }
+ @media @desktop-landscape {
top: 5px;
right: 5px;
}
@media @phone-landscape {
- height: 45px;
- width: 45px;
- top: 5px;
- right: 5px;
+ top: 4px;
+ right: 4px;
}
@media @tablet-landscape {
- height: 50px;
- width: 50px;
top: 5px;
right: 5px;
}
@media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- width: 50px;
- top: 2px;
- right: 2px;
+ top: 4px;
+ right: 4px;
}
@media @tablet-portrait-with-keyboard, @tablet-portrait {
height: 53px;
width: 53px;
- top: 5px;
+ top: 3px;
+ line-height: 54px;
right: 5px;
}
@media @desktop-portrait {
- height: 50px;
- width: 50px;
top: 5px;
right: 5px;
}
}
-.raiseHandButton {
- @media @desktop-landscape {
- height: 40px;
- width: 40px;
- bottom: 5px;
- right: 5px;
- }
- @media @phone-landscape {
- height: 45px;
- width: 45px;
- bottom: 5px;
- right: 5px;
- }
- @media @tablet-landscape {
- height: 50px;
- width: 50px;
- bottom: 5px;
- right: 5px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- width: 50px;
- bottom: 2px;
- right: 2px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 53px;
- width: 53px;
- bottom: 5px;
- right: 5px;
- }
- @media @desktop-portrait {
- height: 40px;
- width: 40px;
- bottom: 5px;
- right: 5px;
- }
-}
-
.exitFullscreenButton {
top: 10px;
right: 10px;
- @media @landscape {
- height: 50px;
- width: 50px;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- height: 5%;
- width: 10%;
- }
+ height: 50px;
+ width: 50px;
}
.soaringButton {
+ @media @desktop-portrait{
+ margin-top: -60px;
+ }
position: absolute;
margin-bottom: 0;
padding: 0;
@@ -315,6 +552,8 @@
.iconChrome {
i {
font-size: 200%;
+ position: relative;
+ top: 1px;
}
}
@@ -324,18 +563,158 @@
}
}
+// Emojis FAB
+
.activeEmojiButton {
- background-color: #34495E;
+ background-color: #3896D3;
+ border: 2px solid #34495E;
+ svg {
+ position: relative;
+ top: -2px;
+ left: -2px;
+ }
+}
+
+.FABContainer {
+ &.closedFAB {
+ .activeEmojiButton,
+ .inactiveEmojiButton {
+ pointer-events: none;
+ cursor: default;
+ }
+ }
+}
+
+.FABTriggerButton, .inactiveEmojiButton {
+ background-color: #3896D3;
}
-.sl-fab-trigger, .inactiveEmojiButton {
+.FABTriggerButton:hover {
background-color: #3896D3;
}
-.sl-fab-btn:hover {
+.FABTriggerButton {
+ position: absolute;
+ right: 4px;
+ bottom: 4px;
+ @media @desktop-landscape, @phone-landscape, @tablet-landscape,
+ @phone-portrait-with-keyboard, @phone-portrait, @desktop-portrait {
+ height: 50px;
+ width: 50px;
+ }
+ @media @tablet-portrait-with-keyboard, @tablet-portrait {
+ height: 53px;
+ width: 53px;
+ }
+}
+
+.openedFAB {
+ .FABTriggerButton {
+ i {
+ opacity: 0.5;
+ }
+ }
+ button:nth-child(2), button:nth-child(3) {
+ animation: increaseOpacity 0.15s forwards;
+ }
+ button:nth-child(4), button:nth-child(5) {
+ animation: increaseOpacity 0.15s forwards;
+ animation-delay: 0.075s;
+ }
+ button:nth-child(6), button:nth-child(7) {
+ animation: increaseOpacity 0.15s forwards;
+ animation-delay: 0.15s;
+ }
+}
+
+.closedFAB {
+ button:nth-child(2), button:nth-child(3) {
+ animation: decreaseOpacity 0.15s forwards;
+ animation-delay: 0.15s;
+ }
+ button:nth-child(4), button:nth-child(5) {
+ animation: decreaseOpacity 0.15s forwards;
+ animation-delay: 0.075s;
+ }
+ button:nth-child(6), button:nth-child(7) {
+ animation: decreaseOpacity 0.15s forwards;
+ }
+}
+
+.FABContainer > button:nth-child(n + 2):hover {
background-color: #34495E;
}
-.sl-fab-trigger:hover {
- background-color: #3896D3;
+.FABContainer {
+ &.noPresentation{
+ right: 60px;
+ }
+ @media @mobile-portrait{
+ position: absolute;
+ bottom: 3px;
+ right: 0px;
+ height: 55px;
+ }
+ @media @tablet-portrait{
+ bottom: 3px;
+ right: 0px;
+ }
+ button {
+ padding: 0;
+ margin: 0;
+ font-size: 30px;
+ border-radius: 50%;
+ z-index: 100;
+ &:focus {
+ outline:0;
+ }
+ }
+ & > button:nth-child(n + 2) {
+ position: absolute;
+ height: 50px;
+ width: 50px;
+ opacity: 0;
+ }
+ & > button:nth-child(2) {
+ right: 70px;
+ bottom: 4px;
+ }
+ & > button:nth-child(3) {
+ right: 70px;
+ bottom: 59px;
+ }
+ & > button:nth-child(4) {
+ right: 130px;
+ bottom: 4px;
+ }
+ & > button:nth-child(5) {
+ right: 130px;
+ bottom: 59px;
+ }
+ & > button:nth-child(6) {
+ right: 190px;
+ bottom: 4px;
+ }
+ & > button:nth-child(7) {
+ right: 190px;
+ bottom: 59px;
+ }
+}
+
+.generateIncreaseOpacityAnimation (@i) when (@i < 105) {
+ @p: ~"@{i}%"; // local variable: iterator + a percent sign
+ @{p} {
+ opacity: @i * 0.01;
+ }
+ .generateIncreaseOpacityAnimation(@i + 5);
+}
+
+@keyframes increaseOpacity {
+ .generateIncreaseOpacityAnimation(0);
+}
+
+@keyframes decreaseOpacity {
+ 100% {
+ opacity: 0;
+ }
}
diff --git a/bigbluebutton-html5/app/client/views/chat/chat_bar.coffee b/bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
index ca40ff72c460d105a02d79ddafea936d46436b1c..38cabe186efac0c2d2b7a52fc7a9afa45d8b9ae8 100755
--- a/bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
+++ b/bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
@@ -53,14 +53,14 @@ Handlebars.registerHelper "autoscroll", ->
# true if the lock settings limit public chat and the current user is locked
Handlebars.registerHelper "publicChatDisabled", ->
userIsLocked = Meteor.Users.findOne({userId:getInSession 'userId'})?.user.locked
- publicChatIsDisabled = Meteor.Meetings.findOne({})?.roomLockSettings.disablePubChat
+ publicChatIsDisabled = Meteor.Meetings.findOne({})?.roomLockSettings.disablePublicChat
presenter = Meteor.Users.findOne({userId:getInSession 'userId'})?.user.presenter
return userIsLocked and publicChatIsDisabled and !presenter
# true if the lock settings limit private chat and the current user is locked
Handlebars.registerHelper "privateChatDisabled", ->
userIsLocked = Meteor.Users.findOne({userId:getInSession 'userId'})?.user.locked
- privateChatIsDisabled = Meteor.Meetings.findOne({})?.roomLockSettings.disablePrivChat
+ privateChatIsDisabled = Meteor.Meetings.findOne({})?.roomLockSettings.disablePrivateChat
presenter = Meteor.Users.findOne({userId:getInSession 'userId'})?.user.presenter
return userIsLocked and privateChatIsDisabled and !presenter
@@ -209,29 +209,6 @@ Template.message.helpers
minutes = "0" + minutes
hours + ":" + minutes
-Template.optionsFontSize.events
- "click #decreaseFontSize": (event) ->
- if getInSession("messageFontSize") is 8 # min
- $('#decreaseFontSize').disabled = true
- $('#decreaseFontSize').removeClass('icon fi-minus')
- $('#decreaseFontSize').html('MIN')
- else
- setInSession "messageFontSize", getInSession("messageFontSize") - 2
- if $('#increaseFontSize').html() is 'MAX'
- $('#increaseFontSize').html('')
- $('#increaseFontSize').addClass('icon fi-plus')
-
- "click #increaseFontSize": (event) ->
- if getInSession("messageFontSize") is 40 # max
- $('#increaseFontSize').disabled = true
- $('#increaseFontSize').removeClass('icon fi-plus')
- $('#increaseFontSize').html('MAX')
- else
- setInSession "messageFontSize", getInSession("messageFontSize") + 2
- if $('#decreaseFontSize').html() is 'MIN'
- $('#decreaseFontSize').html('')
- $('#decreaseFontSize').addClass('icon fi-minus')
-
# make links received from Flash client clickable in HTML
@toClickable = (str) ->
if typeof str is 'string'
diff --git a/bigbluebutton-html5/app/client/views/chat/chat_bar.html b/bigbluebutton-html5/app/client/views/chat/chat_bar.html
index b1ba1376c1b30f156a04f8426ca081443d4b9122..32b3b0b5cc45651205386ededa0938b9275f95f6 100755
--- a/bigbluebutton-html5/app/client/views/chat/chat_bar.html
+++ b/bigbluebutton-html5/app/client/views/chat/chat_bar.html
@@ -35,13 +35,13 @@
<div id="chatInput" class="chat-input-wrapper">
{{#if inPrivateChat}}
{{#if privateChatDisabled}}
- <textarea id="newMessageInput" class="disabledChat" placeholder="Private chat is temporarily locked (disabled)" rel="tooltip" data-placement="top" title="Private chat is temporarily locked" disabled></textarea>
+ <textarea id="newMessageInput" class="disabledChat" {{messageFontSize}} placeholder="Private chat is temporarily locked (disabled)" rel="tooltip" data-placement="top" title="Private chat is temporarily locked" disabled></textarea>
{{else}}
{{> chatInputControls}}
{{/if}}
{{else}}
{{#if publicChatDisabled}}
- <textarea id="newMessageInput" class="disabledChat" placeholder="Public chat is temporarily locked (disabled)" rel="tooltip" data-placement="top" title="Public chat is temporarily locked" disabled></textarea>
+ <textarea id="newMessageInput" class="disabledChat" {{messageFontSize}} placeholder="Public chat is temporarily locked (disabled)" rel="tooltip" data-placement="top" title="Public chat is temporarily locked" disabled></textarea>
{{else}}
{{> chatInputControls}}
{{/if}}
@@ -51,7 +51,7 @@
<template name="chatInputControls">
<div class="button-group radius">
- <textarea id="newMessageInput" rel="tooltip" data-placement="top" title="Write a new message"></textarea>
+ <textarea id="newMessageInput" {{messageFontSize}} rel="tooltip" data-placement="top" title="Write a new message"></textarea>
<input type="submit" id="sendMessageButton" class="button radius" rel="tooltip" data-placement="top" value="Send" />
</div>
</template>
@@ -75,16 +75,3 @@
<div style="color:{{colourToHex message.from_color}}">{{{sanitizeAndFormat message.message}}}</div>
{{autoscroll}}
</template>
-
-<template name="optionsFontSize">
- <fieldset class="desktopSettingsFieldset">
- <legend><span class="chatOptionsText" >Chat Message Font Size</span><br/></legend>
- <table id="fontSizeTable" align="center">
- <tr>
- <td>{{> makeButton id="decreaseFontSize" btn_class="displayButtons" i_class="fi-minus" rel="tooltip" title="Decrease Font Size"}}</td>
- <td id="displayLabel"><label class="fontSizeLabel" {{messageFontSize}} >Size({{getInSession "messageFontSize"}})</label></td>
- <td>{{> makeButton id="increaseFontSize" btn_class="displayButtons" i_class="fi-plus" rel="tooltip" title="Increase Font Size"}}</td>
- </tr>
- </table>
- </fieldset>
-</template>
diff --git a/bigbluebutton-html5/app/client/views/modals/modals.coffee b/bigbluebutton-html5/app/client/views/modals/modals.coffee
index e9d5c81eed386182683423539c11a21478186ee9..b09b8676167914abccb727213aa8fe98e2390b09 100755
--- a/bigbluebutton-html5/app/client/views/modals/modals.coffee
+++ b/bigbluebutton-html5/app/client/views/modals/modals.coffee
@@ -18,5 +18,32 @@ Template.settingsAudio.events
"click #joinMicrophone": (event) -> joinVoiceCall @, isListenOnly: false
Template.settingsModal.events
- "click .closeSettings": -> setInSession "messageFontSize", getInSession("tempFontSize")
- "click #saveSettings": -> $("#settingsModal").foundation('reveal', 'close');
+ "click #closeSettings": -> $("#settingsModal").foundation('reveal', 'close');
+
+Template.optionsFontSize.events
+ "click #decreaseFontSize": (event) ->
+ if getInSession("messageFontSize") is 8 # min
+ $('#decreaseFontSize').disabled = true
+ $('#decreaseFontSize').removeClass('icon fi-minus')
+ $('#decreaseFontSize').html('MIN')
+ else
+ setInSession "messageFontSize", getInSession("messageFontSize") - 2
+ adjustChatInputHeight()
+ setTimeout(scrollChatDown, 0)
+ if $('#increaseFontSize').html() is 'MAX'
+ $('#increaseFontSize').html('')
+ $('#increaseFontSize').addClass('icon fi-plus')
+
+ "click #increaseFontSize": (event) ->
+ if getInSession("messageFontSize") is 40 # max
+ $('#increaseFontSize').disabled = true
+ $('#increaseFontSize').removeClass('icon fi-plus')
+ $('#increaseFontSize').html('MAX')
+ else
+ setInSession "messageFontSize", getInSession("messageFontSize") + 2
+ adjustChatInputHeight()
+ setTimeout(scrollChatDown, 0)
+
+ if $('#decreaseFontSize').html() is 'MIN'
+ $('#decreaseFontSize').html('')
+ $('#decreaseFontSize').addClass('icon fi-minus')
diff --git a/bigbluebutton-html5/app/client/views/modals/modals.html b/bigbluebutton-html5/app/client/views/modals/modals.html
index b4863e2695deac5e6fc82d72c7d2432d19d5c623..fdff9a7178c40f943450e02b404981713d1552e9 100755
--- a/bigbluebutton-html5/app/client/views/modals/modals.html
+++ b/bigbluebutton-html5/app/client/views/modals/modals.html
@@ -1,24 +1,28 @@
<!-- listen only | microphone -->
<template name="settingsAudio">
<fieldset class="desktopSettingsFieldset">
- <legend>Audio Options</legend>
- {{#if amIInAudio}}
- {{#if amIListenOnlyAudio}}
- <!-- display listen only with exit -->
- {{> makeButton id="exitAudio" btn_class="exitAudio settingsButton joinAudioButton" i_class="ion-volume-mute" rel="tooltip"
- data_placement="bottom" title="Leave Audio Call"}}
+ <legend align="center">Audio Options</legend>
+ <div id="audioButtonContainer">
+ {{#if amIInAudio}}
+ {{#if amIListenOnlyAudio}}
+ <!-- display listen only with exit -->
+ {{> makeButton id="exitAudio" btn_class="exitAudio settingsButton joinAudioButton" i_class="ion-volume-mute" rel="tooltip"
+ data_placement="bottom" title="Leave Audio Call"}}
+ {{else}}
+ <!-- display microphone with exit -->
+ {{> makeButton id="exitAudio" btn_class="exitAudio settingsButton joinAudioButton" i_class="ion-volume-mute" rel="tooltip"
+ data_placement="bottom" title="Leave Audio Call"}}
+ {{/if}}
{{else}}
- <!-- display microphone with exit -->
- {{> makeButton id="exitAudio" btn_class="exitAudio settingsButton joinAudioButton" i_class="ion-volume-mute" rel="tooltip"
- data_placement="bottom" title="Leave Audio Call"}}
+ <!-- display both with join -->
+ {{#if canJoinWithMic}}
+ {{> makeButton id="joinMicrophone" btn_class="joinMicrophone settingsButton joinAudioButton" i_class="fi-microphone"
+ rel="tooltip" data_placement="bottom" title="Join Microphone"}}
+ {{/if}}
+ {{> makeButton id="joinListenOnly" btn_class="joinListenOnly settingsButton joinAudioButton" i_class="fi-volume"
+ rel="tooltip" data_placement="bottom" title="Join Listen only"}}
{{/if}}
- {{else}}
- <!-- display both with join -->
- {{> makeButton id="joinMicrophone" btn_class="joinMicrophone settingsButton joinAudioButton" i_class="fi-microphone"
- rel="tooltip" data_placement="bottom" title="Join Microphone"}}
- {{> makeButton id="joinListenOnly" btn_class="joinListenOnly settingsButton joinAudioButton" i_class="fi-volume"
- rel="tooltip" data_placement="bottom" title="Join Listen only"}}
- {{/if}}
+ </div>
</fieldset>
</template>
@@ -27,9 +31,6 @@
<p>
<span class="modalTitle">BigBlueButton Settings</span>
</p>
- <p>
- <a href="#" class="closeSettings close-reveal-modal">×</a>
- </p>
</div>
<div class="settingsBody">
@@ -39,8 +40,7 @@
</div>
<div class="bar bottomBar">
- <a href="#" class="closeSettings close-reveal-modal"><u>Cancel</u></a>
- {{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip" title="Save Changes" label="Save"}}
+ {{> makeButton id="closeSettings" btn_class="settingsButton vertically-centered" rel="tooltip" title="Close" label="Close"}}
</div>
</template>
@@ -49,3 +49,16 @@
{{> makeButton id="yes" btn_class="logoutButton" label="Yes"}}
{{> makeButton id="no" btn_class="logoutButton" label="No"}}
</template>
+
+<template name="optionsFontSize">
+ <fieldset class="desktopSettingsFieldset">
+ <legend align="center"><span class="chatOptionsText" >Chat Message Font Size</span><br/></legend>
+ <table id="fontSizeTable" align="center">
+ <tr>
+ <td>{{> makeButton id="decreaseFontSize" btn_class="displayButtons" i_class="fi-minus" rel="tooltip" title="Decrease Font Size"}}</td>
+ <td id="displayLabel"><label class="fontSizeLabel" {{messageFontSize}} >Size({{getInSession "messageFontSize"}})</label></td>
+ <td>{{> makeButton id="increaseFontSize" btn_class="displayButtons" i_class="fi-plus" rel="tooltip" title="Increase Font Size"}}</td>
+ </tr>
+ </table>
+ </fieldset>
+</template>
diff --git a/bigbluebutton-html5/app/client/views/users/user_item.coffee b/bigbluebutton-html5/app/client/views/users/user_item.coffee
index 944f0df771125974afb4f248711a240e10cce0a1..1efcbe23d80bc3c4f0e520865756d0eabfff6bbd 100755
--- a/bigbluebutton-html5/app/client/views/users/user_item.coffee
+++ b/bigbluebutton-html5/app/client/views/users/user_item.coffee
@@ -15,11 +15,11 @@ Template.displayUserIcons.helpers
# the user is set to be locked and there is a relevant lock in place
locked = BBB.getUser(userId)?.user.locked
settings = Meteor.Meetings.findOne()?.roomLockSettings
- lockInAction = settings.disablePrivChat or
+ lockInAction = settings.disablePrivateChat or
settings.disableCam or
settings.disableMic or
settings.lockedLayout or
- settings.disablePubChat
+ settings.disablePublicChat
return locked and lockInAction
# Opens a private chat tab when a username from the userlist is clicked
@@ -32,8 +32,7 @@ Template.usernameEntry.events
else
setInSession "inChatWith", userIdSelected
if isPortrait() or isPortraitMobile()
- toggleLeftDrawer()
- toggleLeftArrowClockwise()
+ toggleUserlistMenu()
toggleShield()
setTimeout () -> # waits until the end of execution queue
$("#newMessageInput").focus()
diff --git a/bigbluebutton-html5/app/client/views/users/user_item.html b/bigbluebutton-html5/app/client/views/users/user_item.html
index 0306d5ec96d46bfdbb35d299a8fdbfe6b2f4d04f..f554903a0d85d23f96972454e877c1283a8b246f 100755
--- a/bigbluebutton-html5/app/client/views/users/user_item.html
+++ b/bigbluebutton-html5/app/client/views/users/user_item.html
@@ -59,19 +59,19 @@
<template name="usernameEntry">
<div class="status">
{{#if equals user.emoji_status "happy"}}
- {{> slIcon name="happy-face" size="25"}}
+ {{> icon name="happy-face" size="25"}}
{{else}}
{{#if equals user.emoji_status "neutral"}}
- {{> slIcon name="neutral-face" size="25"}}
+ {{> icon name="neutral-face" size="25"}}
{{else}}
{{#if equals user.emoji_status "confused"}}
- {{> slIcon name="confused-face" size="25"}}
+ {{> icon name="confused-face" size="25"}}
{{else}}
{{#if equals user.emoji_status "sad"}}
- {{> slIcon name="sad-face" size="25"}}
+ {{> icon name="sad-face" size="25"}}
{{else}}
{{#if equals user.emoji_status "away"}}
- {{> slIcon name="clock" size="25"}}
+ {{> icon name="clock" size="25"}}
{{else}}
{{#if equals user.emoji_status "raiseHand"}}
<span rel="tooltip" data-placement="bottom" title="Lower your hand">
@@ -99,14 +99,14 @@
{{#if isCurrentUser userId}}
<span class="userCurrent usernameEntry {{#if hasGotUnreadMailClass 'PUBLIC_CHAT'}}gotUnreadMail{{/if}}" rel="tooltip" data-placement="bottom" title="{{user.name}} (you)">
- <span class="userName">{{user.name}} {{#if user.presenter}} (presenter) {{/if}} (you)</span>
+ <span class="userName">{{user.name}} (you)</span>
</span>
{{#if hasGotUnreadMailClass 'PUBLIC_CHAT' }}
<div class="unreadChatNumber">{{getNumberOfUnreadMessages 'PUBLIC_CHAT'}}</div>
{{/if}}
{{else}}
<span class="usernameEntry {{#if hasGotUnreadMailClass user.userid}}gotUnreadMail{{/if}}" rel="tooltip" data-placement="bottom" title="{{user.name}}">
- <span class="userName"> {{user.name}} {{#if user.presenter}} (presenter) {{/if}}</span>
+ <span class="userName"> {{user.name}}</span>
</span>
{{#if hasGotUnreadMailClass user.userid }}
<div class="unreadChatNumber">{{getNumberOfUnreadMessages user.userid}}</div>
diff --git a/bigbluebutton-html5/app/client/views/users/user_list.coffee b/bigbluebutton-html5/app/client/views/users/user_list.coffee
index 19fe70d5b07c0884725a325daf0d68ecfdcd266d..b8bc7b6be1b0e9c03dd73a32eb458ef0c98be4e1 100755
--- a/bigbluebutton-html5/app/client/views/users/user_list.coffee
+++ b/bigbluebutton-html5/app/client/views/users/user_list.coffee
@@ -6,7 +6,7 @@ Template.usersList.helpers
# do not display the label if there are just a few users
Template.usersList.rendered = ->
- $('.sl-left-drawer').resizable
+ $('.userlistMenu').resizable
handles: 'e'
maxWidth: 600
minWidth: 200
@@ -19,4 +19,4 @@ Template.usersList.rendered = ->
comp.stop()
if isPhone()
- $('.sl-left-drawer').addClass('hiddenInLandscape')
+ $('.userlistMenu').addClass('hiddenInLandscape')
diff --git a/bigbluebutton-html5/app/client/views/users/users_list.html b/bigbluebutton-html5/app/client/views/users/users_list.html
index ee3c5f8390ca8a51734fc110cfa994a0a33a30b9..9b4050ceaa458d204ec879e6903e2112bf8892ed 100755
--- a/bigbluebutton-html5/app/client/views/users/users_list.html
+++ b/bigbluebutton-html5/app/client/views/users/users_list.html
@@ -6,7 +6,7 @@
<div id="user-contents">
<div class="userlist ScrollableWindowY">
{{#each getUsersInMeeting}}
- <div id="content" class="sl-left-drawer-item">{{>userItem}}</div>
+ <div id="content" class="userItem">{{>userItem}}</div>
{{/each}}
</div>
</div>
diff --git a/bigbluebutton-html5/app/client/views/whiteboard/slide.coffee b/bigbluebutton-html5/app/client/views/whiteboard/slide.coffee
index 2ef35528cb0e2cc2af97deb2be78977eff860627..34e663945108f4ce477ee7b4295cc56e969ebb69 100755
--- a/bigbluebutton-html5/app/client/views/whiteboard/slide.coffee
+++ b/bigbluebutton-html5/app/client/views/whiteboard/slide.coffee
@@ -1,5 +1,6 @@
Template.slide.rendered = ->
currentSlide = getCurrentSlideDoc()
+
pic = new Image()
pic.onload = ->
setInSession 'slideOriginalWidth', this.width
@@ -20,6 +21,7 @@ Template.slide.rendered = ->
@displaySlide = (wpm) ->
currentSlide = getCurrentSlideDoc()
+
wpm.create()
adjustedDimensions = scaleSlide(getInSession('slideOriginalWidth'), getInSession('slideOriginalHeight'))
wpm._displayPage(currentSlide?.slide?.img_uri, getInSession('slideOriginalWidth'), getInSession('slideOriginalHeight'))
@@ -84,7 +86,7 @@ Template.slide.rendered = ->
else
adjustedWidth = boardWidth
- { width: adjustedWidth, height: adjustedHeight }
+ { width: adjustedWidth, height: adjustedHeight, boardWidth: boardWidth, boardHeight: boardHeight }
Template.slide.helpers
updatePointerLocation: (pointer) ->
diff --git a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
index 58adb75992d2789a8b8ac1204a473a70e08bc6f3..421fb5158e508d2f056b3a258de975a0008d2bc7 100755
--- a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
+++ b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
@@ -11,6 +11,7 @@ Template.whiteboard.helpers
currentPresentation = Meteor.Presentations.findOne({'presentation.current':true})
currentSlideNum = Meteor.Slides.findOne({'presentationId': currentPresentation?.presentation.id, 'slide.current':true})?.slide.num
totalSlideNum = Meteor.Slides.find({'presentationId': currentPresentation?.presentation.id})?.count()
+ console.log('slide', currentSlideNum)
if currentSlideNum isnt undefined
return "#{currentSlideNum}/#{totalSlideNum}"
else
@@ -21,6 +22,9 @@ Template.whiteboard.helpers
else
return false
+ hasNoPresentation: ->
+ Meteor.Presentations.findOne({'presentation.current':true})
+
Template.whiteboard.events
'click .whiteboardFullscreenButton': (event, template) ->
enterWhiteboardFullscreen()
@@ -33,63 +37,57 @@ Template.whiteboard.events
else if document.webkitExitFullscreen
document.webkitExitFullscreen()
- 'click .raiseHand': (event) ->
- BBB.raiseHand(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'))
-
- 'click .lowerHand': (event) ->
- BBB.lowerHand(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'))
-
'click .sadEmojiButton.inactiveEmojiButton': (event) ->
if $('.sadEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "sad")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
'click .happyEmojiButton.inactiveEmojiButton': (event) ->
if $('.happyEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "happy")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
'click .confusedEmojiButton.inactiveEmojiButton': (event) ->
if $('.confusedEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "confused")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
'click .neutralEmojiButton.inactiveEmojiButton': (event) ->
if $('.neutralEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "neutral")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
'click .awayEmojiButton.inactiveEmojiButton': (event) ->
if $('.awayEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "away")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
'click .raiseHandEmojiButton.inactiveEmojiButton': (event) ->
if $('.raiseHandEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "raiseHand")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
'click .activeEmojiButton': (event) ->
if $('.activeEmojiButton').css('opacity') is '1'
BBB.setEmojiStatus(BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken'), "none")
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
- 'click .sl-fab-trigger': (event) ->
- $('.sl-fab-trigger').blur()
- toggleFAB()
+ 'click .FABTriggerButton': (event) ->
+ $('.FABTriggerButton').blur()
+ toggleEmojisFAB()
-Template.presenterBottomControllers.events
- 'click .previousSlide':(event) ->
+Template.whiteboardControls.events
+ 'click .whiteboard-buttons-slide > .prev':(event) ->
BBB.goToPreviousPage()
- 'click .nextSlide':(event) ->
+ 'click .whiteboard-buttons-slide > .next':(event) ->
BBB.goToNextPage()
'click .switchSlideButton': (event) ->
@@ -107,10 +105,10 @@ Template.polling.rendered = ->
Template.polling.destroyed = ->
setTimeout(scaleWhiteboard, 0)
-Template.presenterBottomControllers.rendered = ->
+Template.whiteboardControls.rendered = ->
scaleWhiteboard()
-Template.presenterBottomControllers.destroyed = ->
+Template.whiteboardControls.destroyed = ->
setTimeout(scaleWhiteboard, 0)
Template.whiteboard.rendered = ->
@@ -132,3 +130,75 @@ Template.whiteboard.rendered = ->
Meteor.NotificationControl = new NotificationControl('notificationArea')
$(document).foundation() # initialize foundation javascript
+
+Template.presenterUploaderControl.created = ->
+ this.isOpen = new ReactiveVar(false);
+ this.files = new ReactiveList({
+ sort: (a, b) ->
+ # Put the ones who still uploading first
+ (a.isUploading == b.isUploading) ? 0 : a.isUploading ? -1 : 1;
+ });
+ this.presentations = Meteor.Presentations.find({},
+ {
+ sort: {'presentation.current': -1, 'presentation.name': 1}
+ fields: {'presentation': 1}
+ });
+
+fakeUpload = (file, list) ->
+ setTimeout (->
+ file.uploadedSize = file.uploadedSize + (Math.floor(Math.random() * file.size + file.uploadedSize)/10)
+ unless file.size > file.uploadedSize
+ file.uploadedSize = file.size
+ file.isUploading = false
+
+ list.update(file.name, file)
+
+ if file.isUploading == true
+ fakeUpload(file, list)
+ else
+ # TODO: Here we should remove and update te presentation on mongo
+ list.remove(file.name)
+ ), 200
+
+Template.presenterUploaderControl.events
+ 'click .js-open':(event, template) ->
+ template.isOpen.set(true);
+
+ 'click .js-close':(event, template) ->
+ template.isOpen.set(false);
+
+ 'dragover [data-dropzone]':(e) ->
+ e.preventDefault()
+ $(e.currentTarget).addClass('hover')
+
+ 'dragleave [data-dropzone]':(e) ->
+ e.preventDefault()
+ $(e.currentTarget).removeClass('hover')
+
+ 'drop [data-dropzone], change [data-dropzone] > input[type="file"]':(e, template) ->
+ e.preventDefault();
+ files = (e.originalEvent.dataTransfer || e.originalEvent.target).files
+
+ _.each(files, (file) ->
+ file.isUploading = true;
+ file.uploadedSize = 0;
+ file.percUploaded = 0;
+
+ template.files.insert(file.name, file)
+ fakeUpload(file, template.files)
+ )
+
+Template.presenterUploaderControl.helpers
+ isOpen: -> Template.instance().isOpen.get()
+ files: -> Template.instance().files.fetch()
+ presentations: -> Template.instance().presentations.fetch().map((x) -> x.presentation)
+
+Template.presenterUploaderControlFileListItem.helpers
+ percUploaded: -> Math.round((this.uploadedSize / this.size) * 100)
+
+Template.presenterUploaderControlPresentationListItem.events
+ 'click [data-action-show]':(event, template) ->
+ console.info('Should show the file `' + this.name + '`');
+
+ 'click [data-action-delete]':(event, template) ->
+ console.info('Should delete the file `' + this.name + '`');
diff --git a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
index 307cf6d8b510d78bc90ee87825d0b7829d39d8ea..df2ae7b2bcd980a4be0a133b64496fd7024a6ca4 100755
--- a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
+++ b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
@@ -1,59 +1,130 @@
<template name="whiteboard">
<div id="{{id}}" {{visibility name}} class="component">
- {{#each getCurrentSlide}}
+ {{#if getCurrentSlide}}
{{> slide}}
- {{/each}}
+ {{/if}}
<div id="whiteboard-container" class="{{whiteboardSize}}">
<div id="whiteboard-paper">
</div>
- <div class="sl-fab-container sl-left-hr-dbl-fab">
- <button type="submit" class="sl-fab-trigger">
- <i class="ion-plus-round"></i>
+ <!-- TODO: Move this to the whiteboardControls -->
+ <div class="FABContainer {{#unless hasNoPresentation}}noPresentation{{/unless}}">
+ <button type="submit" class="FABTriggerButton">
+ <i class="ion-android-hand"></i>
</button>
- <button type="submit" class="sl-fab-btn sadEmojiButton {{#if equals getCurrentUserEmojiStatus 'sad'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
- {{> slIcon name="sad-face" size="50"}}
+ <button type="submit" class="sadEmojiButton {{#if equals getCurrentUserEmojiStatus 'sad'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
+ {{> icon name="sad-face" size="50"}}
</button>
- <button type="submit" class="sl-fab-btn happyEmojiButton {{#if equals getCurrentUserEmojiStatus 'happy'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
- {{> slIcon name="happy-face" size="50"}}
+ <button type="submit" class="happyEmojiButton {{#if equals getCurrentUserEmojiStatus 'happy'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
+ {{> icon name="happy-face" size="50"}}
</button>
- <button type="submit" class="sl-fab-btn confusedEmojiButton {{#if equals getCurrentUserEmojiStatus 'confused'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
- {{> slIcon name="confused-face" size="50"}}
+ <button type="submit" class="confusedEmojiButton {{#if equals getCurrentUserEmojiStatus 'confused'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
+ {{> icon name="confused-face" size="50"}}
</button>
- <button type="submit" class="sl-fab-btn neutralEmojiButton {{#if equals getCurrentUserEmojiStatus 'neutral'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
- {{> slIcon name="neutral-face" size="50"}}
+ <button type="submit" class="neutralEmojiButton {{#if equals getCurrentUserEmojiStatus 'neutral'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
+ {{> icon name="neutral-face" size="50"}}
</button>
- <button type="submit" class="sl-fab-btn awayEmojiButton {{#if equals getCurrentUserEmojiStatus 'away'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
- {{> slIcon name="clock" size="50"}}
+ <button type="submit" class="awayEmojiButton {{#if equals getCurrentUserEmojiStatus 'away'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
+ {{> icon name="clock" size="50"}}
</button>
- <button type="submit" class="sl-fab-btn raiseHandEmojiButton {{#if equals getCurrentUserEmojiStatus 'raiseHand'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
+ <button type="submit" class="raiseHandEmojiButton {{#if equals getCurrentUserEmojiStatus 'raiseHand'}}activeEmojiButton{{else}}inactiveEmojiButton{{/if}}">
<i class="ion-android-hand"></i>
</button>
</div>
+
{{#if isMobile}}
{{> makeButton btn_class="soaringButton fullscreenButton whiteboardFullscreenButton" i_class="ion-arrow-expand"}}
{{/if}}
+
+ {{> whiteboardControls}}
</div>
{{#if isPollStarted}}
{{> polling}}
{{/if}}
- {{#if isCurrentUserPresenter}}
- {{> presenterBottomControllers}}
- {{/if}}
</div>
</template>
-<template name="presenterBottomControllers">
- <div id="controllers">
- <div id="switchSlideSection">
- {{> makeButton btn_class="switchSlideButton previousSlide" i_class="ion-arrow-left-a" rel="tooltip" data_placement="top" title="Previous"}}
- <span id="presentationProgress">
- {{presentationProgress}}
- </span>
- {{> makeButton btn_class="switchSlideButton nextSlide" i_class="ion-arrow-right-a" rel="tooltip" data_placement="top" title="Next"}}
+<template name="whiteboardControls">
+ <div id="whiteboard-controls">
+ <div class="whiteboard-buttons-left">
+ <!-- TODO: Adjust the presenter uploader for mobile views on iOS devices
+ you cant upload PDFs, only images from camera/gallery -->
+ {{#unless isMobile}}
+ {{> presenterUploaderControl}}
+ {{/unless}}
+ </div>
+ <div class="whiteboard-buttons-center">
+ {{#if isCurrentUserPresenter}}
+ <div class="whiteboard-buttons-slide">
+ {{> makeButton btn_class="prev" i_class="ion-arrow-left-a" rel="tooltip" data_placement="top" title="Previous"}}
+ <span class="current">
+ {{presentationProgress}}
+ </span>
+ {{> makeButton btn_class="next" i_class="ion-arrow-right-a" rel="tooltip" data_placement="top" title="Next"}}
+ </div>
+ {{/if}}
+ </div>
+ <div class="whiteboard-buttons-right">
</div>
</div>
</template>
+<template name="presenterUploaderControl">
+ {{#if isCurrentUserPresenter}}
+ <div class="presenter-uploader-control {{#if isOpen}}is-open{{/if}}">
+ <div class="presenter-uploader-container">
+ <ul class="presenter-uploader-file-list">
+ {{#each files}}
+ {{> presenterUploaderControlFileListItem}}
+ {{/each}}
+ {{#each presentations}}
+ {{> presenterUploaderControlPresentationListItem}}
+ {{/each}}
+ </ul>
+ <div class="presenter-uploader-dropzone" data-dropzone>
+ <input type="file" class="presenter-uploader-dropzone-fileinput" multiple />
+ <i class="presenter-uploader-dropzone-icon ion-archive"></i>
+ <span class="presenter-uploader-dropzone-label">Drop files here <br/>or click to upload</span>
+ </div>
+ <div class="presenter-uploader-tip">
+ Upload any office document or Portable Document Format (PDF) file.
+ <br/>
+ For best results upload PDF.
+ </div>
+ {{> makeButton btn_class="presenter-uploader-control-btn js-close" i_class="ion-ios-close-outline"}}
+ </div>
+
+ {{#unless isOpen}}
+ {{> makeButton btn_class="presenter-uploader-control-btn js-open" i_class="ion-ios-upload-outline"}}
+ {{/unless}}
+ </div>
+ {{/if}}
+</template>
+
+<template name="presenterUploaderControlFileListItem">
+ <li class="presenter-uploader-file-item is-uploading">
+ <span class="presenter-uploader-file-item-name">
+ {{name}}
+ </span>
+ <span class="presenter-uploader-file-item-progress">
+ {{percUploaded}}%
+ </span>
+ </li>
+</template>
+
+<template name="presenterUploaderControlPresentationListItem">
+ <li class="presenter-uploader-file-item {{#if current}}current{{/if}}">
+ <span class="presenter-uploader-file-item-name" data-action-show>
+ {{name}}
+ </span>
+ <span class="presenter-uploader-file-item-actions">
+ {{#unless current}}
+ <i class="ion-ios-eye-outline" data-action-show></i>
+ {{/unless}}
+ <i class="ion-ios-trash-outline" data-action-delete></i>
+ </span>
+ </li>
+</template>
+
<template name="polling">
<div class="polling">
{{#each getPollQuestions}}
diff --git a/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_paper.coffee b/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_paper.coffee
index 4e44655aa8f548582274d7cc86efb9cab2e2640c..76d6ed6d4a1a42a890ca7b4cda08d4bb5b4f1011 100755
--- a/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_paper.coffee
+++ b/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_paper.coffee
@@ -224,11 +224,17 @@ class Meteor.WhiteboardPaperModel
# Update the dimensions of the container.
_updateContainerDimensions: ->
- #console.log "update Container Dimensions"
-
$container = $('#whiteboard-paper')
- @containerWidth = $container.innerWidth()
- @containerHeight = $container.innerHeight()
+
+ containerDimensions = scaleSlide(getInSession('slideOriginalWidth'), getInSession('slideOriginalHeight'))
+ if($container.innerWidth() is 0)
+ @containerWidth = containerDimensions.boardWidth
+ else
+ @containerWidth = $container.innerWidth()
+ if($container.innerHeight() is 0)
+ @containerHeight = containerDimensions.boardHeight
+ else
+ @containerHeight = $container.innerHeight()
@containerOffsetLeft = $container.offset()?.left
@containerOffsetTop = $container.offset()?.top
@@ -307,11 +313,6 @@ class Meteor.WhiteboardPaperModel
boardHeight = @containerHeight
currentSlide = getCurrentSlideDoc()
-
- # TODO currentSlide undefined in some cases - will check later why
- imageWidth = boardWidth * (currentSlide?.slide.width_ratio/100) or boardWidth
- imageHeight = boardHeight * (currentSlide?.slide.height_ratio/100) or boardHeight
-
currentPresentation = Meteor.Presentations.findOne({"presentation.current": true})
presentationId = currentPresentation?.presentation?.id
currentSlideCursor = Meteor.Slides.find({"presentationId": presentationId, "slide.current": true})
diff --git a/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee b/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee
index f654017f7583c2a45a513a7198d1aad95d5b4092..dac65d411bb25e7084c72e95cdb59020fa865bf3 100755
--- a/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee
+++ b/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee
@@ -45,7 +45,8 @@ class @WhiteboardPollModel extends WhiteboardToolModel
if votesTotal is 0
textArray[i].push("0%")
else
- textArray[i].push(startingData.result[i].num_votes/votesTotal*100+"%")
+ percResult = startingData.result[i].num_votes/votesTotal*100;
+ textArray[i].push(Math.round(percResult) + "%")
#if coordinates are reversed - change them back
if x2 < x1
@@ -132,7 +133,7 @@ class @WhiteboardPollModel extends WhiteboardToolModel
#*****************************************************************************************************
#******************************************MAGIC NUMBER***********************************************
- #There is no automatic vertical centering in SVG.
+ #There is no automatic vertical centering in SVG.
#To center the text element we have to move it down by the half of its height.
#But every text element has its own padding by default.
#The height we receive by calling getBBox() includes padding, but the anchor point doesn't consider it.
@@ -268,7 +269,7 @@ calculateFontAndWidth = (textArray, calcFontSize, width, height, x, y) ->
if spanHeight > maxLineHeight
maxLineHeight = spanHeight
test = getRenderedTextSize(line[2], calcFontSize)
- spanWidth = test[0]
+ spanWidth = test[0]
spanHeight = test[1]
if spanWidth > maxRightWidth
maxRightWidth = spanWidth
diff --git a/bigbluebutton-html5/app/config.coffee b/bigbluebutton-html5/app/config.coffee
index bc41f22cdf4642a65bf1c9aaeafab3d4906cd2ad..f319522eaf784639042b54670dfbc911f2996764 100755
--- a/bigbluebutton-html5/app/config.coffee
+++ b/bigbluebutton-html5/app/config.coffee
@@ -20,11 +20,14 @@ config.lockOnJoin = true
config.app = {}
#default font sizes for mobile / desktop
-config.app.mobileFont = 24
-config.app.desktopFont = 14
+config.app.mobileFont=16
+config.app.desktopFont=14
# Will offer the user to join the audio when entering the meeting
config.app.autoJoinAudio = false
+config.app.listenOnly = false
+config.app.skipCheck = false
+
# The amount of time the client will wait before making another call to successfully hangup the WebRTC conference call
config.app.WebRTCHangupRetryInterval = 2000
diff --git a/bigbluebutton-html5/app/lib/router.coffee b/bigbluebutton-html5/app/lib/router.coffee
index 7b52cae94fc26a39e871b937823de0f35ecbd675..54949b2b48a3b10286cb57796277a48016d0af6d 100755
--- a/bigbluebutton-html5/app/lib/router.coffee
+++ b/bigbluebutton-html5/app/lib/router.coffee
@@ -4,11 +4,14 @@
# this is how we handle login attempts
@route "main",
path: "/html5client/:meeting_id/:user_id/:auth_token"
+ where: "client"
onBeforeAction: ->
meetingId = @params.meeting_id
userId = @params.user_id
authToken = @params.auth_token
+ setInSession("loginUrl", @originalUrl)
+
# catch if any of the user's meeting data is invalid
if not authToken? or not meetingId? or not userId?
# if their data is invalid, redirect the user to the logout page
@@ -31,6 +34,7 @@
# the user successfully logged in
@route "signedin",
path: "/html5client"
+ where: "client"
action: ->
meetingId = getInSession "meetingId"
userId = getInSession "userId"
@@ -38,15 +42,15 @@
onErrorFunction = (error, result) ->
console.log "ONERRORFUNCTION"
- #if error
- # # Was unable to authorize the user. Redirect to the home page
- # # alert error.reason
#make sure the user is not let through
Meteor.call("userLogout", meetingId, userId, authToken)
- clearSessionVar (alert "Please sign in again")
- document.location = getInSession('logoutURL') or '/'
+ clearSessionVar()
+
+ # Attempt to log back in
+ unless error?
+ window.location.href = getInSession('loginUrl') or getInSession('logoutURL')
return
Meteor.subscribe 'chat', meetingId, userId, authToken, onError: onErrorFunction, onReady: =>
@@ -57,7 +61,8 @@
Meteor.subscribe 'users', meetingId, userId, authToken, onError: onErrorFunction, onReady: =>
Meteor.subscribe 'whiteboard-clean-status', meetingId, onReady: =>
Meteor.subscribe 'bbb_poll', meetingId, userId, authToken, onReady: =>
- # done subscribing
+ # done subscribing, start rendering the client and set default settings
+ @render('main')
onLoadComplete()
handleLogourUrlError = () ->
@@ -81,7 +86,7 @@
a.fail (data, textStatus, errorThrown) ->
handleLogourUrlError()
- @render('main')
+ @render('loading')
# endpoint - is the html5client running (ready to handle a user)
diff --git a/bigbluebutton-html5/app/server/collection_methods/chat.coffee b/bigbluebutton-html5/app/server/collection_methods/chat.coffee
index 70c5b2b41c69e6626ad4a9cdc20ac6aa17487a12..d93c70448aabb5306106184d9e761e17e821b871 100755
--- a/bigbluebutton-html5/app/server/collection_methods/chat.coffee
+++ b/bigbluebutton-html5/app/server/collection_methods/chat.coffee
@@ -49,7 +49,12 @@ Meteor.methods
if messageObject.from_userid? and messageObject.to_userid?
messageObject.message = translateFlashToHTML5(messageObject.message)
- entry =
+ id = Meteor.Chat.upsert({
+ meetingId:meetingId
+ 'message.message': messageObject.message
+ 'message.from_time': messageObject.from_time
+ 'message.from_userid': messageObject.from_userid
+ }, {
meetingId: meetingId
message:
chat_type: messageObject.chat_type
@@ -62,9 +67,12 @@ Meteor.methods
from_time: messageObject.from_time
from_username: messageObject.from_username
from_lang: messageObject.from_lang
-
- id = Meteor.Chat.insert(entry)
- Meteor.log.info "added chat id=[#{id}]:#{messageObject.message}." #" Chat.size is now #{Meteor.Chat.find({meetingId: meetingId}).count()}"
+ }, (err, numChanged) ->
+ if err?
+ Meteor.log.error "_error #{err} when adding chat to collection"
+ if numChanged.insertedId?
+ Meteor.log.info "_added chat id=[#{numChanged.insertedId}]
+ #{messageObject.from_username} to #{'PUBLIC' if messageObject.to_username?}:#{messageObject.message}")
# called on server start and meeting end
@clearChatCollection = (meetingId) ->
diff --git a/bigbluebutton-html5/app/server/collection_methods/meetings.coffee b/bigbluebutton-html5/app/server/collection_methods/meetings.coffee
index 00d2acc142efe5e23352737a0ff19d82871e0d02..3f5de78916afab8f77aa0fde0ddb2414b30cb1cc 100755
--- a/bigbluebutton-html5/app/server/collection_methods/meetings.coffee
+++ b/bigbluebutton-html5/app/server/collection_methods/meetings.coffee
@@ -1,39 +1,48 @@
# --------------------------------------------------------------------------------------------
# Private methods on server
# --------------------------------------------------------------------------------------------
-@addMeetingToCollection = (meetingId, name, intendedForRecording, voiceConf, duration) ->
- #check if the meeting is already in the collection
- unless Meteor.Meetings.findOne({meetingId: meetingId})?
- entry =
- meetingId: meetingId
- meetingName: name
- intendedForRecording: intendedForRecording
- currentlyBeingRecorded: false # defaut value
- voiceConf: voiceConf
- duration: duration
- roomLockSettings:
- # by default the lock settings will be disabled on meeting create
- disablePrivChat: false
- disableCam: false
- disableMic: false
- lockOnJoin: Meteor.config.lockOnJoin
- lockedLayout: false
- disablePubChat: false
-
- id = Meteor.Meetings.insert(entry)
- Meteor.log.info "added meeting _id=[#{id}]:meetingId=[#{meetingId}]:name=[#{name}]:duration=[#{duration}]:voiceConf=[#{voiceConf}]
- roomLockSettings:[#{JSON.stringify entry.roomLockSettings}]."
+
+@addMeetingToCollection = (meetingId, name, intendedForRecording, voiceConf, duration, callback) ->
+ #check if the meeting is already in the collection
+
+ obj = Meteor.Meetings.upsert({meetingId:meetingId}, {$set: {
+ meetingName:name
+ intendedForRecording: intendedForRecording
+ currentlyBeingRecorded: false # default value
+ voiceConf: voiceConf
+ duration: duration
+ roomLockSettings:
+ # by default the lock settings will be disabled on meeting create
+ disablePrivateChat: false
+ disableCam: false
+ disableMic: false
+ lockOnJoin: Meteor.config.lockOnJoin
+ lockedLayout: false
+ disablePublicChat: false
+ lockOnJoinConfigurable: false # TODO
+ }}, (err, numChanged) =>
+ if numChanged.insertedId?
+ funct = (cbk) ->
+ Meteor.log.info "__added MEETING #{meetingId}"
+ cbk()
+ funct(callback)
+ else
+ Meteor.log.error "nothing happened"
+ callback()
+ )
+
@clearMeetingsCollection = (meetingId) ->
if meetingId?
- Meteor.Meetings.remove({meetingId: meetingId}, Meteor.log.info "cleared Meetings Collection (meetingId: #{meetingId}!")
+ Meteor.Meetings.remove({meetingId: meetingId},
+ Meteor.log.info "cleared Meetings Collection (meetingId: #{meetingId}!")
else
Meteor.Meetings.remove({}, Meteor.log.info "cleared Meetings Collection (all meetings)!")
#clean up upon a meeting's end
-@removeMeetingFromCollection = (meetingId) ->
+@removeMeetingFromCollection = (meetingId, callback) ->
if Meteor.Meetings.findOne({meetingId: meetingId})?
Meteor.log.info "end of meeting #{meetingId}. Clear the meeting data from all collections"
# delete all users in the meeting
@@ -53,6 +62,16 @@
# delete the meeting
clearMeetingsCollection(meetingId)
+
+ callback()
+ else
+ funct = (localCallback) ->
+ Meteor.log.error ("Error! There was no such meeting #{meetingId}")
+ localCallback()
+ funct(callback)
+
+
+
# --------------------------------------------------------------------------------------------
# end Private methods on server
# --------------------------------------------------------------------------------------------
diff --git a/bigbluebutton-html5/app/server/collection_methods/presentations.coffee b/bigbluebutton-html5/app/server/collection_methods/presentations.coffee
index 0b9f3085b9c2c3f64d0804622b91b2903cdb9ee1..c3f8a889d8465bff317d95056b0224926bfee466 100755
--- a/bigbluebutton-html5/app/server/collection_methods/presentations.coffee
+++ b/bigbluebutton-html5/app/server/collection_methods/presentations.coffee
@@ -14,15 +14,12 @@ Meteor.methods
"slide.num" : currentSlideDoc?.slide.num-1})
if previousSlideDoc? and isAllowedTo('switchSlide', meetingId, userId, authToken)
- newPage = previousSlideDoc.slide.id
message =
"payload":
- "page":
- "id": previousSlideDoc.slide.id
+ "page": previousSlideDoc.slide.id
"meeting_id": meetingId
"header":
- "timestamp": new Date().getTime()
- "name": "presentation_page_changed_message"
+ "name": "go_to_slide"
publish Meteor.config.redis.channels.toBBBApps.presentation, message
@@ -41,15 +38,12 @@ Meteor.methods
"slide.num" : currentSlideDoc?.slide.num+1})
if nextSlideDoc? and isAllowedTo('switchSlide', meetingId, userId, authToken)
- newPage = nextSlideDoc.slide.id
message =
"payload":
- "page":
- "id": nextSlideDoc.slide.id
+ "page": nextSlideDoc.slide.id
"meeting_id": meetingId
"header":
- "timestamp": new Date().getTime()
- "name": "presentation_page_changed_message"
+ "name": "go_to_slide"
publish Meteor.config.redis.channels.toBBBApps.presentation, message
@@ -78,6 +72,7 @@ Meteor.methods
if meetingId? and presentationId? and Meteor.Presentations.findOne({meetingId: meetingId, "presentation.id": presentationId})?
id = Meteor.Presentations.findOne({meetingId: meetingId, "presentation.id": presentationId})
if id?
+ Meteor.Slides.remove({presentationId: presentationId}, Meteor.log.info "cleared Slides Collection (presentationId: #{presentationId}!")
Meteor.Presentations.remove(id._id)
Meteor.log.info "----removed presentation[" + presentationId + "] from " + meetingId
diff --git a/bigbluebutton-html5/app/server/collection_methods/shapes.coffee b/bigbluebutton-html5/app/server/collection_methods/shapes.coffee
index 94ac6d69e87babab5190af8549361855e902dc7f..5be009add6ffaa81436a1b22e8a5b771c26ecc09 100755
--- a/bigbluebutton-html5/app/server/collection_methods/shapes.coffee
+++ b/bigbluebutton-html5/app/server/collection_methods/shapes.coffee
@@ -89,7 +89,7 @@
# called on server start and meeting end
@clearShapesCollection = (meetingId) ->
if meetingId?
- Meteor.Shapes.remove {}, ->
+ Meteor.Shapes.remove {meetingId: meetingId}, ->
Meteor.log.info "cleared Shapes Collection (meetingId: #{meetingId}!"
Meteor.WhiteboardCleanStatus.update({meetingId: meetingId}, {$set: {in_progress: false}})
else
diff --git a/bigbluebutton-html5/app/server/collection_methods/users.coffee b/bigbluebutton-html5/app/server/collection_methods/users.coffee
index 24f1c308e2721dd17ff0ad5d4ef2f80a8abbb767..7b84566b1946e893400852c1d493d0b1b56d795d 100755
--- a/bigbluebutton-html5/app/server/collection_methods/users.coffee
+++ b/bigbluebutton-html5/app/server/collection_methods/users.coffee
@@ -139,16 +139,71 @@ Meteor.methods
# Received information from BBB-Apps that a user left
# Need to update the collection
# params: meetingid, userid as defined in BBB-Apps
-@markUserOffline = (meetingId, userId) ->
+# callback
+@markUserOffline = (meetingId, userId, callback) ->
# mark the user as offline. remove from the collection on meeting_end #TODO
- Meteor.log.info "marking user [#{userId}] as offline in meeting[#{meetingId}]"
- Meteor.Users.update({'meetingId': meetingId, 'userId': userId}, {$set:{'user.connection_status':'offline'}})
+ user = Meteor.Users.findOne({meetingId: meetingId, userId: userId})
+ if user?.clientType is "HTML5"
+ Meteor.log.info "marking html5 user [#{userId}] as offline in meeting[#{meetingId}]"
+ Meteor.Users.update({meetingId: meetingId, userId: userId}, {$set:{
+ 'user.connection_status':'offline'
+ 'voiceUser.talking': false
+ 'voiceUser.joined': false
+ 'voiceUser.muted': false
+ 'user.time_of_joining': 0
+ 'user.listenOnly': false
+ }}, (err, numChanged) ->
+ if err?
+ Meteor.log.error "_unsucc update (mark as offline) of user #{user?.user.name} #{userId}
+ err=#{JSON.stringify err}"
+ callback()
+ else
+ funct = (cbk) ->
+ Meteor.log.info "_marking as offline html5 user #{user?.user.name}
+ #{userId} numChanged=#{numChanged}"
+ cbk()
+
+ funct(callback)
+ )
+ else
+ Meteor.Users.remove({meetingId: meetingId, userId: userId}, (err, numDeletions) ->
+ if err?
+ Meteor.log.error "_unsucc deletion of user #{user?.user.name} #{userId}
+ err=#{JSON.stringify err}"
+ callback()
+ else
+ funct = (cbk) ->
+ Meteor.log.info "_deleting info for user #{user?.user.name} #{userId}
+ numDeletions=#{numDeletions}"
+ cbk()
+
+ funct(callback)
+ )
+
# Corresponds to a valid action on the HTML clientside
# After authorization, publish a user_leaving_request in redis
# params: meetingid, userid as defined in BBB-App
@requestUserLeaving = (meetingId, userId) ->
- if Meteor.Users.findOne({'meetingId': meetingId, 'userId': userId})?
+ userObject = Meteor.Users.findOne({'meetingId': meetingId, 'userId': userId})
+ voiceConf = Meteor.Meetings.findOne({meetingId:meetingId})?.voiceConf
+ if userObject? and voiceConf? and userId? and meetingId?
+
+ # end listenOnly audio for the departing user
+ if userObject.user.listenOnly
+ listenOnlyMessage =
+ payload:
+ userid: userId
+ meeting_id: meetingId
+ voice_conf: voiceConf
+ name: userObject.user.name
+ header:
+ timestamp: new Date().getTime()
+ name: "user_disconnected_from_global_audio"
+
+ publish Meteor.config.redis.channels.toBBBApps.meeting, listenOnlyMessage
+
+ # remove user from meeting
message =
payload:
meeting_id: meetingId
@@ -156,39 +211,76 @@ Meteor.methods
header:
timestamp: new Date().getTime()
name: "user_leaving_request"
- version: "0.0.1"
- if userId? and meetingId?
- Meteor.log.info "sending a user_leaving_request for #{meetingId}:#{userId}"
- publish Meteor.config.redis.channels.toBBBApps.users, message
- else
- Meteor.log.info "did not have enough information to send a user_leaving_request"
+ Meteor.log.info "sending a user_leaving_request for #{meetingId}:#{userId}"
+ publish Meteor.config.redis.channels.toBBBApps.users, message
+ else
+ Meteor.log.info "did not have enough information to send a user_leaving_request"
+
#update a voiceUser - a helper method
-@updateVoiceUser = (meetingId, voiceUserObject) ->
+@updateVoiceUser = (meetingId, voiceUserObject, callback) ->
u = Meteor.Users.findOne userId: voiceUserObject.web_userid
if u?
if voiceUserObject.talking?
- Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid}, {$set: {'user.voiceUser.talking':voiceUserObject.talking}}) # talking
+ Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid},
+ {$set: {'user.voiceUser.talking':voiceUserObject.talking}},
+ (err, numChanged) ->
+ if err?
+ Meteor.log.error "_unsucc update of voiceUser #{voiceUserObject.web_userid}
+ [talking] err=#{JSON.stringify err}"
+ callback()
+ ) # talking
if voiceUserObject.joined?
- Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid}, {$set: {'user.voiceUser.joined':voiceUserObject.joined}}) # joined
+ Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid},
+ {$set: {'user.voiceUser.joined':voiceUserObject.joined}},
+ (err, numChanged) ->
+ if err?
+ Meteor.log.error "_unsucc update of voiceUser #{voiceUserObject.web_userid}
+ [joined] err=#{JSON.stringify err}"
+ callback()
+ ) # joined
if voiceUserObject.locked?
- Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid}, {$set: {'user.voiceUser.locked':voiceUserObject.locked}}) # locked
+ Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid},
+ {$set: {'user.voiceUser.locked':voiceUserObject.locked}},
+ (err, numChanged) ->
+ if err?
+ Meteor.log.error "_unsucc update of voiceUser #{voiceUserObject.web_userid}
+ [locked] err=#{JSON.stringify err}"
+ callback()
+ ) # locked
if voiceUserObject.muted?
- Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid}, {$set: {'user.voiceUser.muted':voiceUserObject.muted}}) # muted
+ Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid},
+ {$set: {'user.voiceUser.muted':voiceUserObject.muted}},
+ (err, numChanged) ->
+ if err?
+ Meteor.log.error "_unsucc update of voiceUser #{voiceUserObject.web_userid}
+ [muted] err=#{JSON.stringify err}"
+ callback()
+ ) # muted
if voiceUserObject.listen_only?
- Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid}, {$set: {'user.listenOnly':voiceUserObject.listen_only}}) # listenOnly
+ Meteor.Users.update({meetingId: meetingId ,userId: voiceUserObject.web_userid},
+ {$set: {'user.listenOnly':voiceUserObject.listen_only}},
+ (err, numChanged) ->
+ if err?
+ Meteor.log.error "_unsucc update of voiceUser #{voiceUserObject.web_userid}
+ [listenOnly] err=#{JSON.stringify err}"
+ callback()
+ ) # listenOnly
else
Meteor.log.error "ERROR! did not find such voiceUser!"
+ callback()
-@userJoined = (meetingId, user) ->
+@userJoined = (meetingId, user, callback) ->
userId = user.userid
u = Meteor.Users.findOne({userId:user.userid, meetingId: meetingId})
- # the collection already contains an entry for this user because
- # we added a dummy user on register_user_message (to save authToken)
- if u?
- Meteor.log.info "UPDATING USER #{user.userid}, authToken=#{u.authToken}, locked=#{user.locked}"
+ # the collection already contains an entry for this user
+ # because the user is reconnecting OR
+ # in the case of an html5 client user we added a dummy user on
+ # register_user_message (to save authToken)
+ if u? and u.authToken?
+
Meteor.Users.update({userId:user.userid, meetingId: meetingId}, {$set:{
user:
userid: user.userid
@@ -196,14 +288,12 @@ Meteor.methods
name: user.name
_sort_name: user.name.toLowerCase()
phone_user: user.phone_user
- emoji_status: user.emoji_status
set_emoji_time: user.set_emoji_time
emoji_status: user.emoji_status
has_stream: user.has_stream
role: user.role
listenOnly: user.listenOnly
extern_userid: user.extern_userid
- permissions: user.permissions
locked: user.locked
time_of_joining: user.timeOfJoining
connection_status: "online" # TODO consider other default value
@@ -217,37 +307,52 @@ Meteor.methods
locked: user.voiceUser.locked
muted: user.voiceUser.muted
webcam_stream: user.webcam_stream
- }})
-
- # only add the welcome message if it's not there already
- unless Meteor.Chat.findOne({"message.chat_type":'SYSTEM_MESSAGE', "message.to_userid": userId})?
- welcomeMessage = Meteor.config.defaultWelcomeMessage
- .replace /%%CONFNAME%%/, Meteor.Meetings.findOne({meetingId: meetingId})?.meetingName
- welcomeMessage = welcomeMessage + Meteor.config.defaultWelcomeMessageFooter
-
- # store the welcome message in chat for easy display on the client side
- Meteor.Chat.insert(
- meetingId: meetingId
- message:
- chat_type: "SYSTEM_MESSAGE"
- message: welcomeMessage
- from_color: '0x3399FF'
- to_userid: userId
- from_userid: "SYSTEM_MESSAGE"
- from_username: ""
- from_time: user.timeOfJoining?.toString()
- )
- Meteor.log.info "added a system message in chat for user #{userId}"
+ }}, (err) ->
+ if err?
+ Meteor.log.error "_error #{err} when trying to insert user #{userId}"
+ callback()
+ else
+ funct = (cbk) ->
+ Meteor.log.info "_(case1) UPDATING USER #{user.userid}, authToken=
+ #{u.authToken}, locked=#{user.locked}, username=#{user.name}"
+ cbk()
+
+ funct(callback)
+ )
+
+ welcomeMessage = Meteor.config.defaultWelcomeMessage
+ .replace /%%CONFNAME%%/, Meteor.Meetings.findOne({meetingId: meetingId})?.meetingName
+ welcomeMessage = welcomeMessage + Meteor.config.defaultWelcomeMessageFooter
+ # add the welcome message if it's not there already OR update time_of_joining
+ Meteor.Chat.upsert({
+ meetingId: meetingId
+ userId: userId
+ 'message.chat_type': 'SYSTEM_MESSAGE'
+ 'message.to_userid': userId
+ }, {
+ meetingId: meetingId
+ userId: userId
+ message:
+ chat_type: 'SYSTEM_MESSAGE'
+ message: welcomeMessage
+ from_color: '0x3399FF'
+ to_userid: userId
+ from_userid: 'SYSTEM_MESSAGE'
+ from_username: ''
+ from_time: user.timeOfJoining?.toString()
+ }, (err) ->
+ if err?
+ Meteor.log.error "_error #{err} when trying to insert welcome message for #{userId}"
+ else
+ Meteor.log.info "_added/updated a system message in chat for user #{userId}"
+ # note that we already called callback() when updating the user. Adding
+ # the welcome message in the chat is not as vital and we can afford to
+ # complete it when possible, without blocking the serial event messages processing
+ )
else
- # scenario: there are meetings running at the time when the meteor
- # process starts. As a result we the get_users_reply message contains
- # users for which we have not observed user_registered_message and
- # hence we do not have the auth_token. There will be permission issues
- # as the server collection does not have the auth_token of such users
- # and cannot authorize their client side actions
- Meteor.log.info "NOTE: got user_joined_message "
- entry =
+ # Meteor.log.info "NOTE: got user_joined_message #{user.name} #{user.userid}"
+ Meteor.Users.upsert({meetingId: meetingId, userId: userId}, {
meetingId: meetingId
userId: userId
user:
@@ -262,7 +367,6 @@ Meteor.methods
role: user.role
listenOnly: user.listenOnly
extern_userid: user.extern_userid
- permissions: user.permissions
locked: user.locked
time_of_joining: user.timeOfJoining
connection_status: "" # TODO consider other default value
@@ -276,51 +380,65 @@ Meteor.methods
locked: user.voiceUser.locked
muted: user.voiceUser.muted
webcam_stream: user.webcam_stream
+ }, (err, numChanged) ->
+ if numChanged.insertedId?
+ funct = (cbk) ->
+ Meteor.log.info "_joining user (case2) userid=[#{userId}]:#{user.name}.
+ Users.size is now #{Meteor.Users.find({meetingId: meetingId}).count()}"
+ cbk()
+
+ funct(callback)
+ else
+ callback()
+ )
+
- id = Meteor.Users.insert(entry)
- Meteor.log.info "joining user userid=[#{userId}], id=[#{id}]:#{user.name}. Users.size is now #{Meteor.Users.find({meetingId: meetingId}).count()}"
@createDummyUser = (meetingId, userId, authToken) ->
if Meteor.Users.findOne({userId:userId, meetingId: meetingId, authToken:authToken})?
- Meteor.log.info "html5 user userid:[#{userId}] from [#{meetingId}] tried to revalidate token"
+ Meteor.log.info "html5 user userId:[#{userId}] from [#{meetingId}] tried to revalidate token"
else
- entry =
+ Meteor.Users.insert({
meetingId: meetingId
userId: userId
authToken: authToken
clientType: "HTML5"
validated: false #will be validated on validate_auth_token_reply
-
- id = Meteor.Users.insert(entry)
- Meteor.log.info "added user dummy html5 user with: userid=[#{userId}], id=[#{id}]
+ }, (err, id) ->
+ Meteor.log.info "_added a dummy html5 user with: userId=[#{userId}]
Users.size is now #{Meteor.Users.find({meetingId: meetingId}).count()}"
-
+ )
# when new lock settings including disableMic are set,
# all viewers that are in the audio bridge with a mic should be muted and locked
@handleLockingMic = (meetingId, newSettings) ->
# send mute requests for the viewer users joined with mic
for u in Meteor.Users.find({
- meetingId:meetingId
- 'user.role':'VIEWER'
- 'user.listenOnly':false
- 'user.locked':true
- 'user.voiceUser.joined':true
- 'user.voiceUser.muted':false})?.fetch()
- Meteor.log.error u.user.name #
+ meetingId:meetingId
+ 'user.role':'VIEWER'
+ 'user.listenOnly':false
+ 'user.locked':true
+ 'user.voiceUser.joined':true
+ 'user.voiceUser.muted':false})?.fetch()
+ # Meteor.log.info u.user.name #
Meteor.call('muteUser', meetingId, u.userId, u.userId, u.authToken, true) #true for muted
# change the locked status of a user (lock settings)
@setUserLockedStatus = (meetingId, userId, isLocked) ->
- if Meteor.Users.findOne({userId:userId, meetingId: meetingId})?
- Meteor.Users.update({userId:userId, meetingId: meetingId}, {$set:{'user.locked': isLocked}})
-
+ u = Meteor.Users.findOne({meetingId:meetingId, userId:userId})
+ if u?
+ Meteor.Users.update({userId:userId, meetingId: meetingId},
+ {$set:{'user.locked': isLocked}},
+ (err, numChanged) ->
+ if err?
+ Meteor.log.error "_error #{err} while updating user #{userId} with lock settings"
+ else
+ Meteor.log.info "_setting user locked status for userid:[#{userId}] from [#{meetingId}] locked=#{isLocked}"
+ )
# if the user is sharing audio, he should be muted upon locking involving disableMic
- u = Meteor.Users.findOne({meetingId:meetingId, userId:userId})
if u.user.role is 'VIEWER' and !u.user.listenOnly and u.user.voiceUser.joined and !u.user.voiceUser.muted and isLocked
Meteor.call('muteUser', meetingId, u.userId, u.userId, u.authToken, true) #true for muted
- Meteor.log.info "setting user locked status for userid:[#{userId}] from [#{meetingId}] locked=#{isLocked}"
else
Meteor.log.error "(unsuccessful-no such user) setting user locked status for userid:[#{userId}] from [#{meetingId}] locked=#{isLocked}"
@@ -328,6 +446,16 @@ Meteor.methods
# called on server start and on meeting end
@clearUsersCollection = (meetingId) ->
if meetingId?
- Meteor.Users.remove({meetingId: meetingId}, Meteor.log.info "cleared Users Collection (meetingId: #{meetingId}!")
+ Meteor.Users.remove({meetingId: meetingId}, (err) ->
+ if err?
+ Meteor.log.error "_error #{JSON.stringify err} while removing users from meeting #{meetingId}"
+ else
+ Meteor.log.info "_cleared Users Collection (meetingId: #{meetingId})!"
+ )
else
- Meteor.Users.remove({}, Meteor.log.info "cleared Users Collection (all meetings)!")
+ Meteor.Users.remove({}, (err) ->
+ if err?
+ Meteor.log.error "_error #{JSON.stringify err} while removing users from all meetings!"
+ else
+ Meteor.log.info "_cleared Users Collection (all meetings)!"
+ )
diff --git a/bigbluebutton-html5/app/server/redispubsub.coffee b/bigbluebutton-html5/app/server/redispubsub.coffee
index 76e7715abc5b2a7d819571329ee76e5facec237a..38d7cf76402318a6550b9242d1a67cd7741042c0 100755
--- a/bigbluebutton-html5/app/server/redispubsub.coffee
+++ b/bigbluebutton-html5/app/server/redispubsub.coffee
@@ -1,5 +1,4 @@
Meteor.methods
-
# Construct and send a message to bbb-web to validate the user
validateAuthToken: (meetingId, userId, authToken) ->
Meteor.log.info "sending a validate_auth_token with",
@@ -23,6 +22,7 @@ Meteor.methods
else
Meteor.log.info "did not have enough information to send a validate_auth_token message"
+
class Meteor.RedisPubSub
constructor: (callback) ->
Meteor.log.info "constructor RedisPubSub"
@@ -33,9 +33,10 @@ class Meteor.RedisPubSub
Meteor.log.info("Subscribing message on channel: #{Meteor.config.redis.channels.fromBBBApps}")
@subClient.on "psubscribe", Meteor.bindEnvironment(@_onSubscribe)
- @subClient.on "pmessage", Meteor.bindEnvironment(@_onMessage)
+ @subClient.on "pmessage", Meteor.bindEnvironment(@_addToQueue)
@subClient.psubscribe(Meteor.config.redis.channels.fromBBBApps)
+
callback @
_onSubscribe: (channel, count) =>
@@ -48,321 +49,24 @@ class Meteor.RedisPubSub
"payload": {} # I need this, otherwise bbb-apps won't recognize the message
publish Meteor.config.redis.channels.toBBBApps.meeting, message
- _onMessage: (pattern, channel, jsonMsg) =>
- # TODO: this has to be in a try/catch block, otherwise the server will
- # crash if the message has a bad format
+ _addToQueue: (pattern, channel, jsonMsg) =>
message = JSON.parse(jsonMsg)
- correlationId = message.payload?.reply_to or message.header?.reply_to
- meetingId = message.payload?.meeting_id
+ eventName = message.header.name
- # just because it's common. we handle it anyway
- notLoggedEventTypes = [
- "keep_alive_reply"
- "page_resized_message"
- "presentation_page_resized_message"
- "presentation_cursor_updated_message"
- "get_presentation_info_reply"
- # "get_users_reply"
- "get_chat_history_reply"
- "get_all_meetings_reply"
- "presentation_shared_message"
- "presentation_conversion_done_message"
- "presentation_conversion_progress_message"
- "presentation_page_generated_message"
- "presentation_page_changed_message"
+ messagesWeIgnore = [
"BbbPubSubPongMessage"
"bbb_apps_is_alive_message"
+ "broadcast_layout_message"
]
- if message?.header? and message?.payload?
- unless message.header.name in notLoggedEventTypes
- Meteor.log.info "eventType= #{message.header.name} ",
- message: jsonMsg
-
- # handle voice events
- if message.header.name in ['user_left_voice_message', 'user_joined_voice_message', 'user_voice_talking_message', 'user_voice_muted_message']
- if message.payload.user?
- updateVoiceUser meetingId,
- 'web_userid': message.payload.user.voiceUser.web_userid
- 'listen_only': message.payload.listen_only
- 'talking': message.payload.user.voiceUser.talking
- 'joined': message.payload.user.voiceUser.joined
- 'locked': message.payload.user.voiceUser.locked
- 'muted': message.payload.user.voiceUser.muted
- return
-
- # listen only
- if message.header.name is 'user_listening_only'
- updateVoiceUser meetingId, {'web_userid': message.payload.userid, 'listen_only': message.payload.listen_only}
- # most likely we don't need to ensure that the user's voiceUser's {talking, joined, muted, locked} are false by default #TODO?
- return
-
- if message.header.name is "get_all_meetings_reply"
- Meteor.log.info "Let's store some data for the running meetings so that when an HTML5 client joins everything is ready!"
- listOfMeetings = message.payload.meetings
- for meeting in listOfMeetings
- # we currently do not have voice_conf or duration in this message.
- addMeetingToCollection meeting.meetingID, meeting.meetingName, meeting.recorded, meeting.voiceBridge, meeting.duration
- return
-
- if message.header.name is "get_users_reply" and message.payload.requester_id is "nodeJSapp"
- unless Meteor.Meetings.findOne({MeetingId: message.payload.meeting_id})?
- users = message.payload.users
- for user in users
- user.timeOfJoining = message.header.current_time # TODO this might need to be removed
- if user.emoji_status isnt 'none' and typeof user.emoji_status is 'string'
- user.set_emoji_time = new Date()
- userJoined meetingId, user
- return
-
- if message.header.name is "validate_auth_token_reply"
- user = Meteor.Users.findOne({userId:message.payload.userid, meetingId: message.payload.meeting_id})
- validStatus = message.payload.valid
-
- # if the user already exists in the db
- if user?.clientType is "HTML5"
- #if the html5 client user was validated successfully, add a flag
- Meteor.Users.update({userId:message.payload.userid, meetingId:message.payload.meeting_id}, {$set:{validated: validStatus}})
- Meteor.log.info "user.validated for user #{user.userId} in meeting #{user.meetingId} just
- became #{Meteor.Users.findOne({userId:message.payload.userid, meetingId: message.payload.meeting_id})?.validated}"
- else
- Meteor.log.info "a non-html5 user got validate_auth_token_reply."
- return
-
- if message.header.name is "user_registered_message"
- #createDummyUser message.payload.meeting_id, message.payload.user
- return
-
- if message.header.name is "user_joined_message"
- userObj = message.payload.user
- dbUser = Meteor.Users.findOne({userId: message.payload.user.userid, meetingId: message.payload.meeting_id})
- if dbUser?.clientType is "HTML5" # typically html5 users will be in the db [as a dummy user] before the joining message
- status = dbUser?.validated
- Meteor.log.info "in user_joined_message the validStatus of the user was #{status}"
- userJoined meetingId, userObj
- return
-
- if message.header.name is "user_left_message"
- userId = message.payload.user?.userid
- if userId? and meetingId?
- markUserOffline meetingId, userId
- return
-
- if message.header.name is "disconnect_user_message"
- Meteor.log.info "a user(#{message.payload.userid}) was kicked out from meeting(#{message.payload.meeting_id})"
- return
-
- if message.header.name is "get_chat_history_reply" and message.payload.requester_id is "nodeJSapp"
- unless Meteor.Meetings.findOne({MeetingId: message.payload.meeting_id})?
- for chatMessage in message.payload.chat_history
- addChatToCollection meetingId, chatMessage
- return
-
- if message.header.name is "send_public_chat_message" or message.header.name is "send_private_chat_message"
- messageObject = message.payload.message
- # use current_time instead of message.from_time so that the chats from Flash and HTML5 have uniform times
- messageObject.from_time = message.header.current_time
- addChatToCollection meetingId, messageObject
- return
-
- if message.header.name is "meeting_created_message"
- meetingName = message.payload.name
- intendedForRecording = message.payload.recorded
- voiceConf = message.payload.voice_conf
- duration = message.payload.duration
- addMeetingToCollection meetingId, meetingName, intendedForRecording, voiceConf, duration
- return
-
- if message.header.name is "presentation_shared_message"
- presentationId = message.payload.presentation?.id
- # change the currently displayed presentation to presentation.current = false
- Meteor.Presentations.update({"presentation.current": true, meetingId: meetingId},{$set: {"presentation.current": false}})
-
- #update(if already present) entirely the presentation with the fresh data
- removePresentationFromCollection meetingId, presentationId
- addPresentationToCollection meetingId, message.payload.presentation
-
- for slide in message.payload.presentation?.pages
- addSlideToCollection meetingId, message.payload.presentation?.id, slide
- if slide.current
- displayThisSlide meetingId, slide.id, slide
- return
-
- if message.header.name is "get_presentation_info_reply" and message.payload.requester_id is "nodeJSapp"
- for presentation in message.payload.presentations
- addPresentationToCollection meetingId, presentation
-
- for page in presentation.pages
- #add the slide to the collection
- addSlideToCollection meetingId, presentation.id, page
-
- #request for shapes
- whiteboardId = "#{presentation.id}/#{page.num}" # d2d9a672040fbde2a47a10bf6c37b6a4b5ae187f-1404411622872/1
- #Meteor.log.info "the whiteboard_id here is:" + whiteboardId
-
- message =
- "payload":
- "meeting_id": meetingId
- "requester_id": "nodeJSapp"
- "whiteboard_id": whiteboardId
- "header":
- "timestamp": new Date().getTime()
- "name": "get_whiteboard_shapes_request"
- "version": "0.0.1"
-
- if whiteboardId? and meetingId?
- publish Meteor.config.redis.channels.toBBBApps.whiteboard, message
- else
- Meteor.log.info "did not have enough information to send a user_leaving_request"
- return
-
- if message.header.name is "presentation_page_changed_message"
- newSlide = message.payload.page
- displayThisSlide meetingId, newSlide?.id, newSlide
- return
-
- if message.header.name is "get_whiteboard_shapes_reply" and message.payload.requester_id is "nodeJSapp"
-
- # Create a whiteboard clean status or find one for the current meeting
- if not Meteor.WhiteboardCleanStatus.findOne({meetingId: meetingId})?
- Meteor.WhiteboardCleanStatus.insert({meetingId: meetingId, in_progress: false})
-
- for shape in message.payload.shapes
- whiteboardId = shape.wb_id
- addShapeToCollection meetingId, whiteboardId, shape
- return
-
- if message.header.name is "send_whiteboard_shape_message"
-
- #Meteor stringifies an array of JSONs (...shape.result) in this message
- #parsing the String and reassigning the value
- if message.payload.shape.shape_type is "poll_result" and typeof message.payload.shape.shape.result is 'string'
- message.payload.shape.shape.result = JSON.parse message.payload.shape.shape.result
-
- shape = message.payload.shape
- whiteboardId = shape?.wb_id
- addShapeToCollection meetingId, whiteboardId, shape
- return
-
- if message.header.name is "presentation_cursor_updated_message"
- x = message.payload.x_percent
- y = message.payload.y_percent
- Meteor.Presentations.update({"presentation.current": true, meetingId: meetingId},{$set: {"pointer.x": x, "pointer.y": y}})
- return
-
- if message.header.name is "whiteboard_cleared_message"
- whiteboardId = message.payload.whiteboard_id
- Meteor.WhiteboardCleanStatus.update({meetingId: meetingId}, {$set: {'in_progress': true}})
- removeAllShapesFromSlide meetingId, whiteboardId
- return
-
- if message.header.name is "undo_whiteboard_request"
- whiteboardId = message.payload.whiteboard_id
- shapeId = message.payload.shape_id
- removeShapeFromSlide meetingId, whiteboardId, shapeId
- return
-
- if message.header.name is "presenter_assigned_message"
- newPresenterId = message.payload.new_presenter_id
- if newPresenterId?
- # reset the previous presenter
- Meteor.Users.update({"user.presenter": true, meetingId: meetingId},{$set: {"user.presenter": false}})
- # set the new presenter
- Meteor.Users.update({"user.userid": newPresenterId, meetingId: meetingId},{$set: {"user.presenter": true}})
- return
-
- if message.header.name is "presentation_page_resized_message"
- slideId = message.payload.page?.id
- heightRatio = message.payload.page?.height_ratio
- widthRatio = message.payload.page?.width_ratio
- xOffset = message.payload.page?.x_offset
- yOffset = message.payload.page?.y_offset
- presentationId = slideId.split("/")[0]
- Meteor.Slides.update({presentationId: presentationId, "slide.current": true}, {$set: {"slide.height_ratio": heightRatio, "slide.width_ratio": widthRatio, "slide.x_offset": xOffset, "slide.y_offset": yOffset}})
- return
-
- if message.header.name is "user_emoji_status_message"
- userId = message.payload.userid
- meetingId = message.payload.meeting_id
- emojiStatus = message.payload.emoji_status
- if userId? and meetingId?
- set_emoji_time = new Date()
- Meteor.Users.update({"user.userid": userId},{$set: {"user.set_emoji_time": set_emoji_time, "user.emoji_status": emojiStatus}})
- return
-
- if message.header.name is "recording_status_changed_message"
- intendedForRecording = message.payload.recorded
- currentlyBeingRecorded = message.payload.recording
- Meteor.Meetings.update({meetingId: meetingId, intendedForRecording: intendedForRecording}, {$set: {currentlyBeingRecorded: currentlyBeingRecorded}})
- return
-
- # --------------------------------------------------
- # lock settings ------------------------------------
- if message.header.name is "eject_voice_user_message"
- console.log "\n111111111"
- return
-
- if message.header.name is "new_permission_settings"
- oldSettings = Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings
- newSettings = message.payload
-
- # if the disableMic setting was turned on
- if !oldSettings?.disableMic and newSettings.disableMic
- handleLockingMic(meetingId, newSettings)
-
- # substitute with the new lock settings
- Meteor.Meetings.update({meetingId: meetingId}, {$set: {
- 'roomLockSettings.disablePrivChat': message.payload.disablePrivChat
- 'roomLockSettings.disableCam': message.payload.disableCam
- 'roomLockSettings.disableMic': message.payload.disableMic
- 'roomLockSettings.lockOnJoin': message.payload.lockOnJoin
- 'roomLockSettings.lockedLayout': message.payload.lockedLayout
- 'roomLockSettings.disablePubChat': message.payload.disablePubChat
- }})
- return
-
- if message.header.name is "user_locked_message" or message.header.name is "user_unlocked_message"
- userId = message.payload.userid
- isLocked = message.payload.locked
- setUserLockedStatus(meetingId, userId, isLocked)
- return
-
- if message.header.name in ["meeting_ended_message", "meeting_destroyed_event",
- "end_and_kick_all_message", "disconnect_all_users_message"]
- if Meteor.Meetings.findOne({meetingId: meetingId})?
- Meteor.log.info "there are #{Meteor.Users.find({meetingId: meetingId}).count()} users in the meeting"
- for user in Meteor.Users.find({meetingId: meetingId}).fetch()
- markUserOffline meetingId, user.userId
- #TODO should we clear the chat messages for that meeting?!
- unless message.header.name is "disconnect_all_users_message"
- removeMeetingFromCollection meetingId
- return
-
- if message.header.name is "poll_started_message"
- if message.payload.meeting_id? and message.payload.requester_id? and message.payload.poll?
- if Meteor.Meetings.findOne({meetingId: message.payload.meeting_id})?
- #initializing the list of current users
- users = Meteor.Users.find({meetingId: message.payload.meeting_id}, {fields:{"user.userid": 1, _id: 0}} ).fetch()
- addPollToCollection message.payload.poll, message.payload.requester_id, users, message.payload.meeting_id
-
- if message.header.name is "poll_stopped_message"
- meetingId = message.payload.meeting_id
- poll_id = message.payload.poll_id
- clearPollCollection meetingId, poll_id
-
- if message.header.name is "user_voted_poll_message"
- if message.payload?.poll? and message.payload.meeting_id? and message.payload.presenter_id?
- pollObj = message.payload.poll
- meetingId = message.payload.meeting_id
- requesterId = message.payload.presenter_id
- updatePollCollection pollObj, meetingId, requesterId
-
- if message.header.name is "poll_show_result_message"
- if message.payload.poll.id? and message.payload.meeting_id?
- poll_id = message.payload.poll.id
- meetingId = message.payload.meeting_id
- clearPollCollection meetingId, poll_id
+ unless eventName in messagesWeIgnore
+ console.log "Q #{eventName} #{Meteor.myQueue.total()}"
+ Meteor.myQueue.add({
+ pattern: pattern
+ channel: channel
+ jsonMsg: jsonMsg
+ })
# --------------------------------------------------------------------------------------------
# Private methods on server
@@ -370,9 +74,9 @@ class Meteor.RedisPubSub
# message should be an object
@publish = (channel, message) ->
- # Meteor.log.info "Publishing",
- # channel: channel
- # message: message
+ Meteor.log.info "redis outgoing message #{message.header.name}",
+ channel: channel
+ message: message
if Meteor.redisPubSub?
Meteor.redisPubSub.pubClient.publish channel, JSON.stringify(message), (err, res) ->
diff --git a/bigbluebutton-html5/app/server/server.coffee b/bigbluebutton-html5/app/server/server.coffee
index 908851c98dc9a4dc34d042d2dbad21a40ce1e032..79679a68e4bbdd0d1a1e5de19a256c91ab4d9fc2 100755
--- a/bigbluebutton-html5/app/server/server.coffee
+++ b/bigbluebutton-html5/app/server/server.coffee
@@ -14,3 +14,487 @@ Meteor.startup ->
# create create a PubSub connection, start listening
Meteor.redisPubSub = new Meteor.RedisPubSub(->
Meteor.log.info "created pubsub")
+
+
+ Meteor.myQueue = new PowerQueue({
+ # autoStart:true
+ # isPaused: true
+ })
+ Meteor.myQueue.taskHandler = (data, next, failures) ->
+ eventName = JSON.parse(data.jsonMsg)?.header.name
+ if failures > 0
+ Meteor.log.error "got a failure on taskHandler #{eventName} #{failures}"
+ else
+ handleRedisMessage(data, ()->
+ length = Meteor.myQueue.length()
+ lengthString = ->
+ if length>0
+ "In the queue we have #{length} event(s) to process."
+ else ""
+
+ Meteor.log.info "in callback after handleRedisMessage #{eventName}.
+ #{lengthString()}"
+ next()
+ )
+
+
+ # To ensure that we process the redis json event messages serially we use a
+ # callback. This callback is to be called when the Meteor collection is
+ # updated with the information coming in the payload of the json message. The
+ # callback signalizes to the queue that we are done processing the current
+ # message in the queue and are ready to move on to the next one. If we do not
+ # use the callback mechanism we may encounter a race condition situation
+ # due to not following the order of events coming through the redis pubsub.
+ # for example: a user_left event reaching the collection before a user_joined
+ # for the same user.
+ @handleRedisMessage = (data, callback) ->
+ message = JSON.parse(data.jsonMsg)
+ # correlationId = message.payload?.reply_to or message.header?.reply_to
+ meetingId = message.payload?.meeting_id
+
+ # Avoid cluttering the log with json messages carrying little or repetitive
+ # information. Comment out a message type in the array to be able to see it
+ # in the log upon restarting of the Meteor process.
+ notLoggedEventTypes = [
+ "keep_alive_reply"
+ "page_resized_message"
+ "presentation_page_resized_message"
+ "presentation_cursor_updated_message"
+ "get_presentation_info_reply"
+# "get_users_reply"
+ "get_chat_history_reply"
+# "get_all_meetings_reply"
+ "get_whiteboard_shapes_reply"
+ "presentation_shared_message"
+ "presentation_conversion_done_message"
+ "presentation_conversion_progress_message"
+ "presentation_page_generated_message"
+ # "presentation_page_changed_message"
+ "BbbPubSubPongMessage"
+ "bbb_apps_is_alive_message"
+ "user_voice_talking_message"
+ "meeting_state_message"
+ "get_recording_status_reply"
+ ]
+
+ eventName = message.header.name
+ meetingId = message.payload?.meeting_id
+
+ unless message?.header? and message.payload?
+ Meteor.log.error "ERROR!! No header or payload"
+ callback()
+
+ unless message.header.name in notLoggedEventTypes
+ Meteor.log.info "redis incoming message #{eventName} ",
+ message: data.jsonMsg
+
+ # we currently disregard the pattern and channel
+ if message?.header? and message.payload?
+ if eventName is 'meeting_created_message'
+ # Meteor.log.error JSON.stringify message
+ meetingName = message.payload.name
+ intendedForRecording = message.payload.recorded
+ voiceConf = message.payload.voice_conf
+ duration = message.payload.duration
+ addMeetingToCollection meetingId, meetingName, intendedForRecording,
+ voiceConf, duration, callback
+
+ # handle voice events
+ else if message.payload.user? and eventName in [
+ 'user_left_voice_message'
+ 'user_joined_voice_message'
+ 'user_voice_talking_message'
+ 'user_voice_muted_message']
+
+ voiceUserObj = {
+ 'web_userid': message.payload.user.voiceUser.web_userid
+ 'listen_only': message.payload.listen_only
+ 'talking': message.payload.user.voiceUser.talking
+ 'joined': message.payload.user.voiceUser.joined
+ 'locked': message.payload.user.voiceUser.locked
+ 'muted': message.payload.user.voiceUser.muted
+ }
+ updateVoiceUser meetingId, voiceUserObj, callback
+
+ else if eventName is 'user_listening_only'
+ voiceUserObj = {
+ 'web_userid': message.payload.userid
+ 'listen_only': message.payload.listen_only
+ }
+ updateVoiceUser meetingId, voiceUserObj, callback
+
+ else if eventName is 'get_all_meetings_reply'
+ Meteor.log.info "Let's store some data for the running meetings
+ so that when an HTML5 client joins everything is ready!"
+ Meteor.log.info JSON.stringify(message)
+ listOfMeetings = message.payload.meetings
+
+ # Processing the meetings recursively with a callback to notify us,
+ # ensuring that we update the meeting collection serially
+ processMeeting = () ->
+ meeting = listOfMeetings.pop()
+ if meeting?
+ addMeetingToCollection meeting.meetingID, meeting.meetingName,
+ meeting.recorded, meeting.voiceBridge, meeting.duration, processMeeting
+ else
+ callback() # all meeting arrays (if any) have been processed
+
+ processMeeting()
+
+ else if eventName is 'user_joined_message'
+ userObj = message.payload.user
+ dbUser = Meteor.Users.findOne({userId: userObj.userid, meetingId: message.payload.meeting_id})
+
+ # On attempting reconnection of Flash clients (in voiceBridge) we receive
+ # an extra user_joined_message. Ignore it as it will add an extra user
+ # in the user list, creating discrepancy with the list in the Flash client
+ if dbUser?.user?.connection_status is "offline" and message.payload.user?.phone_user
+ Meteor.log.error "offline AND phone user"
+ callback() #return without joining the user
+ else
+ if dbUser?.clientType is "HTML5" # typically html5 users will be in
+ # the db [as a dummy user] before the joining message
+ status = dbUser?.validated
+ Meteor.log.info "in user_joined_message the validStatus
+ of the user was #{status}"
+ userObj.timeOfJoining = message.header.current_time
+ userJoined meetingId, userObj, callback
+ else
+ userJoined meetingId, userObj, callback
+
+
+ # only process if requester is nodeJSapp means only process in the case when
+ # we explicitly request the users
+ else if eventName is 'get_users_reply' and message.payload.requester_id is 'nodeJSapp'
+ users = message.payload.users
+
+ #TODO make the serialization be split per meeting. This will allow us to
+ # use N threads vs 1 and we'll take advantage of Mongo's concurrency tricks
+
+ # Processing the users recursively with a callback to notify us,
+ # ensuring that we update the users collection serially
+ processUser = () ->
+ user = users.pop()
+ if user?
+ user.timeOfJoining = message.header.current_time
+ if user.emoji_status isnt 'none' and typeof user.emoji_status is 'string'
+ console.log "3"
+ user.set_emoji_time = new Date()
+ userJoined meetingId, user, processUser
+ else
+ # console.error("this is not supposed to happen")
+ userJoined meetingId, user, processUser
+ else
+ callback() # all meeting arrays (if any) have been processed
+
+ processUser()
+
+
+ else if eventName is 'validate_auth_token_reply'
+ userId = message.payload.userid
+ user = Meteor.Users.findOne({userId:userId, meetingId: meetingId})
+ validStatus = message.payload.valid
+
+ # if the user already exists in the db
+ if user?.clientType is "HTML5"
+ #if the html5 client user was validated successfully, add a flag
+ Meteor.Users.update({userId:userId, meetingId:message.payload.meeting_id},
+ {$set:{validated: validStatus}},
+ (err, numChanged) ->
+ if numChanged.insertedId?
+ funct = (cbk) ->
+ val=Meteor.Users.findOne({userId:userId, meetingId: message.payload.meeting_id})?.validated
+ Meteor.log.info "user.validated for user #{userId} in meeting #{user.meetingId} just became #{val}"
+ cbk()
+
+ funct(callback)
+ else
+ callback()
+ )
+ else
+ Meteor.log.info "a non-html5 user got validate_auth_token_reply."
+ callback()
+
+
+ else if eventName is 'user_left_message'
+ userId = message.payload.user?.userid
+ if userId? and meetingId?
+ markUserOffline meetingId, userId, callback
+ else
+ callback() #TODO check how to get these cases out and reuse code
+
+
+ # for now not handling this serially #TODO
+ else if eventName is 'presenter_assigned_message'
+ newPresenterId = message.payload.new_presenter_id
+ if newPresenterId?
+ # reset the previous presenter
+ Meteor.Users.update({"user.presenter": true, meetingId: meetingId},
+ {$set: {"user.presenter": false}},
+ (err, numUpdated) ->
+ Meteor.log.info(" Updating old presenter numUpdated=#{numUpdated},
+ err=#{err}")
+ )
+ # set the new presenter
+ Meteor.Users.update({"user.userid": newPresenterId, meetingId: meetingId},
+ {$set: {"user.presenter": true}},
+ (err, numUpdated) ->
+ Meteor.log.info(" Updating new presenter numUpdated=#{numUpdated},
+ err=#{err}")
+ )
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is 'user_emoji_status_message'
+ userId = message.payload.userid
+ meetingId = message.payload.meeting_id
+ emojiStatus = message.payload.emoji_status
+ if userId? and meetingId?
+ set_emoji_time = new Date()
+ Meteor.Users.update({"user.userid": userId},
+ {$set:{"user.set_emoji_time":set_emoji_time,"user.emoji_status":emojiStatus}},
+ (err, numUpdated) ->
+ Meteor.log.info(" Updating emoji numUpdated=#{numUpdated}, err=#{err}")
+ )
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName in ['user_locked_message', 'user_unlocked_message']
+ userId = message.payload.userid
+ isLocked = message.payload.locked
+ setUserLockedStatus(meetingId, userId, isLocked)
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName in ["meeting_ended_message", "meeting_destroyed_event",
+ "end_and_kick_all_message", "disconnect_all_users_message"]
+ Meteor.log.info("DESTROYING MEETING #{meetingId}")
+ removeMeetingFromCollection meetingId, callback
+
+ ###
+ if Meteor.Meetings.findOne({meetingId: meetingId})?
+ count=Meteor.Users.find({meetingId: meetingId}).count()
+ Meteor.log.info "there are #{count} users in the meeting"
+ for user in Meteor.Users.find({meetingId: meetingId}).fetch()
+ markUserOffline meetingId, user.userId
+ #TODO should we clear the chat messages for that meeting?!
+ unless eventName is "disconnect_all_users_message"
+ removeMeetingFromCollection meetingId
+ ###
+
+ # for now not handling this serially #TODO
+ else if eventName is "get_chat_history_reply" and message.payload.requester_id is "nodeJSapp"
+ unless Meteor.Meetings.findOne({MeetingId: message.payload.meeting_id})?
+ for chatMessage in message.payload.chat_history
+ addChatToCollection meetingId, chatMessage
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "send_public_chat_message" or eventName is "send_private_chat_message"
+ messageObject = message.payload.message
+ # use current_time instead of message.from_time so that the chats from Flash and HTML5 have uniform times
+ messageObject.from_time = message.header.current_time
+ addChatToCollection meetingId, messageObject
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "presentation_shared_message"
+ presentationId = message.payload.presentation?.id
+ # change the currently displayed presentation to presentation.current = false
+ Meteor.Presentations.update({"presentation.current": true, meetingId: meetingId},
+ {$set: {"presentation.current": false}})
+
+ #update(if already present) entirely the presentation with the fresh data
+ removePresentationFromCollection meetingId, presentationId
+ addPresentationToCollection meetingId, message.payload.presentation
+
+ for slide in message.payload.presentation?.pages
+ addSlideToCollection meetingId, message.payload.presentation?.id, slide
+ if slide.current
+ displayThisSlide meetingId, slide.id, slide
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "get_presentation_info_reply" and message.payload.requester_id is "nodeJSapp"
+ for presentation in message.payload.presentations
+ addPresentationToCollection meetingId, presentation
+
+ for page in presentation.pages
+ #add the slide to the collection
+ addSlideToCollection meetingId, presentation.id, page
+
+ #request for shapes
+ whiteboardId = "#{presentation.id}/#{page.num}" # d2d9a672040fbde2a47a10bf6c37b6a4b5ae187f-1404411622872/1
+ #Meteor.log.info "the whiteboard_id here is:" + whiteboardId
+
+ replyTo = "#{meetingId}/nodeJSapp"
+ message =
+ "payload":
+ "meeting_id": meetingId
+ "requester_id": "nodeJSapp"
+ "whiteboard_id": whiteboardId
+ "reply_to": replyTo
+ "header":
+ "timestamp": new Date().getTime()
+ "name": "request_whiteboard_annotation_history_request"
+
+ if whiteboardId? and meetingId?
+ publish Meteor.config.redis.channels.toBBBApps.whiteboard, message #TODO
+ else
+ Meteor.log.info "did not have enough information to send a user_leaving_request" #TODO
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "presentation_page_changed_message"
+ newSlide = message.payload.page
+ displayThisSlide meetingId, newSlide?.id, newSlide
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "presentation_removed_message"
+ presentationId = message.payload.presentation_id
+ meetingId = message.payload.meeting_id
+ removePresentationFromCollection meetingId, presentationId
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "get_whiteboard_shapes_reply" and message.payload.requester_id is "nodeJSapp"
+ # Create a whiteboard clean status or find one for the current meeting
+ if not Meteor.WhiteboardCleanStatus.findOne({meetingId: meetingId})?
+ Meteor.WhiteboardCleanStatus.insert({meetingId: meetingId, in_progress: false})
+
+ for shape in message.payload.shapes
+ whiteboardId = shape.wb_id
+ addShapeToCollection meetingId, whiteboardId, shape
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "send_whiteboard_shape_message"
+ #Meteor stringifies an array of JSONs (...shape.result) in this message
+ #parsing the String and reassigning the value
+ if message.payload.shape.shape_type is "poll_result" and typeof message.payload.shape.shape.result is 'string'
+ message.payload.shape.shape.result = JSON.parse message.payload.shape.shape.result
+
+ shape = message.payload.shape
+ whiteboardId = shape?.wb_id
+ addShapeToCollection meetingId, whiteboardId, shape
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "presentation_cursor_updated_message"
+ x = message.payload.x_percent
+ y = message.payload.y_percent
+ Meteor.Presentations.update({"presentation.current": true, meetingId: meetingId},
+ {$set: {"pointer.x": x, "pointer.y": y}})
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "whiteboard_cleared_message"
+ whiteboardId = message.payload.whiteboard_id
+ Meteor.WhiteboardCleanStatus.update({meetingId: meetingId}, {$set: {'in_progress': true}})
+ removeAllShapesFromSlide meetingId, whiteboardId
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "undo_whiteboard_request"
+ whiteboardId = message.payload.whiteboard_id
+ shapeId = message.payload.shape_id
+ removeShapeFromSlide meetingId, whiteboardId, shapeId
+ callback()
+
+
+ # for now not handling this serially #TODO
+ else if eventName is "presentation_page_resized_message"
+ slideId = message.payload.page?.id
+ heightRatio = message.payload.page?.height_ratio
+ widthRatio = message.payload.page?.width_ratio
+ xOffset = message.payload.page?.x_offset
+ yOffset = message.payload.page?.y_offset
+ presentationId = slideId.split("/")[0]
+ Meteor.Slides.update({presentationId: presentationId, "slide.current": true},
+ {$set:{"slide.height_ratio": heightRatio,"slide.width_ratio": widthRatio,"slide.x_offset":xOffset,"slide.y_offset":yOffset}}
+ )
+ callback()
+
+
+ # for now not handling this serially #TODO
+ else if eventName is "recording_status_changed_message"
+ intendedForRecording = message.payload.recorded
+ currentlyBeingRecorded = message.payload.recording
+ Meteor.Meetings.update({meetingId: meetingId, intendedForRecording: intendedForRecording},
+ {$set: {currentlyBeingRecorded: currentlyBeingRecorded}}
+ )
+ callback()
+
+ # --------------------------------------------------
+ # lock settings ------------------------------------
+ # for now not handling this serially #TODO
+ else if eventName is "eject_voice_user_message"
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "new_permission_settings"
+ oldSettings = Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings
+ newSettings = message.payload?.permissions
+
+ # if the disableMic setting was turned on
+ if !oldSettings?.disableMic and newSettings.disableMic
+ handleLockingMic(meetingId, newSettings)
+
+ # substitute with the new lock settings
+ Meteor.Meetings.update({meetingId: meetingId}, {$set: {
+ 'roomLockSettings.disablePrivateChat': newSettings.disablePrivateChat
+ 'roomLockSettings.disableCam': newSettings.disableCam
+ 'roomLockSettings.disableMic': newSettings.disableMic
+ 'roomLockSettings.lockOnJoin': newSettings.lockOnJoin
+ 'roomLockSettings.lockedLayout': newSettings.lockedLayout
+ 'roomLockSettings.disablePublicChat': newSettings.disablePublicChat
+ 'roomLockSettings.lockOnJoinConfigurable': newSettings.lockOnJoinConfigurable #TODO
+ }})
+ callback()
+
+
+ # for now not handling this serially #TODO
+ else if eventName is "poll_started_message"
+ if message.payload.meeting_id? and message.payload.requester_id? and message.payload.poll?
+ if Meteor.Meetings.findOne({meetingId: message.payload.meeting_id})?
+ #initializing the list of current users
+ users = Meteor.Users.find({meetingId: message.payload.meeting_id},
+ {fields:{"user.userid": 1, _id: 0}} ).fetch()
+ addPollToCollection message.payload.poll, message.payload.requester_id,
+ users, message.payload.meeting_id
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "poll_stopped_message"
+ meetingId = message.payload.meeting_id
+ poll_id = message.payload.poll_id
+ clearPollCollection meetingId, poll_id
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "user_voted_poll_message"
+ if message.payload?.poll? and message.payload.meeting_id? and message.payload.presenter_id?
+ pollObj = message.payload.poll
+ meetingId = message.payload.meeting_id
+ requesterId = message.payload.presenter_id
+ updatePollCollection pollObj, meetingId, requesterId
+ callback()
+
+ # for now not handling this serially #TODO
+ else if eventName is "poll_show_result_message"
+ if message.payload.poll.id? and message.payload.meeting_id?
+ poll_id = message.payload.poll.id
+ meetingId = message.payload.meeting_id
+ clearPollCollection meetingId, poll_id
+ callback()
+
+
+ else # keep moving in the queue
+ unless eventName in notLoggedEventTypes
+ Meteor.log.info "WARNING!!!
+ THE JSON MESSAGE WAS NOT OF TYPE SUPPORTED BY THIS APPLICATION\n
+ #{eventName} {JSON.stringify message}"
+ callback()
+ else
+ callback()
diff --git a/bigbluebutton-html5/app/server/user_permissions.coffee b/bigbluebutton-html5/app/server/user_permissions.coffee
index 42471e1e5623c0420464a34d92664ce8ab9cf0a6..815ba195dc070b01efec20b3ecfd5ad76fa471c9 100755
--- a/bigbluebutton-html5/app/server/user_permissions.coffee
+++ b/bigbluebutton-html5/app/server/user_permissions.coffee
@@ -69,10 +69,10 @@ viewer = (meetingId, userId) ->
subscribeChat: true
#chat
- chatPublic: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePubChat) or
+ chatPublic: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePublicChat) or
!(Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.locked) or
Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.presenter
- chatPrivate: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePrivChat) or
+ chatPrivate: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePrivateChat) or
!(Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.locked) or
Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.presenter
@@ -92,7 +92,7 @@ viewer = (meetingId, userId) ->
Meteor.log.info "in isAllowedTo: action-#{action}, userId=#{userId}, authToken=#{authToken} validated:#{validated}"
user = Meteor.Users.findOne({meetingId:meetingId, userId: userId})
- Meteor.log.info "user=" + JSON.stringify user
+ # Meteor.log.info "user=" + JSON.stringify user
if user? and authToken is user.authToken # check if the user is who he claims to be
if user.validated and user.clientType is "HTML5"
diff --git a/bigbluebutton-html5/app/start.sh b/bigbluebutton-html5/app/start.sh
index c472fcbb2377fe27ceffcf6ca1c4e3f0bed65d6d..38926a7a4dd285be7e68ef81ae55a22d405b4d21 100755
--- a/bigbluebutton-html5/app/start.sh
+++ b/bigbluebutton-html5/app/start.sh
@@ -2,4 +2,3 @@
# the idea is that this way we prevent test runs (for whenever needed)
HOME=/usr/share/meteor JASMINE_SERVER_UNIT=0 JASMINE_SERVER_INTEGRATION=0 JASMINE_CLIENT_INTEGRATION=0 JASMINE_BROWSER=PhantomJS JASMINE_MIRROR_PORT=3000 ROOT_URL=http://127.0.0.1/html5client meteor
# ROOT_URL_PATH_PREFIX=html5client meteor
-
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index 65873d355a91fd03401c77e05639524182bf7436..3bed357473db4d12ac5a131d1e1de35c14440160 100644
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -1,7 +1,9 @@
{
"name": "BBB-HTML-CLIENT",
"scripts": {
- "start": "meteor"
+ "start": "cd app;./start.sh",
+ "preinstall": "sudo npm install -g grunt-cli",
+ "test": "cd app;JASMINE_BROWSER=PhantomJS JASMINE_MIRROR_PORT=3000 meteor run --test"
},
"devDependencies": {
"coffeelint": "^1.6.0",
diff --git a/record-and-playback/core/scripts/bigbluebutton.yml b/record-and-playback/core/scripts/bigbluebutton.yml
index c7c9e1b3348c2bcc640fee21359a356cef1ecb50..7f8a46b8874910b65ec92a7afeee53e066b46f62 100755
--- a/record-and-playback/core/scripts/bigbluebutton.yml
+++ b/record-and-playback/core/scripts/bigbluebutton.yml
@@ -7,12 +7,12 @@ raw_presentation_src: /var/bigbluebutton
redis_host: 127.0.0.1
redis_port: 6379
-
-# # For PRODUCTION
-# log_dir: /var/log/bigbluebutton
-# recording_dir: /var/bigbluebutton/recording
-# published_dir: /var/bigbluebutton/published
-# playback_host: 10.0.3.203
+# For PRODUCTION
+log_dir: /var/log/bigbluebutton
+recording_dir: /var/bigbluebutton/recording
+published_dir: /var/bigbluebutton/published
+playback_host: 10.0.3.203
+playback_protocol: http
# For DEVELOPMENT
# This allows us to run the scripts manually
diff --git a/record-and-playback/presentation/playback/presentation/0.81/lib/writing.js b/record-and-playback/presentation/playback/presentation/0.81/lib/writing.js
index 596cab85de0527cd0e3a6f9933503e85c18ddfc0..3040a3aaad4597305282e9a564f393aa3be71066 100755
--- a/record-and-playback/presentation/playback/presentation/0.81/lib/writing.js
+++ b/record-and-playback/presentation/playback/presentation/0.81/lib/writing.js
@@ -411,8 +411,7 @@ var cursorStyle;
var params = getUrlParameters();
var MEETINGID = params.meetingId;
-var HOST = window.location.host;
-var url = "http://" + HOST + "/presentation/" + MEETINGID;
+var url = "/presentation/" + MEETINGID;
var shapes_svg = url + '/shapes.svg';
var events_xml = url + '/panzooms.xml';
var cursor_xml = url + '/cursor.xml';
diff --git a/record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js b/record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
index 94baf53d0337885b6434d20054ac1e3f6e95e602..2b5e9301d9e31cdac798a430f22678470b177a39 100755
--- a/record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
+++ b/record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
@@ -477,8 +477,7 @@ var cursorStyle;
var params = getUrlParameters();
var MEETINGID = params.meetingId;
-var HOST = window.location.host;
-var url = "http://" + HOST + "/presentation/" + MEETINGID;
+var url = "/presentation/" + MEETINGID;
var shapes_svg = url + '/shapes.svg';
var events_xml = url + '/panzooms.xml';
var cursor_xml = url + '/cursor.xml';
diff --git a/record-and-playback/presentation/scripts/publish/presentation.rb b/record-and-playback/presentation/scripts/publish/presentation.rb
index 398b60a919ba8df8f0ce8e91a600baee0d9c9720..70bced160335eab974fb9f698d0d797c5787c6b4 100755
--- a/record-and-playback/presentation/scripts/publish/presentation.rb
+++ b/record-and-playback/presentation/scripts/publish/presentation.rb
@@ -949,7 +949,8 @@ if ($playback == "presentation")
$process_dir = "#{recording_dir}/process/presentation/#{$meeting_id}"
BigBlueButton.logger.info("setting publish dir")
publish_dir = simple_props['publish_dir']
- BigBlueButton.logger.info("setting playback host")
+ BigBlueButton.logger.info("setting playback url info")
+ playback_protocol = bbb_props['playback_protocol']
playback_host = bbb_props['playback_host']
BigBlueButton.logger.info("setting target dir")
target_dir = "#{recording_dir}/publish/presentation/#{$meeting_id}"
@@ -1017,7 +1018,7 @@ if ($playback == "presentation")
b.end_time(real_end_time)
b.playback {
b.format("presentation")
- b.link("http://#{playback_host}/playback/presentation/0.9.0/playback.html?meetingId=#{$meeting_id}")
+ b.link("#{playback_protocol}://#{playback_host}/playback/presentation/0.9.0/playback.html?meetingId=#{$meeting_id}")
b.processing_time("#{processing_time}")
b.duration("#{recording_time}")
}