diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index afa217dda5b691f6b584780cfdc1a67726062d09..403dd97759cde1cecd8f399acc4d07aca05e3492 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -9,7 +9,6 @@ bbb.mainshell.statusProgress.loading = Loading {0} modules
bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
bbb.mainshell.copyrightLabel2 = (c) 2010, BigBlueButton build {0} - For more information see http://www.bigbluebutton.org/.
bbb.mainshell.logBtn.toolTip = Open Log Window
-bbb.mainshell.fullScreenBtn.toolTip = Toggle Full-Screen
bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
# OldLocaleWarnWIndow.mxml
@@ -17,20 +16,7 @@ bbb.oldlocalewindow.reminder1=You may have an old language translations of BigBl
bbb.oldlocalewindow.reminder2=Please clear your browser's cache and try again.
bbb.oldlocalewindow.windowTitle=Warning: Old Language Translations
-# LogWindow.mxml
-bbb.logwindow.title = Log Window
-bbb.logwindow.highlight = Highlight:
-bbb.logwindow.turnLoggingOff = Turn Logging Off
-bbb.logwindow.clearBtn = Clear
-bbb.logwindow.refreshBtn = Refresh
-
-# JoinFailedWindow.mxml
-bbb.joinFailedWindow.title = Join Failed
-bbb.joinFailedWindow.okBtn = OK
-bbb.joinFailedWindow.failedInfo = No valid session. Click ok to login.
-
# MainToolbar.mxml
-bbb.mainToolbar.loggedInUserLbl = {1}: Dial: 613-520-7610 85115
bbb.mainToolbar.helpBtn = Help
bbb.mainToolbar.logoutBtn = Logout
bbb.mainToolbar.logoutBtn.toolTip = Log out
@@ -38,7 +24,7 @@ bbb.mainToolbar.logoutBtn.toolTip = Log out
###### modules ######
-# ViewersWindow.mxml
+# Viewers
bbb.viewers.title = Users{0} {1}
bbb.viewers.viewersGrid.nameItemRenderer = Name
bbb.viewers.viewersGrid.nameItemRenderer.nameLabel.toolTip = You are logged in as this user.
@@ -53,27 +39,16 @@ bbb.viewers.presentBtn.label = Switch Presenter
bbb.viewers.kickUserBtn.toolTip = Kick User
# Presentation
-## PresentationWindow.mxml
bbb.presentation.title = Presentation
-bbb.presentation.uploadPresBtn = Upload a document for presentation.
bbb.presentation.uploadPresBtn.toolTip = Upload a document for presentation.
bbb.presentation.backBtn.toolTip = Previous slide.
-bbb.presentation.slideNumLbl =
+bbb.presentation.slideNumLbl.toolTip = Click to select a slide
bbb.presentation.forwardBtn.toolTip = Next slide
bbb.presentation.resetZoomBtn.toolTip = Reset Zoom
bbb.presentation.presenterNameLbl = {0} is currently presenting.
-bbb.presentation.maximizeRestoreBtn.toolTip = Maximize this window
-bbb.presentation.maximizeRestoreBtn.toolTip2 = Restore to previous size
-bbb.presentation.clickToUpload = Upload presentation
bbb.presentation.maxUploadFileExceededAlert = Error: The file is bigger than what's allowed.
-## PresentationWindowMediator.as
-bbb.presentation.presenting = {0} is currently presenting.
-bbb.presentation.pages = {0} / {1}
-
-## FileUploadWindowMediator.as
bbb.presentation.uploadcomplete = Upload completed. Please wait while we convert the document.
-bbb.presentation.uploadsuccessful = Upload successful.
bbb.presentation.uploaded = uploaded.
bbb.presentation.document.supported = The uploaded document is supported. Starting to convert...
bbb.presentation.document.converted = Successfully converted the office document.
@@ -82,15 +57,10 @@ bbb.presentation.error.io = IO Error: Please contact administrator.
bbb.presentation.error.security = Security Error: Please contact administrator.
bbb.presentation.error.convert.format = Error: Please check that the uploaded file have a valid extension.
bbb.presentation.error.convert.notsupported = Error: The uploaded document is unsupported. Please upload a compatible file.
-bbb.presentation.error.convert.soffice = Error: Failed to convert the uploaded document.
bbb.presentation.error.convert.nbpage = Error: Failed to determine the number of pages in the uploaded document.
bbb.presentation.error.convert.maxnbpagereach = Error: The uploaded document has too many pages.
bbb.presentation.error.convert.swf = Error When Converting Uploaded File. Please Contact The Administrator.
-bbb.presentation.error.convert.swfimage = Error When Converting Image To Swf : please check that your image isn't corrupted or in a JPG/PNG Format.
-bbb.presentation.error.convert.swfpdf = Error When Converting PDF To Swf : please check that your PDF File isn't corrupted.
-bbb.presentation.error.convert.thumbnail = Error When Creating Thumbnail. Please Contact The Administrator.
bbb.presentation.converted = Converted {0} of {1} slides.
-bbb.presentation.extracting = Extracting slide {0} of {1} slides.
bbb.presentation.ok = OK
bbb.presentation.uploadwindow.presentationfile = Presentation file
bbb.presentation.uploadwindow.pdf = PDF
@@ -99,8 +69,6 @@ bbb.presentation.uploadwindow.excel = EXCEL
bbb.presentation.uploadwindow.powerpoint = POWERPOINT
bbb.presentation.uploadwindow.image = IMAGE
bbb.presentation.uploadwindow.closeLabel = Click OK to close the window
-
-## FileUploadWindow.mxml
bbb.fileupload.title = Upload Presentation
bbb.fileupload.fileLbl = File:
bbb.fileupload.selectBtn.toolTip = Browse file
@@ -111,18 +79,10 @@ bbb.fileupload.deleteBtn.toolTip = Delete Presentation
bbb.fileupload.showBtn = Show
bbb.fileupload.showBtn.toolTip = Show Presentation
bbb.fileupload.okCancelBtn = Cancel
-bbb.fileupload.progressLbl.uploadSuccessful = Upload completed. Please wait while we convert the document.
-bbb.fileupload.progressBar.uploadSuccessful = Upload successful.
-bbb.fileupload.progressLbl.uploading = {0}% uploaded.
-bbb.fileupload.progressBar.uploading = {0}% uploaded.
-bbb.fileupload.progressLbl.converting = Converted {0} of {1} slides.
-bbb.fileupload.progressBar.converting = Converted {0} of {1} slides.
-bbb.fileupload.progressLbl.extracting = Extracting slide {0} of {1} slides.
-bbb.fileupload.progressBar.extracting = Extracting slide {0} of {1} slides.
bbb.fileupload.genThumbText = Generating thumbnails..
bbb.fileupload.progBarLbl = Progress:
-# ChatWindow.mxml
+# Chat
bbb.chat.title = Chat
bbb.chat.cmpColorPicker.toolTip = Text Color
bbb.chat.sendBtn = Send
@@ -136,25 +96,23 @@ bbb.chat.privateChatSelect = Select a person to chat with privately
bbb.chat.chatOptions = Chat Options
bbb.chat.fontSize = Font Size
-# ListenersWindow.mxml
+# Listeners
bbb.listeners.title = Listeners{0} {1}
bbb.listeners.muteAllBtn.toolTip = Mute all
bbb.listeners.unmuteAllBtn.toolTip = Unmute all
bbb.listeners.ejectTooltip = Kick User
-
-# ListenerItem.mxml
bbb.listenerItem.nameLbl.toolTip = Select this user and click button to mute or unmute.
bbb.listenerItem.talkImg.toolTip = Talking
bbb.listenerItem.lockImg.toolTip = Click to keep muted or unmuted
bbb.listenerItem.muteUnmute.toolTip = Mute or unmute this listener
-# PublishWindow.mxml
+# Video
bbb.publishVideo.title = Share your webcam
bbb.publishVideo.startPublishBtn.toolTip = Start Sharing
bbb.video.publish.close.tooltip = Stop sharing your video
bbb.video.publish.close.label = Close
-# DesktopPublishWindow.mxml
+# Desktop Sharing
bbb.desktopPublish.title = Desktop Sharing: Presenter's Preview
bbb.desktopPublish.fullscreen.tooltip = Share your whole screen
bbb.desktopPublish.fullscreen.label = Full Screen
@@ -175,7 +133,7 @@ bbb.toolbar.phone.toolTip = Share My Microphone
bbb.toolbar.deskshare.toolTip = Share My Desktop
bbb.toolbar.video.toolTip = Share My Camera
-# HighlighterToolbar.mxml
+# Whiteboard
bbb.highlighter.toolbar.pencil = Highlighter
bbb.highlighter.toolbar.ellipse = Circle
bbb.highlighter.toolbar.rectangle = Rectangle
@@ -184,6 +142,5 @@ bbb.highlighter.toolbar.undo = Undo Shape
bbb.highlighter.toolbar.color = Select Color
bbb.highlighter.toolbar.thickness = Change Thickness
-# WhiteboardButton.mxml
bbb.highlighter.button.toolTipShow = Show Whiteboard
bbb.highlighter.button.toolTipHide = Hide Whiteboard
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/JoinFailedWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/JoinFailedWindow.mxml
deleted file mode 100755
index aee1f44dc64b770623616a55d6655b5f45299973..0000000000000000000000000000000000000000
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/JoinFailedWindow.mxml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- BigBlueButton - http://www.bigbluebutton.org
-
- Copyright (c) 2008-2009 by respective authors (see below). All rights reserved.
-
- BigBlueButton is free software; you can redistribute it and/or modify it under the
- terms of the GNU Lesser General Public License as published by the Free Software
- Foundation; either version 3 of the License, or (at your option) any later
- version.
-
- BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License along
- with BigBlueButton; if not, If not, see <http://www.gnu.org/licenses/>.
-
- $Id: $
--->
-
-<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml"
- title="Join Failed" showCloseButton="false" creationComplete="init()"
- x="168" y="86" layout="absolute" width="400" height="100">
- <mx:Script>
- <![CDATA[
- import org.bigbluebutton.common.LogUtil;
- import mx.controls.Alert;
- import mx.managers.PopUpManager;
-
- private function init():void {
- var pageURL:String = mx.core.Application.application.url.split("/")[2];
- var url:URLRequest = new URLRequest("http://" + pageURL + "/conference-session/signOut");
- LogUtil.debug("Log out url: " + pageURL);
- addEventListener(Event.CLOSE, onUserLoggedOutWindowClose);
- }
-
- private function redirect():void {
- var pageURL:String = mx.core.Application.application.url.split("/")[2];
- var url:URLRequest = new URLRequest("http://" + pageURL + "/bigbluebutton/conference-session/signOut");
- LogUtil.debug("Log out url: " + pageURL);
- navigateToURL(url, '_self');
- PopUpManager.removePopUp(this);
- }
-
- private function onUserLoggedOutWindowClose(e:Event):void {
- PopUpManager.removePopUp(this);
- }
- ]]>
- </mx:Script>
-
- <mx:Button id="okBtn" label="OK" click="redirect()" x="118.5" y="28"/>
- <mx:Label text="No valid session. Click ok to login." y="7" x="24"/>
-</mx:TitleWindow>
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
index c42de251c61995d44f7e4ca5ad438c638047790c..aa1f2e18b67837fb3f52b4c05b2d0a6f6282367e 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
@@ -49,6 +49,7 @@
}
private function testRTMP(e:PortTestEvent):void{
+ //- Cannot get locale string this early in loading process
this.label = 'Connecting to the server'; //ResourceUtil.getInstance().getString('bbb.mainshell.statusProgress.connecting');
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 28d6168ba6e6b4c6f9c09f4b5b005b91466e3057..55768b80f941ca46893520147ec8c74136ca23c1 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -240,7 +240,6 @@
<mx:Spacer width="20"/>
<mx:Spacer width="100%"/>
<mx:Button width="20" height="20" toolTip="{ResourceUtil.getInstance().getString('bbb.mainshell.logBtn.toolTip')}" id="logBtn" icon="{logs_icon}" click="openLogWindow()" />
- <!--mx:Button width="20" height="20" toolTip="{ResourceUtil.getInstance().getString('bbb.mainshell.fullScreenBtn.toolTip')}" id="fullScreen" icon="{fullscreen_icon}" click="toggleFullScreen()" /-->
<mx:Button width="20" height="20" toolTip="{ResourceUtil.getInstance().getString('bbb.mainshell.resetLayoutBtn.toolTip')}" id="btnResetLayout" icon="{reset_layout_icon}" click="resetLayout()" />
</mx:ControlBar>
</mx:VBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml
index aafb49a0a604c5b7afee6bf6a9324cf2d282fd4c..7dd027d02223eff401c1fcebe8d683d9493044d5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml
@@ -561,14 +561,15 @@
<mx:ApplicationControlBar id="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}">
<mx:Button id="uploadPres" icon="{uploadIcon}" visible="false" width="20" height="20"
- toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn')}"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn.toolTip')}"
click="dispatchEvent(new UploadEvent(UploadEvent.OPEN_UPLOAD_WINDOW))"/>
<mx:Spacer width="50%" id="spacer1"/>
<mx:Button id="backButton" icon="{backwardIcon}" visible="false" width="30" height="20"
- toolTip="Previous slide." click="gotoPreviousSlide()"/>
- <mx:Button id="btnSlideNum" visible="false" label="" click="showThumbnails()" doubleClick="showPageDialog()"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.backBtn.toolTip')}" click="gotoPreviousSlide()"/>
+ <mx:Button id="btnSlideNum" visible="false" label="" click="showThumbnails()" doubleClick="showPageDialog()"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.slideNumLbl.toolTip')}"/>
<mx:Button id="forwardButton" icon="{forwardIcon}" visible="false" width="30" height="20"
- toolTip="Next slide" click="gotoNextSlide()"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="gotoNextSlide()"/>
<mx:Spacer width="10%" id="spacer2"/>
<mx:HSlider id="zoomSlider" visible="false"
minimum="100" maximum="400" value="100" dataTipPlacement="top" labels="['100%','400%']"
@@ -577,8 +578,7 @@
<mx:Spacer width="50%" id="spacer3"/>
<!--containers:Docker id="toolbarDocker" height="100%" width="250" visible="{isPresenter}" /-->
<mx:Button id="btnResetZoom" icon="{magnifierIcon}" visible="false" width="20" height="20"
- toolTip="Reset Zoom" click="onResetZoom()"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.resetZoomBtn.toolTip')}" click="onResetZoom()"/>
<mx:Spacer width="5" id="spacer4"/>
- <!--<mx:Button id="btnSelection" click="enableTextSelection()" />-->
</mx:ApplicationControlBar>
</pres:MDIWindow>