diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 86824dedd514a92affa962a58325ac19c0d8ecef..1af4cb0dbcf15e0486820814189151dcbee8f418 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -54,12 +54,27 @@ bbb.participants.title = Participants{0} {1}
bbb.participants.titleBar = Participants Window title bar, double click to maximize
bbb.participants.minimizeBtn.accessibilityName = Minimize the Participants Window
bbb.participants.maximizeRestoreBtn.accessibilityName = Maximize the Participants Window
+bbb.participants.settings.buttonTooltip = Settings
+bbb.participants.settings.audioSettings = Audio Settings
+bbb.participants.settings.muteAll = Mute All
+bbb.participants.settings.unmuteAll = Unmute All
+bbb.participants.settings.lowerAllHands = Lower All Hands
+bbb.participants.pushToTalk.toolTip = Click to talk
+bbb.participants.pushToMute.toolTip = Click to mute yourself
bbb.participants.participantsGrid.accessibilityName = Participants List. Use the arrow keys to navigate.
-bbb.participants.participantsGrid.mediaItemRenderer = Media
+bbb.participants.participantsGrid.nameItemRenderer = Name
+bbb.participants.participantsGrid.statusItemRenderer = Status
+bbb.participants.participantsGrid.statusItemRenderer.changePresenter = Change Presenter
bbb.participants.participantsGrid.statusItemRenderer.presenter = Presenter
bbb.participants.participantsGrid.statusItemRenderer.moderator = Moderator
bbb.participants.participantsGrid.statusItemRenderer.handRaised = Hand Raised
bbb.participants.participantsGrid.statusItemRenderer.viewer = Viewer
+bbb.participants.participantsGrid.mediaItemRenderer = Media
+bbb.participants.participantsGrid.mediaItemRenderer.talking = Talking
+bbb.participants.participantsGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.participants.participantsGrid.mediaItemRenderer.pushToTalk = Click to talk
+bbb.participants.participantsGrid.mediaItemRenderer.pushToMute = Click to mute yourself
+bbb.participants.participantsGrid.mediaItemRenderer.kickUser = Kick user
bbb.participants.participantsGrid.mediaItemRenderer.webcam = Webcam shared
bbb.participants.participantsGrid.mediaItemRenderer.micOff = Microphone off
bbb.participants.participantsGrid.mediaItemRenderer.micOn = Microphone on
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
index 39fa34e695d8982e4d68b28df40abda560c06247..4c8de9dae46c4a076a0e2c666fc7d8eb01c1b2d9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
@@ -106,16 +106,16 @@
</mx:Script>
<mx:Image id="talkingIcon" visible="{data.talking}" source="{images.sound_new}" width="20" height="20"
- toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.talkImg.toolTip')}" />
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.talking')}" />
<mx:Button id="webcamBtn" visible="{data.hasStream}" click="viewCamera()" icon="{images.webcam_new}"
width="20" height="20" enabled="false"
- toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip')}" />
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.webcam')}" />
<mx:Button id="muteBtn" visible="{data.voiceJoined}" enabled="false"
width="20" height="20" click="toggleMuteState()"
icon="{data.voiceMuted ? images.audio_muted : images.audio}"
- toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.listeners.pushToMute.toolTip')}" />
+ toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToTalk') : ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToMute')}" />
<mx:Button id="kickUserBtn" icon="{images.eject_user_new}"
width="20" height="20" visible="{rolledOver}"
- toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.kickUserBtn.toolTip')}"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.kickUser')}"
click="kickUser()"/>
</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
index 0582bc6114bef989a95033db79fd2ce275a8e558..7ad7ff0df9ba809aa78d06173f4d67b98423689b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
@@ -30,5 +30,5 @@
<mx:Label id="nameLabel" textAlign="left" text="{data.name} {data.me ? '(you)' : ''}"
fontWeight="{data.me ? 'bold' : 'normal'}"
color="{data.me ? 0x003399 : 0x000000}"
- toolTip="Name"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}"/>
</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
index 8dcda4bf345f63a4e80d8cf5152812b9d46d74fa..37f2ec430deb3c79923125f1d5efba505e4e5116 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
@@ -25,6 +25,7 @@
implements="org.bigbluebutton.common.IBbbModuleWindow"
xmlns:mate="http://mate.asfusion.com/"
creationComplete="onCreationComplete()"
+ title="{ResourceUtil.getInstance().getString('bbb.participants.title')}"
showCloseButton="false">
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
@@ -171,15 +172,15 @@
private function openSettings():void {
// everyone can see the audio settings
- var myMenuData:Array = [{label: "Audio Settings", icon: images.audio}];
+ var myMenuData:Array = [{label: ResourceUtil.getInstance().getString('bbb.participants.settings.audioSettings'), icon: images.audio}];
if (amIModerator) {
myMenuData[1] = {type: "separator"};
if (!roomMuted)
- myMenuData[2] = {label: "Mute All", icon: images.audio_muted};
+ myMenuData[2] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.muteAll'), icon: images.audio_muted};
else
- myMenuData[2] = {label: "Unmute All", icon: images.audio};
- myMenuData[3] = {label: "Lower All Hands", icon: images.hand_new};
+ myMenuData[2] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.unmuteAll'), icon: images.audio};
+ myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.lowerAllHands'), icon: images.hand_new};
}
// make sure the previous menu is closed before opening a new one
@@ -374,9 +375,9 @@
tabIndex="{partOptions.baseTabIndex+5}"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.accessibilityName')}" >
<mx:columns>
- <mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer')}" editable="false" width="45"
+ <mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer')}" editable="false" width="45"
itemRenderer="org.bigbluebutton.modules.participants.views.StatusItemRenderer" sortable="false" />
- <mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
+ <mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
itemRenderer="org.bigbluebutton.modules.participants.views.NameItemRenderer"/>
<mx:DataGridColumn dataField="media" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer')}" sortable="false"
itemRenderer="org.bigbluebutton.modules.participants.views.MediaItemRenderer"/>
@@ -385,7 +386,7 @@
<mx:ControlBar width="100%">
<mx:Button id="settingsBtn" icon="{images.users_settings}" width="30" height="30"
- toolTip="Settings" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.settings.buttonTooltip')}" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
<mx:Button id="raiseHandBtn" toggle="true" icon="{images.hand_new}"
width="30" height="30" toolTip="Raise Hand" click="raiseHand()"
visible="false" includeInLayout="{raiseHandBtn.visible}" tabIndex="{partOptions.baseTabIndex+15}" />
@@ -393,7 +394,7 @@
<mx:Button id="muteMeBtn" click="toggleMuteMeState()" height="30" width="30"
icon="{UserManager.getInstance().getConference().voiceMuted ? images.audio_muted : images.audio}"
visible="{UserManager.getInstance().getConference().voiceJoined}"
- toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.listeners.pushToMute.toolTip')}"
+ toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.participants.pushToMute.toolTip')}"
tabIndex="{partOptions.baseTabIndex+20}"/>
</mx:ControlBar>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
index 31392bb86eaef2c31ee0992eda8e0e0235af5522..09d513a199b2d82484033c3baf3f1fbde9edef6d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
@@ -93,7 +93,7 @@
roleBtn.enabled = false;
} else if (rolledOver) {
roleBtn.setStyle("icon", images.presenter_new);
- roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.viewers.presentBtn.label');
+ roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.changePresenter');
roleBtn.enabled = true;
} else if (data.role == Role.MODERATOR) {
roleBtn.setStyle("icon", images.moderator);