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

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

Browse Source
This commit is contained in:
deniszgonjanin 2010-06-24 08:59:25 +00:00
commit 4f44869815
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -6,7 +6,7 @@ bbb.pageTitle = BigBlueButton
bbb.mainshell.statusInfo = Please wait while we load {0} modules:
bbb.mainshell.statusInfo.loaded = {0}(loaded)
bbb.mainshell.statusInfo.testRTMPConnection = Please wait while we test your connection to the server.
bbb.mainshell.statusInfo2.testRTMPConnection = This may take a minute or two.
bbb.mainshell.statusInfo2 = NOTE: If the loading stops, please clear your browser's cache and try again.
bbb.mainshell.statusProgress.testRTMPConnection = Connecting to RTMP://{0}:1935/{1}.
bbb.mainshell.statusProgress.testRTMPTConnection = Connecting to RTMPT://{0}:80/{1}.
bbb.mainshell.statusProgress.loading = Loading:

2
bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
View File

@ -178,7 +178,7 @@
effectsLib="{flexlib.mdi.effects.effectsLib.MDIVistaEffects}"
width="100%" height="100%">
<mx:Label x="200" y="400" id="statusInfo" text="{ResourceUtil.getInstance().getString('bbb.mainshell.statusInfo',[numberOfModules])}"/>
<mx:Label x="200" y="420" id="statusInfo2"/>
<mx:Label x="200" y="420" id="statusInfo2" text="{ResourceUtil.getInstance().getString('bbb.mainshell.statusInfo2')}"/>
<mx:Label x="200" y="440" id="statusProgress" text="{ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.loading')}"/>
</main:MainCanvas>
<mx:ControlBar width="100%" height="20" paddingTop="0">