Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

This commit is contained in:
Richard Alam 2014-08-23 14:53:51 -07:00
commit 75889acd1d

View File

@ -65,12 +65,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
width="400" width="400"
left="0"/> left="0"/>
<mx:HBox width="100%"> <mx:HBox width="100%">
<mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micPermissions.firefox.message1')." <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micPermissions.firefox.message1')}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Image source="@Embed('assets/ff-share-mic.png')"/> <mx:Image source="@Embed('assets/ff-share-mic.png')"/>
</mx:HBox> </mx:HBox>
<mx:HBox width="100%"> <mx:HBox width="100%">
<mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micPermissions.firefox.message2')" <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micPermissions.firefox.message2')}"
styleName="micSettingsWindowHearFromHeadsetLabelStyle"/> styleName="micSettingsWindowHearFromHeadsetLabelStyle"/>
<mx:Image source="@Embed('assets/ff-show-mic.png')"/> <mx:Image source="@Embed('assets/ff-show-mic.png')"/>
</mx:HBox> </mx:HBox>