diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx index 85f98175b9..ce4038560c 100755 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/recording-indicator/component.jsx @@ -148,9 +148,9 @@ class RecordingIndicator extends PureComponent { cy="10" /> diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml index a1ff4e68e5..313eab556f 100755 --- a/bigbluebutton-html5/private/config/settings.yml +++ b/bigbluebutton-html5/private/config/settings.yml @@ -1,6 +1,5 @@ public: app: - requireAdditionalRecordingConsentOnJoin: true mobileFontSize: 16px desktopFontSize: 14px audioChatNotification: false diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json index 10be219ecb..50bc1a50fc 100755 --- a/bigbluebutton-html5/public/locales/en.json +++ b/bigbluebutton-html5/public/locales/en.json @@ -91,7 +91,7 @@ "app.userList.menu.unmuteUserAudio.label": "Unmute user", "app.userList.menu.webcamPin.label": "Pin user's webcam", "app.userList.menu.webcamUnpin.label": "Unpin user's webcam", - "app.userList.menu.giveWhiteboardAccess.label": "Give whiteboard access", + "app.userList.menu.giveWhiteboardAccess.label" : "Give whiteboard access", "app.userList.menu.removeWhiteboardAccess.label": "Remove whiteboard access", "app.userList.menu.ejectUserCameras.label": "Close cameras", "app.userList.userAriaLabel": "{0} {1} {2} Status {3}", @@ -237,8 +237,8 @@ "app.presentationUploder.uploading": "Uploading {0} {1}", "app.presentationUploder.uploadStatus": "{0} of {1} uploads complete", "app.presentationUploder.completed": "{0} uploads complete", - "app.presentationUploder.item": "item", - "app.presentationUploder.itemPlural": "items", + "app.presentationUploder.item" : "item", + "app.presentationUploder.itemPlural" : "items", "app.presentationUploder.clearErrors": "Clear errors", "app.presentationUploder.clearErrorsDesc": "Clears failed presentation uploads", "app.presentationUploder.uploadViewTitle": "Upload Presentation", @@ -259,16 +259,16 @@ "app.poll.customPlaceholder": "Add poll option", "app.poll.noPresentationSelected": "No presentation selected! Please select one.", "app.poll.clickHereToSelect": "Click here to select", - "app.poll.question.label": "Write your question...", - "app.poll.optionalQuestion.label": "Write your question (optional)...", - "app.poll.userResponse.label": "User Response", - "app.poll.responseTypes.label": "Response Types", - "app.poll.optionDelete.label": "Delete", - "app.poll.responseChoices.label": "Response Choices", - "app.poll.typedResponse.desc": "Users will be presented with a text box to fill in their response.", - "app.poll.addItem.label": "Add item", - "app.poll.start.label": "Start Poll", - "app.poll.secretPoll.label": "Anonymous Poll", + "app.poll.question.label" : "Write your question...", + "app.poll.optionalQuestion.label" : "Write your question (optional)...", + "app.poll.userResponse.label" : "User Response", + "app.poll.responseTypes.label" : "Response Types", + "app.poll.optionDelete.label" : "Delete", + "app.poll.responseChoices.label" : "Response Choices", + "app.poll.typedResponse.desc" : "Users will be presented with a text box to fill in their response.", + "app.poll.addItem.label" : "Add item", + "app.poll.start.label" : "Start Poll", + "app.poll.secretPoll.label" : "Anonymous Poll", "app.poll.secretPoll.isSecretLabel": "The poll is anonymous – you will not be able to see individual responses.", "app.poll.questionErr": "Providing a question is required.", "app.poll.optionErr": "Enter a Poll option", @@ -370,7 +370,7 @@ "app.actionsBar.actionsDropdown.restorePresentationDesc": "Button to restore presentation after it has been minimized", "app.actionsBar.actionsDropdown.minimizePresentationLabel": "Minimize presentation", "app.actionsBar.actionsDropdown.minimizePresentationDesc": "Button used to minimize presentation", - "app.screenshare.screenShareLabel": "Screen share", + "app.screenshare.screenShareLabel" : "Screen share", "app.submenu.application.applicationSectionTitle": "Application", "app.submenu.application.animationsLabel": "Animations", "app.submenu.application.audioFilterLabel": "Audio Filters for Microphone", @@ -422,11 +422,11 @@ "app.statusNotifier.and": "and", "app.switch.onLabel": "ON", "app.switch.offLabel": "OFF", - "app.talkingIndicator.ariaMuteDesc": "Select to mute user", - "app.talkingIndicator.isTalking": "{0} is talking", - "app.talkingIndicator.moreThanMaxIndicatorsTalking": "{0}+ are talking", - "app.talkingIndicator.moreThanMaxIndicatorsWereTalking": "{0}+ were talking", - "app.talkingIndicator.wasTalking": "{0} stopped talking", + "app.talkingIndicator.ariaMuteDesc" : "Select to mute user", + "app.talkingIndicator.isTalking" : "{0} is talking", + "app.talkingIndicator.moreThanMaxIndicatorsTalking" : "{0}+ are talking", + "app.talkingIndicator.moreThanMaxIndicatorsWereTalking" : "{0}+ were talking", + "app.talkingIndicator.wasTalking" : "{0} stopped talking", "app.actionsBar.actionsDropdown.actionsLabel": "Actions", "app.actionsBar.actionsDropdown.presentationLabel": "Manage presentations", "app.actionsBar.actionsDropdown.initPollLabel": "Initiate a poll", @@ -512,8 +512,8 @@ "app.audioModal.closeLabel": "Close", "app.audioModal.yes": "Yes", "app.audioModal.no": "No", - "app.audioModal.yes.arialabel": "Echo is audible", - "app.audioModal.no.arialabel": "Echo is inaudible", + "app.audioModal.yes.arialabel" : "Echo is audible", + "app.audioModal.no.arialabel" : "Echo is inaudible", "app.audioModal.echoTestTitle": "This is a private echo test. Speak a few words. Did you hear audio?", "app.audioModal.settingsTitle": "Change your audio settings", "app.audioModal.helpTitle": "There was an issue with your media devices", @@ -525,7 +525,7 @@ "app.audioDial.audioDialConfrenceText": "and enter the conference PIN number:", "app.audioModal.autoplayBlockedDesc": "We need your permission to play audio.", "app.audioModal.playAudio": "Play audio", - "app.audioModal.playAudio.arialabel": "Play audio", + "app.audioModal.playAudio.arialabel" : "Play audio", "app.audioDial.tipIndicator": "Tip", "app.audioDial.tipMessage": "Press the '0' key on your phone to mute/unmute yourself.", "app.audioModal.connecting": "Establishing audio connection", @@ -800,7 +800,7 @@ "app.sfu.serverIceGatheringFailed2021": "Media server cannot gather connection candidates (ICE error 2021)", "app.sfu.serverIceGatheringFailed2022": "Media server connection failed (ICE error 2022)", "app.sfu.mediaGenericError2200": "Media server failed to process request (error 2200)", - "app.sfu.invalidSdp2202": "Client generated an invalid media request (SDP error 2202)", + "app.sfu.invalidSdp2202":"Client generated an invalid media request (SDP error 2202)", "app.sfu.noAvailableCodec2203": "Server could not find an appropriate codec (error 2203)", "app.meeting.endNotification.ok.label": "OK", "app.whiteboard.annotations.poll": "Poll results were published", @@ -1023,4 +1023,4 @@ "app.learningDashboard.statusTimelineTable.thumbnail": "Presentation thumbnail", "app.learningDashboard.errors.invalidToken": "Invalid session token", "app.learningDashboard.errors.dataUnavailable": "Data is no longer available" -} \ No newline at end of file +}