BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problems with merge and language

Browse Source
This commit is contained in:
João Francisco Siebel 2018-02-23 14:44:51 -03:00
parent 4d8d522bb8
commit 9a2c797274
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-html5/imports/ui/components/media/container.jsx
View File

@ -54,7 +54,7 @@ MediaContainer.defaultProps = defaultProps;
export default withTracker(() => {
const { dataSaving } = Settings;
const { viewParticipantsWebcams, viewScreenshare } = dataSaving;
const { viewParticipantsWebcams: viewVideoDock, viewScreenshare } = dataSaving;
const data = {};
data.currentPresentation = MediaService.getPresentationInfo();

8
bigbluebutton-html5/private/locales/en.json
View File

@ -171,10 +171,10 @@
"app.settings.main.cancel.label.description": "Discards the changes and closes the settings menu",
"app.settings.main.save.label": "Save",
"app.settings.main.save.label.description": "Saves the changes and closes the settings menu",
"app.settings.dataSaving.label": "Data Savings",
"app.settings.dataSaving.webcam": "Disable Webcams",
"app.settings.dataSaving.screenShare": "Disable Desktop Sharing",
"app.settings.dataSaving.description": "To save your bandwidth adjust what's currently being displayed.",
"app.settings.dataSavingTab.label": "Data Savings",
"app.settings.dataSavingTab.webcam": "Disable Webcams",
"app.settings.dataSavingTab.screenShare": "Disable Desktop Sharing",
"app.settings.dataSavingTab.description": "To save your bandwidth adjust what's currently being displayed.",
"app.actionsBar.actionsDropdown.actionsLabel": "Actions",
"app.actionsBar.actionsDropdown.presentationLabel": "Upload a presentation",
"app.actionsBar.actionsDropdown.initPollLabel": "Initiate a poll",