Merge branch 'master' into record-and-playback-feature
Conflicts: bigbluebutton-client/.actionScriptProperties bigbluebutton-client/.flexProperties
This commit is contained in:
Richard Alam
commit
6b97c99817
@ -11,8 +11,8 @@ sip.server.password=secret
|
||||
# in your bbb_sip.conf.
|
||||
# See http://code.google.com/p/bigbluebutton/source/browse/#svn/trunk/bbb-voice-conference/config/asterisk
|
||||
# create-sip-users.sh script to create the users.
|
||||
startAudioPort=34380
|
||||
stopAudioPort=34479
|
||||
startAudioPort=15000
|
||||
stopAudioPort=16383
|
||||
|
||||
# An extension pattern, in case your asterisk extensions.conf
|
||||
# uses a naming convetion for your meeting rooms
|
||||
|
||||
@ -45,9 +45,7 @@
|
||||
<module application="src/BigBlueButton.mxml" destPath="BreakoutModule.swf" optimize="true" sourcePath="src/BreakoutModule.mxml"/>
|
||||
</modules>
|
||||
<buildCSSFiles>
|
||||
<buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/logo_basic.css"/>
|
||||
<buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/theme.css"/>
|
||||
</buildCSSFiles>
|
||||
</actionScriptProperties>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
<property name="DYN_INFO" value="DynamicInfoModule" />
|
||||
<property name="BREAKOUT" value="BreakoutModule" />
|
||||
|
||||
<property name="AVAILABLE_LOCALES" value="az_AZ,bg_BG,cs_CZ,de_DE,el_GR,en_US,es_ES,es_LA,fr_FR,fr_CA,hu_HU,it_IT,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,tr_TR,vi_VN,zh_CN,zh_TW,sv_SE,fa_IR,ja_JP"/>
|
||||
<property name="AVAILABLE_LOCALES" value="az_AZ,bg_BG,cs_CZ,de_DE,el_GR,en_US,es_ES,es_LA,fr_FR,fr_CA,hu_HU,it_IT,lv_LV,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,tr_TR,vi_VN,zh_CN,zh_TW,sv_SE,fa_IR,ja_JP"/>
|
||||
|
||||
<xmlproperty file="${SRC_DIR}/conf/locales.xml" collapseAttributes="true"/>
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
<target name="branding" depends="init-ant-contrib">
|
||||
<sequential>
|
||||
<mxmlc file="${SRC_DIR}/branding/css/theme.css" output="${OUTPUT_DIR}/branding/css/theme.swf" debug="false" optimize="true">
|
||||
<mxmlc file="${SRC_DIR}/branding/css/${themeFile}" output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" debug="false" optimize="true">
|
||||
</mxmlc>
|
||||
</sequential>
|
||||
</target>
|
||||
|
||||
@ -7,7 +7,7 @@ bbb.mainshell.locale.version=0.71
|
||||
bbb.mainshell.statusProgress.connecting = Connecting to the server
|
||||
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.copyrightLabel2 = (c) 2011, BigBlueButton build {0} - For more information see http://www.bigbluebutton.org/.
|
||||
bbb.mainshell.logBtn.toolTip = Open Log Window
|
||||
bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
|
||||
|
||||
|
||||
148
bigbluebutton-client/locale/lv_LV/bbbResources.properties
Executable file
148
bigbluebutton-client/locale/lv_LV/bbbResources.properties
Executable file
@ -0,0 +1,148 @@
|
||||
|
||||
# BigBlueButton.mxml
|
||||
bbb.pageTitle = BigBlueButton
|
||||
|
||||
# MainApplicationShell.mxml
|
||||
bbb.mainshell.locale.version=0.71
|
||||
bbb.mainshell.statusProgress.connecting = Pievienojas serverim
|
||||
bbb.mainshell.statusProgress.loading = Iel?d? {0} modu?us
|
||||
bbb.mainshell.statusProgress.cannotConnectServer = Atvainojiet, piesl?gties serverim neizdev?s.
|
||||
bbb.mainshell.copyrightLabel2 = (c) 2010, BigBlueButton build {0} - For more information see http://www.bigbluebutton.org/.
|
||||
bbb.mainshell.logBtn.toolTip = Atv?rt logus
|
||||
bbb.mainshell.resetLayoutBtn.toolTip = Atiestat?t izk?rtojumu
|
||||
|
||||
# OldLocaleWarnWIndow.mxml
|
||||
bbb.oldlocalewindow.reminder1=Iesp?jams, ka tulkojums ir novecojis.
|
||||
bbb.oldlocalewindow.reminder2=Izt?riet p?rl?ka ke?atmi?u un m??iniet v?lreiz.
|
||||
bbb.oldlocalewindow.windowTitle=Br?din?jums: Tulkojums ir novecojis.
|
||||
|
||||
# MainToolbar.mxml
|
||||
bbb.mainToolbar.helpBtn = Pal?dz?ba
|
||||
bbb.mainToolbar.logoutBtn = Iziet
|
||||
bbb.mainToolbar.logoutBtn.toolTip = Iziet
|
||||
|
||||
|
||||
###### modules ######
|
||||
|
||||
# Viewers
|
||||
bbb.viewers.title = Lietot?ji {0} {1}
|
||||
bbb.viewers.viewersGrid.nameItemRenderer = V?rds
|
||||
bbb.viewers.viewersGrid.nameItemRenderer.nameLabel.toolTip = J?s esat piesl?dzies k? ?is lietot?js.
|
||||
bbb.viewers.viewersGrid.roleItemRenderer = Loma
|
||||
bbb.viewers.viewersGrid.statusItemRenderer = Statuss
|
||||
bbb.viewers.viewersGrid.statusItemRenderer.raiseHand.toolTip = Roka pacelta {0}
|
||||
bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip = Spiest lai apskat?tu.
|
||||
bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip = Demonstr?t?js
|
||||
bbb.viewers.presentBtn.toolTip = Izv?l?ties dal?bnieku k? demonstr?t?ju.
|
||||
bbb.viewers.raiseHandBtn.toolTip = Spiest lai paceltu roku.
|
||||
bbb.viewers.presentBtn.label = P?rsl?gt demonstr?t?ju
|
||||
bbb.viewers.kickUserBtn.toolTip = Izsviest lietot?ju
|
||||
|
||||
# Presentation
|
||||
bbb.presentation.title = Prezent?cija
|
||||
bbb.presentation.uploadPresBtn = Aug?upiel?d?t prezent?ciju.
|
||||
bbb.presentation.uploadPresBtn.toolTip = Aug?upiel?d?t prezent?ciju.
|
||||
bbb.presentation.backBtn.toolTip = Iepriek??jais slaids.
|
||||
bbb.presentation.slideNumLbl.toolTip = Spiest lai izv?l?tos slaidu
|
||||
bbb.presentation.forwardBtn.toolTip = N?ko?ais slaids
|
||||
bbb.presentation.resetZoomBtn.toolTip = Atiestat?t palielin?jumu
|
||||
bbb.presentation.presenterNameLbl = {0} pa?laik prezent?.
|
||||
bbb.presentation.clickToUpload = Aug?upiel?d?t prezent?ciju
|
||||
bbb.presentation.maxUploadFileExceededAlert = K??da: Faila izm?rs ir liel?ks par at?auto.
|
||||
|
||||
bbb.presentation.uploadcomplete = Aug?upiel?de pabeigta. Uzgaidiet kam?r dokuments tiek konvert?ts.
|
||||
bbb.presentation.uploaded = aug?upiel?d?ts.
|
||||
bbb.presentation.document.supported = Aug?upiel?d?tais documents ir atbalst?ts. Uzs?kta konvert?cija...
|
||||
bbb.presentation.document.converted = Dokuments veiksm?gi konvert?ts.
|
||||
bbb.presentation.error.document.convert.failed = K??da: Dokumenta konvert?cija neizdev?s.
|
||||
bbb.presentation.error.io = IO K??da: Kontakt?jieties ar administratoru.
|
||||
bbb.presentation.error.security = Dro??bas K??da: Kontakt?jieties ar administratoru.
|
||||
bbb.presentation.error.convert.format = K??da: P?rbaudiet vai failam ir pareizs papla?in?jums.
|
||||
bbb.presentation.error.convert.notsupported = K??da: Aug?upiel?d?tais dokuments netiek atbalst?ts.
|
||||
bbb.presentation.error.convert.nbpage = K??da: Neizdev?s noteikt dokumenta lapu skaitu.
|
||||
bbb.presentation.error.convert.maxnbpagereach = K??da: Aug?upiel?d?tajam dokumentam ir par daudz lapu.
|
||||
bbb.presentation.error.convert.swf = K??da konvert?jot failu. Kontakt?jieties ar administratoru.
|
||||
bbb.presentation.converted = Konvert?ti {0} no {1} slaidiem.
|
||||
bbb.presentation.ok = OK
|
||||
bbb.presentation.uploadwindow.presentationfile = Prezent?cijas fails
|
||||
bbb.presentation.uploadwindow.pdf = PDF
|
||||
bbb.presentation.uploadwindow.word = WORD
|
||||
bbb.presentation.uploadwindow.excel = EXCEL
|
||||
bbb.presentation.uploadwindow.powerpoint = POWERPOINT
|
||||
bbb.presentation.uploadwindow.image = ATT?LS
|
||||
bbb.presentation.uploadwindow.closeLabel = Spiest OK lai aizv?rtu logu
|
||||
bbb.fileupload.title = Aug?upiel?d?t prezent?ciju
|
||||
bbb.fileupload.fileLbl = Fails:
|
||||
bbb.fileupload.selectBtn.toolTip = P?rl?kot failu
|
||||
bbb.fileupload.uploadBtn = Aug?upiel?d?t
|
||||
bbb.fileupload.uploadBtn.toolTip = Aug?upiel?d?t failu
|
||||
bbb.fileupload.presentationNamesLbl = Aug?upiel?d?t?s prezent?cijas:
|
||||
bbb.fileupload.deleteBtn.toolTip = Dz?st prezent?ciju
|
||||
bbb.fileupload.showBtn = R?d?t
|
||||
bbb.fileupload.showBtn.toolTip = R?d?t prezent?ciju
|
||||
bbb.fileupload.okCancelBtn = Atcelt
|
||||
bbb.fileupload.genThumbText = ?ener? priek?skat?jumus..
|
||||
bbb.fileupload.progBarLbl = Progress:
|
||||
|
||||
# Chat
|
||||
bbb.chat.title = ?ats
|
||||
bbb.chat.cmpColorPicker.toolTip = Teksta kr?sa
|
||||
bbb.chat.sendBtn = S?t?t
|
||||
bbb.chat.sendBtn.toolTip = S?t?t zi?u
|
||||
bbb.chat.publicChatUsername = Visi
|
||||
bbb.chat.publicMsgAwaiting = Jauna publisk? zi?a
|
||||
bbb.chat.publicMsgAwaiting2 = Jauna publisk? zi?a *
|
||||
bbb.chat.privateMsgAwaiting = Jauna priv?t? zi?a
|
||||
bbb.chat.privateMsgAwaiting2 = Jauna priv?t? zi?a *
|
||||
bbb.chat.privateChatSelect = Izv?l?ties personu priv?tam ?atam
|
||||
bbb.chat.chatOptions = ?ata opcijas
|
||||
bbb.chat.fontSize = ?rifta izm?rs
|
||||
|
||||
# Listeners
|
||||
bbb.listeners.title = Klaus?t?ji {0} {1}
|
||||
bbb.listeners.muteAllBtn.toolTip = Apklusin?t visus
|
||||
bbb.listeners.unmuteAllBtn.toolTip = Iesl?gt visus
|
||||
bbb.listeners.ejectTooltip = Izsviest lietot?ju
|
||||
bbb.listenerItem.nameLbl.toolTip = Izv?l?ties lietot?ju un spiest ?eit lai apklusin?tu vai iesl?gtu lietot?ju.
|
||||
bbb.listenerItem.talkImg.toolTip = Run?
|
||||
bbb.listenerItem.lockImg.toolTip = Spiest lai patur?tu apklusin?tu vai iesl?gtu
|
||||
bbb.listenerItem.muteUnmute.toolTip = Apklusin?t vai iesl?gt lietot?ju
|
||||
|
||||
# Video
|
||||
bbb.publishVideo.title = Raid?t webkameru
|
||||
bbb.publishVideo.startPublishBtn.toolTip = S?kt raid??anu
|
||||
bbb.video.publish.close.tooltip = Aptur?t video raid??anu
|
||||
bbb.video.publish.close.label = Aizv?rt
|
||||
|
||||
# Desktop Sharing
|
||||
bbb.desktopPublish.title = Darbavirsmas raid??ana: Demonstr?t?ja piem?rs
|
||||
bbb.desktopPublish.fullscreen.tooltip = Raid?t visu ekr?nu
|
||||
bbb.desktopPublish.fullscreen.label = Pilnekr?ns
|
||||
bbb.desktopPublish.region.tooltip = Raid?t da?u no ekr?na
|
||||
bbb.desktopPublish.region.label = Re?ions
|
||||
bbb.desktopPublish.stop.tooltip = Aizv?rt ekr?na raid??anu
|
||||
bbb.desktopPublish.stop.label = Aizv?rt
|
||||
bbb.desktopPublish.maximizeRestoreBtn.toolTip = ?o logu maksimiz?t nevar.
|
||||
bbb.desktopPublish.closeBtn.toolTip = Aptur?t raid??anu un aizv?rt ?o logu.
|
||||
bbb.desktopPublish.minimizeBtn.toolTip = Minimiz?t ?o logu.
|
||||
|
||||
bbb.desktopView.title = Darbavirsmas raid??ana
|
||||
bbb.desktopView.fitToWindow = Ietilpin?t log?
|
||||
bbb.desktopView.actualSize = R?d?t re?laj? izm?r?
|
||||
|
||||
# ToolbarButton.mxml
|
||||
bbb.toolbar.phone.toolTip = Raid?t mikrofonu
|
||||
bbb.toolbar.deskshare.toolTip = Raid?t darbavirsmu
|
||||
bbb.toolbar.video.toolTip = Raid?t webkameru
|
||||
|
||||
# Whiteboard
|
||||
bbb.highlighter.toolbar.pencil = Mar?ieris
|
||||
bbb.highlighter.toolbar.ellipse = Elipse
|
||||
bbb.highlighter.toolbar.rectangle = Taisnst?ris
|
||||
bbb.highlighter.toolbar.clear = Not?r?t lapu
|
||||
bbb.highlighter.toolbar.undo = Atcelt formu
|
||||
bbb.highlighter.toolbar.color = Izv?l?ties kr?su
|
||||
bbb.highlighter.toolbar.thickness = Main?t biezumu
|
||||
|
||||
bbb.highlighter.button.toolTipShow = R?d?t t?feli
|
||||
bbb.highlighter.button.toolTipHide = Pasl?pt t?feli
|
||||
Binary file not shown.
@ -6,7 +6,7 @@
|
||||
<porttest host="HOST" application="video"/>
|
||||
<application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter" />
|
||||
<language userSelectionEnabled="true" />
|
||||
<skinning enabled="false" url="branding/css/theme.swf" />
|
||||
<skinning enabled="false" url="branding/css/theme.css.swf" />
|
||||
<debug showDebugWindow="false" />
|
||||
|
||||
<modules>
|
||||
|
||||
6
bigbluebutton-client/src/branding/css/logo_basic.css
Executable file
6
bigbluebutton-client/src/branding/css/logo_basic.css
Executable file
@ -0,0 +1,6 @@
|
||||
/*The image for your logo is 200x200 pixels. No other size is currently supported so resize your logo accordingly. The logo will always appear in the lower right corner. */
|
||||
BrandingLogo
|
||||
{
|
||||
backgroundImage: Embed(source="assets/img/BBBLogo.png");
|
||||
backgroundSize: "100%";
|
||||
}
|
||||
@ -11,7 +11,7 @@ Application
|
||||
/*The image for your logo is 200x200 pixels. No other size is currently supported so resize your logo accordingly. The logo will always appear in the lower right corner. */
|
||||
BrandingLogo
|
||||
{
|
||||
backgroundImage: Embed(source="assets/img/BBBlogo.png");
|
||||
backgroundImage: Embed(source="assets/img/BBBLogo.png");
|
||||
backgroundSize: "100%";
|
||||
}
|
||||
|
||||
|
||||
@ -39,6 +39,7 @@
|
||||
'Greek',
|
||||
'Italian',
|
||||
'Japanese',
|
||||
'Latvian',
|
||||
'Lithuanian',
|
||||
'Norwegian',
|
||||
'Dutch',
|
||||
@ -67,6 +68,7 @@
|
||||
'el_GR',
|
||||
'it_IT',
|
||||
'ja_JP',
|
||||
'lv_LV',
|
||||
'lt_LT',
|
||||
'nb_NO',
|
||||
'nl_NL',
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
#set -x
|
||||
|
||||
|
||||
BBB_VERSION="0.71a-dev"
|
||||
BBB_VERSION="0.71a"
|
||||
|
||||
if [ ! -f /usr/share/red5/webapps/bigbluebutton/WEB-INF/red5-web.xml ]; then
|
||||
echo "#"
|
||||
@ -631,7 +631,7 @@ if [ $CHECKOUT ]; then
|
||||
echo "# "
|
||||
git clone $CHECKOUT
|
||||
cd ~/dev/source/bigbluebutton
|
||||
echo " Checking out version $BBB_VERSION (Not implemented yet)"
|
||||
echo " Checking out version $BBB_VERSION "
|
||||
#git checkout -b 0.7-release-workspace v0.7
|
||||
#git checkout -b 0.7-release-workspace v0.7
|
||||
echo "# "
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<div id="slogan"><h3>Demo Server</h3></div>
|
||||
</div>
|
||||
<div id="versionNum">
|
||||
<p style="text-align:right;"><strong>What's new in version 0.71</strong></p>
|
||||
<p style="text-align:right;"><strong>What's new in version 0.71a</strong></p>
|
||||
<p style="text-align:right;">Improved VoIP</p>
|
||||
<p style="text-align:right;">Selectable region for desktop sharing</p>
|
||||
<p style="text-align:right;">Automatic chat translation</p>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user